Skip to content

Commit

Permalink
Expose ErrorBarSettings to python. Re #2657.
Browse files Browse the repository at this point in the history
  • Loading branch information
@RussellTaylor
RussellTaylor committed Jan 8, 2012
1 parent ad3d3b3 commit 14cddb6
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 19 deletions.
39 changes: 21 additions & 18 deletions Code/Mantid/MantidPlot/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion Code/Mantid/MantidPlot/src/Mantid/ErrorBarSettings.h
View file
Original file line number Diff line number Diff line change
@@ -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 &copy; 2012 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
Expand All @@ -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();

Expand Down
28 changes: 28 additions & 0 deletions Code/Mantid/MantidPlot/src/qti.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 14cddb6

Please sign in to comment.