Commit 8cd6a599 authored by Adam Paquette's avatar Adam Paquette
Browse files

Modified file prefix in jigsaw to add an underscore between the given prefix... 

Modified file prefix in jigsaw to add an underscore between the given prefix and the output file names. Fixes #4309

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

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

+8 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include <QList>

#include <QObject>

#include <QSharedPointer>

#include <QString>

#include <QChar>



#include "BundleAdjust.h"

#include "BundleResults.h"
@@ -226,6 +228,12 @@ BundleSettingsQsp bundleSettings(UserInterface &ui) { 
  QString outputfileprefix = "";

  if (ui.WasEntered("FILE_PREFIX"))  {

    outputfileprefix = ui.GetString("FILE_PREFIX");

    int length = (outputfileprefix.length()) - 1;

    QChar endvalue = outputfileprefix[length];

    QString check = "/";

    if (endvalue != check) {

      outputfileprefix += "_";

    }

  }

  settings->setOutputFilePrefix(outputfileprefix);

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

+5 −1
Original line number Diff line number Diff line
@@ -201,6 +201,9 @@ 
    <change name="Ian Humphrey" date="2016-08-22">

      Reviewed documentation and updated small spelling and grammar errors. References #4226.

    </change>

    <change name="Adam Paquette" data="2016-08-31">

      Updated how jigsaw handles its prefix parameter  along with a small documentation change. Fixes #4309.

    </change>

  </history>



  <groups>
@@ -1085,7 +1088,8 @@ 
         <internalDefault>none</internalDefault>

         <brief>Output file prefix</brief>

         <description>

           File prefix to prepend for the generated output files. 

           File prefix to prepend for the generated output files. Any prefix that is not a 

	   file path will have an underscore placed between the prefix and file name.

         </description>

        </parameter>

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

+12 −11
Original line number Diff line number Diff line
@@ -33,26 +33,27 @@ commands: 
	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/cube.lis;

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

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

	           onet=$(OUTPUT)/apollo_cholmod_out.net \

	           onet=$(OUTPUT)/apollo_out.net \

	           radius=yes \

	           errorpropagation=yes \

	           spsolve=position \

	           spacecraft_position_sigma=1000.0 \

	           camera_angles_sigma=2.0 > /dev/null;

	$(CAT) bundleout.txt  | grep -v "Run Time:" | grep -v "Elapsed Time:" \

	           camera_angles_sigma=2. \

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

	$(CAT) $(OUTPUT)/bundleout.txt  | grep -v "Run Time:" | grep -v "Elapsed Time:" \

	       | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

	       | $(SED) 's/\([0-9][0-9]*\.[0-9][0-9][0-9][0-9]\)\([0-9][0-9]*\)/\1/g' \

	       | $(SED) s/`date +%Y-%m-%dT`\[0-2\]\[0-9\]:\[0-5\]\[0-9\]:\[0-5\]\[0-9\]/date/ \

	       > $(OUTPUT)/apollo_cholmod_bundleout.txt;

	$(CAT) residuals.csv \

	       > $(OUTPUT)/apollo_bundleout.txt;

	$(CAT) $(OUTPUT)/residuals.csv \

	       | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

	       > $(OUTPUT)/apollo_cholmod_residuals.csv;

	       > $(OUTPUT)/apollo_residuals.csv;

#	$(CAT) bundleout_images.csv \

#	       | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

#	       > $(OUTPUT)/apollo_cholmod_bundleout_images.csv;

	#$(RM) bundleout_images.csv > /dev/null;

	$(MV) bundleout_points.csv $(OUTPUT)/apollo_cholmod_bundleout_points.csv > /dev/null;

	$(RM) bundleout.txt print.prt > /dev/null;

	$(RM) residuals.csv > /dev/null;

	$(RM) inverseMatrix.dat > /dev/null;

	$(MV) $(OUTPUT)/bundleout_points.csv $(OUTPUT)/apollo_bundleout_points.csv > /dev/null;

	$(RM) $(OUTPUT)/bundleout.txt print.prt > /dev/null;

	$(RM) $(OUTPUT)/residuals.csv > /dev/null;

	$(RM) $(OUTPUT)/inverseMatrix.dat > /dev/null;

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

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ commands: 
	  radius=yes \

	  errorpropagation=yes \

	  point_radius_sigma=500 \

	  file_prefix=temp_ \

	  file_prefix=temp \

	  > /dev/null

	$(CAT) temp_bundleout.txt  | grep -v "Run Time:" | grep -v "Elapsed Time:" \

	  | perl -pe 's/(^|,|: )([^,:]+\/)([^,\/:]*\.)(net|cub)/\1\3\4/g' 2>/dev/null \

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

+1 −1
Original line number Diff line number Diff line
@@ -64,4 +64,4 @@ commands: 
	$(RM) $(OUTPUT)/cube.lis > /dev/null;

	$(RM) bundleout.txt print.prt > /dev/null;

	$(RM) residuals.csv  > /dev/null;

	$(RM) inverseMatrix.dat > /dev/null;