Commit ce65e482 authored by Ken Edmundson's avatar Ken Edmundson
Browse files

mods to allow input of lidar data file to jigsaw

parent 24b4e769

isis/src/control/apps/jigsaw/jigsaw.cpp

+11 −0
Original line number Diff line number Diff line
@@ -78,6 +78,17 @@ void IsisMain() { 
      ControlNetQsp cnet = fixHeldImages(cnetFile, heldList, cubeList);

      bundleAdjustment = new BundleAdjust(settings, cnet, cubeList);

    }

    else if (ui.WasEntered("LIDARDATA")) {

      QString lidarFile = ui.GetFileName("LIDARDATA");



      // validate lidar point file exists

      if (!QFile::exists(lidarFile)) {

        string msg = "Input lidar point file does not exist";

        throw IException(IException::User, msg, _FILEINFO_);

      }



      bundleAdjustment = new BundleAdjust(settings, cnetFile, cubeList, lidarFile);

    }

    else {

      bundleAdjustment = new BundleAdjust(settings, cnetFile, cubeList);

    }

isis/src/control/apps/jigsaw/jigsaw.xml

+14 −0
Original line number Diff line number Diff line
@@ -324,6 +324,20 @@ 
          *.net

        </filter>

      </parameter>

      <parameter name="LIDARDATA">

        <type>filename</type>

        <fileMode>input</fileMode>

        <brief>

          Input Lidar Point File

        </brief>

        <description>

        This file is a <def>lidar point data</def> generated from <b>lrolola2isis.cpp</b>.

        It contains <def>lidar control point</def>s and associated measures for simultaneous images.

        </description>

        <filter>

          *.dat *.json

        </filter>

      </parameter>



 <!-- Turning off USEPVL and SC_PARAMETERS for now. Since we are now using observation numbers

      to obtain the BundleObservationSolveSettings for a BundleObservation (instead of inst. id),