Commit 962aa11f authored by Ian Humphrey's avatar Ian Humphrey
Browse files

JSD now uses observationNumber() instead of serialNumber()

parent 11e72df9

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.cpp

+7 −7
Original line number Diff line number Diff line
@@ -112,12 +112,12 @@ namespace Isis { 
    if (!m_project->directory()->model()->selectedItems().isEmpty()) {

      foreach (ProjectItem * projItem, m_project->directory()->model()->selectedItems()) {

        if (projItem->isImage()) {

          defaultObservationSettings.addObservationNumber(projItem->image()->serialNumber());  

          defaultObservationSettings.addObservationNumber(projItem->image()->observationNumber());  

        }

        else if (projItem->isImageList()) {

          for (int i = 0; i < projItem->rowCount(); i++) {

            ProjectItem * childItem = projItem->child(i);

            defaultObservationSettings.addObservationNumber(childItem->image()->serialNumber());  

            defaultObservationSettings.addObservationNumber(childItem->image()->observationNumber());  

          }

        }

      }
@@ -132,7 +132,7 @@ namespace Isis { 
          for (int j = 0; j < imglistItem->rowCount(); j++) {

            ProjectItem * imgItem = imglistItem->child(j);

            if (imgItem->isImage()) {

              defaultObservationSettings.addObservationNumber(imgItem->image()->serialNumber());  

              defaultObservationSettings.addObservationNumber(imgItem->image()->observationNumber());  

            }

          }

        }
@@ -896,7 +896,7 @@ namespace Isis { 


          if (projItem->isImage() ) {

            Image * img = projItem->data().value<Image *>();

            boss.addObservationNumber(img->serialNumber() );

            boss.addObservationNumber(img->observationNumber() );



          }

        }
@@ -1786,8 +1786,8 @@ namespace Isis { 
      if (projItem) {

        // Tree traversal is top down so we dont need to do this check for imagelists?

        if (projItem->isImage() && 

            !selectedObservationNumbers.contains(projItem->image()->serialNumber())) {

          selectedObservationNumbers.append(projItem->image()->serialNumber());

            !selectedObservationNumbers.contains(projItem->image()->observationNumber())) {

          selectedObservationNumbers.append(projItem->image()->observationNumber());

        }

        else if (projItem->isImageList()) {

          // Use the proxymodel's children as it might not include all of the sourcemodel's children
@@ -1795,7 +1795,7 @@ namespace Isis { 
            QModelIndex childProxyIndex = proxyModel->index(i, 0, index);

            QModelIndex childSourceIndex = proxyModel->mapToSource(childProxyIndex);

            ProjectItem * childItem = sourceModel->itemFromIndex(childSourceIndex);

            selectedObservationNumbers.append(childItem->image()->serialNumber());

            selectedObservationNumbers.append(childItem->image()->observationNumber());

          }

        }

      }