Refs #7363. Set Active view to current view

mantidproject · Dec 9, 2014 · c8f2504 · c8f2504
1 parent 72faff7
commit c8f2504
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
@@ -434,7 +434,7 @@ void MdViewerWidget::renderWorkspace(QString wsname, int wstype)
   }
 
   pqPipelineSource* source = this->currentView->setPluginSource(sourcePlugin, wsname);
-  pqSaveDataReaction::saveActiveData("/tmp/data.vtk");
+  //pqSaveDataReaction::saveActiveData("/tmp/data.vtk");
   source->getProxy()->SetAnnotation(this->m_widgetName.toLatin1().data(), "1");
   //this->ui.proxiesPanel->clear();
   //this->ui.proxiesPanel->addProxy(source->getProxy(),"datasource",QStringList(),true);
@@ -567,6 +567,15 @@ bool MdViewerWidget::eventFilter(QObject *obj, QEvent *ev)
       return true;
     }
   }*/
+  if(ev->type() == QEvent::WindowActivate)
+  {
+    if(this->currentView)
+    {
+      pqView* view = this->currentView->getView();
+      pqActiveObjects::instance().setActiveView(view);
+      pqActiveObjects::instance().setActiveSource(this->currentView->origSrc);
+    }
+  }
   return VatesViewerInterface::eventFilter(obj, ev);
 }