Unverified Commit cba1cd78 authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge branch 'ipceDocks' into ipceDocksTemplates

parents eaf99ee5 6d6b285d

isis/src/qisis/apps/ipce/IpceMainWindow.cpp

+4 −1
Original line number Diff line number Diff line
@@ -225,8 +225,11 @@ namespace Isis { 
   * @param view QWidget* The view to close.

   */

  void IpceMainWindow::removeView(QWidget *view) {

    view->close();

    QDockWidget *parentDock = qobject_cast<QDockWidget *>(view->parent());

    removeDockWidget(parentDock);

    m_viewDocks.removeAll(parentDock);

    delete view;

    delete parentDock;

  }

isis/src/qisis/apps/ipce/IpceMainWindow.h

+4 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ namespace Isis { 
   *   @history 2018-07-07 Summer Stapleton - Added check in the closeEvent() for changes to any 

   *                           TemplateEditorWidget currently open to create a pop-up warning/

   *                           option to save.

   *   @history 2018-07-09 Kaitlyn Lee - Added tileViews() and the menu option to tile all docked/undocked

   *                           and tabbed/untabbed views. Changed removeView() to delete the parent dock widget.

   *                           If we do not delete the dock widget, an empty dock widget will remain where the

   *                           view used to be.

   */

  class IpceMainWindow : public QMainWindow {

      Q_OBJECT

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

+11 −13
Original line number Diff line number Diff line
@@ -566,12 +566,10 @@ namespace Isis { 


  void Directory::newActiveControl(bool newControl) {



//  if (newControl && m_controlPointEditViewWidget) {

//    bool closed = m_controlPointEditViewWidget->close();

//    qDebug()<<"Directory::newActiveControl  CPEditor closed = "<<closed;

//    emit viewClosed(m_controlPointEditViewWidget);

//    delete m_controlPointEditViewWidget;

//  }

    if (newControl && m_controlPointEditViewWidget) {

     emit viewClosed(m_controlPointEditViewWidget);

     delete m_controlPointEditViewWidget;

    }



    // If the new active control is the same as what is showing in the cnetEditorWidget, allow

    // editing of control points from the widget, otherwise turnoff from context menu

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

+3 −1
Original line number Diff line number Diff line
@@ -254,6 +254,8 @@ namespace Isis { 
   *   @history 2018-07-07 Summer Stapleton - Implemented changes to handle implementation of 

   *                           separate import work orders for both map and registration templates.

   *

   *   @history 2018-07-09 Kaitlyn Lee - Uncommented code that closes a ControlPointEditView when a new

   *                           active control is set.

   */

  class Directory : public QObject {

    Q_OBJECT