Acceleration sensor control and basic vision framework

[mardrone] / mardrone / ConfigDialog.qml

diff --git a/mardrone/ConfigDialog.qml b/mardrone/ConfigDialog.qml
index a4fed33..31690fc 100644 (file)
--- a/mardrone/ConfigDialog.qml
+++ b/mardrone/ConfigDialog.qml
@@ -21,7 +21,7 @@ Page {
         anchors.left:parent.left;anchors.right:parent.right
           anchors.leftMargin:50;anchors.rightMargin:50
 
-           spacing: 30
+           spacing: 40
            Text {
               width:400
               text: "Drone IP"
@@ -45,7 +45,17 @@ Page {
         //      onEnabledChanged:{drone.confFullScreen=enabled;}
               onCheckedChanged:{drone.confFullScreen=checked;}
            }
-
+           Text {
+              text: "Acceleration Sensor for controll"
+           }
+           Switch {
+              id: useAccelSw
+          //    enabled:drone.confUseAccel
+              checked:drone.confUseAccel
+              anchors.right:parent.right
+//              onEnabledChanged:{drone.confUseAccel=enabled;}
+              onCheckedChanged:{drone.confUseAccel=checked;}
+           }
            Text {
               text: "Show debug"
            }
@@ -83,7 +93,7 @@ Page {
            }
 
            Text {
-              text: "Forward gain"
+              text: "Forward/backward gain"
            }
 
            Slider {
@@ -95,6 +105,7 @@ Page {
               value:drone.confForwardGain
               onValueChanged:{drone.confForwardGain=value;}
            }
+           /*
            Text {
               text: "Backward gain"
            }
@@ -122,9 +133,9 @@ Page {
               value:drone.confLeftGain
               onValueChanged:{drone.confLeftGain=value;}
            }
-
+*/
            Text {
-              text: "Right gain"
+              text: "Right/Left gain"
            }
 
            Slider {
@@ -136,7 +147,19 @@ Page {
               value:drone.confRightGain
               onValueChanged:{drone.confRightGain=value;}
            }
+           Text {
+              text: "accel ctrl treshold"
+           }
 
+           Slider {
+              id: ctrlTreshold
+              anchors.right:parent.right
+         //    maximumValue:25.0
+         //     stepSize:0.01
+         //     steps:1
+              value:drone.confCtrlTrsh
+              onValueChanged:{drone.confCtrlTrsh=value;}
+           }
           }
        }
      }