Commit 5aa7b8fe authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Removed the underscores from the new parameters in jigsaw. Fixes #4308. 

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

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

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void IsisMain() { 
      bundleSolution.outputText();

    }



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

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

      bundleSolution.outputImagesCSV();

    }
@@ -222,8 +222,8 @@ BundleSettingsQsp bundleSettings(UserInterface &ui) { 
  // target body options

  if (ui.GetBoolean("SOLVETARGETBODY") == true) {

    PvlObject obj;

    ui.GetFileName("TB_PARAMETERS");

    Pvl tbParPvl(FileName(ui.GetFileName("TB_PARAMETERS")).expanded());

    ui.GetFileName("TBPARAMETERS");

    Pvl tbParPvl(FileName(ui.GetFileName("TBPARAMETERS")).expanded());

    if (!tbParPvl.hasObject("Target")) {

      QString msg = "Input Target parameters file missing main Target object";

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

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

+7 −4
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ 
      be the pointing's (rotation's) center angles. The bundleout_images.csv file will also have

      these defaults provided. Fixes #4464.

    </change>

    <change name="Makayla Shepherd" date="2016-10-26"> 

      Removed the underscores from the new parameters IMAGESCSV and TBPARAMETERS.

    </change>

  </history>



  <groups>
@@ -974,16 +977,16 @@ 
        <brief>Enter target body parameters and a priori values using a PVL file</brief>

        <description>

          This option indicates that target body parameters are to be input via the PVL file specified

          by TB_PARAMETERS. All of the following values for coefficients must be in the PVL file:

          by TBPARAMETERS. All of the following values for coefficients must be in the PVL file:

          body pole RA and DEC; prime meridian; triaxial radii and/or mean radius. An example template

          PVL file is located at $base/templates/jigsaw/TargetBodyParameters.pvl.

        </description>

        <inclusions>

          <item>TB_PARAMETERS</item>

          <item>TBPARAMETERS</item>

        </inclusions>

      </parameter>



      <parameter name="TB_PARAMETERS">

      <parameter name="TBPARAMETERS">

        <type>filename</type>

        <fileMode>input</fileMode>

        <brief>
@@ -1148,7 +1151,7 @@ 
          </default>

        </parameter>



        <parameter name="IMAGES_CSV">

        <parameter name="IMAGESCSV">

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

          </brief>

          <description>

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

+3 −3
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ commands: 
	fi;

# TEST B: exception occurs when performing bundle adjust

#         TODO: This still needs to be tested.

# TEST C: SOLVETARGETBODY=yes and TB_PARAMETERS file missing Target object

# TEST C: SOLVETARGETBODY=yes and TBPARAMETERS file missing Target object

	echo -e "Error Test C:" >> $(OUTPUT)/error.txt;

	if [[ `$(APPNAME) \

	  fromlist=$(INPUT)/empty.lis \

	  cnet=$(INPUT)/empty.net \

	  onet=$(OUTPUT)/out.net \

	  solvetargetbody=yes \

	  tb_parameters=$(INPUT)/invalidTargetParameters.pvl \

	  tbparameters=$(INPUT)/invalidTargetParameters.pvl \

	  2>> $(OUTPUT)/error.txt \

	  > /dev/null` ]]; \

	then \
@@ -49,7 +49,7 @@ commands: 
	  cnet=$(INPUT)/empty.net \

	  onet=$(OUTPUT)/out.net \

	  solvetargetbody=yes \

	  tb_parameters=$(INPUT)/zeroTargetParameters.pvl \

	  tbparameters=$(INPUT)/zeroTargetParameters.pvl \

	  2>> $(OUTPUT)/error.txt \

	  > /dev/null` ]]; \

	then \