Refs #11528 Fix drag and drop issue in PV4

mantidproject · Apr 16, 2015 · 0f0545f · 0f0545f
1 parent 78cd53e
commit 0f0545f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
@@ -136,6 +136,7 @@ pqComponents
 vtkPVServerManagerRendering
 vtkRenderingFreeType
 vtkRenderingFreeTypeOpenGL
+vtksys
 ${QT_LIBRARIES}
 VatesSimpleGuiQtWidgets
 MantidQtAPI

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
@@ -1026,7 +1026,7 @@ void MdViewerWidget::swapViews()
  */
 bool MdViewerWidget::eventFilter(QObject *obj, QEvent *ev)
 {
-  /*if (this->currentView == obj)
+  if (this->currentView == obj)
   {
     if (this->pluginMode && QEvent::Hide == ev->type() &&
         !ev->spontaneous())
@@ -1044,7 +1044,7 @@ bool MdViewerWidget::eventFilter(QObject *obj, QEvent *ev)
 
       return true;
     }
-  }*/
+  }
   if(ev->type() == QEvent::WindowActivate)
   {
     if(this->currentView)

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp
@@ -290,6 +290,10 @@ pqPipelineSource* ViewBase::setPluginSource(QString pluginName, QString wsName)
   src->getProxy()->UpdateVTKObjects(); // Updates all the proxies
   src->updatePipeline(); // Updates the pipeline
   src->setModifiedState(pqProxy::UNMODIFIED); // Just to that the UI state looks consistent with the apply
+
+  // Update the properties, from PV3.98.1 to PV4.3.1, it wasn't updating any longer, so need to force it
+  src->getProxy()->UpdatePropertyInformation();
+
   return src;
 }