diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
index 63e92772b8cbf6d035898aba08e377e17be55071..06e2a09dc15f833751ec87c05afa471ecbbbb2ce 100644
--- a/Code/Mantid/MantidPlot/CMakeLists.txt
+++ b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -106,7 +106,7 @@ set ( QTIPLOT_SRCS src/ApplicationWindow.cpp
src/ScriptingWindow.cpp
src/ScriptManagerWidget.cpp
src/SelectionMoveResizer.cpp
- src/SendToProgramDialog.cpp
+ src/SendToProgramDialog.cpp
src/SetColValuesDialog.cpp
src/SigmoidalFit.cpp
src/SmoothCurveDialog.cpp
@@ -153,6 +153,7 @@ endif ()
set ( MANTID_SRCS src/Mantid/AbstractMantidLog.cpp
src/Mantid/AlgorithmMonitor.cpp
src/Mantid/AlgorithmHistoryWindow.cpp
+ src/Mantid/ErrorBarSettings.cpp
src/Mantid/FirstTimeSetup.cpp
src/Mantid/FitParameterTie.cpp
src/Mantid/FlowLayout.cpp
@@ -163,19 +164,19 @@ set ( MANTID_SRCS src/Mantid/AbstractMantidLog.cpp
src/Mantid/ManageCustomMenus.cpp
src/Mantid/MantidAbout.cpp
src/Mantid/MantidApplication.cpp
- src/Mantid/MantidCurve.cpp
+ src/Mantid/MantidCurve.cpp
src/Mantid/MantidDock.cpp
src/Mantid/MantidLog.cpp
src/Mantid/MantidMatrix.cpp
- src/Mantid/MantidMatrixCurve.cpp
- src/Mantid/MantidMDCurve.cpp
+ src/Mantid/MantidMatrixCurve.cpp
+ src/Mantid/MantidMDCurve.cpp
src/Mantid/MantidMatrixDialog.cpp
src/Mantid/MantidSampleLogDialog.cpp
src/Mantid/MantidUI.cpp
src/Mantid/MantidTable.cpp
src/Mantid/MantidWSIndexDialog.cpp
- src/Mantid/MantidQwtIMDWorkspaceData.cpp
- src/Mantid/MantidQwtMatrixWorkspaceData.cpp
+ src/Mantid/MantidQwtIMDWorkspaceData.cpp
+ src/Mantid/MantidQwtMatrixWorkspaceData.cpp
src/Mantid/PeakPickerTool.cpp
src/Mantid/Preferences.cpp
src/Mantid/RemoveErrorsDialog.cpp
@@ -330,7 +331,7 @@ set ( QTIPLOT_HDRS src/ApplicationWindow.h
src/ScriptingWindow.h
src/ScriptManagerWidget.h
src/SelectionMoveResizer.h
- src/SendToProgramDialog.h
+ src/SendToProgramDialog.h
src/SetColValuesDialog.h
src/SigmoidalFit.h
src/SmoothCurveDialog.h
@@ -369,6 +370,7 @@ set ( QTIPLOT_HDRS src/ApplicationWindow.h
set ( MANTID_HDRS src/Mantid/AbstractMantidLog.h
src/Mantid/AlgorithmMonitor.h
src/Mantid/AlgorithmHistoryWindow.h
+ src/Mantid/ErrorBarSettings.h
src/Mantid/FirstTimeSetup.h
src/Mantid/FitParameterTie.h
src/Mantid/FlowLayout.h
@@ -379,20 +381,20 @@ set ( MANTID_HDRS src/Mantid/AbstractMantidLog.h
src/Mantid/ManageCustomMenus.h
src/Mantid/MantidAbout.h
src/Mantid/MantidApplication.h
- src/Mantid/MantidCurve.h
- src/Mantid/MantidDock.h
+ src/Mantid/MantidCurve.h
+ src/Mantid/MantidDock.h
src/Mantid/MantidLog.h
src/Mantid/MantidMatrixCurve.h
- src/Mantid/MantidMDCurve.h
+ src/Mantid/MantidMDCurve.h
src/Mantid/MantidMatrixDialog.h
src/Mantid/MantidMatrix.h
src/Mantid/MantidSampleLogDialog.h
src/Mantid/MantidUI.h
src/Mantid/MantidWSIndexDialog.h
src/Mantid/MantidTable.h
- src/Mantid/MantidQwtIMDWorkspaceData.h
- src/Mantid/MantidQwtMatrixWorkspaceData.h
- src/Mantid/MantidQwtWorkspaceData.h
+ src/Mantid/MantidQwtIMDWorkspaceData.h
+ src/Mantid/MantidQwtMatrixWorkspaceData.h
+ src/Mantid/MantidQwtWorkspaceData.h
src/Mantid/PeakPickerTool.h
src/Mantid/Preferences.h
src/Mantid/RemoveErrorsDialog.h
@@ -605,7 +607,7 @@ set ( QTIPLOT_MOC_FILES src/ApplicationWindow.h
src/ScriptingWindow.h
src/ScriptManagerWidget.h
src/SelectionMoveResizer.h
- src/SendToProgramDialog.h
+ src/SendToProgramDialog.h
src/SetColValuesDialog.h
src/SigmoidalFit.h
src/SmoothCurveDialog.h
@@ -636,6 +638,7 @@ set ( QTIPLOT_MOC_FILES src/ApplicationWindow.h
set ( MANTID_MOC_FILES src/Mantid/AlgorithmMonitor.h
src/Mantid/AlgorithmHistoryWindow.h
+ src/Mantid/ErrorBarSettings.h
src/Mantid/FirstTimeSetup.h
src/Mantid/IFunctionWrapper.h
src/Mantid/ImportWorkspaceDlg.h
@@ -646,16 +649,16 @@ set ( MANTID_MOC_FILES src/Mantid/AlgorithmMonitor.h
src/Mantid/MantidCurve.h
src/Mantid/MantidDock.h
src/Mantid/MantidLog.h
- src/Mantid/MantidMatrixCurve.h
- src/Mantid/MantidMDCurve.h
+ src/Mantid/MantidMatrixCurve.h
+ src/Mantid/MantidMDCurve.h
src/Mantid/MantidMatrixDialog.h
src/Mantid/MantidMatrix.h
src/Mantid/MantidSampleLogDialog.h
src/Mantid/MantidUI.h
src/Mantid/MantidWSIndexDialog.h
src/Mantid/MantidTable.h
- src/Mantid/MantidQwtIMDWorkspaceData.h
- src/Mantid/MantidQwtMatrixWorkspaceData.h
+ src/Mantid/MantidQwtIMDWorkspaceData.h
+ src/Mantid/MantidQwtMatrixWorkspaceData.h
src/Mantid/PeakPickerTool.h
src/Mantid/RemoveErrorsDialog.h
src/Mantid/UserFitFunctionDialog.h
diff --git a/Code/Mantid/MantidPlot/src/Mantid/ErrorBarSettings.h b/Code/Mantid/MantidPlot/src/Mantid/ErrorBarSettings.h
index 8f3ec9f5206ae27e046423941ee6acf3b9af9cb5..9d1507d0245abadcbd35e9c7e4ee91b7e03c7fe2 100644
--- a/Code/Mantid/MantidPlot/src/Mantid/ErrorBarSettings.h
+++ b/Code/Mantid/MantidPlot/src/Mantid/ErrorBarSettings.h
@@ -1,9 +1,11 @@
#ifndef ERRORBARSETTINGS_H
#define ERRORBARSETTINGS_H
+#include <QObject>
#include <QColor>
/** Holds the settings for how a set of error bars are to be drawn.
+ The class is a QObject purely so that our python proxy objects will work with it.
Copyright © 2012 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
@@ -22,8 +24,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-class ErrorBarSettings
+class ErrorBarSettings : public QObject
{
+ Q_OBJECT
public:
ErrorBarSettings();
diff --git a/Code/Mantid/MantidPlot/src/qti.sip b/Code/Mantid/MantidPlot/src/qti.sip
index f3d39236a35ab5466085916ff86883d64468076f..e12d752b40d336613357672952dfed65b838c4d8 100644
--- a/Code/Mantid/MantidPlot/src/qti.sip
+++ b/Code/Mantid/MantidPlot/src/qti.sip
@@ -868,6 +868,34 @@ private:
MultiLayer(const MultiLayer&);
};
+class ErrorBarSettings
+{
+%TypeHeaderCode
+#include "../src/Mantid/ErrorBarSettings.h"
+%End
+public:
+ int capLength();
+ void setCapLength(int t);
+
+ double width();
+ void setWidth(double w);
+
+ QColor color();
+ void setColor(const QColor& c);
+
+ bool throughSymbol();
+ void drawThroughSymbol(bool);
+
+ bool plusSide();
+ void drawPlusSide(bool);
+
+ bool minusSide();
+ void drawMinusSide(bool);
+
+private:
+ ErrorBarSettings(const ErrorBarSettings&);
+};
+
class Note: MdiSubWindow
{
%TypeHeaderCode