summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--bin/settings/default.ini56
-rw-r--r--facetracknoir/tracker.cpp2
-rw-r--r--ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui6
3 files changed, 40 insertions, 24 deletions
diff --git a/bin/settings/default.ini b/bin/settings/default.ini
index 95cd1335..4f53df42 100644
--- a/bin/settings/default.ini
+++ b/bin/settings/default.ini
@@ -82,30 +82,46 @@ EnableZ=true
[Accela]
Reduction=100
-zoom-slowness=10
+zoom-slowness=20
[Curves-Accela-Scaling-Rotation]
-point-count=6
-point-0-x=0
-point-0-y=0
-point-1-x=0.329842925071716
-point-1-y=0.159999996423721
-point-2-x=0.691099464893341
-point-2-y=0.573333323001862
-point-3-x=1.00523555278778
-point-3-y=1.30666661262512
-point-4-x=1.29319369792938
-point-4-y=2.75999999046326
-point-5-x=1.38743455497382
-point-5-y=4.22666666666667
+point-count=11
+point-0-x=0.418848156929016
+point-0-y=0.0399999991059303
+point-1-x=0.759162306785583
+point-1-y=0.106666669249535
+point-2-x=1.03141355514526
+point-2-y=0.200000002980232
+point-3-x=1.40314136125654
+point-3-y=0.4
+point-4-x=1.73298429319372
+point-4-y=0.706666666666667
+point-5-x=2.09424083769634
+point-5-y=1.18666666666667
+point-6-x=2.40837696335079
+point-6-y=1.85333333333333
+point-7-x=2.64397905759162
+point-7-y=2.61333333333333
+point-8-x=2.84816753926702
+point-8-y=3.61333333333333
+point-9-x=2.98429319371728
+point-9-y=4.52
+point-10-x=3.08900523560209
+point-10-y=6
[Curves-Accela-Scaling-Translation]
-point-count=4
+point-count=7
point-0-x=0
point-0-y=0
point-1-x=0.460732996463776
-point-1-y=1.63999998569489
-point-2-x=0.654450237751007
-point-2-y=3.6266667842865
-point-3-x=0.72251307964325
-point-3-y=5.34666681289673 \ No newline at end of file
+point-1-y=0.0799999982118607
+point-2-x=0.874345541000366
+point-2-y=0.293333321809769
+point-3-x=1.48167538642883
+point-3-y=0.986666679382324
+point-4-x=2.0209424495697
+point-4-y=2
+point-5-x=2.49738216400146
+point-5-y=4.01333332061768
+point-6-x=2.61780095100403
+point-6-y=6 \ No newline at end of file
diff --git a/facetracknoir/tracker.cpp b/facetracknoir/tracker.cpp
index fbc0bd29..15b36f69 100644
--- a/facetracknoir/tracker.cpp
+++ b/facetracknoir/tracker.cpp
@@ -299,7 +299,7 @@ void Tracker::run() {
}
//for lower cpu load
- usleep(10000);
+ usleep(1000);
}
GlobalPose->X.curvePtr->setTrackingActive( false );
diff --git a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui
index 9be0356b..0d41d5eb 100644
--- a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui
+++ b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui
@@ -204,7 +204,7 @@ background:none;</string>
<number>1</number>
</property>
<property name="maximum">
- <number>100</number>
+ <number>1000</number>
</property>
<property name="pageStep">
<number>5</number>
@@ -238,7 +238,7 @@ background:none;</string>
<number>1</number>
</property>
<property name="maximum">
- <number>100</number>
+ <number>1000</number>
</property>
<property name="value">
<number>100</number>
@@ -373,7 +373,7 @@ background:none;</string>
<customwidget>
<class>QFunctionConfigurator</class>
<extends>QWidget</extends>
- <header>qfunctionconfigurator/qfunctionconfigurator.h</header>
+ <header>qfunctionconfigurator.h</header>
</customwidget>
</customwidgets>
<resources/>