Unverified Commit 3ed9451d authored by Tracie Sucharski's avatar Tracie Sucharski Committed by GitHub
Browse files

Merge pull request #213 from kdl222/bundleMW 

Added a central widget to BundleObservationView so the view will open in ipce
parents 9b6bd2b8 9d15c96d

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/Directory/Directory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ namespace Isis { 
      result->setObjectName( result->windowTitle() );

    }



    emit newWidgetAvailable(result);

    emit newDockAvailable(result);



    return result;

  }

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

+4 −2
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ namespace Isis { 
   *   @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.

   *   @history 2018-06-06 Kaitlyn Lee - Changed the emit in addBundleObservationView() from newWidgetAvailable()

   *                           to newDockAvailable().

   */

  class Directory : public QObject {

    Q_OBJECT