Commit 408a30a6 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Refactored IpceMainWindow for the new ipce user interface using docked views... 

Refactored IpceMainWindow for the new ipce user interface using docked views rather than mdi sub-windows.  Fixes #5433.
parents 319c37b7 3ed9451d

isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp

+4 −12
Original line number Diff line number Diff line
@@ -156,9 +156,7 @@ namespace Isis { 
    // NOTE: QHeaderView::ResizeToContents does not allow user to resize by dragging column divider

    qtable->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);



    QVBoxLayout *layout = new QVBoxLayout;

    setLayout(layout);

    layout->addWidget(qtable);

    setCentralWidget(qtable);



    QSizePolicy policy = sizePolicy();

    policy.setHorizontalPolicy(QSizePolicy::Expanding);
@@ -198,10 +196,7 @@ namespace Isis { 


    file.close();



    QVBoxLayout *layout = new QVBoxLayout;

    setLayout(layout);

    layout->addWidget(qText);



    setCentralWidget(qText);

    qText->moveCursor(QTextCursor::Start);



    QSizePolicy policy = sizePolicy();
@@ -217,6 +212,3 @@ namespace Isis { 
  BundleObservationView::~BundleObservationView() {

  }

}

isis/src/qisis/objs/BundleObservationView/BundleObservationView.h

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ namespace Isis{ 
   *   @history 2018-04-16 Ken Edmundson - Modified display of residuals.csv to properly show the

   *                           rejected column if there are rejected measures. Also displays

   *                           rejected measure row in red.

   *   @history 2018-06-06 Kaitlyn Lee - Set a central widget and removed layout (it is not needed

   *                           after setting a central widget) because AbstractProjectItemView was

   *                           updated to inherit from QMainWindow.

   */



  class BundleObservationView : public AbstractProjectItemView

isis/src/qisis/objs/Project/Project.cpp

+21 −21
Original line number Diff line number Diff line
@@ -1804,8 +1804,8 @@ namespace Isis { 




  void Project::activeControlModified() {



    m_activeControl->setModified(true);

    setClean(false);

  }

isis/src/qisis/objs/Project/Project.h

+3 −1
Original line number Diff line number Diff line
@@ -253,6 +253,8 @@ namespace Isis { 
   *  @history 2018-04-25 Tracie Sucharski - Fixed typo in XmlHandler::startElement reading

   *                           imported shapes from a project which caused the shapes to be put in

   *                           the wrong place on the project tree. Fixes #5274.

   *  @history 2018-06-06 Kaitlyn Lee - activeControlModified() calls setClean(false) to enable the save

   *                           button when the active control net is modified, i.e. a point is modified.

   *

   */

  class Project : public QObject {