Commit 7bb5a43d authored by John Bonn's avatar John Bonn
Browse files

Added PDS pixel offset changes m02244 etc. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7704 41f8697f-d340-4b68-9986-7bafba869bb8
parents dfbfaa12 1558edcf

isis/src/base/apps/isis2pds/tsts/offsetTest/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
APPNAME = isis2pds



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/ldem_4.cub \

	to=$(OUTPUT)/ldem_4_isis2pds.img > /dev/null;

	catlab from=$(OUTPUT)/ldem_4_isis2pds.img to=$(OUTPUT)/ldem_4truth.pvl > /dev/null;

	$(RM) $(OUTPUT)/ldem_4_isis2pds.img > /dev/null;

isis/src/base/apps/pds2isis/tsts/offsetTest/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
APPNAME = pds2isis



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/ldem_4.lbl \

	to=$(OUTPUT)/ldem_4.cub > /dev/null;

	catlab from=$(OUTPUT)/ldem_4.cub to=$(OUTPUT)/ldem_4truth.pvl > /dev/null;

isis/src/base/objs/ProcessExportPds/ProcessExportPds.cpp

+2 −2
Original line number Diff line number Diff line
@@ -780,12 +780,12 @@ namespace Isis { 
    double lineOffset = inputMapping.findKeyword("UpperLeftCornerY");

    lineOffset /= (double)inputMapping.findKeyword("PixelResolution");

    lineOffset *= 1.0;

    lineOffset += 0.5; // Add half a line to get to the center of (1,1)

    lineOffset -= 0.5; // Add half a line to get to the center of (1,1)

    pdsMapObj += PvlKeyword("LINE_PROJECTION_OFFSET", toString(lineOffset), "PIXEL");

    double sampleOffset = inputMapping.findKeyword("UpperLeftCornerX");

    sampleOffset /= (double)inputMapping.findKeyword("PixelResolution");

    sampleOffset *= -1.0;

    sampleOffset += 0.5; // Add half a sample to get to the center of (1,1)

    sampleOffset -= 0.5; // Add half a sample to get to the center of (1,1)

    pdsMapObj += PvlKeyword("SAMPLE_PROJECTION_OFFSET", toString(sampleOffset), "PIXEL");



    // Add units to keywords already in the IMAGE_MAP_PROJECTION object as necessary

isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1595,11 +1595,11 @@ namespace Isis { 


    xmult = -1.0;

    ymult = 1.0;

    xoff = -0.5;

    yoff = -0.5;

    xoff = 0.5;

    yoff = 0.5;



    //  Open projectionOffsetMults file

    Isis::Pvl p(p_transDir + "/" + "translations/pdsProjectionLineSampToXY.def");

    Isis::Pvl p(p_transDir + "/" + "translations/pdsProjectionLineSampToXY_V2.def");



    Isis::PvlObject &projDef = p.findObject("ProjectionOffsetMults",

                                            Pvl::Traverse);

isis/src/lro/apps/mrf2isis/tsts/level2/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -7,3 +7,5 @@ commands: 
	to=$(OUTPUT)/FSL_CDR_LV2_00200_1Q.cub > /dev/null;

	$(APPNAME) from=$(INPUT)/LSL_CDR_LV2_00300_1Q.LBL \

	to=$(OUTPUT)/LSL_CDR_LV2_00300_1Q.cub > /dev/null;

	catlab FROM=$(OUTPUT)/FSL_CDR_LV2_00200_1Q.cub to=$(OUTPUT)/FSL_CDR_LV2_00200_1Q.pvl > /dev/null;

	catlab FROM=$(OUTPUT)/LSL_CDR_LV2_00300_1Q.cub to=$(OUTPUT)/LSL_CDR_LV2_00300_1Q.pvl > /dev/null;