Unused warning & localmin for profile

hrobeers · May 4, 2013 · 291e758 · 291e758
1 parent a95010d
commit 291e758
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/fineditors/outlineeditor/contourcalculator.cpp b/src/fineditors/outlineeditor/contourcalculator.cpp
@@ -46,15 +46,15 @@ ContourCalculator::ContourCalculator(qreal percContourHeight, QPainterPath *outl
 
     if (fast)
     {
-        _sectionCount = 15;
-        _resolution = 100;
+        _sectionCount = 20;
+        _resolution = 200;
         _tTol = 0.002;
         _fTol = 0.01;
     }
     else
     {
-        _sectionCount = 100;
-        _resolution = 200;
+        _sectionCount = 150;
+        _resolution = 400;
         _tTol = 0.0001;
         _fTol = 0.001;
     }
@@ -69,13 +69,13 @@ void ContourCalculator::run()
 
     // find the top of the outline
     f_yValueAtPercent yOutline(_outline);
-    qreal t_top;
-    qreal y_top = hrlib::Brent::local_min(0, 1, 0.01, yOutline, t_top); // glomin isn't finding a correct top
+    qreal t_top = 0.5; // start value
+    qreal y_top = hrlib::Brent::local_min(0, 1, _tTol, yOutline, t_top); // glomin isn't finding a correct top
 
     // find dimensions of the profile
     f_yValueAtPercent yProfile(_profile);
-    qreal t_profileTop;
-    qreal y_profileTop = hrlib::Brent::glomin(0, 1, 0.35, 3, _fTol, _tTol, yProfile, t_profileTop);
+    qreal t_profileTop = 0.3; // start value
+    qreal y_profileTop = hrlib::Brent::local_min(0, 1, _tTol, yProfile, t_profileTop);
     qreal profileLength = _profile->pointAtPercent(1).x();
 
     //

diff --git a/src/patheditor/pathpoint.cpp b/src/patheditor/pathpoint.cpp
@@ -38,7 +38,7 @@ PathPoint::PathPoint(qreal xpos, qreal ypos)
     _toFollowPoint = 0;
 }
 
-void PathPoint::setParent(QObject *object)
+void PathPoint::setParent(QObject* /*unused*/)
 {
     QString message("Cannot use setParent() on a PathPoint. Use smart pointers to manage PathPoint objects.");
     throw hrlib::ImplementationException(message, this);

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 126
-#define COMMIT_HASH "d2ad3e487ace8ea567d23f76a16ea792150344f2"
+#define BUILD_NUMBER 127
+#define COMMIT_HASH "a95010d24e94c042a23e6a2f7710803e46e0ed9e"
 
 #endif // VERSION_AUTOGEN_H