Commit d4d76207 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Added a results group for PDS projection offsets if changed from defaults Fixes #4887 

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

isis/src/base/apps/pds2isis/pds2isis.cpp

+9 −0
Original line number Diff line number Diff line
@@ -68,6 +68,15 @@ void IsisMain() { 
    ocube->putGroup(otherLabels.findGroup("Archive"));

  }

  

  //  Check for and log any change from the default projection offsets and multipliers

  if (p.GetProjectionOffsetChange()) {

    PvlGroup results = p.GetProjectionOffsetGroup();

    results.setName("Results");

    results[0].addComment("Projection offsets and multipliers have been changed from");

    results[0].addComment("defaults. New values are below.");

    Application::Log(results);

  }



  p.EndProcess();



  return;

isis/src/base/apps/pds2isis/pds2isis.xml

+5 −1
Original line number Diff line number Diff line
@@ -118,12 +118,16 @@ xsi:noNamespaceSchemaLocation= 
    <change name="Kimberly Oyama" date="2012-11-21">

      Added app tests for BIP and BIL formatted input. References #819.

    </change>

    <change name="Tyler Wilson" data ="2016-02-25">

    <change name="Tyler Wilson" date ="2016-02-25">

     Added an app test for opening Galileo NIMS qubes saved in VAX format.  Modified the filter

     tag on FROM parameter in this document to also recognize *.qub files.  All changes

     relating to converting VAX to IEEE were made in ProcessImport, ProcessImportPds.

     References:  #2368.

    </change>

    <change name="Summer Stapleton" date="2017-06-27">

     Added conditional to check whether default offsets and multipliers where changed from their 

     default values and log them if so.

    </change>

	

  </history>

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

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



labels.txt.IGNORELINES = Bytes StartByte ByteOrder TileSamples TileLines



include $(ISISROOT)/make/isismake.tsts



commands:

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

	  to=$(OUTPUT)/ff17Truth.cub \

	  | $(SED) 's+.*% Processed.*#+#+' \

	  | grep -v "Processed" \

	  | grep -v "Working" \

	  | grep -v "Importing" \

	  >& $(OUTPUT)/print.txt;

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

isis/src/base/objs/Application/Application.cpp

+2 −0
Original line number Diff line number Diff line
@@ -376,6 +376,8 @@ namespace Isis { 
    SessionLog::TheLog().AddResults(results);



    // See if the log file will be written to the terminal/gui

    // The results group of the Sessoion::Log will be written later

    // in Application::FunctionCleanup if TerminalOutput is on

    if (SessionLog::TheLog().TerminalOutput()) return;



    // See if we should write the info to our parents gui

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

+1062 −1044

File changed.

Preview size limit exceeded, changes collapsed.