Commit 377f733a authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Refactored for changes to view classes which are now docked widgets within the ipce main window.

parent 0848afb8

isis/src/qisis/objs/Directory/Directory.cpp

+7 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <QApplication>

#include <QDockWidget>

#include <QGridLayout>

#include <QMainWindow>

#include <QMenu>

#include <QMenuBar>

#include <QMessageBox>
@@ -698,7 +699,7 @@ namespace Isis { 
    result->setWindowTitle("Cube DN View");

    result->setWindowTitle( tr("Cube DN View %1").arg(m_cubeDnViewWidgets.count() ) );



    emit newWidgetAvailable(result);

    emit newDockAvailable(result);



    //  Connections between mouse button events from view and control point editing

    connect(result, SIGNAL(modifyControlPoint(ControlPoint *, QString)),
@@ -1804,6 +1805,11 @@ namespace Isis { 
        "has been saved.";

      m_historyTreeWidget->addToHistory(saveCnetHistoryEntry);

    }



    // Make sure the ControlPointEditView "Save Net" button is no longer red

    if (controlPointEditView()) {

      controlPointEditView()->controlPointEditWidget()->colorizeSaveNetButton(true);

    }

  }

isis/src/qisis/objs/Directory/Directory.h

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


class QAction;

class QDockWidget;

class QMainWindow;

class QMenuBar;

class QProgressBar;

class QSplitter;
@@ -236,6 +237,9 @@ namespace Isis { 
   *   @history 2018-05-14 Tracie Sucharski - Serialize Footprint2DView rather than

   *                           MosaicSceneWidget. This will allow all parts of Footprint2DView to be

   *                           saved/restored including the ImageFileListWidget. Fixes #5422.

   *   @history 2018-05-30 Tracie Sucharski - Changed for re-factored docked views. Added signal to

   *                           let IpceMainWindow know there is a new view available for docking.

   *                           This needs further work to cleanup and change the mdi interface.

   */

  class Directory : public QObject {

    Q_OBJECT
@@ -355,6 +359,7 @@ namespace Isis { 
      void directoryCleaned();

      void newWarning();

      void newWidgetAvailable(QWidget *newWidget);

      void newDockAvailable(QMainWindow *newWidget);



      void viewClosed(QWidget *widget);