From 81e8f7e500bcbeb34f7844349800887eabcde305 Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Wed, 5 Sep 2012 17:30:23 +0000 Subject: Modified 4 Arduino Tracker git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@126 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- .../QFunctionConfigurator/qfunctionconfigurator.h | 18 +++++++++--------- .../release/QFunctionConfigurator.dll | Bin 69632 -> 69632 bytes .../release/QFunctionConfigurator.exp | Bin 17180 -> 17230 bytes .../release/QFunctionConfigurator.lib | Bin 30108 -> 30168 bytes 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'QFunctionConfigurator') diff --git a/QFunctionConfigurator/QFunctionConfigurator/qfunctionconfigurator.h b/QFunctionConfigurator/QFunctionConfigurator/qfunctionconfigurator.h index c96b0f55..48b816ca 100644 --- a/QFunctionConfigurator/QFunctionConfigurator/qfunctionconfigurator.h +++ b/QFunctionConfigurator/QFunctionConfigurator/qfunctionconfigurator.h @@ -120,9 +120,9 @@ public: ~QFunctionConfigurator(); FunctionConfig* config(); - void setConfig(FunctionConfig* config); // Connect the FunctionConfig to the Widget. - void loadSettings(QSettings& settings); // Load the FunctionConfig (points) from the INI-file - void saveSettings(QSettings& settings); // Save the FunctionConfig (points) to the INI-file + void setConfig(FunctionConfig* config, QString settingsFile); // Connect the FunctionConfig to the Widget. + void loadSettings(QString settingsFile); // Load the FunctionConfig (points) from the INI-file + void saveSettings(QString settingsFile); // Save the FunctionConfig (points) to the INI-file signals: void CurveChanged(bool); @@ -142,8 +142,8 @@ public slots: void setCaption(QString); void resetCurve() { - QSettings iniFile( strSettingsFile, QSettings::IniFormat ); // Application settings (in INI-file) - loadSettings( iniFile ); + qDebug() << "QFunctionConfigurator::resetCurve = " << strSettingsFile; + loadSettings( strSettingsFile ); } protected slots: @@ -165,10 +165,10 @@ protected: virtual void resizeEvent(QResizeEvent *); private: - QRectF range; // The actual rectangle for the Bezier-curve - QPointF lastPoint; // The right-most point of the Function - QPointF normalizePoint (QPointF point) const; // Convert the graphical Point to a real-life Point - QPointF graphicalizePoint (QPointF point) const; // Convert the Point to a graphical Point + QRectF range; // The actual rectangle for the Bezier-curve + QPointF lastPoint; // The right-most point of the Function + QPointF normalizePoint (QPointF point) const; // Convert the graphical Point to a real-life Point + QPointF graphicalizePoint (QPointF point, QString source) const; // Convert the Point to a graphical Point QPointF *moving; int movingPoint; diff --git a/QFunctionConfigurator/release/QFunctionConfigurator.dll b/QFunctionConfigurator/release/QFunctionConfigurator.dll index 008bdc0b..8fbdf805 100644 Binary files a/QFunctionConfigurator/release/QFunctionConfigurator.dll and b/QFunctionConfigurator/release/QFunctionConfigurator.dll differ diff --git a/QFunctionConfigurator/release/QFunctionConfigurator.exp b/QFunctionConfigurator/release/QFunctionConfigurator.exp index cd05cbd2..b1d0e01b 100644 Binary files a/QFunctionConfigurator/release/QFunctionConfigurator.exp and b/QFunctionConfigurator/release/QFunctionConfigurator.exp differ diff --git a/QFunctionConfigurator/release/QFunctionConfigurator.lib b/QFunctionConfigurator/release/QFunctionConfigurator.lib index b102f3be..c41801d4 100644 Binary files a/QFunctionConfigurator/release/QFunctionConfigurator.lib and b/QFunctionConfigurator/release/QFunctionConfigurator.lib differ -- cgit v1.2.3