X-Git-Url: http://git.maemo.org/git/?p=mardrone;a=blobdiff_plain;f=mardrone%2Fardrone_symbian.qml;fp=mardrone%2Fardrone_symbian.qml;h=cebc89af1cb0afa78cf79d317aefe9312a8a7dab;hp=ae89bcb631116507efde70204abcfcdcc7857172;hb=36cc6e25d56bca63eef76e0ef3569c9b78514496;hpb=9810849a03cbb8f89bd3cbeb18c7b2005f846622 diff --git a/mardrone/ardrone_symbian.qml b/mardrone/ardrone_symbian.qml index ae89bcb..cebc89a 100644 --- a/mardrone/ardrone_symbian.qml +++ b/mardrone/ardrone_symbian.qml @@ -61,7 +61,7 @@ PageStackWindow { EfisPFD { id:hudPDF y:0 - x:100 + anchors.horizontalCenter: parent.horizontalCenter visible:drone.confShowHorizon roll:drone.droneRoll pitch:drone.dronePitch @@ -70,21 +70,19 @@ PageStackWindow { indicatorColor:"#00FF00" skyColor:"#00000000" groundColor:"#00000000" -// value:lj.xv -// value2:lj.yv - width:640;height:480; + width:500;height:400; } - Text { y:50 - // visible:drone.confUseAccel + visible:drone.confShowDebug color: "#00FF00" id: droneCtrlValues font.pixelSize:25 text: "cmd:pitch=" + drone.pitch.toFixed(2) + " roll= " + drone.roll.toFixed(2) + " yaw=" + drone.yaw.toFixed(2) + " vv= " + drone.vVelocity.toFixed(2) } + Text { y:70 visible:drone.confShowDebug @@ -164,7 +162,7 @@ PageStackWindow { anchors.left:parent.left anchors.bottom:parent.bottom anchors.margins:10 - // joyBackground: "" + joyBackground: "" onYvChanged:{drone.vVelocity=-1*yv/200.0;} onXvChanged:{drone.yaw=xv/200.0;} onPressedChanged: { drone.ctrlActive=pressed;} @@ -173,8 +171,7 @@ PageStackWindow { JoyStickTouch { visible: !drone.confUseJoyStick id:rj - - // joyBackground: "" + joyBackground: "" anchors.right:parent.right anchors.bottom:parent.bottom width:200;height:200; @@ -219,6 +216,7 @@ PageStackWindow { Button { x:400 width:60 + height:50 id:flyButton anchors.bottom:parent.bottom anchors.margins:15 @@ -229,17 +227,36 @@ PageStackWindow { } } Button { - x:400;y:100 - width:120 + x:500; + width:80 + height:50 id:emergencyButton - anchors.top:parent.top - + anchors.bottom:parent.bottom anchors.margins:15 - text:"Energency"; + text:"Emrg"; checkable:true onClicked:{drone.emergency=checked;} } - + Button { + x:600; + width:100 + height:50 + id:recordButton + anchors.bottom:parent.bottom + anchors.margins:15 + text:"Rec"; + checkable:true + onClicked:{droneVideo.recVideo=checked; drone.logFileName=droneVideo.videoFileName; drone.recordLog=checked;} + } + Text { + y:700 + anchors.bottom:parent.bottom + // visible:droneVideo.recVideo + color: "#00FF00" + id: droneFrameSeq + font.pixelSize:25 + text: droneVideo.videoFileName+ " "+droneVideo.frameSeq + } Connections { target:drone