Make Grid and Legend work with proxy objects. Re #1037.

mantidproject · Jan 9, 2012 · b026dc5 · b026dc5
1 parent 2c795e4
commit b026dc5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -558,6 +558,7 @@ set ( QTIPLOT_MOC_FILES src/ApplicationWindow.h
                         src/FunctionDialog.h
                         src/Graph3D.h
                         src/Graph.h
+                        src/Grid.h
                         src/ImageDialog.h
                         src/ImageExportDialog.h
                         src/ImportASCIIDialog.h

diff --git a/Code/Mantid/MantidPlot/src/Grid.cpp b/Code/Mantid/MantidPlot/src/Grid.cpp
@@ -36,7 +36,7 @@
 
 #include <QPainter>
 
-Grid::Grid() : QwtPlotGrid(),
+Grid::Grid() : QObject(), QwtPlotGrid(),
 d_maj_pen_y(QPen(Qt::blue, 0.5, Qt::SolidLine)),
 d_min_pen_y(QPen(Qt::gray, 0.4, Qt::DotLine)),
 mrkX(-1),

diff --git a/Code/Mantid/MantidPlot/src/Grid.h b/Code/Mantid/MantidPlot/src/Grid.h
@@ -33,8 +33,9 @@
 #include <qwt_plot_grid.h>
 #include <qwt_plot_marker.h>
 
-class Grid : public QwtPlotGrid
+class Grid : public QObject, public QwtPlotGrid // Made a QObject just for our python proxies
 {
+  Q_OBJECT
 public:
     Grid();
 

diff --git a/Code/Mantid/MantidPlot/src/qti.sip b/Code/Mantid/MantidPlot/src/qti.sip
@@ -481,7 +481,7 @@ private:
   ImageMarker(const ImageMarker&);
 };
 
-class LegendWidget // : QWidget /PyName=Legend/
+class LegendWidget : QObject // : QWidget /PyName=Legend/
 {
 %TypeHeaderCode
 #include "src/LegendWidget.h"
@@ -586,7 +586,7 @@ private:
 };
 
 
-class Grid // : QwtPlotGrid
+class Grid : QObject // : QwtPlotGrid
 {
 %TypeHeaderCode
 #include "src/Grid.h"