From 0497f57268e8be7af69d37e24fa356e441c0d5f6 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 1 Nov 2015 09:09:25 +0100
Subject: cmake: less linkage boilerplate

---
 spline-widget/functionconfig.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spline-widget/functionconfig.h')

diff --git a/spline-widget/functionconfig.h b/spline-widget/functionconfig.h
index 3d2fc23c..97a80cac 100644
--- a/spline-widget/functionconfig.h
+++ b/spline-widget/functionconfig.h
@@ -18,7 +18,7 @@
 #include <limits>
 #include "opentrack-compat/qcopyable-mutex.hpp"
 
-#ifdef BUILD_opentrack_spline_widget
+#ifdef BUILD_spline_widget
 #   define SPLINE_WIDGET_EXPORT Q_DECL_EXPORT
 #else
 #   define SPLINE_WIDGET_EXPORT Q_DECL_IMPORT
-- 
cgit v1.2.3


From 0fb267c19925a949a8b1f8c62d9fbe52ba821d3d Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 6 Nov 2015 00:44:35 +0100
Subject: qfc: always ensure at least one point exists

Previously, insertion of the lone point was postponed until opening the
mapping window.
---
 spline-widget/functionconfig.cpp | 6 +++++-
 spline-widget/functionconfig.h   | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'spline-widget/functionconfig.h')

diff --git a/spline-widget/functionconfig.cpp b/spline-widget/functionconfig.cpp
index dcc9ca65..33100e07 100644
--- a/spline-widget/functionconfig.cpp
+++ b/spline-widget/functionconfig.cpp
@@ -219,7 +219,11 @@ void Map::loadSettings(QSettings& settings, const QString& title) {
 void Map::saveSettings(QSettings& settings, const QString& title) {
     QMutexLocker foo(&_mutex);
     settings.beginGroup(QString("Curves-%1").arg(title));
-    int max = cur.input.size();
+
+    if (cur.input.size() == 0)
+        cur.input.push_back(QPointF(max_x, max_y));
+
+    const int max = cur.input.size();
     settings.setValue("point-count", max);
 
     for (int i = 0; i < max; i++) {
diff --git a/spline-widget/functionconfig.h b/spline-widget/functionconfig.h
index 97a80cac..145ee14e 100644
--- a/spline-widget/functionconfig.h
+++ b/spline-widget/functionconfig.h
@@ -30,7 +30,7 @@ private:
 
     struct State {
         QList<QPointF> input;
-        std::vector<float> data;        
+        std::vector<float> data;
     };
 
     int precision() const;
@@ -52,6 +52,8 @@ public:
     {
         setMaxInput(maxx);
         setMaxOutput(maxy);
+        if (cur.input.size() == 0)
+            cur.input.push_back(QPointF(maxx, maxy));
         reload();
     }
 
-- 
cgit v1.2.3