Commit e15a15d2 authored by Kristin Berry's avatar Kristin Berry
Browse files

resolve merge conflicts

parent 161378fa

isis/src/apollo/apps/apollopaninit/apollopaninit.cpp

+13 −3
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ void IsisMain() { 
  ProcessImport jp;

  FileName transFile("$apollo15/translations/apollopantranstable.trn");

  PvlTranslationTable transTable(transFile);



  PvlGroup kernels_pvlG;



  //scFrameCode and insCode from user input
@@ -140,6 +141,7 @@ void IsisMain() { 
  ////////////////////////////////////////////build the cube header instrament group

  PvlGroup inst_pvlG("Instrument");





  PvlKeyword keyword;



  //four that are the same for every panaramic mission
@@ -147,9 +149,17 @@ void IsisMain() { 
  keyword.setValue(mission);

  inst_pvlG.addKeyword(keyword);



  keyword.setName("InstrumentName");

  keyword.setValue(transTable.Translate("InstrumentName","whatever"));

  inst_pvlG.addKeyword(keyword);

//  keyword.setName("InstrumentName");

//  keyword.setValue(transTable.Translate("InstrumentName","whatever"));

//  inst_pvlG.addKeyword(keyword);



  Pvl fakeInputLabel; // <-- there's nothing in here for this small test case, but I'm not sure that's what you want for the real thing

  Pvl testOutputLabel; 

  PvlToPvlTranslationManager translater(fakeInputLabel, transFile.expanded());

  translater.Auto(testOutputLabel); 

  // then actually write testOutputLabel to the cube



  std::cout << testOutputLabel << std::endl; 



  keyword.setName("InstrumentId");

  keyword.setValue(transTable.Translate("InstrumentId","whatever"));

isis/src/base/objs/PvlToXmlTranslationManager/PvlToXmlTranslationManager.cpp

+25 −9
Original line number Diff line number Diff line
@@ -156,18 +156,34 @@ namespace Isis { 


      const PvlContainer *con = GetContainer(grp);

      if (con != NULL) {

        if (con->hasKeyword(InputKeywordName(transGroupName))) {

        if (con->hasKeyword(InputKeywordName(transGroupName)) || 

            hasInputDefault(transGroupName)) { // < -- we in fact to not have this



          QStringList outputName = parseSpecification(OutputName(transGroupName));



          PvlKeyword inputKeyword;

          QString translatedValue;

          QString units;

          if (con->hasKeyword(InputKeywordName(transGroupName))) {

            std::cout << "Translating a non-InputDefault as." << std::endl; 

            // Get the InputKey from the input label.

          PvlKeyword inputKeyword = (*con)[InputKeywordName(transGroupName)];

            inputKeyword = (*con)[InputKeywordName(transGroupName)];

            // Translate input keyword value and set the qdomelement

            // NOTE: We are assuming this is a single valued keyword since

            //       xml does not allow multiple values

            QString untranslatedValue = inputKeyword[0];

          QString translatedValue = PvlTranslationTable::Translate(transGroupName, 

            translatedValue = PvlTranslationTable::Translate(transGroupName, 

                                                                   untranslatedValue);

          QString units = inputKeyword.unit(); 

            units = inputKeyword.unit(); 

          }

          else {

            // get the InputKey from the InputDefault

            translatedValue = InputDefault(transGroupName);

            std::cout << "Translating an InputDefault as: " << translatedValue << std::endl; 

            units = "";

          }





          if (outputName.size() == 2 && outputName[0] == "att") {

            parentElement.setAttribute(outputName[1], translatedValue);

            if (transGroup.hasKeyword("OutputAttributes")) {

isis/src/base/objs/SpiceRotation/SpiceRotation.cpp

+197 −184
Original line number Diff line number Diff line
@@ -885,12 +885,21 @@ namespace Isis { 


          // Now check for nutation/precession terms.  Check for nut/prec ra values

          // first to see if the terms are even used for this body.

          std::cout << "centerbodycode: " << centerBodyCode << std::endl;

          naifKeyword = "BODY" + toString(centerBodyCode) + "_NUT_PREC_RA" ;



          dtpool_c(naifKeyword.toLatin1().data(), &found, &numReturned, &naifType);

          if (found) {

            // Get the barycenter (bc) linear coefficients first (2 for each period).

            // Then we can get the maximum expected coefficients.

            SpiceInt bcCode = centerBodyCode/100;  // Ex: bc code for Jupiter (599) & its moons is 5



            SpiceInt bcCode;

            if (!(centerBodyCode > 1000000.0)) {

              bcCode = centerBodyCode / 100;  // Ex: bc code for Jupiter (599) & its moons is 5

            }

            else {

              bcCode = centerBodyCode; 

            }

            naifKeyword = "BODY" + toString(bcCode) + "_NUT_PREC_ANGLES" ;

            dtpool_c(naifKeyword.toLatin1().data(), &found, &numExpected, &naifType);

            std::vector<double>npAngles(numExpected, 0.);
@@ -2380,6 +2389,7 @@ namespace Isis { 
      kdata_c(0, "ck", FILESIZ, TYPESIZ, SOURCESIZ, file, filtyp, source, &handle, &found);

      dafbfs_c(handle);

      daffna_c(&found);



      int spCode = ((int)(p_constantFrames[0] / 1000)) * 1000; 



      while (found) {
@@ -3012,7 +3022,10 @@ namespace Isis { 
    frinfo_c(frameCode, &centerBodyCode, &frameClass, &classId, &found);



    if (found) {

      if (frameClass == 2  ||  (centerBodyCode > 0 && frameClass != 3)) {







      if (frameClass == 2  || (centerBodyCode > 0  && frameClass != 3 ) {

        m_frameType = PCK;

        // Load the PC information while it is available and set member values

        loadPCFromSpice(centerBodyCode);

isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ namespace Isis { 
      frameId = "ROS_VIRTIS-M_IR";

    }



    std::cout << "virFrame: " << virFrame << std::endl; 

    instrumentRotation()->SetFrame(virFrame);



    // We do not want to downsize the cache
@@ -326,6 +327,7 @@ namespace Isis { 


      // Store line,

      smInfo.m_lineNum = lineno;

      std::cout << "line midtime: " << iTime(lineMidTime).UTC() << std::endl; 

      smInfo.m_scanLineEt = lineMidTime;

      smInfo.m_mirrorSin = mirrorSin;

      smInfo.m_mirrorCos = mirrorCos;

isis/src/tgo/apps/tgocassismos/tsts/default/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ include $(ISISROOT)/make/isismake.tsts 
commands:

	$(LS) -1 $(INPUT)/*.cub > $(OUTPUT)/mosaic.lis;

	$(APPNAME) fromlist=$(OUTPUT)/mosaic.lis \

		   to=$(OUTPUT)/tgocassismos.cub >& /dev/null;

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

		   to=$(OUTPUT)/tgocassismos.cub ;

	catlab from=$(OUTPUT)/tgocassismos.cub to=$(OUTPUT)/tgocassismos.pvl;	

	$(RM) $(OUTPUT)/mosaic.lis;