Adding DllOptionIV.h and updating for windows build.

Restoring CMakeLists.txt and adding DLL option info to all header files. Also removine ui_ImageView.h file that will be auto-generated from the ImageView.ui file during the build. refs #5058
mantidproject · Apr 4, 2012 · 3945046 · 3945046
1 parent feac0dd
commit 3945046
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 424 deletions.
diff --git a/Code/Mantid/MantidQt/CMakeLists.txt b/Code/Mantid/MantidQt/CMakeLists.txt
@@ -19,6 +19,7 @@ add_subdirectory ( CustomDialogs )
 add_subdirectory ( CustomInterfaces )
 add_subdirectory ( DesignerPlugins )
 add_subdirectory ( SliceViewer )
+add_subdirectory ( ImageViewer )
 add_subdirectory ( Factory )
 
 
@@ -34,9 +35,11 @@ if ( MSVC_IDE )
   set_property ( TARGET CustomInterfaces PROPERTY FOLDER "MantidQt" )
   set_property ( TARGET DesignerPlugins PROPERTY FOLDER "MantidQt" )
   set_property ( TARGET MantidQtSliceViewer PROPERTY FOLDER "MantidQt" )
+  set_property ( TARGET MantidQtImageViewer PROPERTY FOLDER "MantidQt" )
 else ()
   add_custom_target ( MantidQt DEPENDS MantidQtAPI MantidWidgets 
-                                       CustomDialogs CustomInterfaces MantidQtSliceViewer
+                                       CustomDialogs CustomInterfaces
+MantidQtSliceViewer MantidQtImageViewer
   )
 endif ()
 
@@ -116,6 +119,9 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/SliceViewer/inc )
 include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/MantidWidgets/inc )
 include_directories ( ${CMAKE_CURRENT_BINARY_DIR}/SliceViewer ) # to find the ui_*.h auto-generated files
 
+include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/ImageViewer/inc )
+include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/ImageViewer ) #to find ui*.h
+
 # This creates the target library, just for python bindings
 add_library ( mantidqtpython MODULE ${SIP_SRC} )
 

