From b4ddf359cfc44a508b95527fabb7a8db06c408cd Mon Sep 17 00:00:00 2001 From: Valentin Platzgummer Date: Wed, 18 Dec 2019 17:21:17 +0100 Subject: [PATCH] rc1 --- src/FlightDisplay/FlightDisplayView.qml | 4 ++-- src/FlightDisplay/FlightDisplayWimaMenu.qml | 6 ------ src/Wima/WimaPlaner.cc | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 6712dbd90..eedeb42ef 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -606,8 +606,8 @@ QGCView { anchors.bottom: parent.bottom anchors.leftMargin: ScreenTools.defaultFontPixelWidth anchors.bottomMargin: ScreenTools.defaultFontPixelWidth - maxWidth: 300 - maxHeight: parent.height - toolStrip.height - ScreenTools.defaultFontPixelWidth*4 + maxWidth: Math.min(300, singleMultiSelector.x - ScreenTools.defaultFontPixelHeight*4 ) + maxHeight: parent.height - toolStrip.height - toolStrip.y - ScreenTools.defaultFontPixelHeight*4 wimaController: wimaController diff --git a/src/FlightDisplay/FlightDisplayWimaMenu.qml b/src/FlightDisplay/FlightDisplayWimaMenu.qml index 45670d651..d84b73865 100644 --- a/src/FlightDisplay/FlightDisplayWimaMenu.qml +++ b/src/FlightDisplay/FlightDisplayWimaMenu.qml @@ -68,12 +68,6 @@ Item { property real _margins: _root._margins - Component.onCompleted: { - console.log('mainFrame onCompleted') - console.log('_margins') - console.log(_margins) - } - // checkbox to enable/ disable wima SliderSwitch { id: enableWima diff --git a/src/Wima/WimaPlaner.cc b/src/Wima/WimaPlaner.cc index 9dace16b0..910c15153 100644 --- a/src/Wima/WimaPlaner.cc +++ b/src/Wima/WimaPlaner.cc @@ -36,10 +36,10 @@ WimaPlaner::WimaPlaner(QObject *parent) _updateTimer.setInterval(500); // 250 ms means: max update time 2*250 ms _updateTimer.start(); - // for debugging and testing purpose + // for debugging and testing purpose, remove if not needed anymore connect(&_autoLoadTimer, &QTimer::timeout, this, &WimaPlaner::autoLoadMission); _autoLoadTimer.setSingleShot(true); - _autoLoadTimer.start(300); + //_autoLoadTimer.start(300); _calcArrivalAndReturnPathTimer.setInterval(100); _calcArrivalAndReturnPathTimer.setSingleShot(true); -- 2.22.0