Commit 0b41cac1 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Merge branch 'ipceBundleWindow' of github.com:twilson271828/ISIS3 into ipceBundleWindow

parents f0370278 054dacf9

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

+1 −1
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
#include "Control.h"

#include "IString.h"

#include "MaximumLikelihoodWFunctions.h"

#include "SubTreeProxyModel.h"

#include "Project.h"

#include "ProjectItem.h"

#include "ProjectItemProxyModel.h"

#include "SpecialPixel.h"

#include "SubTreeProxyModel.h"

#include "ui_JigsawSetupDialog.h"



namespace Isis {

isis/src/qisis/objs/SubTreeProxyModel/SubTreeProxyModel.cpp

+4 −1
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ namespace Isis { 
    // }



    // check if the model index corresponds to the invisible root item in source model

    if (sourceIndex == static_cast<QStandardItemModel *>(sourceModel())->invisibleRootItem()->index()) {

    if (sourceIndex == 

            static_cast<QStandardItemModel *>(sourceModel())->invisibleRootItem()->index()) {

      qDebug() << "creating index for invisible root item "

          << static_cast<QStandardItemModel *>(sourceModel())->invisibleRootItem()->index();

      return createIndex(sourceIndex.row(), 0, sourceIndex.internalId());

    }

isis/src/qisis/objs/SubTreeProxyModel/SubTreeProxyModel.h

+2 −1
Original line number Diff line number Diff line 
#ifndef SubtreeProxyModel_h



#ifndef SubTreeProxyModel_h

#define SubTreeProxyModel_h



#include <QIdentityProxyModel>