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

Merge pull request #390 from kdl222/ipceDocks 

Allow rows to be deleted in CnetEditorView of ipce regardless if an active cnet is set.
parents 56a34dd3 5f9daf4a

isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1681,17 +1681,18 @@ namespace Isis { 
    if (QApplication::applicationName() != "cneteditor") {

      if (m_activeControlNet) {

        m_editControlPointAct->setEnabled(true);

        m_deleteSelectedRowsAct->setEnabled(true);

        m_applyToSelectionAct->setEnabled(true);

        m_applyToAllAct->setEnabled(true);

      }

      else {

        m_editControlPointAct->setEnabled(false);

        m_deleteSelectedRowsAct->setEnabled(false);

        m_applyToSelectionAct->setEnabled(false);

        m_applyToAllAct->setEnabled(false);

      }



      // We want to be able to delete rows in a nonactive control.

      m_deleteSelectedRowsAct->setEnabled(true);



      if (hasActiveCell() && selectedRows.count() <= 1) {

        contextMenu.addAction(m_editControlPointAct);

      }

isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ namespace Isis { 
    *                           have braces. This prevents a misleading-indentation warning from

    *                           occuring during Fedora25 (c++14) builds. No functionality has been

    *                           changed. References #4809.

    *   @history 2018-07-17 Kaitlyn Lee - Modified showContextMenu() to enable 

                                m_deleteSelectedRowsAct regardless if an active control is set. 

    */

  class TableViewContent : public QAbstractScrollArea {

      Q_OBJECT