Merge remote-tracking branch 'origin/bugfix/10809_fix_multislice_freeze_with_mdevent_data'

Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui

@@ -6,14 +6,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>974</width>
+    <width>1057</width>
     <height>710</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>1057</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,1,0">
+  <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,0,0">
    <property name="spacing">
     <number>0</number>
    </property>
@@ -172,7 +178,7 @@
       <widget class="pqPipelineBrowserWidget" name="pipelineBrowser" native="true">
        <property name="minimumSize">
         <size>
-         <width>150</width>
+         <width>350</width>
          <height>50</height>
         </size>
        </property>
@@ -206,8 +212,8 @@
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>98</width>
-              <height>28</height>
+              <width>274</width>
+              <height>370</height>
              </rect>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout">
@@ -225,7 +231,7 @@
      <widget class="QWidget" name="viewWidget" native="true">
       <property name="minimumSize">
        <size>
-        <width>800</width>
+        <width>600</width>
         <height>600</height>
        </size>
       </property>

Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp

@@ -327,6 +327,9 @@ void MdViewerWidget::removeProxyTabWidgetConnections()
 {
   QObject::disconnect(&pqActiveObjects::instance(), 0,
                       this->ui.propertiesPanel, 0);
+  this->ui.propertiesPanel->setRepresentation(NULL);
+  this->ui.propertiesPanel->setView(NULL);
+  this->ui.propertiesPanel->setOutputPort(NULL);
 }
 
 /**
@@ -387,6 +390,10 @@ void MdViewerWidget::setParaViewComponentsForView()
   QObject::connect(activeObjects, SIGNAL(viewChanged(pqView*)),
                    this->ui.propertiesPanel, SLOT(setView(pqView*)));
 
+  this->ui.propertiesPanel->setOutputPort(activeObjects->activePort());
+  this->ui.propertiesPanel->setView(this->currentView->getView());
+  this->ui.propertiesPanel->setRepresentation(activeObjects->activeRepresentation());
+
   QObject::connect(this->currentView,
                    SIGNAL(triggerAccept()),
                    this->ui.propertiesPanel,