Renamed another function I will use. Connection python to c++ works. …

…This refs #5801
mantidproject · Oct 1, 2012 · ad2e48e · ad2e48e
1 parent a819778
commit ad2e48e
Show file tree

Hide file tree

Showing 21 changed files with 146 additions and 361 deletions.
diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/CMakeLists.txt b/Code/Mantid/MantidQt/RefDetectorViewer/CMakeLists.txt
@@ -10,7 +10,7 @@ set ( SRC_FILES
        src/RefImageView.cpp      
        src/SliderHandler.cpp
        src/RangeHandler.cpp
-       src/ImageDataSource.cpp  
+       src/RefImageDataSource.cpp  
        src/RefIVConnections.cpp 
        src/RefMatrixWSDataSource.cpp
        src/RefMatrixWSImageView.cpp
@@ -30,7 +30,7 @@ set ( INC_FILES
        inc/MantidQtRefDetectorViewer/GraphDisplay.h
        inc/MantidQtRefDetectorViewer/RefImageView.h
        inc/MantidQtRefDetectorViewer/QtUtils.h
-       inc/MantidQtRefDetectorViewer/ImageDataSource.h
+       inc/MantidQtRefDetectorViewer/RefImageDataSource.h
        inc/MantidQtRefDetectorViewer/SliderHandler.h
        inc/MantidQtRefDetectorViewer/RangeHandler.h
        inc/MantidQtRefDetectorViewer/RefMatrixWSDataSource.h

diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/ArrayDataSource.h b/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/ArrayDataSource.h
@@ -3,7 +3,7 @@
 
 #include <cstddef>
 #include "MantidQtRefDetectorViewer/DataArray.h"
-#include "MantidQtRefDetectorViewer/ImageDataSource.h"
+#include "MantidQtRefDetectorViewer/RefImageDataSource.h"
 
 /**
     @class ArrayDataSource 
@@ -41,7 +41,7 @@ namespace MantidQt
 namespace RefDetectorViewer
 {
 
-class EXPORT_OPT_MANTIDQT_IMAGEVIEWER ArrayDataSource: public ImageDataSource
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER ArrayDataSource: public RefImageDataSource
 {
   public:
 

diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/GraphDisplay.h b/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/GraphDisplay.h
@@ -5,7 +5,7 @@
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
 
-#include "MantidQtRefDetectorViewer/ImageDataSource.h"
+#include "MantidQtRefDetectorViewer/RefImageDataSource.h"
 #include "MantidQtRefDetectorViewer/DllOptionIV.h"
 
 /**
@@ -55,7 +55,7 @@ class EXPORT_OPT_MANTIDQT_IMAGEVIEWER GraphDisplay
   ~GraphDisplay();
 
    /// Set the source of information for the table of position information 
-   void SetDataSource( ImageDataSource* data_source );
+   void SetDataSource( RefImageDataSource* data_source );
 
    /// Set the actual data that will be displayed on the graph
    void SetData( const QVector<double> & xData,
@@ -81,7 +81,7 @@ class EXPORT_OPT_MANTIDQT_IMAGEVIEWER GraphDisplay
    QwtPlot*          graph_plot;
    QwtPlotCurve*     curve;
 //   QTableWidget*     graph_table;
-   ImageDataSource*  data_source;
+   RefImageDataSource*  data_source;
 
    bool    is_vertical;
    bool    is_log_x;

diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/ImageDataSource.h b/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/ImageDataSource.h
diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/RangeHandler.h b/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/RangeHandler.h
@@ -2,7 +2,7 @@
 #define RANGE_HANDLER_H
 
 #include "ui_RefImageView.h"
-#include "MantidQtRefDetectorViewer/ImageDataSource.h"
+#include "MantidQtRefDetectorViewer/RefImageDataSource.h"
 #include "MantidQtRefDetectorViewer/DllOptionIV.h"
 
 /**
@@ -49,7 +49,7 @@ class EXPORT_OPT_MANTIDQT_IMAGEVIEWER RangeHandler
     RangeHandler( Ui_MainWindow* iv_ui );
 
     /// Configure min, max and step controls for the specified data source
-    void ConfigureRangeControls( ImageDataSource* data_source );
+    void ConfigureRangeControls( RefImageDataSource* data_source );
 
     /// Get the range of data to display in the image, from GUI controls
     void GetRange( double &min, double &max, double &step );

diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/RefImageDisplay.h b/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/RefImageDisplay.h
@@ -7,7 +7,7 @@
 #include <QTableWidget>
 #include <qwt_plot.h>
 
-#include "MantidQtRefDetectorViewer/ImageDataSource.h"
+#include "MantidQtRefDetectorViewer/RefImageDataSource.h"
 #include "MantidQtRefDetectorViewer/GraphDisplay.h"
 #include "MantidQtRefDetectorViewer/RefImagePlotItem.h"
 #include "MantidQtRefDetectorViewer/SliderHandler.h"
@@ -77,7 +77,7 @@ class EXPORT_OPT_MANTIDQT_IMAGEVIEWER RefImageDisplay
      ~RefImageDisplay();
 
      /// Set the source of the image data and information for the table
-     void SetDataSource( ImageDataSource* data_source );
+     void SetDataSource( RefImageDataSource* data_source );
 
      /// Rebuild the scroll bars and image due to change of xmin, xmax, step
      void UpdateRange();
@@ -134,7 +134,7 @@ class EXPORT_OPT_MANTIDQT_IMAGEVIEWER RefImageDisplay
      std::vector<QRgb>    negative_color_table;
      std::vector<double>  intensity_table;
 
-     ImageDataSource*     data_source;
+     RefImageDataSource*     data_source;
      DataArray*           data_array;
 
      QwtPlot*             image_plot;

diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/RefImageView.h b/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/RefImageView.h
@@ -5,7 +5,7 @@
 #include <QtGui>
 
 #include "MantidQtRefDetectorViewer/GraphDisplay.h"
-#include "MantidQtRefDetectorViewer/ImageDataSource.h"
+#include "MantidQtRefDetectorViewer/RefImageDataSource.h"
 #include "MantidQtRefDetectorViewer/DllOptionIV.h"
 
 /**
@@ -50,7 +50,7 @@ class EXPORT_OPT_MANTIDQT_IMAGEVIEWER RefImageView : public QMainWindow
   public:
 
      /// Construct an ImageView to display data from the specified data source 
-     RefImageView( ImageDataSource* data_source );
+     RefImageView( RefImageDataSource* data_source );
 
     ~RefImageView();
 

diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/RefMatrixWSDataSource.h b/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/RefMatrixWSDataSource.h
@@ -4,7 +4,7 @@
 #include <cstddef>
 
 #include "MantidQtRefDetectorViewer/DataArray.h"
-#include "MantidQtRefDetectorViewer/ImageDataSource.h"
+#include "MantidQtRefDetectorViewer/RefImageDataSource.h"
 #include "MantidQtRefDetectorViewer/DllOptionIV.h"
 
 #include "MantidAPI/MatrixWorkspace.h"
@@ -44,7 +44,7 @@ namespace MantidQt
 namespace RefDetectorViewer
 {
 
-class EXPORT_OPT_MANTIDQT_IMAGEVIEWER RefMatrixWSDataSource: public ImageDataSource
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER RefMatrixWSDataSource: public RefImageDataSource
 {
   public:
 
@@ -67,7 +67,7 @@ class EXPORT_OPT_MANTIDQT_IMAGEVIEWER RefMatrixWSDataSource: public ImageDataSou
 
     /// Get DataArray covering full range of data in x, and y directions
     DataArray * GetDataArray( bool is_log_x );
-
+    
     /// Get DataArray covering restricted range of data 
     DataArray * GetDataArray( double  xmin,
                               double  xmax,
@@ -83,7 +83,7 @@ class EXPORT_OPT_MANTIDQT_IMAGEVIEWER RefMatrixWSDataSource: public ImageDataSou
                       std::vector<std::string> &list );
   private:
     Mantid::API::MatrixWorkspace_sptr  mat_ws;
-
+    
 };
 
 } // namespace MantidQt 

diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/SliderHandler.h b/Code/Mantid/MantidQt/RefDetectorViewer/inc/MantidQtRefDetectorViewer/SliderHandler.h
@@ -4,7 +4,7 @@
 #include <QRect>
 
 #include "ui_RefImageView.h"
-#include "MantidQtRefDetectorViewer/ImageDataSource.h"
+#include "MantidQtRefDetectorViewer/RefImageDataSource.h"
 #include "MantidQtRefDetectorViewer/DllOptionIV.h"
 
 /**
@@ -52,7 +52,7 @@ class EXPORT_OPT_MANTIDQT_IMAGEVIEWER SliderHandler
 
     /// Configure the image scrollbars for the specified data and drawing area
     void ConfigureSliders( QRect            draw_area, 
-                           ImageDataSource* data_source );
+                           RefImageDataSource* data_source );
 
     /// Configure the horizontal scrollbar to cover the specified range
     void ConfigureHSlider( int         n_data_steps, 

diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/src/ArrayDataSource.cpp b/Code/Mantid/MantidQt/RefDetectorViewer/src/ArrayDataSource.cpp
@@ -34,7 +34,7 @@ ArrayDataSource::ArrayDataSource( double total_xmin, double total_xmax,
                                   double total_ymin, double total_ymax,
                                   size_t total_rows, size_t total_cols,
                                   float* data )
-                :ImageDataSource( total_xmin, total_xmax,
+                :RefImageDataSource( total_xmin, total_xmax,
                                   total_ymin, total_ymax,
                                   total_rows, total_cols )
 {

diff --git a/Code/Mantid/MantidQt/RefDetectorViewer/src/GraphDisplay.cpp b/Code/Mantid/MantidQt/RefDetectorViewer/src/GraphDisplay.cpp
@@ -61,7 +61,7 @@ GraphDisplay::~GraphDisplay()
  * @param data_source The ImageDataSource that provides information for
  *                    the table.
  */
-void GraphDisplay::SetDataSource( ImageDataSource* data_source )
+void GraphDisplay::SetDataSource( RefImageDataSource* data_source )
 {
   this->data_source = data_source;
 }