Commit 79132294 authored by Adam Paquette's avatar Adam Paquette
Browse files

Changed all instances of PvlTranslationManager to PvlToPVlTranslation Manager... 

Changed all instances of PvlTranslationManager to PvlToPVlTranslation Manager and renamed PvlTranslationManager to PvlToPvlTranslationManager. Fixes #4901.

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

isis/src/base/apps/spiceinit/spiceinit.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "KernelDb.h"

#include "Longitude.h"

#include "Process.h"

#include "PvlTranslationManager.h"

#include "PvlToPvlTranslationManager.h"

#include "SpiceClient.h"

#include "SpiceClientStarter.h"

#include "Table.h"
@@ -80,7 +80,7 @@ void IsisMain() { 
                                    "translations/MissionName2DataDir.trn");



  // Get the mission translation manager ready

  PvlTranslationManager missionXlater(lab, transFile);

  PvlToPvlTranslationManager missionXlater(lab, transFile);



  // Get the mission name so we can search the correct DB's for kernels

  QString mission = missionXlater.Translate("MissionName");

isis/src/base/apps/spiceserver/spiceserver.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "Longitude.h"

#include "Process.h"

#include "Pvl.h"

#include "PvlTranslationManager.h"

#include "PvlToPvlTranslationManager.h"

#include "Table.h"

#include "TextFile.h"
@@ -165,7 +165,7 @@ void IsisMain() { 
    QString transFile = p.MissionData("base", "translations/MissionName2DataDir.trn");



    // Get the mission translation manager ready

    PvlTranslationManager missionXlater(label, transFile);

    PvlToPvlTranslationManager missionXlater(label, transFile);



    // Get the mission name so we can search the correct DB's for kernels

    QString mission = missionXlater.Translate("MissionName");

isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ namespace Isis { 
   *

   * @internal

   *  @history 2017-01-11 Jeannie Backer - Original Version. Code moved out of

   *                          PvlTranslationManager to make a generic parent

   *                          PvlToPvlTranslationManager to make a generic parent

   *                          class. Fixes #4584.

   *  @history 2017-01-20 Jesse Mapel - Updated documentation and unit test. Fixes #4584.

   */

isis/src/base/objs/NaifStatus/NaifStatus.cpp

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "IException.h"

#include "IString.h"

#include "Pvl.h"

#include "PvlTranslationManager.h"

#include "PvlToPvlTranslationManager.h"



namespace Isis {

  bool NaifStatus::initialized = false;
@@ -88,7 +88,7 @@ namespace Isis { 
    errorDescription.addKeyword(PvlKeyword("LongMessage", naifLong));

    error.addGroup(errorDescription);



    PvlTranslationManager trans(error, "$base/translations/NaifErrors.trn");

    PvlToPvlTranslationManager trans(error, "$base/translations/NaifErrors.trn");



    try {

      errMsg = trans.Translate("ShortMessage");

isis/src/base/objs/ObservationNumber/ObservationNumber.cpp

+7 −7
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include "Pvl.h"

#include "Cube.h"

#include "Process.h"

#include "PvlTranslationManager.h"

#include "PvlToPvlTranslationManager.h"

#include "FileName.h"



namespace Isis {
@@ -78,13 +78,13 @@ namespace Isis { 


    // Get the mission name

    static QString missionTransFile = (QString) dataDir["base"] + "/translations/MissionName2DataDir.trn";

    static PvlTranslationManager missionXlater(missionTransFile);

    static PvlToPvlTranslationManager missionXlater(missionTransFile);

    missionXlater.SetLabel(label);

    QString mission = missionXlater.Translate("MissionName");



    // Get the instrument name

    static QString instTransFile = (QString) dataDir["base"] + "/translations/Instruments.trn";

    static PvlTranslationManager instrumentXlater(instTransFile);

    static PvlToPvlTranslationManager instrumentXlater(instTransFile);

    instrumentXlater.SetLabel(label);

    QString instrument = instrumentXlater.Translate("InstrumentName");
@@ -93,9 +93,9 @@ namespace Isis { 
    //   from the disk is not necessary every time. To do this, we'll use a map to store

    //   the translation managers and observation number keys with a string identifier to find them.

    //   This identifier needs to have the mission name and the instrument name.

    static std::map<QString, std::pair<PvlTranslationManager, PvlKeyword> > missionTranslators;

    static std::map<QString, std::pair<PvlToPvlTranslationManager, PvlKeyword> > missionTranslators;

    QString key = mission + "_" + instrument;

    std::map<QString, std::pair<PvlTranslationManager, PvlKeyword> >::iterator

    std::map<QString, std::pair<PvlToPvlTranslationManager, PvlKeyword> >::iterator

    translationIterator = missionTranslators.find(key);



    if(translationIterator == missionTranslators.end()) {
@@ -113,8 +113,8 @@ namespace Isis { 


      // use the translation file to generate keywords

      missionTranslators.insert(

        std::pair<QString, std::pair<PvlTranslationManager, PvlKeyword> >

        (key, std::pair<PvlTranslationManager, PvlKeyword>(PvlTranslationManager(snFile.expanded()), observationKeys))

        std::pair<QString, std::pair<PvlToPvlTranslationManager, PvlKeyword> >

        (key, std::pair<PvlToPvlTranslationManager, PvlKeyword>(PvlToPvlTranslationManager(snFile.expanded()), observationKeys))

      );



      translationIterator = missionTranslators.find(key);