diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-21 20:44:33 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-21 20:52:20 +0200 |
| commit | a815d8dfe1b452e0cab9b588a9d4ec4650a5bdda (patch) | |
| tree | 12dbf31a6dde154f6fa8bee0669584c217c3fad6 /facetracknoir/settings.ui | |
| parent | 757252abb8043909dcd8f1e9dc8c51016f01ee63 (diff) | |
| parent | fe3bc42f80bb8cef37dea68539e8a1fd9752baa8 (diff) | |
Merge branch 'unstable' into trackhattrackhat-1.1p2
* unstable:
cmake: update toolchain file
shortcuts: fix osx/linux keystrokes persisting
cmake: fix copy-paste comment
cmake: add toolchain file for OSX
cmake: add osx policy to make it shutup
x-plane: ignore diagnostic
osx: nix warning
gitattributes: more text extensions to eol=lf
cmake: timestamp logic simplify/fix
cmake: no timestamp for tag builds
all: update copyright where appropriate
all: comments only
cmake: regen before making tarball
cmake: fix dropbox share invocation
tracker: initialize newpose
pt: use previous pose on NaN result from POSIT
accela: also don't poison ewma state with nans
cmake: fix tarball invocation
accela: elide NaN output values
qfc: elide NaN values
pt: reformat more
pt: reformat posit
pt: refactor auto threshold somewhat
pt: rename ill-chosen name
pt: switch min/max point size to reals
cmake: upload tarball to Dropbox but only if I'm the user
cmake: add tarball timestamp so it gets rebuilt
cmake: don't regen version if none changed
cmake: fix git describe --dirty
cmake: retab git module
fix tarball target
cmake: mark dirty tree
cmake: regen tarball even if exists
cmake: generate version.cc
tracker: check for NaN values
accela: don't check NaNs in filter, wrong place
cmake: drop -ffast-math, allow for NaN check
shortcuts: actually print screen binding works
shortcuts: alias right modifier keys to left modifier keys
shortcuts: allow for binding scroll lock and pause/break
accela: also filter out NaNs on tracking start
allow for filter immediate center
Diffstat (limited to 'facetracknoir/settings.ui')
| -rw-r--r-- | facetracknoir/settings.ui | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/facetracknoir/settings.ui b/facetracknoir/settings.ui index 5a32daf6..5ab857db 100644 --- a/facetracknoir/settings.ui +++ b/facetracknoir/settings.ui @@ -300,19 +300,6 @@ </property> </widget> </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="mindiam_spin"> - <property name="toolTip"> - <string>Minimum point diameter</string> - </property> - <property name="suffix"> - <string> px</string> - </property> - <property name="maximum"> - <number>1024</number> - </property> - </widget> - </item> <item row="0" column="2"> <widget class="QLabel" name="label_22"> <property name="text"> @@ -324,15 +311,28 @@ </widget> </item> <item row="0" column="3"> - <widget class="QSpinBox" name="maxdiam_spin"> + <widget class="QDoubleSpinBox" name="maxdiam_spin"> <property name="toolTip"> <string>Maximum point diameter</string> </property> <property name="suffix"> <string> px</string> </property> - <property name="maximum"> - <number>1024</number> + <property name="decimals"> + <number>1</number> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QDoubleSpinBox" name="mindiam_spin"> + <property name="toolTip"> + <string>Minimum point diameter</string> + </property> + <property name="suffix"> + <string> px</string> + </property> + <property name="decimals"> + <number>1</number> </property> </widget> </item> |