using threshold expressed in cm

Author: cristeab

ConfigDialog.cpp

@@ -10,7 +10,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) : QDialog(parent)
 	//setup
 	mainWnd_ = dynamic_cast<VirtualTouchScreen*>(parent);
 	if (NULL != mainWnd_) {
-		ui_.doubleSpinBoxThreshold->setValue(mainWnd_->virtualScreenThreshold_);
+		ui_.spinBoxThreshold->setValue(static_cast<int>(100*mainWnd_->virtualScreenThreshold_));
 		ui_.spinBoxOffsetX->setValue(mainWnd_->offset.x());
 		ui_.spinBoxOffsetY->setValue(mainWnd_->offset.y());
 		ui_.spinBoxScaleFactor->setValue(static_cast<int>(100*mainWnd_->scaleFactor));
@@ -61,7 +61,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) : QDialog(parent)
 
 void ConfigDialog::onBrowse()
 {
-	QFileDialog openFile(NULL, "Select an Image File");//always in the center of the screen
+	QFileDialog openFile(this, "Select an Image File");//always in the center of the screen
 	openFile.setFileMode(QFileDialog::ExistingFile);
 	openFile.setViewMode(QFileDialog::Detail);
 	openFile.setNameFilter("*.png *.jpg *.jpeg");
@@ -103,7 +103,7 @@ void ConfigDialog::onCancel()
 void ConfigDialog::onApply()
 {
 	if (NULL != mainWnd_) {
-		mainWnd_->virtualScreenThreshold_ = ui_.doubleSpinBoxThreshold->value();
+		mainWnd_->virtualScreenThreshold_ = ui_.spinBoxThreshold->value()/100.0;
 		mainWnd_->offset.setX(ui_.spinBoxOffsetX->value());
 		mainWnd_->offset.setY(ui_.spinBoxOffsetY->value());
 		mainWnd_->scaleFactor = ui_.spinBoxScaleFactor->value()/100.0;

VirtualTouchScreen.cpp

@@ -24,7 +24,7 @@ VirtualTouchScreen::VirtualTouchScreen(QWidget *parent)
 	config(NULL),
 	handSkeletonPoints_(Hand::POINTS),
 	touch_(new TouchInputEmulator()),
-	virtualScreenThreshold_(VIRTUAL_SCREEN_THRESHOLD_x100/100.0),
+	virtualScreenThreshold_(VIRTUAL_SCREEN_THRESHOLD_CM/100.0),
 	fingerIcon_(FINGER_DEFAULT_ICON),
 	fingerIconSize_(FINGER_ICON_SIZE),
 	hideThumb_(false)
@@ -246,7 +246,7 @@ void VirtualTouchScreen::loadSettings()
 {
 	QSettings settings(COMPANY_NAME, APPLICATION_NAME);
 	virtualScreenThreshold_ = settings.value(KEY_VIRTUAL_SCREEN_THRESHOLD, 
-		VIRTUAL_SCREEN_THRESHOLD_x100/100.0).toDouble();
+		VIRTUAL_SCREEN_THRESHOLD_CM/100.0).toDouble();
 	fingerIcon_ = settings.value(KEY_FINGER_ICON, FINGER_DEFAULT_ICON).toString();
 	fingerIconSize_ = settings.value(KEY_FINGER_ICON_SIZE, FINGER_ICON_SIZE).toInt();
 	hideThumb_ = settings.value(KEY_HIDE_THUMB, false).toBool();

VirtualTouchScreen.h

@@ -25,7 +25,7 @@ class VirtualTouchScreen : public QMainWindow
 	~VirtualTouchScreen();
 	enum {OFFSET_X = 200, OFFSET_Y = 100, 
 		SCALE_FACTOR_x100 = 100,
-		VIRTUAL_SCREEN_THRESHOLD_x100 = 35,
+		VIRTUAL_SCREEN_THRESHOLD_CM = 35,
 		FINGER_ICON_SIZE = 32};
 	enum Hand {THUMB = 0, INDEX, POINTS};
 public slots:

configuration.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>273</width>
-    <height>361</height>
+    <height>349</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>320</y>
+     <y>310</y>
      <width>231</width>
      <height>32</height>
     </rect>
@@ -35,63 +35,30 @@
   <widget class="QWidget" name="horizontalLayoutWidget">
    <property name="geometry">
     <rect>
-     <x>18</x>
+     <x>28</x>
      <y>10</y>
-     <width>231</width>
+     <width>211</width>
      <height>31</height>
     </rect>
    </property>
    <layout class="QHBoxLayout" name="horizontalLayout">
-    <item>
-     <spacer name="horizontalSpacer">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
     <item>
      <widget class="QLabel" name="label">
       <property name="text">
-       <string>Virtual Screen Threshold</string>
+       <string>Virtual Screen Threshold [cm]</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class="QDoubleSpinBox" name="doubleSpinBoxThreshold">
-      <property name="maximum">
-       <double>999.990000000000009</double>
-      </property>
-      <property name="singleStep">
-       <double>0.100000000000000</double>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <spacer name="horizontalSpacer_2">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>40</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
+     <widget class="QSpinBox" name="spinBoxThreshold"/>
     </item>
    </layout>
   </widget>
   <widget class="QGroupBox" name="groupBox">
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>50</y>
+     <y>180</y>
      <width>231</width>
      <height>121</height>
     </rect>
@@ -182,9 +149,9 @@
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>180</y>
+     <y>50</y>
      <width>231</width>
-     <height>131</height>
+     <height>121</height>
     </rect>
    </property>
    <property name="title">
@@ -220,7 +187,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>60</y>
+      <y>50</y>
       <width>171</width>
       <height>31</height>
      </rect>
@@ -246,7 +213,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>100</y>
+      <y>80</y>
       <width>171</width>
       <height>31</height>
      </rect>