diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-15 03:44:46 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-15 03:44:46 +0200 |
| commit | e1cf876626aad4cbed2db96f30867c8e11af340e (patch) | |
| tree | 06603562438276f37e7bfc6243bc0791d37b8f87 /qfunctionconfigurator | |
| parent | 51fb3e42f915c3b538c423cfb9e5dfae11778717 (diff) | |
Fix MSVC build. Also, minor reformat
Diffstat (limited to 'qfunctionconfigurator')
| -rw-r--r-- | qfunctionconfigurator/functionconfig.cpp | 5 | ||||
| -rw-r--r-- | qfunctionconfigurator/functionconfig.h | 11 | ||||
| -rw-r--r-- | qfunctionconfigurator/qfunctionconfigurator.h | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/qfunctionconfigurator/functionconfig.cpp b/qfunctionconfigurator/functionconfig.cpp index af350143..5dab2b52 100644 --- a/qfunctionconfigurator/functionconfig.cpp +++ b/qfunctionconfigurator/functionconfig.cpp @@ -39,6 +39,11 @@ FunctionConfig::FunctionConfig(QString title, int intMaxInput, int intMaxOutput) reload(); } +void FunctionConfig::setTrackingActive(bool blnActive) +{ + _tracking_active = blnActive; +} + FunctionConfig::FunctionConfig() : _tracking_active(false), _max_Input(0), diff --git a/qfunctionconfigurator/functionconfig.h b/qfunctionconfigurator/functionconfig.h index 21e9e43e..f1310a8c 100644 --- a/qfunctionconfigurator/functionconfig.h +++ b/qfunctionconfigurator/functionconfig.h @@ -6,6 +6,8 @@ * notice appear in all copies. */ +#pragma once + #include <QList> #include <QPointF> #include <QString> @@ -13,9 +15,6 @@ #include <QMutex> #include "ftnoir_tracker_base/ftnoir_tracker_base.h" -#ifndef FUNCTION_CONFIG_H -#define FUNCTION_CONFIG_H - #define MEMOIZE_PRECISION 500 class FTNOIR_TRACKER_BASE_EXPORT FunctionConfig { @@ -69,10 +68,6 @@ public: void saveSettings(QSettings& settings); void loadSettings(QSettings& settings); - void setTrackingActive(bool blnActive) { - _tracking_active = blnActive; - } + void setTrackingActive(bool blnActive); QString getTitle() { return _title; } }; - -#endif diff --git a/qfunctionconfigurator/qfunctionconfigurator.h b/qfunctionconfigurator/qfunctionconfigurator.h index 7260de1f..c9290722 100644 --- a/qfunctionconfigurator/qfunctionconfigurator.h +++ b/qfunctionconfigurator/qfunctionconfigurator.h @@ -50,9 +50,11 @@ // The Function is coded in a separate Class and can exists, without the Widget. When the widget is displayed (therefore 'created'), the Function can be attached to the // Widget and the Widget used to change the Function. // + class FTNOIR_TRACKER_BASE_EXPORT QFunctionConfigurator : public QWidget { Q_OBJECT + Q_PROPERTY(int maxInputEGU READ maxInputEGU WRITE setmaxInputEGU) Q_PROPERTY(int maxOutputEGU READ maxOutputEGU WRITE setmaxOutputEGU) Q_PROPERTY(int pixPerEGU_Input READ pixPerEGU_Input WRITE setpixPerEGU_Input) |