Commit ff0b5b8a authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Updated hidtmgen program to allow any number of ortho images and to allow color images. Fixes #801 

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

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

+665 −456

File changed.

Preview size limit exceeded, changes collapsed.

isis/src/mro/apps/hidtmgen/hidtmgen.xml

+527 −447

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+62 −0
Original line number Diff line number Diff line 
# Please note, the input data was reduced from its original size, in doing so

# the Scale and PixelResolution was changed, for the purpose of testing it

# needed to be the original values, so, the values were edited. This means

# the values for those two keywords are incorrect.

#

# This test is testing an equitorial projection, of primary importance is the

# labels and details such as quoting on keywords, the standard for the output

# is very specific.



APPNAME = hidtmgen



include $(ISISROOT)/make/isismake.tsts



commands:

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

	$(APPNAME) DEFAULTNAMES=TRUE \

	           OUTPUTDIR=$(OUTPUT) \

	           DTM=$(INPUT)/Ares4_Marth_Crater_3557E_126N_ngate_03.cub \

	           ORTHOFROMLIST=$(OUTPUT)/orthoInputList.txt \

	           PARAMSPVL=$(INPUT)/params.pvl \

	           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 \

	       > /dev/null;  

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

	       to=$(OUTPUT)/ESP_042252_1930_IRB_B_41_ORTHO.pvl \

	       > /dev/null;  

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

	       to=$(OUTPUT)/ESP_042252_1930_IRB_D_31_ORTHO.pvl \

	       > /dev/null;  

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

	       to=$(OUTPUT)/ESP_042753_1930_IRB_B_26_ORTHO.pvl \

	       > /dev/null;  

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

	       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 \

	         > /dev/null;

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

	         to=$(OUTPUT)/ESP_042252_1930_IRB_B_41_ORTHO.cub \

	         > /dev/null;

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

	         to=$(OUTPUT)/ESP_042252_1930_IRB_D_31_ORTHO.cub \

	         > /dev/null;

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

	         to=$(OUTPUT)/ESP_042753_1930_IRB_B_26_ORTHO.cub \

	         > /dev/null;  

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

	         to=$(OUTPUT)/ESP_042753_1930_IRB_D_59_ORTHO.cub \

	         > /dev/null;  

	

	$(RM) $(OUTPUT)/DTEED_042252_1930_042753_1930_A01.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;

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

	$(RM) $(OUTPUT)/orthoInputList.txt;

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

0 → 100644
+30 −0
Original line number Diff line number Diff line 
# Please note, the input data was reduced from its original size, in doing so

# the Scale and PixelResolution was changed, for the purpose of testing it

# needed to be the original values, so, the values were edited. This means

# the values for those two keywords are incorrect.

#

# This test is testing an equitorial projection, of primary importance is the

# labels and details such as quoting on keywords, the standard for the output

# is very specific.



APPNAME = hidtmgen



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) DEFAULTNAMES=TRUE \

	           OUTPUTDIR=$(OUTPUT) \

	           DTM=$(INPUT)/Ares4_Marth_Crater_3557E_126N_ngate_03.cub \

	           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 \

	       > /dev/null;  

	

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

	         to=$(OUTPUT)/DTEED_042252_1930_042753_1930_A01.cub \

	         > /dev/null;

	

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

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

