diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt index 3b23dae6ba892df905f5164edac93246e8063237..6094dcb99a3bb4ee8908f43b303447696d898d82 100644 --- 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 index 691556e664db38f61baca9a7d7d11d66a495796d..62e7ac9333cac737b4166e4c40bd224a0433e9e9 100644 --- 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 index d2de0e6fa69da790794f39f237e54de49311502d..7a7585a3db43288d7e87bf76bf6eccbf82c9a24a 100644 --- 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; }