merge with remote master

WimaDok/main.aux

+\relax 
+\@writefile{toc}{\contentsline {section}{\numberline {1}Introduction}{1}}
+\@writefile{toc}{\contentsline {section}{\numberline {2}Documentation}{1}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {2.1}Structure of QGroundControl}{1}}
+\@writefile{lof}{\contentsline {figure}{\numberline {1}{\ignorespaces Detail view of the QQC window, which appears after start-up. Marked in red is the button for switching to the plan view window, green indicates the flight view button (current window) and marked in magenta is the button for switching to the WiMA main window.}}{2}}
+\newlabel{fig:QGCMainButtonExplain}{{1}{2}}

WimaDok/main.tex

+\documentclass[]{article}
+
+\usepackage{amsmath}
+\usepackage{graphicx}
+\usepackage{wrapfig}
+\usepackage[utf8]{inputenc}
+\usepackage{a4wide}
+\usepackage{multicol}
+
+%opening
+\title{Documentation of the QGroundControl WiMA-Extension}
+\author{Valentin Platzgummer}
+
+\begin{document}
+
+\maketitle
+\section{Introduction} 
+Wima is a abbreviation for Wireless Measurement Application.
+Dieses Dokument soll einerseits die Funktionen der WiMA-Erweiterung dokumentieren und andererseits den Leser dazu anregen Fehler im Programm zu finden. Das Dokument ist in zwei abschnitte unterteilt. Die eigentliche Dokumentation und Vorschläge welche Funktionen getestet werden sollen. Da die WiMA-Erweiterung noch weiterentwickelt wird, können die Funktionen und das Aussehen des Programms von der in dieser Dokumentation dargestellten Inhalten abweichen. 
+
+Der Ordner deploy enthält eine unter Linux ausführbare Datei des Programms, mit dem nahmen "QGroundControl.AppImage". 
+
+\section{Documentation}
+\subsection{Structure of QGroundControl with WiMA-Extension}
+Figure \ref{fig:QGCMainButtonExplain} shows a detail view of the QGC main window. Relevant for this documentation are the flight view, the plan view and the WiMA main window. Their function will now be briefly summarized.
+
+The \textbf{plan view window} is 
+\begin{figure}
+	\includegraphics[width=\textwidth]{pics/QGCMainWindowCroppedRect}
+	\centering
+	\caption{Detail view of the QQC window, which appears after start-up. Marked in red is the button for switching to the plan view window, green indicates the flight view button (current window) and marked in magenta is the button for switching to the WiMA main window.}
+	\label{fig:QGCMainButtonExplain}
+\end{figure}
+
+\end{document}

src/FactSystem/SettingsFact.cc