diff --git a/Code/Mantid/MantidQt/ImageViewer/CMakeLists.txt b/Code/Mantid/MantidQt/ImageViewer/CMakeLists.txt
@@ -27,7 +27,6 @@ set ( INC_FILES
        inc/MantidQtImageViewer/GraphDisplay.h
        inc/MantidQtImageViewer/ImageView.h
        inc/MantidQtImageViewer/QtUtils.h
-       inc/MantidQtImageViewer/ui_ImageView.h
        inc/MantidQtImageViewer/ImageDataSource.h
        inc/MantidQtImageViewer/ImageView.ui
        inc/MantidQtImageViewer/SliderHandler.h

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ColorMaps.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ColorMaps.h
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <QColor>
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 /**
     @class ColorMaps 
@@ -39,7 +40,7 @@ namespace MantidQt
 namespace ImageView
 {
 
-class ColorMaps
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER ColorMaps
 {
 
 public:

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/DataArray.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/DataArray.h
@@ -2,6 +2,9 @@
 #define DATA_ARRAY_H
 
 #include <cstddef>
+
+#include "MantidQtImageViewer/DllOptionIV.h"
+
 /**
     @class DataArray 
   
@@ -37,7 +40,7 @@ namespace MantidQt
 namespace ImageView
 {
 
-class DataArray
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER DataArray
 {
   public:
     DataArray( double xmin,     double xmax,

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/DllOptionIV.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/DllOptionIV.h
@@ -0,0 +1,12 @@
+#ifndef MANTIDQT_MANTID_IMAGE_VIEWER_DLLOPTION_H_
+#define MANTIDQT_MANTID_IMAGE_VIEWER_DLLOPTION_H_
+
+#include <MantidKernel/System.h>
+
+#ifdef IN_MANTIDQT_IMAGEVIEWER
+#define EXPORT_OPT_MANTIDQT_IMAGEVIEWER DLLExport
+#else
+#define EXPORT_OPT_MANTIDQT_IMAGEVIEWER DLLImport
+#endif
+
+#endif //MANTIDQT_MANTID_IMAGE_VIEWER_DLLOPTION_H_
diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/GraphDisplay.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/GraphDisplay.h
@@ -5,7 +5,8 @@
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
 
-#include "ImageDataSource.h"
+#include "MantidQtImageViewer/ImageDataSource.h"
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 /**
     @class GraphDisplay 
@@ -42,7 +43,7 @@ namespace MantidQt
 namespace ImageView
 {
 
-class GraphDisplay 
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER GraphDisplay 
 {
   public:
      GraphDisplay( QwtPlot*      graph_plot, 

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/IVConnections.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/IVConnections.h
@@ -4,10 +4,11 @@
 #include <QtCore/QtCore>
 #include <QtGui/QWidget>
 
-#include "TrackingPicker.h"
 #include "ui_ImageView.h"
-#include "ImageDisplay.h"
-#include "GraphDisplay.h"
+#include "MantidQtImageViewer/TrackingPicker.h"
+#include "MantidQtImageViewer/ImageDisplay.h"
+#include "MantidQtImageViewer/GraphDisplay.h"
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 
 /**
@@ -49,7 +50,7 @@ namespace ImageView
 {
 
 
-class IVConnections: public QWidget
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER IVConnections: public QWidget
 {
   Q_OBJECT
 

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/IVUtils.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/IVUtils.h
@@ -3,6 +3,8 @@
 
 #include <QVector>
 
+#include "MantidQtImageViewer/DllOptionIV.h"
+
 /**
     @class IVUtils 
   
@@ -39,7 +41,7 @@ namespace ImageView
 {
 
 
-class IVUtils
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER IVUtils
 {
   public:
 

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ImageDataSource.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ImageDataSource.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <string>
 #include "MantidQtImageViewer/DataArray.h"
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 /**
     @class ImageDataSource 
@@ -42,7 +43,7 @@ namespace ImageView
 {
 
 
-class ImageDataSource
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER ImageDataSource
 {
   public:
 

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ImageDisplay.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ImageDisplay.h
@@ -7,10 +7,11 @@
 #include <QTableWidget>
 #include <qwt_plot.h>
 
-#include "ImageDataSource.h"
-#include "GraphDisplay.h"
-#include "ImagePlotItem.h"
-#include "SliderHandler.h"
+#include "MantidQtImageViewer/ImageDataSource.h"
+#include "MantidQtImageViewer/GraphDisplay.h"
+#include "MantidQtImageViewer/ImagePlotItem.h"
+#include "MantidQtImageViewer/SliderHandler.h"
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 /**
     @class ImageDisplay 
@@ -48,7 +49,7 @@ namespace ImageView
 {
 
 
-class ImageDisplay
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER ImageDisplay
 {
   public:
      ImageDisplay( QwtPlot*       image_plot, 

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ImagePlotItem.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ImagePlotItem.h
@@ -7,7 +7,8 @@
 #include <qwt_plot_item.h>
 #include <qwt_scale_map.h>
 
-#include "DataArray.h"
+#include "MantidQtImageViewer/DataArray.h"
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 /**
     @class ImagePlotItem 
@@ -45,7 +46,7 @@ namespace ImageView
 {
 
 
-class ImagePlotItem : public QwtPlotItem
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER ImagePlotItem : public QwtPlotItem
 {
 
 public:

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ImageView.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/ImageView.h
@@ -5,11 +5,12 @@
 #include <QtGui>
 
 #include "ui_ImageView.h"
-#include "IVConnections.h"
-#include "GraphDisplay.h"
-#include "ImageDisplay.h"
-#include "ImageDataSource.h"
-#include "SliderHandler.h"
+#include "MantidQtImageViewer/IVConnections.h"
+#include "MantidQtImageViewer/GraphDisplay.h"
+#include "MantidQtImageViewer/ImageDisplay.h"
+#include "MantidQtImageViewer/ImageDataSource.h"
+#include "MantidQtImageViewer/SliderHandler.h"
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 /**
     @class ImageView 
@@ -48,7 +49,7 @@ namespace ImageView
 {
 
 
-class ImageView 
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER ImageView 
 {
   public:
      ImageView( ImageDataSource* data_source );

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/QtUtils.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/QtUtils.h
@@ -3,6 +3,8 @@
 
 #include <QTableWidget>
 
+#include "MantidQtImageViewer/DllOptionIV.h"
+
 /**
     @class QtUtils 
   
@@ -39,7 +41,7 @@ namespace ImageView
 {
 
 
-class QtUtils
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER QtUtils
 {
   public:
   /// enter the specified string in the table

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/SliderHandler.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/SliderHandler.h
@@ -3,8 +3,9 @@
 
 #include <QRect>
 
-#include "ImageDataSource.h"
 #include "ui_ImageView.h"
+#include "MantidQtImageViewer/ImageDataSource.h"
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 /**
     @class SliderHandler 
@@ -42,7 +43,7 @@ namespace ImageView
 {
 
 
-class SliderHandler 
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER SliderHandler 
 {
   public:
 

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/TestDataSource.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/TestDataSource.h
@@ -2,8 +2,9 @@
 #define TEST_DATA_SOURCE_H
 
 #include <cstddef>
-#include "DataArray.h"
-#include "ImageDataSource.h"
+#include "MantidQtImageViewer/DataArray.h"
+#include "MantidQtImageViewer/ImageDataSource.h"
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 /**
     @class TestDataSource 
@@ -41,7 +42,7 @@ namespace ImageView
 {
 
 
-class TestDataSource: public ImageDataSource
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER TestDataSource: public ImageDataSource
 {
   public:
 

diff --git a/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/TrackingPicker.h b/Code/Mantid/MantidQt/ImageViewer/inc/MantidQtImageViewer/TrackingPicker.h
@@ -3,6 +3,7 @@
 
 #include <qwt_plot_picker.h>
 #include <qwt_plot_canvas.h>
+#include "MantidQtImageViewer/DllOptionIV.h"
 
 /** 
    @class TrackingPicker
@@ -39,7 +40,7 @@ namespace MantidQt
 namespace ImageView
 {
 
-class TrackingPicker : public QwtPlotPicker
+class EXPORT_OPT_MANTIDQT_IMAGEVIEWER TrackingPicker : public QwtPlotPicker
 {
   Q_OBJECT