Commit 52920c86 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Merge branch 'ipce' of github.com:USGS-Astrogeology/ISIS3 into ipce

parents cefc08a2 2ec58d0c

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

+0 −2
Original line number Diff line number Diff line
@@ -227,8 +227,6 @@ namespace Isis { 
      if ( QMdiArea *mdiArea = qobject_cast<QMdiArea *>( centralWidget() ) ) {

        mdiArea->addSubWindow(newWidget);

        newWidget->show();

        mdiArea->setActiveSubWindow(qobject_cast<QMdiSubWindow *>(newWidget));

        setActiveView(qobject_cast<AbstractProjectItemView *>(newWidget));

      }

    }

  }

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

+0 −2
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ namespace Isis { 
   *                           containing the given widget. In the closeEvent method check whether

   *                           there is an active control and if it has been modified as additional

   *                           test to determine whether project needs saving.

   *   @history 2018-05-01 Tracie Sucharski - Code accidently left commented from previous checking.

   *                           Fixes #5412.

   *  

   */

  class IpceMainWindow : public QMainWindow {

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp

+7 −31
Original line number Diff line number Diff line
@@ -804,35 +804,17 @@ namespace Isis { 
    //  is selected

    if (controlPoint->Parent() == NULL) {

      m_editPoint = controlPoint;

      // New point in editor, so colorize all save buttons

      colorizeAllSaveButtons("red");

    }

    else {

      m_editPoint = new ControlPoint;

      *m_editPoint = *controlPoint;



      // New point loaded, make sure all save button's text is default black color

      colorizeAllSaveButtons("black");

    }



    loadPoint(serialNumber);

    loadTemplateFile(m_measureEditor->templateFileName());

  }





  void ControlPointEditWidget::colorizeAllSaveButtons(QString color) {



    if (color == "black") {

      // Don't need to colorize save measure button, when loading new measure, the measure editor

      // will set back to default palette.

    // New point loaded, make sure Save Measure Button text is default

    m_savePoint->setPalette(m_saveDefaultPalette);

      m_saveNet->setPalette(m_saveDefaultPalette);

    }

    else if (color == "red") {

      m_measureEditor->colorizeSaveButton(); 

      colorizeSavePointButton();

      colorizeSaveNetButton();

    }

  }
@@ -2484,18 +2466,12 @@ namespace Isis { 
   *

   * @author 2014-07-11 Tracie Sucharski

   */

  void ControlPointEditWidget::colorizeSaveNetButton(bool reset) {

  void ControlPointEditWidget::colorizeSaveNetButton() {



    if (reset) {

      //  Change Save Net button text back to default black

      m_saveNet->setPalette(m_saveDefaultPalette);

    }

    else {

    QColor qc = Qt::red;

    QPalette p = m_savePoint->palette();

    p.setColor(QPalette::ButtonText,qc);

    m_saveNet->setPalette(p);

    }



  }

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h

+2 −9
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ namespace Isis { 
   *   @history 2018-04-25 Tracie Sucharski - Fix bug when creating a control point from CubeDnView

   *                           or FootprintView if a ground source exists in the serial number list.

   *                           Fixes #5399.

   *   @history 2018-05-02 Tracie Sucharski - Colorize save buttons properly when creating new

   *                           control point and loading a different control point. 

   */

  class ControlPointEditWidget : public QWidget {

    Q_OBJECT
@@ -125,11 +123,6 @@ namespace Isis { 
                              bool isGroundSource = false);



      void updatePointInfo(ControlPoint &updatedPoint);

      // Changed colorizeSaveNetButton to public slot so it could be called from

      // Directory::saveActiveControl().  This should be temporary until the modify/save functionality

      // of active control is re-factored. Also added reset parameter, defaulting to false so button

      // is red. This default was used so that current calls did not need to be changed.

      void colorizeSaveNetButton(bool reset = false);



    protected:

      bool eventFilter(QObject *o,QEvent *e);
@@ -157,8 +150,6 @@ namespace Isis { 
      void measureSaved();

      void checkReference();

      void savePoint();



      void colorizeAllSaveButtons(QString color);

      void colorizeSavePointButton();



      void openTemplateFile();
@@ -171,6 +162,8 @@ namespace Isis { 
      void writeTemplateFile(QString);

      void clearEditPoint();



      void colorizeSaveNetButton();



    private:

      void createActions();

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

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "Directory.h"

#include "BundleObservationView.h"

#include "Project.h"

#include "ProjectItemModel.h"



namespace Isis {