Commit dc4bdd27 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Re-implemented CSV output for images in jigsaw. Fixes #4314. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7157 41f8697f-d340-4b68-9986-7bafba869bb8
parent d1717f58

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

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ void IsisMain() { 
    if (ui.GetBoolean("BUNDLEOUT_TXT")) {

      bundleSolution.outputText();

    }



    if (ui.GetBoolean("IMAGES_CSV")) {

      bundleSolution.outputImagesCSV();

    }



    if (ui.GetBoolean("OUTPUT_CSV")) {

      bundleSolution.outputPointsCSV();

    }

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

+18 −0
Original line number Diff line number Diff line
@@ -212,6 +212,11 @@ 
      When running jigsaw with error propagation turned on, the correlation matrix file,

      inverseMatrix.dat, is no longer generated. Fixes #4315.

    </change>

    <change name="Tyler Wilson" date="2016-10-06">

      Added the IMAGES_CSV parameter to the "Output Options" group

      so that the user can now request the bundleout_images.csv file

      in addition to the other output files such as bundleout.txt.  Fixes #4314.

    </change>

  </history>



  <groups>
@@ -1114,6 +1119,19 @@ 
          </default>

        </parameter>



        <parameter name="IMAGES_CSV">

          <brief> Outputs image data (body-fixed) to csv file - bundleout_images.csv

          </brief>

          <description>

            Selection of this parameter flags output of image data

            (in body-fixed coordinates) to a csv file.

          </description>

          <type>boolean</type>

          <default>

            <item>yes</item>

          </default>

        </parameter>



        <parameter name="OUTPUT_CSV">

          <brief> Outputs point and image data (body-fixed) to csv file - bundleout_points.csv

          </brief>

isis/src/control/apps/jigsaw/tsts/imagesOutCSV/Makefile

0 → 100644
+23 −0
Original line number Diff line number Diff line 
APPNAME = jigsaw

# This tests the function which outputs bundleout_images.csv.  It

#

# # 2016-10-11 Tyler Wilson - Original version. Fixes #4314.



include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/cube.lis;

	$(APPNAME) fromlist=$(OUTPUT)/cube.lis  \

	           cnet=$(INPUT)/Ames_7-ImageLSTest_USGS_combined.net \

	           onet=$(OUTPUT)/apollo_out.net \

	           radius=yes \

	           errorpropagation=yes \

	           spsolve=position \

	           spacecraft_position_sigma=1000.0 \

	           camera_angles_sigma=2. \

			   bundleout_txt=no \

			   output_csv=no \

			   residuals_csv=no \

	           file_prefix=$(OUTPUT)/ > /dev/null;

	$(RM) $(OUTPUT)/cube.lis > /dev/null;

	$(RM) $(OUTPUT)/*.net > /dev/null;