Commit 1558edcf authored by John Bonn's avatar John Bonn
Browse files

Changed PDS pixel offset and add test for isis2pds. m02244 

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

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/objs/ProcessExportPds/ProcessExportPds.cpp

+2 −2
Original line number Diff line number Diff line
@@ -773,12 +773,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

+1 −1
Original line number Diff line number Diff line
@@ -1599,7 +1599,7 @@ namespace Isis { 
    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);