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

Merge pull request #291 from AgoinsUSGS/dock_changes 

Made IPCE dockable
parents 019a5799 cba73ed7

isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp

+1 −7
Original line number Diff line number Diff line
@@ -62,24 +62,18 @@ namespace Isis { 
    connect(m_controlHealthMonitorWidget, SIGNAL(openImageEditor()),

            this, SLOT(openImageEditor()));



    QVBoxLayout *layout = new QVBoxLayout;

    setLayout(layout);



    layout->addWidget(m_controlHealthMonitorWidget);

    setCentralWidget(m_controlHealthMonitorWidget);



    m_permToolBar = new QToolBar("Standard Tools", 0);

    m_permToolBar->setObjectName("permToolBar");

    m_permToolBar->setIconSize(QSize(22, 22));

    //toolBarLayout->addWidget(m_permToolBar);



    m_activeToolBar = new QToolBar("Active Tool", 0);

    m_activeToolBar->setObjectName("activeToolBar");

    m_activeToolBar->setIconSize(QSize(22, 22));

    //toolBarLayout->addWidget(m_activeToolBar);



    m_toolPad = new ToolPad("Tool Pad", 0);

    m_toolPad->setObjectName("toolPad");

    //toolBarLayout->addWidget(m_toolPad);





//  m_ControlHealthMonitorWidget->addToPermanent(m_permToolBar);

isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ namespace Isis { 
   *

   * @internal

   *   @history 2018-06-07 Adam Goins - Initial Version.

   *   @history 2018-06-26 Adam Goins - Made the view dockable with setCentralWidget().

   */



class ControlHealthMonitorView : public AbstractProjectItemView {