diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-28 13:45:27 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-28 13:45:27 +0200 |
commit | 08d0eed13d335e26b1cdc6a294d4c1694c623847 (patch) | |
tree | 2c9a087807bc73db7ff452ca076940084f3d15ca | |
parent | aa18be8e6afb8e216dc6f4bc5068e653c52b60db (diff) |
Make the UI useful for both IHT and regular tracker
-rw-r--r-- | facetracknoir/ftnoir_curves.ui | 102 | ||||
-rw-r--r-- | qfunctionconfigurator/qfunctionconfigurator.cpp | 2 |
2 files changed, 52 insertions, 52 deletions
diff --git a/facetracknoir/ftnoir_curves.ui b/facetracknoir/ftnoir_curves.ui index 0b368816..12203879 100644 --- a/facetracknoir/ftnoir_curves.ui +++ b/facetracknoir/ftnoir_curves.ui @@ -6,7 +6,7 @@ <rect>
<x>0</x>
<y>0</y>
- <width>628</width>
+ <width>1050</width>
<height>667</height>
</rect>
</property>
@@ -103,12 +103,12 @@ color: rgb(255, 255, 255); <attribute name="title">
<string>rx</string>
</attribute>
- <widget class="QFunctionConfigurator" name="rxconfig">
+ <widget class="QFunctionConfigurator" name="rxconfig" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>595</width>
+ <width>921</width>
<height>240</height>
</rect>
</property>
@@ -119,16 +119,16 @@ color: rgb(255, 255, 255); <number>180</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>3</number>
+ <number>5</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -149,12 +149,12 @@ color: rgb(255, 255, 255); <string>Use alternative</string>
</property>
</widget>
- <widget class="QFunctionConfigurator" name="rxconfig_alt">
+ <widget class="QFunctionConfigurator" name="rxconfig_alt" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>340</y>
- <width>595</width>
+ <width>921</width>
<height>240</height>
</rect>
</property>
@@ -165,16 +165,16 @@ color: rgb(255, 255, 255); <number>180</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>3</number>
+ <number>5</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -187,7 +187,7 @@ color: rgb(255, 255, 255); <attribute name="title">
<string>ry</string>
</attribute>
- <widget class="QFunctionConfigurator" name="ryconfig">
+ <widget class="QFunctionConfigurator" name="ryconfig" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -203,19 +203,19 @@ color: rgb(255, 255, 255); <number>180</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>3</number>
+ <number>5</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>0</red>
<green>255</green>
<blue>0</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -236,7 +236,7 @@ color: rgb(255, 255, 255); <string>Use alternative</string>
</property>
</widget>
- <widget class="QFunctionConfigurator" name="ryconfig_alt">
+ <widget class="QFunctionConfigurator" name="ryconfig_alt" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -252,19 +252,19 @@ color: rgb(255, 255, 255); <number>180</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>3</number>
+ <number>5</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>0</red>
<green>255</green>
<blue>0</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -277,7 +277,7 @@ color: rgb(255, 255, 255); <attribute name="title">
<string>rz</string>
</attribute>
- <widget class="QFunctionConfigurator" name="rzconfig">
+ <widget class="QFunctionConfigurator" name="rzconfig" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -293,19 +293,19 @@ color: rgb(255, 255, 255); <number>180</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>3</number>
+ <number>5</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>0</red>
<green>0</green>
<blue>255</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -326,7 +326,7 @@ color: rgb(255, 255, 255); <string>Use alternative</string>
</property>
</widget>
- <widget class="QFunctionConfigurator" name="rzconfig_alt">
+ <widget class="QFunctionConfigurator" name="rzconfig_alt" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -342,19 +342,19 @@ color: rgb(255, 255, 255); <number>180</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>3</number>
+ <number>5</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>0</red>
<green>0</green>
<blue>255</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -367,7 +367,7 @@ color: rgb(255, 255, 255); <attribute name="title">
<string>tx</string>
</attribute>
- <widget class="QFunctionConfigurator" name="txconfig">
+ <widget class="QFunctionConfigurator" name="txconfig" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -383,19 +383,19 @@ color: rgb(255, 255, 255); <number>100</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>5</number>
+ <number>7</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>255</red>
<green>0</green>
<blue>255</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -416,7 +416,7 @@ color: rgb(255, 255, 255); <string>Use alternative</string>
</property>
</widget>
- <widget class="QFunctionConfigurator" name="txconfig_alt">
+ <widget class="QFunctionConfigurator" name="txconfig_alt" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -432,19 +432,19 @@ color: rgb(255, 255, 255); <number>100</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>5</number>
+ <number>7</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>255</red>
<green>0</green>
<blue>255</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -457,7 +457,7 @@ color: rgb(255, 255, 255); <attribute name="title">
<string>ty</string>
</attribute>
- <widget class="QFunctionConfigurator" name="tyconfig">
+ <widget class="QFunctionConfigurator" name="tyconfig" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -473,19 +473,19 @@ color: rgb(255, 255, 255); <number>100</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>5</number>
+ <number>7</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>255</red>
<green>255</green>
<blue>0</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -506,7 +506,7 @@ color: rgb(255, 255, 255); <string>Use alternative</string>
</property>
</widget>
- <widget class="QFunctionConfigurator" name="tyconfig_alt">
+ <widget class="QFunctionConfigurator" name="tyconfig_alt" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -522,19 +522,19 @@ color: rgb(255, 255, 255); <number>100</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>5</number>
+ <number>7</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>255</red>
<green>255</green>
<blue>0</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -547,7 +547,7 @@ color: rgb(255, 255, 255); <attribute name="title">
<string>tz</string>
</attribute>
- <widget class="QFunctionConfigurator" name="tzconfig">
+ <widget class="QFunctionConfigurator" name="tzconfig" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -563,19 +563,19 @@ color: rgb(255, 255, 255); <number>100</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>5</number>
+ <number>7</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>0</red>
<green>255</green>
<blue>255</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
@@ -596,7 +596,7 @@ color: rgb(255, 255, 255); <string>Use alternative</string>
</property>
</widget>
- <widget class="QFunctionConfigurator" name="tzconfig_alt">
+ <widget class="QFunctionConfigurator" name="tzconfig_alt" native="true">
<property name="geometry">
<rect>
<x>0</x>
@@ -612,19 +612,19 @@ color: rgb(255, 255, 255); <number>100</number>
</property>
<property name="pixPerEGU_Input" stdset="0">
- <number>5</number>
+ <number>7</number>
</property>
<property name="pixPerEGU_Output" stdset="0">
<number>1</number>
</property>
- <property name="colorBezier">
+ <property name="colorBezier" stdset="0">
<color>
<red>0</red>
<green>255</green>
<blue>255</blue>
</color>
</property>
- <property name="colorBackground">
+ <property name="colorBackground" stdset="0">
<color>
<red>200</red>
<green>200</green>
diff --git a/qfunctionconfigurator/qfunctionconfigurator.cpp b/qfunctionconfigurator/qfunctionconfigurator.cpp index 555d0cf6..e3eb962b 100644 --- a/qfunctionconfigurator/qfunctionconfigurator.cpp +++ b/qfunctionconfigurator/qfunctionconfigurator.cpp @@ -218,7 +218,7 @@ QRect scale; // // Draw the vertical guidelines // - for (i = range.left(); i <= range.right(); i += gDistEGU_Input * pPerEGU_Input * 2) { + for (i = range.left(); i <= range.right(); i += gDistEGU_Input * pPerEGU_Input) { drawLine(&painter, QPointF(i, range.top()), QPointF(i, range.bottom()), pen); scale.setCoords(i - 10, range.bottom() + 2, i + 10, range.bottom() + 15); painter.drawText(scale, Qt::AlignCenter, tr("%1").arg(abs(((range.left() - i))/pPerEGU_Input))); |