Commit 7370ac10 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Fixed hidtmgen's output value for the SOURCE_PRODUCT_ID keyword in... 

Fixed hidtmgen's output value for the SOURCE_PRODUCT_ID keyword in orthorectified images when DEFAULTNAMES=true. References #801

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

isis/src/control/apps/cnetadd/cnetadd.xml

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ 
          List of ISIS3 output images in the ONET

        </brief>

        <description>

          Use this optional parameter to receive a ist of all images in the ONET 

          Use this optional parameter to receive a list of all images in the ONET 

          that are also in the FROMLIST or ADDLIST. To have a complete 

          list, it is important to have the FROMLIST.

        </description>

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

+15 −17
Original line number Diff line number Diff line
@@ -160,11 +160,6 @@ void IsisMain() { 
    // -------------------------------------------------------------------------//

    // -------------------------------------------------------------------------//

    

    // We should add verify identical mapping groups for all inputs???

    // all keywords except upperleftcorner values, resolution values???

    // compare objects code in pvldiff - does this belong in the PvlObject

    // class???



    // The output directory will be used for DTM and ortho images when defaultNames=true

    // this directory won't be used if defaultNames=false but will be used for

    // both DTM and ortho if defaultNames=true.
@@ -300,8 +295,10 @@ void IsisMain() { 
        setProjectionInformation(inCube, pdsLabel, mappingObject, projectionType);



        QString productId = "";

        QString orthoId = "";

        if (defaultNames) {

          productId = orthoFromList[i].baseName().left(15);

          orthoId = orthoFromList[i].baseName().left(15);

          productId = orthoId;

          productId += "_";

          productId += orthoContentColorCode(orthoFromList[i]);

          productId += "_";
@@ -317,6 +314,7 @@ void IsisMain() { 
        else {

          productId = orthoProductIdList[i].expanded();

          outFile = orthoToList[i];

          orthoId = productId;

        }



        // for ortho images, source product ID is the DTM product ID followed by the
@@ -328,7 +326,7 @@ void IsisMain() { 
        else {

          source += dtmProductId;

        }

        source += productId;

        source += orthoId;

        setIdentificationInformation(pdsLabel, productId, source, paramsPvl, ui);

      

        processCube(orthoExportProcess, outFile);
@@ -592,7 +590,7 @@ QString dtmSourceOrbitAndTargetCodes(const PvlKeyword &sourceKeyword) { 
  // we use the source product id for the DTM to get the orbit IDs and target code

  // for the source products (i.e. the stereo pair)

  return sourceKeyword[0].mid(4,11) + "_" + 

         sourceKeyword[1].mid(4,12) + "_";//??? why diff number of characters???

         sourceKeyword[1].mid(4,12) + "_";

}

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

+6 −0
Original line number Diff line number Diff line
@@ -258,6 +258,12 @@ 
          orthorectified files. 

      Fixes ticket #801

    </change>

    <change name="Jeannie Backer" date="2016-08-19">

      Modified the code so that when DEFAULTNAMES=true, then

      SOURCE_PRODUCT_ID = (DTM_PRODUCT_ID,  pSP_xxxxxx_xxxx) where

      pSP_xxxxxx_xxxx is the first 15 characters of the ortho product ID described in 

      the documentation. References #801.

    </change>

  </history>

  

  <groups>