@@ -39,7 +39,7 @@ SettingsFact::SettingsFact(QString settingsGroup, FactMetaData* metaData, QObjec
     if (_visible) {
         QVariant typedValue;
         QString errorString;
-        metaData->convertAndValidateRaw(settings.value(_name, rawDefaultValue), true /* conertOnly */, typedValue, errorString);
+        metaData->convertAndValidateRaw(settings.value(_name, rawDefaultValue), true /* convertOnly */, typedValue, errorString);
         _rawValue = typedValue;
     } else {
         // Setting is not visible, force to default value always

src/PlanView/CircularSurveyItemEditor.qml

@@ -104,10 +104,10 @@ Rectangle {
             FactTextField {
                 fact:                   missionItem.deltaAlpha
                 Layout.fillWidth:       true
-                onUpdated:              angleSlider.value = missionItem.deltaAlpha.value
+                //onUpdated:              angleSlider.value = missionItem.deltaAlpha.value
             }
 
-            QGCSlider {
+            /*QGCSlider {
                 id:                     angleSlider
                 minimumValue:           0.3
                 maximumValue:           10
@@ -116,10 +116,10 @@ Rectangle {
                 Layout.fillWidth:       true
                 Layout.columnSpan:      2
                 Layout.preferredHeight: ScreenTools.defaultFontPixelHeight * 1.5
-                onValueChanged:         missionItem.deltaAlpha.value = value
                 Component.onCompleted:  value = missionItem.deltaAlpha.value
-                updateValueWhileDragging: true
-            }
+                onValueChanged:         missionItem.deltaAlpha.value = value
+                updateValueWhileDragging: false
+            }*/
         }
 
         ColumnLayout {

src/Wima/CircularSurvey.SettingsGroup.json

@@ -14,6 +14,7 @@
     "type":             "double",
     "units":            "Deg",
     "min":              0.3,
+    "max":              90,
     "decimalPlaces":    1,
     "defaultValue":     5.0
 }

src/Wima/CircularSurveyComplexItem.cc

@@ -26,11 +26,6 @@ CircularSurveyComplexItem::CircularSurveyComplexItem(Vehicle *vehicle, bool flyV
     connect(&_deltaAlpha,   &Fact::valueChanged, this, &CircularSurveyComplexItem::_setDirty);
     connect(this,           &CircularSurveyComplexItem::refPointChanged, this, &CircularSurveyComplexItem::_setDirty);
 
-    _deltaR.setRawValue(_deltaR.rawDefaultValue());
-    _deltaAlpha.setRawValue(_deltaAlpha.rawDefaultValue());
-    qDebug() << _deltaAlpha.rawDefaultValue().toDouble();
-    qDebug() << _deltaAlpha.rawValue().toDouble();
-
     connect(&_updateTimer, &QTimer::timeout, this, &CircularSurveyComplexItem::_updateItem);
     _updateTimer.start(100);
 }
@@ -336,6 +331,8 @@ void CircularSurveyComplexItem::_rebuildTransectsPhase1()
     using namespace PolygonCalculus;
     using namespace PlanimetryCalculus;
 
+
+
     if ( _surveyAreaPolygon.count() < 3)
         return;
 

src/Wima/CircularSurveyComplexItem.h

@@ -7,6 +7,7 @@
 #include "GeoUtilities.h"
 #include "QVector"
 #include "Circle.h"
+#include "SettingsFact.h"
 
 class CircularSurveyComplexItem :public TransectStyleComplexItem
 {

src/Wima/WimaMeasurementArea.cc

@@ -10,13 +10,23 @@ const char* WimaMeasurementArea::WimaMeasurementAreaName =         "Measurement
 
 
 WimaMeasurementArea::WimaMeasurementArea(QObject *parent)
-  : WimaArea (parent)
+  :     WimaArea (parent)
+  ,     _metaDataMap            (FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/WimaMeasurementArea.SettingsGroup.json"), this /* QObject parent */))
+  ,     _bottomLayerAltitude    (SettingsFact(settingsGroup, _metaDataMap[bottomLayerAltitudeName], this /* QObject parent */))
+  ,     _numberOfLayers         (SettingsFact(settingsGroup, _metaDataMap[numberOfLayersName], this /* QObject parent */))
+  ,     _layerDistance          (SettingsFact(settingsGroup, _metaDataMap[layerDistanceName], this /* QObject parent */))
+  ,     _borderPolygonOffset    (SettingsFact(settingsGroup, _metaDataMap[borderPolygonOffsetName], this /* QObject parent */))
 {
     init();
 }
 
 WimaMeasurementArea::WimaMeasurementArea(const WimaMeasurementArea &other, QObject *parent)
-  : WimaArea(other, parent)
+    :     WimaArea (other, parent)
+    ,     _metaDataMap            (FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/WimaMeasurementArea.SettingsGroup.json"), this /* QObject parent */))
+    ,     _bottomLayerAltitude    (SettingsFact(settingsGroup, _metaDataMap[bottomLayerAltitudeName], this /* QObject parent */))
+    ,     _numberOfLayers         (SettingsFact(settingsGroup, _metaDataMap[numberOfLayersName], this /* QObject parent */))
+    ,     _layerDistance          (SettingsFact(settingsGroup, _metaDataMap[layerDistanceName], this /* QObject parent */))
+    ,     _borderPolygonOffset    (SettingsFact(settingsGroup, _metaDataMap[borderPolygonOffsetName], this /* QObject parent */))
 {
     init();
 }
@@ -150,14 +160,6 @@ void WimaMeasurementArea::recalcBorderPolygon()
 
 void WimaMeasurementArea::init()
 {
-
-    _metaDataMap            = FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/WimaMeasurementArea.SettingsGroup.json"), this /* QObject parent */);
-    _bottomLayerAltitude    = SettingsFact(settingsGroup, _metaDataMap[bottomLayerAltitudeName], this /* QObject parent */);
-    _numberOfLayers         = SettingsFact(settingsGroup, _metaDataMap[numberOfLayersName], this /* QObject parent */);
-    _layerDistance          = SettingsFact(settingsGroup, _metaDataMap[layerDistanceName], this /* QObject parent */);
-    _borderPolygonOffset    = SettingsFact(settingsGroup, _metaDataMap[borderPolygonOffsetName], this /* QObject parent */);
-    _borderPolygon          = new QGCMapPolygon(this);
-
     this->setObjectName(WimaMeasurementAreaName);
     connect(this, &WimaMeasurementArea::pathChanged, this, &WimaMeasurementArea::recalcBorderPolygon);
     connect(&_borderPolygonOffset, &SettingsFact::rawValueChanged, this, &WimaMeasurementArea::recalcBorderPolygon);

src/Wima/WimaPlaner.cc

@@ -220,16 +220,12 @@ bool WimaPlaner::updateMission()
     CircularSurveyComplexItem* OldSurveyPt  = nullptr;
 
     QGeoCoordinate oldSurveyRef;
-    double oldSurveyDeltaR      = 0;
-    double oldSurveyDeltaAlpha  = 0;
     bool oldSurveyExists = false;
 
     for (int i = 0; i < _missionController->visualItems()->count(); i++) {
         OldSurveyPt = qobject_cast<CircularSurveyComplexItem*>(missionItems->get(i));
         if ( OldSurveyPt != nullptr) {
             oldSurveyRef        = OldSurveyPt->refPoint();
-            oldSurveyDeltaR     = OldSurveyPt->deltaR()->rawValue().toDouble();
-            oldSurveyDeltaAlpha = OldSurveyPt->deltaAlpha()->rawValue().toDouble();
             oldSurveyExists     = true;
             break;
         }
@@ -276,8 +272,6 @@ bool WimaPlaner::updateMission()
     } else {
         if ( oldSurveyExists ) {
            survey->setRefPoint(oldSurveyRef);
-           survey->deltaR()->setRawValue(oldSurveyDeltaR);
-           survey->deltaAlpha()->setRawValue(oldSurveyDeltaAlpha);
         } else  {
             survey->setRefPoint(_measurementArea.center());
         }

src/WimaView/WimaMeasurementAreaEditor.qml

@@ -33,26 +33,10 @@ Rectangle {
     property var    polygon:                    areaItem
     property bool   initNecesarry:              true
 
-    /*onPolylineInteractiveChanged: {
-        polyline.interactive = polylineInteractive;
-    }*/
-
     onPolygonInteractiveChanged: {
         polygon.interactive = polygonInteractive;
     }
 
-    /*function editPolyline(){
-        if (polylineInteractive){
-            //polyline.interactive = false;
-            polylineInteractive = false;
-            //polygonInteractive = true;
-        }else{
-            //polyline.interactive = true;
-            polylineInteractive = true;
-            //polygonInteractive = false;
-        }
-    }*/
-
 
 
 
@@ -73,7 +57,7 @@ Rectangle {
 
         Column {
             anchors.left:   parent.left
-            anchors.right:  parent.rightsetI
+            anchors.right:  parent.right
             spacing:        _margin
             visible:        settingsHeader.checked
 
@@ -87,29 +71,29 @@ Rectangle {
                 QGCLabel { text: qsTr("Altitude") }
 
                 FactTextField {
-                    fact:                   areaItem.bottomLayerAltitude
-                    Layout.alignment:       Qt.AlignLeft | Qt.AlignVCenter
+                    fact:               areaItem.bottomLayerAltitude
+                    Layout.fillWidth:   true
                 }
 
                 QGCLabel { text: qsTr("Layers") }
 
                 FactTextField {
                     fact:               areaItem.numberOfLayers
-                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                    Layout.fillWidth:   true
                 }
 
                 QGCLabel { text: qsTr("Layer Dist.") }
 
                 FactTextField {
                     fact:               areaItem.layerDistance
-                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                    Layout.fillWidth:   true
                 }
 
                 QGCLabel { text: qsTr("Offset") }
 
                 FactTextField {
                     fact:               areaItem.borderPolygonOffset
-                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                    Layout.fillWidth:   true
                 }
 
 

src/WimaView/WimaView.qml

@@ -1031,7 +1031,7 @@ QGCView {
                     currentIndex:   _missionController.currentPlanViewIndex
                     highlightMoveDuration: 250
                     visible:        _editingLayer == _layerMission && !planControlColapsed
-                    //-- List Elements_missionController->setCurrentPlanViewIndex(sequenceNumber, true);
+                    //-- List Elements
                     delegate: MissionItemEditor {
                         map:                editorMap
                         masterController:  _planMasterController
@@ -1076,6 +1076,18 @@ QGCView {
         }
     }
 
+    Component {
+            id: syncLoadFromVehicleOverwrite
+            QGCViewMessage {
+                id:         syncLoadFromVehicleCheck
+                message:   qsTr("You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?")
+                function accept() {
+                    hideDialog()
+                    masterController.loadFromVehicle()
+                }
+            }
+     }
+
     Component {
         id: syncLoadFromFileOverwrite
         QGCViewMessage {