mimap2isis app and tests conversion

isis/src/kaguya/apps/mimap2isis/main.cpp

@@ -1,114 +1,27 @@
 #include "Isis.h"
-#include "ProcessImportPds.h"
 
-#include "UserInterface.h"
-#include "FileName.h"
+#include "mimap2isis.h"
 
-#include <QFile>
+#include "Application.h"
+#include "Pvl.h"
 
 using namespace std;
 using namespace Isis;
 
 void IsisMain() {
-  ProcessImportPds p, ptmp;
-  Pvl label;
   UserInterface &ui = Application::GetUserInterface();
-
-  QString labelFile = ui.GetFileName("FROM");
-  QString imageFile("");
-  if(ui.WasEntered("IMAGE")) {
-    imageFile = ui.GetFileName("IMAGE");
-  }
-
-  // The Kaguya MI MAP files have an incorrect SAMPLE_PROJECTION_OFFSET
-  // keyword value in their labels. The following code creates a temporary
-  // detached PDS label with the correct (negated) keyword value.
-  ptmp.SetPdsFile(labelFile, imageFile, label);
-  PvlObject obj = label.findObject("IMAGE_MAP_PROJECTION");
-  double soff = toDouble(obj.findKeyword("SAMPLE_PROJECTION_OFFSET")[0]);
-  soff = -soff;
-  label.findObject("IMAGE_MAP_PROJECTION").addKeyword(PvlKeyword("SAMPLE_PROJECTION_OFFSET",toString(soff)),Pvl::Replace);
-  FileName tempFileName = FileName::createTempFile("TEMPORARYlabel.pvl").name();
-  QString fn(tempFileName.expanded());
-  label.write(fn);
-  p.SetPdsFile(label, labelFile);
-  QFile::remove(fn);
-
-  Cube *ocube = p.SetOutputCube("TO");
-
-  // Get user entered special pixel ranges
-  if(ui.GetBoolean("SETNULLRANGE")) {
-    p.SetNull(ui.GetDouble("NULLMIN"), ui.GetDouble("NULLMAX"));
-  }
-  if(ui.GetBoolean("SETHRSRANGE")) {
-    p.SetHRS(ui.GetDouble("HRSMIN"), ui.GetDouble("HRSMAX"));
-  }
-  if(ui.GetBoolean("SETHISRANGE")) {
-    p.SetHIS(ui.GetDouble("HISMIN"), ui.GetDouble("HISMAX"));
+  Pvl appLog;
+  try {
+    mimap2isis(ui, &appLog);
   }
-  if(ui.GetBoolean("SETLRSRANGE")) {
-    p.SetLRS(ui.GetDouble("LRSMIN"), ui.GetDouble("LRSMAX"));
+  catch (...) {
+    for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {
+      Application::Log(*grpIt);
+    }
+    throw;
   }
-  if(ui.GetBoolean("SETLISRANGE")) {
-    p.SetLIS(ui.GetDouble("LISMIN"), ui.GetDouble("LISMAX"));
+
+  for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) {
+    Application::Log(*grpIt);
   }
-
-  // Export the cube
-  p.StartProcess();
-
-  // Translate the mapping labels
-  Pvl otherLabels;
-  p.TranslatePdsProjection(otherLabels);
-
-  // Translate the remaining MI MAP labels
-  QString transDir = "$ISISROOT/appdata/translations/";
-
-  FileName transFile(transDir + "KaguyaMiMapBandBin.trn");
-  PvlToPvlTranslationManager bandBinXlater(label, transFile.expanded());
-  bandBinXlater.Auto(otherLabels);
-
-  transFile = transDir + "KaguyaMiMapInstrument.trn";
-  PvlToPvlTranslationManager instXlater(label, transFile.expanded());
-  instXlater.Auto(otherLabels);
-
-  PvlKeyword processId = label.findKeyword("PROCESS_VERSION_ID");
-
-  if (processId[0] == "L3C") {
-    transFile = transDir + "KaguyaMil3cArchive.trn";;
-  }
-  else {
-    transFile = transDir + "KaguyaMiMapArchive.trn";
-  }
-  PvlToPvlTranslationManager archiveXlater(label, transFile.expanded());
-  archiveXlater.Auto(otherLabels);
-
-  if(otherLabels.hasGroup("Mapping") &&
-      (otherLabels.findGroup("Mapping").keywords() > 0)) {
-    ocube->putGroup(otherLabels.findGroup("Mapping"));
-  }
-  if(otherLabels.hasGroup("Instrument") &&
-      (otherLabels.findGroup("Instrument").keywords() > 0)) {
-    ocube->putGroup(otherLabels.findGroup("Instrument"));
-  }
-  if(otherLabels.hasGroup("BandBin") &&
-      (otherLabels.findGroup("BandBin").keywords() > 0)) {
-    ocube->putGroup(otherLabels.findGroup("BandBin"));
-  }
-  if(otherLabels.hasGroup("Archive") &&
-      (otherLabels.findGroup("Archive").keywords() > 0)) {
-    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/kaguya/apps/mimap2isis/mimap2isis.cpp

@@ -0,0 +1,114 @@
+#include "mimap2isis.h"
+
+#include "FileName.h"
+#include "ProcessImportPds.h"
+
+#include <QFile>
+
+using namespace std;
+
+namespace Isis {
+  void mimap2isis(UserInterface &ui, Pvl *log) {
+  ProcessImportPds p, ptmp;
+  Pvl label;
+
+  QString labelFile = ui.GetFileName("FROM");
+  QString imageFile("");
+  if(ui.WasEntered("IMAGE")) {
+    imageFile = ui.GetFileName("IMAGE");
+  }
+
+  // The Kaguya MI MAP files have an incorrect SAMPLE_PROJECTION_OFFSET
+  // keyword value in their labels. The following code creates a temporary
+  // detached PDS label with the correct (negated) keyword value.
+  ptmp.SetPdsFile(labelFile, imageFile, label);
+  PvlObject obj = label.findObject("IMAGE_MAP_PROJECTION");
+  double soff = toDouble(obj.findKeyword("SAMPLE_PROJECTION_OFFSET")[0]);
+  soff = -soff;
+  label.findObject("IMAGE_MAP_PROJECTION").addKeyword(PvlKeyword("SAMPLE_PROJECTION_OFFSET",toString(soff)),Pvl::Replace);
+  FileName tempFileName = FileName::createTempFile("TEMPORARYlabel.pvl").name();
+  QString fn(tempFileName.expanded());
+  label.write(fn);
+  p.SetPdsFile(label, labelFile);
+  QFile::remove(fn);
+
+  Cube *ocube = p.SetOutputCube("TO", ui);
+
+  // Get user entered special pixel ranges
+  if(ui.GetBoolean("SETNULLRANGE")) {
+    p.SetNull(ui.GetDouble("NULLMIN"), ui.GetDouble("NULLMAX"));
+  }
+  if(ui.GetBoolean("SETHRSRANGE")) {
+    p.SetHRS(ui.GetDouble("HRSMIN"), ui.GetDouble("HRSMAX"));
+  }
+  if(ui.GetBoolean("SETHISRANGE")) {
+    p.SetHIS(ui.GetDouble("HISMIN"), ui.GetDouble("HISMAX"));
+  }
+  if(ui.GetBoolean("SETLRSRANGE")) {
+    p.SetLRS(ui.GetDouble("LRSMIN"), ui.GetDouble("LRSMAX"));
+  }
+  if(ui.GetBoolean("SETLISRANGE")) {
+    p.SetLIS(ui.GetDouble("LISMIN"), ui.GetDouble("LISMAX"));
+  }
+
+  // Export the cube
+  p.StartProcess();
+
+  // Translate the mapping labels
+  Pvl otherLabels;
+  p.TranslatePdsProjection(otherLabels);
+
+  // Translate the remaining MI MAP labels
+  QString transDir = "$ISISROOT/appdata/translations/";
+
+  FileName transFile(transDir + "KaguyaMiMapBandBin.trn");
+  PvlToPvlTranslationManager bandBinXlater(label, transFile.expanded());
+  bandBinXlater.Auto(otherLabels);
+
+  transFile = transDir + "KaguyaMiMapInstrument.trn";
+  PvlToPvlTranslationManager instXlater(label, transFile.expanded());
+  instXlater.Auto(otherLabels);
+
+  PvlKeyword processId = label.findKeyword("PROCESS_VERSION_ID");
+
+  if (processId[0] == "L3C") {
+    transFile = transDir + "KaguyaMil3cArchive.trn";;
+  }
+  else {
+    transFile = transDir + "KaguyaMiMapArchive.trn";
+  }
+  PvlToPvlTranslationManager archiveXlater(label, transFile.expanded());
+  archiveXlater.Auto(otherLabels);
+
+  if(otherLabels.hasGroup("Mapping") &&
+      (otherLabels.findGroup("Mapping").keywords() > 0)) {
+    ocube->putGroup(otherLabels.findGroup("Mapping"));
+  }
+  if(otherLabels.hasGroup("Instrument") &&
+      (otherLabels.findGroup("Instrument").keywords() > 0)) {
+    ocube->putGroup(otherLabels.findGroup("Instrument"));
+  }
+  if(otherLabels.hasGroup("BandBin") &&
+      (otherLabels.findGroup("BandBin").keywords() > 0)) {
+    ocube->putGroup(otherLabels.findGroup("BandBin"));
+  }
+  if(otherLabels.hasGroup("Archive") &&
+      (otherLabels.findGroup("Archive").keywords() > 0)) {
+    ocube->putGroup(otherLabels.findGroup("Archive"));
+  }
+
+  //  Check for and log any change from the default projection offsets and multipliers
+  if (log && 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.");
+    log->addGroup(results);
+  }
+
+  p.EndProcess();
+
+  return;
+  }
+}
+

isis/src/kaguya/apps/mimap2isis/mimap2isis.h

@@ -0,0 +1,11 @@
+#ifndef mimap2isis_h
+#define mimap2isis_h
+
+#include "Pvl.h"
+#include "UserInterface.h"
+
+namespace Isis{
+  extern void mimap2isis(UserInterface &ui, Pvl *log=nullptr);
+}
+
+#endif