Commit 8e785863 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Changed the behavior of BundleSettings::observationSolveSettings(QString... 

Changed the behavior of BundleSettings::observationSolveSettings(QString observationNumber) to fix a problem with applying multipe BOSS settings in the JSD.
parent 57354731

isis/src/control/objs/BundleSettings/BundleSettings.cpp

+6 −3
Original line number Diff line number Diff line
@@ -450,14 +450,17 @@ namespace Isis { 
  BundleObservationSolveSettings

      BundleSettings::observationSolveSettings(QString observationNumber) const {



    BundleObservationSolveSettings defaultSolveSettings;



    for (int i = 0; i < numberSolveSettings(); i++) {

      if (m_observationSolveSettings[i].observationNumbers().contains(observationNumber)) {

        return m_observationSolveSettings[i];

      }

    }

    QString msg = "Unable to find BundleObservationSolveSettings for observation number ["

                  + observationNumber + "].";

    throw IException(IException::Unknown, msg, _FILEINFO_);

    return defaultSolveSettings;

    //QString msg = "Unable to find BundleObservationSolveSettings for observation number ["

    //              + observationNumber + "].";

   // throw IException(IException::Unknown, msg, _FILEINFO_);

  }