+35 −30
Original line number Diff line number Diff line
@@ -12,46 +12,51 @@ APPNAME = hidtmgen 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) DTM=$(INPUT)/DTM_Zumba_1m_forPDS.cub \

	  ORTHO1=$(INPUT)/PSP_002118_1510_1m_o_forPDS.cub \

	  ORTHO2=$(INPUT)/PSP_002118_1510_25cm_o_forPDS.cub \

  	  ORTHO3=$(INPUT)/PSP_003608_1510_1m_o_forPDS.cub \

	  ORTHO4=$(INPUT)/PSP_003608_1510_25cm_o_forPDS.cub \

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

	$(APPNAME) DEFAULTNAMES=TRUE \

	           OUTPUTDIR=$(OUTPUT) \

	  PRODUCT_VERSION_ID=2.0 \

	  RATIONALE_DESC=Rationale \

	           DTM=$(INPUT)/DTM_Zumba_1m_forPDS.cub \

	           ORTHOFROMLIST=$(OUTPUT)/orthoInputList.txt \

	           PARAMSPVL=$(INPUT)/hidtmgenDefaults.pvl \

	           ORTHOSEQUENCENUMBERLIST=$(INPUT)/sequenceNumbers.txt \

	           > /dev/null;



	head -n 93 $(OUTPUT)/DTEEC_002118_1510_003608_1510_A02.IMG \

	  > $(OUTPUT)/DTEEC_002118_1510_003608_1510_A02.pvl;

	head -n 92 $(OUTPUT)/DT1EA_002118_1510_003608_1510_A02.IMG \

	  > $(OUTPUT)/DT1EA_002118_1510_003608_1510_A02.pvl;

	head -n 92 $(OUTPUT)/DT1EC_002118_1510_003608_1510_A02.IMG \

	  > $(OUTPUT)/DT1EC_002118_1510_003608_1510_A02.pvl;

	head -n 92 $(OUTPUT)/DT2EA_002118_1510_003608_1510_A02.IMG \

	  > $(OUTPUT)/DT2EA_002118_1510_003608_1510_A02.pvl;

	head -n 92 $(OUTPUT)/DT2EC_002118_1510_003608_1510_A02.IMG \

	  > $(OUTPUT)/DT2EC_002118_1510_003608_1510_A02.pvl;

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

	       to=$(OUTPUT)/DTEEC_002118_1510_003608_1510_A02.pvl \

	       > /dev/null;  

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

	       to=$(OUTPUT)/PSP_002118_1510_RED_C_01_ORTHO.pvl \

	       > /dev/null;  

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

	       to=$(OUTPUT)/PSP_002118_1510_RED_A_02_ORTHO.pvl \

	       > /dev/null;  

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

	       to=$(OUTPUT)/PSP_003608_1510_RED_C_03_ORTHO.pvl \

	       > /dev/null;  

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

	       to=$(OUTPUT)/PSP_003608_1510_RED_A_04_ORTHO.pvl \

	       > /dev/null;  

	

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

	         to=$(OUTPUT)/DTEEC_002118_1510_003608_1510_A02.cub \

	         > /dev/null;

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

	  to=$(OUTPUT)/DT1EA_002118_1510_003608_1510_A02.cub \

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

	         to=$(OUTPUT)/PSP_002118_1510_RED_C_01_ORTHO.cub \

	         > /dev/null;

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

	  to=$(OUTPUT)/DT1EC_002118_1510_003608_1510_A02.cub \

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

	         to=$(OUTPUT)/PSP_002118_1510_RED_A_02_ORTHO.cub \

	         > /dev/null;

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

	  to=$(OUTPUT)/DT2EA_002118_1510_003608_1510_A02.cub \

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

	         to=$(OUTPUT)/PSP_003608_1510_RED_C_03_ORTHO.cub \

	         > /dev/null;  

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

	  to=$(OUTPUT)/DT2EC_002118_1510_003608_1510_A02.cub \

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

	         to=$(OUTPUT)/PSP_003608_1510_RED_A_04_ORTHO.cub \

	         > /dev/null;  



	rm $(OUTPUT)/DTEEC_002118_1510_003608_1510_A02.IMG;

	rm $(OUTPUT)/DT1EA_002118_1510_003608_1510_A02.IMG;

	rm $(OUTPUT)/DT1EC_002118_1510_003608_1510_A02.IMG;

	rm $(OUTPUT)/DT2EA_002118_1510_003608_1510_A02.IMG;

	rm $(OUTPUT)/DT2EC_002118_1510_003608_1510_A02.IMG;

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

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

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

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

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

	$(RM) $(OUTPUT)/orthoInputList.txt;