diff options
| -rw-r--r-- | facetracknoir/facetracknoir.cpp | 8 | ||||
| -rw-r--r-- | facetracknoir/facetracknoir.h | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index e834b6be..58381c13 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -168,7 +168,6 @@ FaceTrackNoIR::FaceTrackNoIR(QWidget *parent, Qt::WFlags flags) : timUpdateHeadPose(this) { ui.setupUi(this); - cameraDetected = false; // // Initialize Widget handles, to prevent memory-access errors. @@ -571,6 +570,13 @@ void FaceTrackNoIR::loadSettings() { } } + if (!_curve_config) + { + _curve_config = new CurveConfigurationDialog( this, this, Qt::Dialog ); + } + + ((CurveConfigurationDialog*) _curve_config)->loadSettings(); + settingsDirty = false; looping = false; } diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index 768f6107..ee4e9132 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -149,7 +149,6 @@ private: // void createMessageGroupBox(); /** helper **/ - bool cameraDetected; bool settingsDirty; void GetCameraNameDX(); @@ -242,10 +241,9 @@ public: explicit CurveConfigurationDialog( FaceTrackNoIR *ftnoir, QWidget *parent=0, Qt::WindowFlags f=0 ); virtual ~CurveConfigurationDialog(); void showEvent ( QShowEvent * event ); - + void loadSettings(); private: Ui::UICCurveConfigurationDialog ui; - void loadSettings(); void save(); /** helper **/ @@ -292,4 +290,4 @@ public: } }; -#endif // FaceTrackNoIR_H
\ No newline at end of file +#endif // FaceTrackNoIR_H |