Merge remote branch 'origin/bugfix/6238_save_instrument_image'

mantidproject · Nov 21, 2013 · d04ed15 · d04ed15
2 parents 33baa82 + 688e017
commit d04ed15
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp
@@ -714,8 +714,14 @@ void InstrumentWindow::saveImage(QString filename)
     }
   }
 
-  if ( m_InstrumentDisplay )
+  if ( isGLEnabled() )
+  {
     m_InstrumentDisplay->saveToFile(filename);
+  }
+  else
+  {
+    m_simpleDisplay->saveToFile(filename);
+  }
 }
 
 /**

diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/SimpleWidget.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/SimpleWidget.cpp
@@ -2,6 +2,7 @@
 #include "ProjectionSurface.h"
 
 #include <QApplication>
+#include <QPixmap>
 
 /// Constructor
 SimpleWidget::SimpleWidget(QWidget* parent):QWidget(parent)
@@ -45,6 +46,17 @@ void SimpleWidget::updateDetectors()
     }
 }
 
+/**
+  * Save widget content to a file.
+  * @param filename :: A file to save to.
+  */
+void SimpleWidget::saveToFile(const QString &filename)
+{
+    QPixmap image( size() );
+    render( &image );
+    image.save( filename );
+}
+
 void SimpleWidget::paintEvent(QPaintEvent*)
 {
     if(m_surface)

diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/SimpleWidget.h b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/SimpleWidget.h
@@ -24,6 +24,8 @@ class SimpleWidget : public QWidget
   void updateView(bool picking = true);
   /// Update the detector information (count values) and redraw
   void updateDetectors();
+  /// Save the image into a file
+  void saveToFile(const QString & filename);
 protected:
   void paintEvent(QPaintEvent*);
   void resizeEvent(QResizeEvent*);