Pushed busy incication inside yaw knob

kromancer · Dec 27, 2015 · c55f3b2 · c55f3b2
1 parent 35b4163
commit c55f3b2
Show file tree

Hide file tree

Showing 9 changed files with 149 additions and 57 deletions.
diff --git a/BLE_PrototypeApp.pro.user b/BLE_PrototypeApp.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.5.1, 2015-12-23T05:53:36. -->
+<!-- Written by QtCreator 3.5.1, 2015-12-24T22:15:49. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/Knob2.qml b/Knob2.qml
@@ -26,6 +26,7 @@ BorderImage {
             text: value
             font.pixelSize: 12
         }
+
     }
 
     MouseArea{

diff --git a/MotorPitch.qml b/MotorPitch.qml
@@ -52,9 +52,10 @@ Rectangle {
     }
 
     Rectangle {
+        width: 50
+        height: 20
         border.color: "black"
         border.width: 1
-        height: textP.height
         anchors.right: pitch.right
         anchors.rightMargin: 0
         anchors.left: pitch.left
@@ -69,7 +70,7 @@ Rectangle {
             validator: IntValidator{bottom: pitchSlider.minimumValue; top: pitchSlider.maximumValue}
 
             text: pitchSlider.value
-            anchors.centerIn: parent
+            anchors.fill: parent
             horizontalAlignment: TextInput.AlignHCenter
 
 

diff --git a/MotorX.qml b/MotorX.qml
@@ -55,25 +55,22 @@ Rectangle {
     }
 
     Rectangle {
-        height: textX.height
+        width: 50
+        height: 20
         anchors.left: xSlider.right
         anchors.leftMargin: 20
         anchors.verticalCenter: xSlider.verticalCenter
-        width: textX.width
         border.color: "black"
         border.width: 1
 
 
 
         TextInput {
             id: textX
-            width: 50
             validator: IntValidator{bottom: xSlider.minimumValue; top: xSlider.maximumValue}
 
             text: xSlider.value
-            anchors.verticalCenterOffset: 0
-            anchors.horizontalCenterOffset: 0
-            anchors.centerIn: parent
+            anchors.fill: parent
             horizontalAlignment: TextInput.AlignHCenter
 
 

diff --git a/MotorY.qml b/MotorY.qml
@@ -46,10 +46,10 @@ Rectangle {
     Label {
         id: yLabel
         x: 0
-        y: 455
         text: qsTr("Y")
-        anchors.bottom: ySlider.top
-        anchors.bottomMargin: 0
+        rotation: 180
+        anchors.top: parent.bottom
+        anchors.topMargin: 0
         anchors.horizontalCenter: ySlider.horizontalCenter
         font.bold: true
         font.pointSize: 11
@@ -58,13 +58,15 @@ Rectangle {
     Rectangle {
         border.color: "black"
         border.width: 1
-        height: textY.height
+        width: 50
+        height: 20
+        rotation: 180
+        anchors.bottom: parent.top
+        anchors.bottomMargin: 9
         anchors.right: ySlider.right
         anchors.rightMargin: 0
         anchors.left: ySlider.left
         anchors.leftMargin: 0
-        anchors.top: ySlider.bottom
-        anchors.topMargin: 7
 
 
 
@@ -73,7 +75,7 @@ Rectangle {
             validator: IntValidator{bottom: ySlider.minimumValue; top: ySlider.maximumValue}
 
             text: ySlider.value
-            anchors.centerIn: parent
+            anchors.fill: parent
             horizontalAlignment: TextInput.AlignHCenter
 
 

diff --git a/MotorZ.qml b/MotorZ.qml
@@ -54,15 +54,16 @@ Rectangle{
     }
 
     Rectangle {
+        width: 50
+        height: 20
         border.color: "black"
         border.width: 1
-        height: textZ.height
         anchors.right: zSlider.right
         anchors.rightMargin: 0
         anchors.left: zSlider.left
         anchors.leftMargin: 0
         anchors.top: zSlider.bottom
-        anchors.topMargin: 7
+        anchors.topMargin: 9
 
 
 
@@ -71,7 +72,8 @@ Rectangle{
             validator: IntValidator{bottom: zSlider.minimumValue; top: zSlider.maximumValue}
 
             text: zSlider.value
-            anchors.centerIn: parent
+            //anchors.centerIn: parent
+            anchors.fill: parent
             horizontalAlignment: TextInput.AlignHCenter
 
 

diff --git a/PanelCamera.qml b/PanelCamera.qml
@@ -143,6 +143,7 @@ Rectangle {
 
         MouseArea{
             anchors.fill: parent
+            hoverEnabled: true
             onClicked: {
                 bluetoothsearchbutton.visible = false;
                 BLE.deviceSearch();
@@ -290,7 +291,7 @@ Rectangle {
     }
 
 
-    //Motor SensorTag Spinner
+    // Motor SensorTag Spinner
     Image {
         Connections {
             target: BLE
@@ -349,7 +350,7 @@ Rectangle {
     }
 
 
-    //Motor Panel Button
+    // Motor Panel Button
     Image {
 
         Connections {
@@ -401,10 +402,19 @@ Rectangle {
                 BLE.connectToMotorSensorTag();
             }
         }
+
+        Text {
+            id: connectToStageText
+            text: "Connect to Stage"
+            anchors.left: parent.right
+            anchors.leftMargin: 4
+            font.pixelSize: 12
+            anchors.verticalCenter: parent.verticalCenter
+        }
     }
 
 
-    //LED SensorTag Spinner
+    // LED SensorTag Spinner
     Image {
         Connections {
             target: BLE
@@ -462,7 +472,7 @@ Rectangle {
     }
 
 
-    //LED control button
+    // LED control button
     Image {
         id: ledControl
         Connections {
@@ -512,5 +522,14 @@ Rectangle {
                 BLE.connectToLEDSensorTag();
             }
         }
+
+        Text {
+            id: connectToLEDText
+            text: "Connect to LED ring"
+            anchors.left: parent.right
+            anchors.leftMargin: 4
+            font.pixelSize: 12
+            anchors.verticalCenter: parent.verticalCenter
+        }
     }
 }