Detailed calculation on point release

hrobeers · May 3, 2013 · a95010d · a95010d
1 parent d2ad3e4
commit a95010d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/src/fineditors/outlineeditor/thicknesscontours.cpp b/src/fineditors/outlineeditor/thicknesscontours.cpp
@@ -59,6 +59,8 @@ void ThicknessContours::paint(QPainter *painter, const QStyleOptionGraphicsItem
         painter->setBrush(QColor(min, 0, max, a));
         painter->drawPath(*_outline);
 
+        calcContours();
+
         int numberOfContours = _contours.length();
         if (numberOfContours > 0)
         {
@@ -72,8 +74,6 @@ void ThicknessContours::paint(QPainter *painter, const QStyleOptionGraphicsItem
                 painter->drawPath(*contour);
             }
         }
-
-        calcContours();
     }
 }
 
@@ -90,17 +90,20 @@ QRectF ThicknessContours::boundingRect() const
 
 void ThicknessContours::onOutlineChange(EditablePath *sender)
 {
+    _fastCalc = !(sender->released());
     _outline = sender->painterPath();
 }
 
 void ThicknessContours::onProfileChange(EditablePath *sender)
 {
+    _fastCalc = !(sender->released());
     _profile = sender->painterPath();
     this->scene()->update(boundingRect());
 }
 
 void ThicknessContours::onThicknessChange(EditablePath *sender)
 {
+    _fastCalc = !(sender->released());
     _thickness = sender->painterPath();
     this->scene()->update(boundingRect());
 }
@@ -116,7 +119,7 @@ void ThicknessContours::calcContours()
             QSharedPointer<QPainterPath> path(new QPainterPath());
             _contours.append(path);
 
-            ContourCalculator calc(thickness, _outline.data(), _profile.data(), _thickness.data(), path.data(), true);
+            ContourCalculator calc(thickness, _outline.data(), _profile.data(), _thickness.data(), path.data(), _fastCalc);
             calc.run();
         }
 #endif
@@ -126,7 +129,7 @@ void ThicknessContours::calcContours()
             QSharedPointer<QPainterPath> path(new QPainterPath());
             _contours.append(path);
 
-            _tPool.start(new ContourCalculator(thickness, _outline.data(), _profile.data(), _thickness.data(), path.data(), true));
+            _tPool.start(new ContourCalculator(thickness, _outline.data(), _profile.data(), _thickness.data(), path.data(), _fastCalc));
         }
         _tPool.waitForDone();
 #endif

diff --git a/src/fineditors/outlineeditor/thicknesscontours.h b/src/fineditors/outlineeditor/thicknesscontours.h
@@ -50,6 +50,7 @@ namespace fineditors
         void onThicknessChange(EditablePath *sender);
 
     private:
+        bool _fastCalc;
         QThreadPool _tPool;
 
         QSharedPointer<QPainterPath> _outline;

diff --git a/src/patheditor/editablepath.cpp b/src/patheditor/editablepath.cpp
@@ -32,6 +32,7 @@ EditablePath::EditablePath(QGraphicsItem * parent)
     : QGraphicsObject(parent)
 {
     _firstPaint = true;
+    _released = true;
     _settings = PathSettings::Default();
 }
 
@@ -118,16 +119,23 @@ QSharedPointer<QPainterPath> EditablePath::painterPath()
     return _painterPath;
 }
 
+bool EditablePath::released()
+{
+    return _released;
+}
+
 void EditablePath::onPointDrag(PathPoint* /*unused*/)
 {
-    this->scene()->update(boundingRect());
+    _released = false;
     emit pathChanged(this);
+    this->scene()->update(boundingRect());
 }
 
 void EditablePath::onPointRelease(PathPoint* /*unused*/)
 {
-    this->scene()->update(boundingRect());
+    _released = true;
     emit pathChanged(this);
+    this->scene()->update(boundingRect());
 }
 
 void EditablePath::connectPoints(PathItem *pathItem)

diff --git a/src/patheditor/editablepath.h b/src/patheditor/editablepath.h
@@ -58,6 +58,8 @@ namespace patheditor
          */
         QSharedPointer<QPainterPath> painterPath();
 
+        bool released();
+
         virtual ~EditablePath() {}
 
     signals:
@@ -69,6 +71,7 @@ namespace patheditor
 
     private:
         bool _firstPaint;
+        bool _released;
 
         PathSettings _settings;
 

diff --git a/src/version_autogen.h b/src/version_autogen.h
@@ -5,7 +5,7 @@
 #ifndef VERSION_AUTOGEN_H
 #define VERSION_AUTOGEN_H
 
-#define BUILD_NUMBER 125
-#define COMMIT_HASH "0a9a108a72f84277da9d06cc6a79577d5bac9c7e"
+#define BUILD_NUMBER 126
+#define COMMIT_HASH "d2ad3e487ace8ea567d23f76a16ea792150344f2"
 
 #endif // VERSION_AUTOGEN_H