started the renaming process and moved everything back from int to si…

…ze_t. This refs #5801

Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ImageDataSource.h

@@ -1,4 +1,4 @@
-#ifndef IMAGE_DATA_SOURCE_H
+    #ifndef IMAGE_DATA_SOURCE_H
 #define IMAGE_DATA_SOURCE_H
 
 #include <cstddef>

Code/Mantid/MantidQt/Python/mantidqt.in.sip

@@ -333,11 +333,18 @@ namespace RefDetectorViewer
 //*WIKI* == Classes ==
 //*WIKI* Here follows a list of the classes exposed to python and the methods you can execute on them.
 
-/**************************************
-/**************************************
-/**************************************
 
-class ArrayDataSource : ImageDataSource
+
+
+
+
+
+
+/**************************************/
+/**************************************/
+/**************************************/
+
+class ArrayDataSource
 {
 %TypeHeaderCode
 #include "RefDetectorViewer/inc/MantidQtRefDetectorViewer/ArrayDataSource.h"
@@ -356,75 +363,27 @@ ArrayDataSource
 public:
 	ArrayDataSource(double total_xmin, double total_xmax,
 				    double total_ymin, double total_ymax,
-				    size_t total_rows, size_t total_cols, 
+				    int total_rows, int total_cols, 
 				    float* data);
 	MantidQt::RefDetectorViewer::DataArray* getDataArray( double xmin,
 														  double xmax,
 														  double ymin,
 														  double ymax,
-														  size_t n_rows,
-														  size_t n_cols,
+														  int n_rows,
+														  int n_cols,
 														  bool is_log_x);
 
 };
 
-/**************************************
-/**************************************
-/**************************************
 
-class DataArray
-{
-%TypeHeaderCode
-#include "RefDetectorViewer/inc/MantidQtRefDetectorViewer/DataArray.h"
-%End
-%Docstring
 
-DataArray
-=========
-
-	This class provides a simple immutable wrapper around a block of data
-	returned from an ImageDataSource
-
-%End
 
-public:
-	DataArray(double xmin, double xmax,
-			  double ymin, double ymax,
-			  bool is_log_x,
-			  size_t n_rows, size_t n_cols,
-			  float *data);
-
-//*WIKI* == get the smallest or largest x or y values actually covered by the DataArray
-	double GetXMin() const;
-	double GetXMax() const;
-	double GetYMin() const;
-	double GetYMax() const;
-
-//*WIKI* == check if the returned array is binned logarithmically in 'x'
-	bool isLogX() const;
-
-//*WIKI* == get the smallest or largest value recorded in the DataArray
-	double getDataMin() const;
-	double getDataMax() const;
-
-//*WIKI* == get the number of rows or columns in the DataArray
-	size_t GetNRows() const;
-	size_t GetNCols() const;
-
-//*WIKI* == get simple array containing all values, packed in a 1D array	
-	float *GetData() const;
-
-//*WIKI* == get the value at the specified row and column
-	double GetValue(int row, int col) const;
 
-//*WIKI* == get the value from the row and column containing the specified point
-	double GetValue(double x, double y) const;
-
-};	
 
-/**************************************
-/**************************************
-/**************************************
+
+/**************************************/
+/**************************************/
+/**************************************/
 
 class ImageView : QMainWindow
 {
@@ -450,3 +409,10 @@ public:
 }; // end namespace
 }; // end namespace
 
+
+
+
+
+
+
+

Code/Mantid/MantidQt/Python/mantidqt.sip

@@ -1121,3 +1121,12 @@ WidgetFactory::WidgetFactory()
 }; // end namespace
 
 
+
+
+
+
+
+
+
+
+

Code/Mantid/MantidQt/RefDetectorViewer/CMakeLists.txt

@@ -1,17 +1,17 @@
 set ( SRC_FILES
        src/ColorMaps.cpp        
-       src/ImageDisplay.cpp   
+       src/RefImageDisplay.cpp   
        src/IVUtils.cpp        
        src/TrackingPicker.cpp
        src/DataArray.cpp        
-       src/ImagePlotItem.cpp  
+       src/RefImagePlotItem.cpp  
        src/QtUtils.cpp
        src/GraphDisplay.cpp     
        src/ImageView.cpp      
        src/SliderHandler.cpp
        src/RangeHandler.cpp
        src/ImageDataSource.cpp  
-       src/IVConnections.cpp 
+       src/RefIVConnections.cpp 
        src/MatrixWSDataSource.cpp
        src/MatrixWSImageView.cpp
        src/ArrayDataSource.cpp
@@ -21,10 +21,10 @@ set ( SRC_FILES
 # Include files aren't required, but this makes them appear in Visual Studio
 set ( INC_FILES
        inc/MantidQtRefDetectorViewer/ColorMaps.h
-       inc/MantidQtRefDetectorViewer/ImageDisplay.h
-       inc/MantidQtRefDetectorViewer/IVConnections.h
+       inc/MantidQtRefDetectorViewer/RefImageDisplay.h
+       inc/MantidQtRefDetectorViewer/RefIVConnections.h
        inc/MantidQtRefDetectorViewer/DataArray.h
-       inc/MantidQtRefDetectorViewer/ImagePlotItem.h
+       inc/MantidQtRefDetectorViewer/RefImagePlotItem.h
        inc/MantidQtRefDetectorViewer/IVUtils.h
        inc/MantidQtRefDetectorViewer/TrackingPicker.h
        inc/MantidQtRefDetectorViewer/GraphDisplay.h
@@ -40,7 +40,7 @@ set ( INC_FILES
 )
 
 set ( MOC_FILES 
-       inc/MantidQtRefDetectorViewer/IVConnections.h
+       inc/MantidQtRefDetectorViewer/RefIVConnections.h
        inc/MantidQtRefDetectorViewer/TrackingPicker.h
 )