Refs #7363. Remove second properties panel.

mantidproject · Apr 14, 2015 · 71af81e · 71af81e
1 parent 37a14aa
commit 71af81e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/...id/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui b/...id/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui
@@ -197,16 +197,6 @@
        <property name="currentIndex">
         <number>0</number>
        </property>
-        <widget class="QWidget" name="properties2">
-         <attribute name="title">
-          <string>Properties</string>
-         </attribute>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
-          <item>
-           <widget class="pqProxiesWidget" name="proxiesPanel" native="true"/>
-          </item>
-        </layout>
-        </widget>
         <widget class="QWidget" name="properties">
          <attribute name="title">
           <string>Properties</string>

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
@@ -216,7 +216,7 @@ void MdViewerWidget::setupUiAndConnections()
   pqApplicationCore::instance()->registerManager(
     "COLOR_EDITOR_PANEL", this->ui.colorMapEditorDock);
   this->ui.colorMapEditorDock->hide();
-  this->connect(this->ui.proxiesPanel,SIGNAL(changeFinished(vtkSMProxy*)),SLOT(panelChanged()));
+  //this->connect(this->ui.proxiesPanel,SIGNAL(changeFinished(vtkSMProxy*)),SLOT(panelChanged()));
   QAction* temp = new QAction(this);
   pqDeleteReaction* deleteHandler = new pqDeleteReaction(temp);
   deleteHandler->connect(this->ui.propertiesPanel,SIGNAL(deleteRequested(pqPipelineSource*)),SLOT(deleteSource(pqPipelineSource*)));
@@ -911,10 +911,10 @@ void MdViewerWidget::renderAndFinalSetup()
   this->currentView->updateAnimationControls();
   pqPipelineSource *source = this->currentView->origSrc;
   pqPipelineRepresentation *repr = this->currentView->origRep;
-  this->ui.proxiesPanel->clear();
-  this->ui.proxiesPanel->addProxy(source->getProxy(),"datasource",QStringList(),true);
-  this->ui.proxiesPanel->addProxy(repr->getProxy(),"display",QStringList("CubeAxesVisibility"),true);
-  this->ui.proxiesPanel->updateLayout();
+  //this->ui.proxiesPanel->clear();
+  //this->ui.proxiesPanel->addProxy(source->getProxy(),"datasource",QStringList(),true);
+  //this->ui.proxiesPanel->addProxy(repr->getProxy(),"display",QStringList("CubeAxesVisibility"),true);
+  //this->ui.proxiesPanel->updateLayout();
   this->setDestroyedListener();
   this->currentView->setVisibilityListener();
   this->currentView->onAutoScale(this->ui.colorSelectionWidget);