Merge branch 'release'

CMake/telesculptor-external-fletch.cmake

@@ -81,7 +81,7 @@ ExternalProject_Add(fletch
     -Dfletch_ENABLE_LevelDB:BOOL=OFF
     -Dfletch_ENABLE_OpenBLAS:BOOL=OFF
     -Dfletch_ENABLE_OpenCV:BOOL=${TELESCULPTOR_ENABLE_FLETCH_OPENCV}
-    -DOpenCV_SELECT_VERSION:STRING=3.4.0
+    -DOpenCV_SELECT_VERSION:STRING=4.5.1
     -Dfletch_ENABLE_OpenCV_FFmpeg:BOOL=ON
     -Dfletch_ENABLE_OpenCV_contrib:BOOL=ON
     -Dfletch_ENABLE_OpenCV_highgui:BOOL=ON
@@ -93,13 +93,13 @@ ExternalProject_Add(fletch
     -Dfletch_ENABLE_Protobuf:BOOL=OFF
     -Dfletch_ENABLE_Qt:BOOL=${TELESCULPTOR_ENABLE_FLETCH_QT}
     -DBUILD_Qt_MINIMAL:BOOL=ON
-    -DQt_SELECT_VERSION:STRING=5.11.2
+    -DQt_SELECT_VERSION:STRING=5.12.8
     -Dfletch_ENABLE_Snappy:BOOL=OFF
     -Dfletch_ENABLE_SQLite3:BOOL=${TELESCULPTOR_ENABLE_FLETCH_PROJ}
     -Dfletch_ENABLE_SuiteSparse:BOOL=${TELESCULPTOR_ENABLE_FLETCH_CERES}
     -Dfletch_ENABLE_TinyXML:BOOL=OFF
     -Dfletch_ENABLE_VTK:BOOL=${TELESCULPTOR_ENABLE_FLETCH_VTK}
-    -DVTK_SELECT_VERSION:STRING=8.2
+    -DVTK_SELECT_VERSION:STRING=9.0
     -Dfletch_ENABLE_VXL:BOOL=ON
     -Dfletch_ENABLE_YAMLcpp:BOOL=OFF
     -Dfletch_ENABLE_ZLib:BOOL=${TELESCULPTOR_ENABLE_FLETCH_ZLIB}

CMake/telesculptor-external-kwiver.cmake

@@ -18,7 +18,7 @@ ExternalProject_Add(kwiver
   BINARY_DIR ${TELESCULPTOR_EXTERNAL_DIR}/kwiver-build
   STAMP_DIR ${TELESCULPTOR_STAMP_DIR}
   GIT_REPOSITORY "https://github.com/Kitware/kwiver.git"
-  GIT_TAG 6786e1371fc71ba27a7d6e3f7acf8cd04af4a225
+  GIT_TAG 1d47113490f123e89286e721fcf2d49aaed81ad2
   #GIT_SHALLOW 1
   CMAKE_CACHE_ARGS
     -DBUILD_SHARED_LIBS:BOOL=ON

CMakeLists.txt

@@ -80,7 +80,6 @@ endif()
 
 option(TELESCULPTOR_ENABLE_MANUALS "Build TeleSculptor user manual(s)" OFF)
 option(TELESCULPTOR_ENABLE_TESTING "Build TeleSculptor testing" OFF)
-option(TELESCULPTOR_ENABLE_TOOLS "Build command line tools" ON)
 set(PYTHON_VERSION_MAJOR "3")
 
 if(TELESCULPTOR_SUPERBUILD)
@@ -95,11 +94,6 @@ set(kwiver_export_name     telesculptor_exports)
 
 add_subdirectory(maptk)
 
-# this is where the executables source code lives
-if(TELESCULPTOR_ENABLE_TOOLS)
-  add_subdirectory(tools)
-endif()
-
 # this is where the algorithm default configuration files live
 add_subdirectory(config)
 

README.rst

@@ -94,9 +94,8 @@ TeleSculptor application into the Applications folder.
 ``./TeleSculptor-<version>-Linux-x86_64.sh --help``
 
 The remainder of this document is aimed at developers who wish to build the
-project from source or run command line tools.  For end users looking for
-instruction on running the GUI application please read the
-`User Guide <doc/TeleSculptor-v1.1-User-Guide.pdf>`_.
+project from source.  For end users looking for instruction on running the GUI
+application please read the `User Guide <doc/TeleSculptor-v1.1-User-Guide.pdf>`_.
 
 
 Building TeleSculptor
@@ -199,7 +198,6 @@ CMake Options
 ``TELESCULPTOR_ENABLE_CUDA``       Enable GPU acceleration with CUDA
 ``TELESCULPTOR_ENABLE_PYTHON``     Enable Python bindings in KWIVER
 ``TELESCULPTOR_ENABLE_MANUALS``    Turn on building the user documentation
-``TELESCULPTOR_ENABLE_TOOLS``      Build the command line tools
 ``TELESCULPTOR_ENABLE_TESTING``    Build the unit tests
 ``TELESCULPTOR_SUPERBUILD``        Build as a superbuild (build Fletch and KWIVER)
 ================================== ===================================================
@@ -312,103 +310,8 @@ Overview of Directories
 ``plugins/blender``     contains Python plug-ins for Blender
 ``plugins/sketchup``    contains Ruby plug-ins for SketchUp
 ``tests``               contains testing framework and tests for each module
-``tools``               contains source for command line utilities
 ======================= ========================================================
 
-MAP-Tk Tools
-============
-
-MAP-Tk command line tools are placed in the ``bin`` directory of the build
-or install path.  These tools are described below.  Note that these tools are
-in the process of being migrated to KWIVER and will leave this repository soon.
-Continued support is not guaranteed and behavior may diverge from documentation.
-
-
-Summary of MAP-Tk Tools
------------------------
-
-The primary tools are ``maptk_track_features`` and
-``maptk_bundle_adjust_tracks``. Together these form the sparse bundle
-adjustment pipeline.  The other tools are for debugging and analysis purposes.
-
-``maptk_detect_and_describe``
-  This optional tool pre-computes feature points and descriptors on each frame
-  of video and caches them on disk.  The same is also done in the
-  ``maptk_track_features``, so this step is not required.  However, this tool
-  makes better use of threading to process all frames in parallel.
-
-``maptk_track_featues``
-  Takes a list of images and produces a feature tracks file.
-
-``maptk_bundle_adjust_tracks``
-  Takes feature tracks and produces cameras (KRTD files) and 3D points (PLY
-  file). Can also take input POS files or geo-reference points and produce
-  optimized POS files.
-
-``maptk_apply_gcp``
-  This tool takes an existing solution from ``maptk_bundle_adjust_tracks``
-  and uses provided ground control points (GCPs) to fit a 3D similarity
-  transformation to align the solution to the GCPs.  The same is done in
-  the bundle adjust tool, but this tool lets you update and reapply GCPs
-  without recomputing bundle adjustment.
-
-``maptk_pos2krtd``
-  Takes POS files and directly produces KRTD.
-
-``maptk_analyze_tracks``
-  Takes images and feature tracks and produces tracking statistics or images
-  with tracks overlaid.
-
-``maptk_estimate_homography``
-  Estimates a homography transformation between two images, outputting a file
-  containing the matrices.
-
-
-Running MAP-Tk Tools
---------------------
-
-Each MAP-Tk tool has the same interface and accepts three command line
-arguments:
-
-* ``-c`` to specify an input configuration file
-* ``-o`` to output the current configuration to a file
-* ``-h`` for help (lists these options)
-
-Each tool has all of its options, including paths to input and output files,
-specified in the configuration file.  To get started, run one of the tools
-like this::
-
-    $ maptk_track_features -o config_file.conf
-
-This will produce an initial set of configuration options.  You can then edit
-``config_file.conf`` to specify input/output files, choices of algorithms, and
-algorithm parameters.  Just as in CMake, configuring some parameters will
-enable new sub-parameters and you need to re-run the tool to get the updated
-list of parameters.  For example::
-
-    $ maptk_track_features -c config_file.conf -o config_file.conf
-
-The above command will overwrite the existing config file with a new file.
-Ordering of entries and comments are not preserved.  Use a different output
-file name to prevent overwriting the original.  Continue to adjust parameters
-and re-run the above command until the tool no longer reports the message::
-
-    ERROR: Configuration not valid.
-
-Note that the config file itself contains detail comments documenting each
-parameter.  For each abstract algorithm you must specify the name of variant
-to use, but the list of valid names (based on which modules are compiled)
-is provided directly in the comment for easy reference. When the config file
-is complete and valid, run the tool one final time as::
-
-    $ maptk_track_features -c config_file.conf
-
-An easier way to get started is to use the sample configuration files for each
-tool that are provided in the ``examples`` directory.  These examples use
-recommended default settings that are known to produce useful results on some
-selected public data samples.  The example configuration files include the
-default configuration files for each algorithm in the ``config`` directory.
-
 
 Getting Help
 ============

doc/release-notes/master.txt → doc/release-notes/1.2.0.txt

@@ -4,7 +4,6 @@ TeleSculptor v1.2.0 Release Notes
 This is a minor release of TeleSculptor that provides both new functionality
 and fixes over the previous v1.1.0 release.
 
-
 Updates since v1.1.0
 --------------------
 
@@ -44,12 +43,25 @@ TeleSculptor Application
  * Added keyboard shortcuts to change frames and to change the selected ground
    control point.
 
+Tools
+
+ * Removed deprecated command line maptk tools. All the underlying kwiver
+   algoritms can be accessed via the 'kwiver' command line tool.
+
 Build System
 
  * The superbuild now allows using system packages for many dependencies.
 
-
-Fixes since v1.1.0
+Fixes since v1.1.2
 ------------------
 
 TeleSculptor Application
+
+ * Fixed a bug in which the "zoom to landmarks" option would make the World
+   View projections permantly invalid if there were no landmarks to zoom to.
+
+ * Updated OpenCV version to 4.5.1
+
+ * Updated Qt version to 5.12.8
+
+ * Updated VTK Version to 9.0