Commit b19f3f3d authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Fixing merge conflicts

parents 10e0860c ee9445c6

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

+3 −5
Original line number Diff line number Diff line
@@ -435,17 +435,15 @@ namespace Isis { 




  /**

   * Retrieves solve settings for the observation corresponding to the given

   * observation number.

   * Retrieves solve settings for the observation corresponding to the given observation number. 

   * If no corresponding settings object exists, return a new solve settings with no related 

   * observation numbers.

   *

   * @param observationNumber The observation number associated with the

   *                          BundleObservationSolveSettings object to be accessed.

   *

   * @return @b BundleObservationSolveSettings The observation settings object that contains

   *                                           the observation number passed.

   *

   * @throw IException::Unknown "Unable to find BundleObservationSolveSettings

   *                             for given observation number"

   */

  BundleObservationSolveSettings

      BundleSettings::observationSolveSettings(QString observationNumber) const {

isis/src/control/objs/BundleSettings/BundleSettings.truth

+0 −1
Original line number Diff line number Diff line
@@ -434,7 +434,6 @@ Testing XML: Object deserialized as (should match object above): 




Testing error throws...

**ERROR** Unable to find BundleObservationSolveSettings for observation number [UnassociatedObservationNumber].

**ERROR** Unable to find BundleObservationSolveSettings with index = [32].

**ERROR** Unable to find BundleObservationSolveSettings with index = [-1].

**PROGRAMMER ERROR** Unknown bundle convergence criteria [Pickles].

isis/src/qisis/objs/ProjectItemImageProxyModel/ProjectItemImageProxyModel.cpp

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
#include "ProjectItemImageProxyModel.h"



#include <QModelIndex>

#include <QObject>

#include <QSortFilterProxyModel>



#include "ProjectItem.h"



namespace Isis {



  ProjectItemImageProxyModel::ProjectItemImageProxyModel(QObject *parent)

    : QSortFilterProxyModel(parent) {

  }





  bool ProjectItemImageProxyModel::filterAcceptsColumn(int sourceColumn,

                                                       const QModelIndex &sourceParent) const {



  }





  bool ProjectItemImageProxyModel::filterAcceptsRow(int sourceRow,

                                                    const QModelIndex &sourceParent) const {

    ProjectItemModel *source = static_cast<ProjectItemModel *>(sourceModel());

    QModelIndex modelIndex = source->index(sourceRow, 0, sourceParent);

    ProjectItem *item = source->itemFromIndex(modelIndex);

    if (item->isImage() || item->isImageList()) {

        return true;

    }

    return false;

  }



}

isis/src/qisis/objs/ProjectItemImageProxyModel/ProjectItemImageProxyModel.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
#ifndef ProjectItemImageProxyModel_h

#define ProjectItemImageProxyModel_h



#include <QSortFilterProxyModel>



namespace Isis {



  class ProjectItemImageProxyModel : public QSortFilterProxyModel {

    public:

      ProjectItemImageProxyModel(QObject *parent = NULL);

      ~ProjectItemImageProxyModel();



    protected:

      virtual bool filterAcceptsColumn(int sourceColumn,

                                     const QModelIndex &sourceParent) const override;

      virtual bool filterAcceptsRow(int sourceRow,

                                  const QModelIndex &sourceParent) const override;

  };

}



#endif

isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp

+16 −0
Original line number Diff line number Diff line
@@ -192,6 +192,22 @@ namespace Isis { 
    QList<ProjectItem *> items;

    QModelIndexList indices = selection.indexes();



    // If nothing is selected, fill items with all image lists and images.

    if (indices.size() == 0) {

      ProjectItem *imageRoot = findItemData(QVariant("Images"), 0);

      items.append(imageRoot);

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

        ProjectItem *imglistItem = imageRoot->child(i);

        items.append(imglistItem);

        for (int j = 0; j < imglistItem->rowCount(); j++) {

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

          if (imgItem->isImage()) {

            items.append(imgItem);

          }

        }

      }

      return items;

    }



    //Query the selected items to see if they have children

    foreach ( QModelIndex ix, indices ) {