From b0e5b4732686f4231ddb156e932ba74fdeb094f3 Mon Sep 17 00:00:00 2001 From: Saijin-Naib <19295950+Saijin-Naib@users.noreply.github.com> Date: Mon, 28 Jun 2021 09:05:27 -0400 Subject: [PATCH 1/2] Updated requirements.txt to reflect latest packages in pypi. Tested/verified locally under Alpine Linux and Windows 10. Re-ordred packages in requirements.txt to be alphabetical for style reasons. Updated Makefile and make.bat to use the --host syntax instead of older -H syntax to set the localhost/loopback address for livehtml build. --- Makefile | 2 +- make.bat | 2 +- requirements.txt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 83aca6527..c3b232488 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ pulllang: tx pull --language "sw,ar,es,fr,te,fil" livehtml: - sphinx-autobuild --open-browser -H 0.0.0.0 -b dirhtml "$(SOURCEDIR)" "$(BUILDDIR)" + sphinx-autobuild --open-browser --host 0.0.0.0 -b dirhtml "$(SOURCEDIR)" "$(BUILDDIR)" export GIT_DEPLOY_DIR = _build/html export GIT_DEPLOY_BRANCH = gh-pages diff --git a/make.bat b/make.bat index 01e7d561a..915082c30 100644 --- a/make.bat +++ b/make.bat @@ -1 +1 @@ -if "%1"=="livehtml" sphinx-autobuild --open-browser -H localhost -b html "source" "_build" \ No newline at end of file +if "%1"=="livehtml" sphinx-autobuild --open-browser --host localhost -b html "source" "_build" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 6f66e3725..79b680a3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -Sphinx==3.5.4 +Sphinx==4.0.2 +sphinx-autobuild==2021.3.14 +sphinx-intl==2.0.1 sphinx-rtd-theme==0.5.2 -sphinx-autobuild==0.7.1 -transifex-client==0.14.2 -sphinx-intl==2.0.1 \ No newline at end of file +transifex-client==0.14.3 \ No newline at end of file From 27b27120b5f0d63a7e22ffe17e92244c063ce93d Mon Sep 17 00:00:00 2001 From: Saijin-Naib <19295950+Saijin-Naib@users.noreply.github.com> Date: Mon, 28 Jun 2021 21:53:51 -0400 Subject: [PATCH 2/2] Update outputs.rst, .gitignore, requirements.txt - Fix Issue #97 - Update outputs.rst to include odm_orthophoto.original.tif explanation - .gitignore - Add exclusion for .vscode directory - requirements.txt - Adjust capital S in Sphinx to lower-case to be more consistent --- .gitignore | 1 + requirements.txt | 2 +- source/outputs.rst | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e6ef8b6f4..ffafa1abd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ _build venv +.vscode # Base ignores: # ============= diff --git a/requirements.txt b/requirements.txt index 79b680a3e..09d72d35d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Sphinx==4.0.2 +sphinx==4.0.2 sphinx-autobuild==2021.3.14 sphinx-intl==2.0.1 sphinx-rtd-theme==0.5.2 diff --git a/source/outputs.rst b/source/outputs.rst index bb4b22ba2..1b444e258 100644 --- a/source/outputs.rst +++ b/source/outputs.rst @@ -32,10 +32,10 @@ You can access the point cloud and textured meshes using MeshLab. Open MeshLab, Orthophoto ^^^^^^^^^^ -``odm_orthophoto/odm_orthphoto.png`` -- The orthophoto, but this is a simple png, which doesn't have any georeferencing information - ``odm_orthophoto/odm_orthphoto.tif`` -- GeoTIFF Orthophoto. You can use it in QGIS as a raster layer. +``odm_orthophoto/odm_orthphoto.original.tif`` -- The orthophoto in its original un-cropped state. + .. figure:: images/orthophoto.png :alt: image of OpenDroneMap orthophoto :align: center