Commit a4d008de authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Merged trunk into ipce branch. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7789 41f8697f-d340-4b68-9986-7bafba869bb8
parents be1de6a1 e12ca8f9

isis/src/base/apps/campt/campt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ QList<PvlGroup*> getCameraPointInfo(const UserInterface &ui, 
  // Setup our parameters from ui and variables

  QList<PvlGroup*> cameraPoints;

  bool usePointList = ui.WasEntered("COORDLIST");

  bool allowOutside = ui.WasEntered("ALLOWOUTSIDE");

  bool allowOutside = ui.GetBoolean("ALLOWOUTSIDE");

  QString type;

  if (ui.WasEntered("COORDLIST")) {

    type = ui.GetString("COORDTYPE");

isis/src/base/apps/campt/campt.xml

+6 −0
Original line number Diff line number Diff line
@@ -211,6 +211,12 @@ End_Group 
      and now allow a developer to control the order in which fields are output in both PVL and

      CSV format.  References #476, #4100.

    </change>

    <change name="Kaj Williams" date="2017-06-13">      

      Resolved issue where the default value for the "allowoutside" parameter was supposed 

      to be set to "true", but the default _behavior_ of campt was instead consistent with a 

      setting of "false". In addition, corrected behavior where 

      manually setting "allowoutside" to "false" was ignored. Ref # 2258.

    </change>

  </history>



  <oldName>

isis/src/base/apps/dstripe/dstripe.cpp

+10 −8
Original line number Diff line number Diff line
@@ -65,9 +65,10 @@ void IsisMain() { 
  // Algorithm: lowpass(from, temp) -> hipass(temp, noise) -> to = from-noise



  // Run lowpass filter on input

  QString tempFileName = FileName::createTempFile("$TEMPORARY/dstripe.temporary.cub").expanded();

  QString lowParams = "";

  lowParams += "from= " + ui.GetFileName("FROM");

  lowParams += " to= dstripe.temporary.cub ";

  lowParams += " to= " + tempFileName + " ";

  lowParams += " samples= " + toString(lowSamples);

  lowParams += " lines= " + toString(lowLines);
@@ -84,23 +85,24 @@ void IsisMain() { 
  }



  // Run highpass filter after lowpass is done, i.e. highpass(lowpass(input))

  QString tempNoiseFileName = FileName::createTempFile("$TEMPORARY/dstripe.noise.temporary.cub").expanded();

  QString highParams = "";

  highParams += "from= dstripe.temporary.cub ";

  highParams += " to= " + ui.GetFileName("NOISE") + " ";

  highParams += " from= "+tempFileName + " ";

  highParams += " to= " + tempNoiseFileName + " ";

  highParams += " samples= " + toString(highSamples);

  highParams += " lines= " + toString(highLines);



  ProgramLauncher::RunIsisProgram("highpass", highParams);

  remove("dstripe.temporary.cub");

  QFile::remove(tempFileName);



  // Take the difference (FROM-NOISE) and write it to output

  p.SetInputCube("NOISE");

  CubeAttributeInput att;

  p.SetInputCube(tempNoiseFileName, att);

  p.SetOutputCube("TO");

  p.StartProcess(difference);

  p.EndProcess();

  if(ui.GetBoolean("DELETENOISE")) {

    QString noiseFile(FileName(ui.GetFileName("NOISE")).expanded());

    QFile::remove(noiseFile);

    QFile::remove(tempNoiseFileName);

  }

}

isis/src/base/apps/dstripe/dstripe.xml

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ 
    <change name="Steven Lambright" date="2008-05-13">

      Removed references to CubeInfo 

    </change>

     <change name="Kaj Williams" date="2017-06-05">

      Now names the temp files with unique names, enabling parallel execution.

    </change>

  </history>



  <groups>

isis/src/base/apps/dstripe/tsts/parallel/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
APPNAME = dstripe



include $(ISISROOT)/make/isismake.tsts



commands:

	cat $(INPUT)/root.lis | xargs -n1 -P 2 -IX $(APPNAME) from=$(INPUT)/X.cub to=$(OUTPUT)/X.dstr.cub mode=vert vlnl=51 vhns=51 > /dev/null;