Merge remote-tracking branch 'origin/feature/10447_spec_view_refresh_…

…function'
mantidproject · Dec 5, 2014 · 5d12214 · 5d12214
2 parents c0837b7 + 1c364b9
commit 5d12214
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 22 deletions.
diff --git a/Code/Mantid/MantidQt/SpectrumViewer/inc/MantidQtSpectrumViewer/SpectrumView.h b/Code/Mantid/MantidQt/SpectrumViewer/inc/MantidQtSpectrumViewer/SpectrumView.h
@@ -74,7 +74,6 @@ class EXPORT_OPT_MANTIDQT_SPECTRUMVIEWER SpectrumView : public QMainWindow, publ
 
 protected slots:
   void closeWindow();
-  void updateWorkspace();
 
 protected:
   virtual void resizeEvent(QResizeEvent * event);

diff --git a/Code/Mantid/MantidQt/SpectrumViewer/src/GraphDisplay.cpp b/Code/Mantid/MantidQt/SpectrumViewer/src/GraphDisplay.cpp
@@ -45,6 +45,7 @@ GraphDisplay::GraphDisplay( QwtPlot*      graphPlot,
 
 GraphDisplay::~GraphDisplay()
 {
+  m_curve->attach(0);
   delete m_curve;
 }
 

diff --git a/Code/Mantid/MantidQt/SpectrumViewer/src/SpectrumView.cpp b/Code/Mantid/MantidQt/SpectrumViewer/src/SpectrumView.cpp
@@ -49,6 +49,14 @@ SpectrumView::~SpectrumView()
 }
 
 
+/**
+ * Handles the resize event fo rthe window.
+ *
+ * Used to keep the image splitters in the correct position and
+ * in alighment with each other.
+ *
+ * @param event The resize event
+ */
 void SpectrumView::resizeEvent(QResizeEvent * event)
 {
   QMainWindow::resizeEvent(event);
@@ -58,23 +66,35 @@ void SpectrumView::resizeEvent(QResizeEvent * event)
 }
 
 
+/**
+ * Renders a new workspace on the spectrum viewer.
+ *
+ * @param wksp The matrix workspace to render
+ */
 void SpectrumView::renderWorkspace(Mantid::API::MatrixWorkspace_const_sptr wksp)
 {
   m_dataSource = MatrixWSDataSource_sptr(new MatrixWSDataSource(wksp));
+
   updateHandlers(m_dataSource);
 
   // Watch for the deletion of the associated workspace
   observeAfterReplace();
   observePreDelete();
   observeADSClear();
 
-  // connect WorkspaceObserver signals
+  // Connect WorkspaceObserver signals
   connect(this, SIGNAL(needToClose()), this, SLOT(closeWindow()));
   connect(this, SIGNAL(needToUpdate()), this, SLOT(updateWorkspace()));
 
-  // set the window title
-  std::string title = "SpectrumView (" + wksp->getTitle() + ")";
-  this->setWindowTitle(QString::fromStdString(title).simplified());
+  // Set the window title
+  std::string windowTitle = "SpectrumView (" + wksp->getTitle() + ")";
+  this->setWindowTitle(QString::fromStdString(windowTitle).simplified());
+
+  // Remove the old graph plots
+  if(m_hGraph) delete m_hGraph;
+  if(m_vGraph) delete m_vGraph;
+  if(m_spectrumDisplay) delete m_spectrumDisplay;
+  if(m_svConnections) delete m_svConnections;
 
   m_hGraph = new GraphDisplay( m_ui->h_graphPlot, m_ui->h_graph_table, false );
   m_vGraph = new GraphDisplay( m_ui->v_graphPlot, m_ui->v_graph_table, true );
@@ -92,7 +112,11 @@ void SpectrumView::renderWorkspace(Mantid::API::MatrixWorkspace_const_sptr wksp)
 }
 
 
-/// Setup the various handlers (energy-mode, slider, range)
+/**
+ * Setup the various handlers (energy-mode, slider, range) for UI controls.
+ *
+ * @param dataSource The data source for the current workspace
+ */
 void SpectrumView::updateHandlers(SpectrumDataSource_sptr dataSource)
 {
   // If we have a MatrixWSDataSource give it the handler for the
@@ -117,22 +141,22 @@ void SpectrumView::updateHandlers(SpectrumDataSource_sptr dataSource)
 }
 
 
-/** Slot to close the window */
+/**
+ * Slot to close the window.
+ */
 void SpectrumView::closeWindow()
 {
   close();
 }
 
 
-/** Slot to replace the workspace being looked at. */
-void SpectrumView::updateWorkspace()
-{
-  close(); // TODO the right thing
-}
-
-
-/** Signal to close this window if the workspace has just been deleted */
-void SpectrumView::preDeleteHandle(const std::string& wsName,const boost::shared_ptr<Mantid::API::Workspace> ws)
+/**
+ * Signal to close this window if the workspace has just been deleted.
+ *
+ * @param wsName Name of workspace
+ * @param ws Pointer to workspace
+ */
+void SpectrumView::preDeleteHandle(const std::string& wsName, const boost::shared_ptr<Mantid::API::Workspace> ws)
 {
   if (m_spectrumDisplay->hasData(wsName, ws))
   {
@@ -141,15 +165,17 @@ void SpectrumView::preDeleteHandle(const std::string& wsName,const boost::shared
 }
 
 
-/** Signal that the workspace being looked at was just replaced with a different one */
-void SpectrumView::afterReplaceHandle(const std::string& wsName,const boost::shared_ptr<Mantid::API::Workspace> ws)
+/**
+ * Signal that the workspace being looked at was just replaced with a different one.
+ *
+ * @param wsName Name of workspace
+ * @param ws Pointer to workspace
+ */
+void SpectrumView::afterReplaceHandle(const std::string& wsName, const boost::shared_ptr<Mantid::API::Workspace> ws)
 {
   if (m_spectrumDisplay->hasData(wsName, ws))
   {
-//    MatrixWSDataSource* matrix_ws_data_source = new Matrix
-//                        dynamic_cast<MatrixWSDataSource>( ws );
-//    m_spectrumDisplay->setDataSource(ws); // TODO implement the right thing
-    emit needToUpdate();
+    renderWorkspace(boost::dynamic_pointer_cast<Mantid::API::MatrixWorkspace>(ws));
   }
 }