Commit 90c43741 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Fixed a couple of bugs found in hidtmgen while adding new tests. References #801 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6626 41f8697f-d340-4b68-9986-7bafba869bb8
parent 0d2d0cd0

isis/src/mro/apps/hidtmgen/hidtmgen.cpp

+4 −2
Original line number Diff line number Diff line
@@ -631,8 +631,10 @@ QString versionNumber(const Pvl &paramsPvl, const UserInterface &ui) { 
  // 0 - <1, if 0.#, is 0#, is 0.#####, is first two ##

  else if (version >= 0.001) { // Any less and we get E... not dealing with that.

    vers = toString(version).remove(QChar('.'));

    int nonZero = vers.lastIndexOf('0');

    if (vers.size() > 2) vers = vers.mid(nonZero-1, 2);

    int nonZero = vers.lastIndexOf("0");

    if (vers.size() > 2) {

      vers = vers.mid(nonZero+1, 2);

    }

  }

  // It was negative, or something else crazy?

  else {

isis/src/mro/apps/hidtmgen/tsts/color/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ APPNAME = hidtmgen 
include $(ISISROOT)/make/isismake.tsts



commands:

	ls $(INPUT)/ESP*.cub > $(OUTPUT)/orthoInputList.txt;

	$(LS) $(INPUT)/ESP*.cub > $(OUTPUT)/orthoInputList.txt;

	$(APPNAME) DEFAULTNAMES=TRUE \

	           OUTPUTDIR=$(OUTPUT) \

	           DTM=$(INPUT)/Ares4_Marth_Crater_3557E_126N_ngate_03.cub \
@@ -21,8 +21,8 @@ commands: 
	           ORTHOSEQUENCENUMBERLIST=$(INPUT)/sequenceNumbers.txt \

	           > /dev/null;



	catlab from=$(OUTPUT)/DTEED_042252_1930_042753_1930_A01.IMG \

	       to=$(OUTPUT)/DTEED_042252_1930_042753_1930_A01.pvl \

	catlab from=$(OUTPUT)/DTEED_042252_1930_042753_1930_A31.IMG \

	       to=$(OUTPUT)/DTEED_042252_1930_042753_1930_A31.pvl \

	       > /dev/null;  

	catlab from=$(OUTPUT)/ESP_042252_1930_IRB_B_41_ORTHO.IMG \

	       to=$(OUTPUT)/ESP_042252_1930_IRB_B_41_ORTHO.pvl \
@@ -37,8 +37,8 @@ commands: 
	       to=$(OUTPUT)/ESP_042753_1930_IRB_D_59_ORTHO.pvl \

	       > /dev/null;  

	

	pds2isis from=$(OUTPUT)/DTEED_042252_1930_042753_1930_A01.IMG \

	         to=$(OUTPUT)/DTEED_042252_1930_042753_1930_A01.cub \

	pds2isis from=$(OUTPUT)/DTEED_042252_1930_042753_1930_A31.IMG \

	         to=$(OUTPUT)/DTEED_042252_1930_042753_1930_A31.cub \

	         > /dev/null;

	pds2isis from=$(OUTPUT)/ESP_042252_1930_IRB_B_41_ORTHO.IMG \

	         to=$(OUTPUT)/ESP_042252_1930_IRB_B_41_ORTHO.cub \
@@ -53,7 +53,7 @@ commands: 
	         to=$(OUTPUT)/ESP_042753_1930_IRB_D_59_ORTHO.cub \

	         > /dev/null;  

	

	$(RM) $(OUTPUT)/DTEED_042252_1930_042753_1930_A01.IMG;

	$(RM) $(OUTPUT)/DTEED_042252_1930_042753_1930_A31.IMG;

	$(RM) $(OUTPUT)/ESP_042252_1930_IRB_B_41_ORTHO.IMG;

	$(RM) $(OUTPUT)/ESP_042252_1930_IRB_D_31_ORTHO.IMG;

	$(RM) $(OUTPUT)/ESP_042753_1930_IRB_B_26_ORTHO.IMG;

isis/src/mro/apps/hidtmgen/tsts/dtmOnly/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ commands: 
	           PARAMSPVL=$(INPUT)/dtmParams.pvl \

	           > /dev/null;



	catlab from=$(OUTPUT)/DTEED_042252_1930_042753_1930_A01.IMG \

	       to=$(OUTPUT)/DTEED_042252_1930_042753_1930_A01.pvl \

	catlab from=$(OUTPUT)/DTEED_042252_1930_042753_1930_A15.IMG \

	       to=$(OUTPUT)/DTEED_042252_1930_042753_1930_A15.pvl \

	       > /dev/null;  

	

	pds2isis from=$(OUTPUT)/DTEED_042252_1930_042753_1930_A01.IMG \

	         to=$(OUTPUT)/DTEED_042252_1930_042753_1930_A01.cub \

	pds2isis from=$(OUTPUT)/DTEED_042252_1930_042753_1930_A15.IMG \

	         to=$(OUTPUT)/DTEED_042252_1930_042753_1930_A15.cub \

	         > /dev/null;

	

	$(RM) $(OUTPUT)/DTEED_042252_1930_042753_1930_A01.IMG;

	$(RM) $(OUTPUT)/DTEED_042252_1930_042753_1930_A15.IMG;

isis/src/mro/apps/hidtmgen/tsts/equi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ commands: 
	           OUTPUTDIR=$(OUTPUT) \

	           DTM=$(INPUT)/DTM_Zumba_1m_forPDS.cub \

	           ORTHOFROMLIST=$(OUTPUT)/orthoInputList.txt \

	           PARAMSPVL=$(INPUT)/hidtmgenDefaults.pvl \

	           PARAMSPVL=$(INPUT)/params.pvl \

	           ORTHOSEQUENCENUMBERLIST=$(INPUT)/sequenceNumbers.txt \

	           > /dev/null;

isis/src/mro/apps/hidtmgen/tsts/orthoOnly/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ APPNAME = hidtmgen 
include $(ISISROOT)/make/isismake.tsts



commands:

	ls $(INPUT)/*.cub > $(OUTPUT)/orthoFromList.txt;

	$(LS) $(INPUT)/*.cub > $(OUTPUT)/orthoFromList.txt;

	$(APPNAME) DEFAULTNAMES=TRUE \

	           OUTPUTDIR=$(OUTPUT) \

	           ORTHOFROMLIST=$(OUTPUT)/orthoFromList.txt \