Skip to content
GitLab
Commit 7e00907d authored by Valentin Platzgummer's avatar Valentin Platzgummer
Browse files

before moving wima view functionality to circular survey (and removing wima view)

parent 7e7612b0
Hide whitespace changes
Inline Side-by-side
qgroundcontrol.pro
View file @ 7e00907d
......@@ -417,6 +417,7 @@ INCLUDEPATH += \
src/QtLocationPlugin/QMLControl \
src/Settings \
src/Wima/Snake \
src/Wima \
src/Terrain \
src/Vehicle \
src/Audio \
......
qgroundcontrol.qrc
View file @ 7e00907d
......@@ -261,7 +261,7 @@
<file alias="QmlTest.qml">src/QmlControls/QmlTest.qml</file>
<file alias="RadioComponent.qml">src/AutoPilotPlugins/Common/RadioComponent.qml</file>
<file alias="SerialSettings.qml">src/ui/preferences/SerialSettings.qml</file>
<file alias="Wima/WimaAreaNoVisual.qml">src/Wima/Snake/WimaAreaNoVisual.qml</file>
<file alias="Wima/WimaAreaNoVisual.qml">src/Wima/Snake/WimaAreaNoVisual.qml</file>
<file alias="CircularGeneratorEditor.qml">src/WimaView/CircularGeneratorEditor.qml</file>
<file alias="QGroundControl/Controls/CircularGeneratorMapVisual.qml">src/WimaView/CircularGeneratorMapVisual.qml</file>
<file alias="CircularSurveyItemEditor.qml">src/WimaView/CircularSurveyItemEditor.qml</file>
......@@ -360,6 +360,10 @@
<file alias="Vehicle/WindFact.json">src/Vehicle/WindFact.json</file>
<file alias="Video.SettingsGroup.json">src/Settings/Video.SettingsGroup.json</file>
<file alias="VTOLLandingPattern.FactMetaData.json">src/MissionManager/VTOLLandingPattern.FactMetaData.json</file>
<file alias="Wima.SettingsGroup.json">src/Settings/Wima.SettingsGroup.json</file>
<file alias="CircularSurvey.SettingsGroup.json">src/Wima/json/CircularSurvey.SettingsGroup.json</file>
<file alias="LinearGenerator.SettingsGroup.json">src/Wima/Snake/json/LinearGenerator.SettingsGroup.json</file>
<file alias="CircularGenerator.SettingsGroup.json">src/Wima/Snake/json/CircularGenerator.SettingsGroup.json</file>
</qresource>
<qresource prefix="/MockLink">
<file alias="APMArduSubMockLink.params">src/comm/APMArduSubMockLink.params</file>
......
resources/.directory
View file @ 7e00907d
[Dolphin]
PreviewsShown=true
Timestamp=2020,2,21,14,47,12
Timestamp=2020,11,12,9,46,48
Version=4
src/MissionManager/MissionController.cc
View file @ 7e00907d
......@@ -2230,6 +2230,7 @@ QStringList MissionController::complexMissionItemNames(void) const
complexItems.append(SurveyComplexItem::name);
complexItems.append(CorridorScanComplexItem::name);
complexItems.append(CircularSurvey::name);
if (_controllerVehicle->multiRotor() || _controllerVehicle->vtol()) {
complexItems.append(StructureScanComplexItem::name);
}
......
src/Settings/Wima.SettingsGroup.json
View file @ 7e00907d
[
{
"name": "lowBatteryThreshold",
"shortDescription": "The battery threshold in percents, for which low battery handling measures get triggered.",
"type": "double",
"units": "%",
"defaultValue": 35
},
{
"name": "enableLowBatteryHandling",
"shortDescription": "Enables or disables low battery handling measures.",
"type": "bool",
"defaultValue": true
},
{
"name": "minimalRemainingMissionTime",
"shortDescription": "If the remaining estimated mission time is lower than this value, low battery handling will not be triggered.",
"type": "uint64",
"units": "s",
"defaultValue": 15
},
"version": 1,
"fileType": "FactMetaData",
"QGC.MetaData.Facts":
[
{
"name": "rosbridgeConnectionString",
"shortDescription": "Ros Bridge Connection String (host:port).",
"type": "string",
"defaultValue": "localhost:9090"
"name": "rosbridgeConnectionString",
"shortDesc": "Connection String",
"longDesc": "Ros Bridge Connection String (e.g. host_ip:port).",
"type": "string",
"default": "localhost:9090"
}
]
}
src/Settings/WimaSettings.cc
View file @ 7e00907d
......@@ -8,7 +8,4 @@ DECLARE_SETTINGGROUP(Wima, "Wima")
qmlRegisterUncreatableType<WimaSettings>("QGroundControl.SettingsManager", 1, 0, "WimaSettings", "Reference only"); \
}
DECLARE_SETTINGSFACT(WimaSettings, lowBatteryThreshold)
DECLARE_SETTINGSFACT(WimaSettings, enableLowBatteryHandling)
DECLARE_SETTINGSFACT(WimaSettings, minimalRemainingMissionTime)
DECLARE_SETTINGSFACT(WimaSettings, rosbridgeConnectionString)
src/Settings/WimaSettings.h
View file @ 7e00907d
......@@ -10,8 +10,5 @@ public:
DEFINE_SETTING_NAME_GROUP()
DEFINE_SETTINGFACT(lowBatteryThreshold)
DEFINE_SETTINGFACT(enableLowBatteryHandling)
DEFINE_SETTINGFACT(minimalRemainingMissionTime)
DEFINE_SETTINGFACT(rosbridgeConnectionString)
};
src/Wima/CircularSurvey.cc
View file @ 7e00907d
......@@ -68,7 +68,7 @@ CircularSurvey::CircularSurvey(PlanMasterController *masterController,
CircularSurvey::~CircularSurvey() {}
void CircularSurvey::reverse() {
this->_setState(STATE::REVERSE);
this->_setState(STATE::REVERT_PATH);
this->_rebuildTransects();
}
......@@ -217,7 +217,7 @@ bool CircularSurvey::_calculating(CircularSurvey::STATE state) const {
}
void CircularSurvey::_changeVariant() {
this->_setState(STATE::VARIANT_CHANGE);
this->_setState(STATE::CHANGE_VARIANT);
this->_rebuildTransects();
}
......@@ -479,12 +479,12 @@ void CircularSurvey::_rebuildTransectsPhase1(void) {
qCDebug(CircularSurveyLog) << "rebuildTransectsPhase1: skipp.";
this->_setState(STATE::IDLE);
break;
case STATE::VARIANT_CHANGE:
case STATE::CHANGE_VARIANT:
qCDebug(CircularSurveyLog) << "rebuildTransectsPhase1: variant change.";
this->_changeVariantWorker();
this->_setState(STATE::IDLE);
break;
case STATE::REVERSE:
case STATE::REVERT_PATH:
qCDebug(CircularSurveyLog) << "rebuildTransectsPhase1: reverse.";
this->_reverseWorker();
this->_setState(STATE::IDLE);
......
src/Wima/Snake/json/CircularGenerator.SettingsGroup.json
View file @ 7e00907d
{
"version": 1,
"fileType": "FactMetaData",
"QGC.MetaData.Facts":
[
{
"name": "TransectDistance",
......@@ -28,3 +32,4 @@
"defaultValue": 5.0
}
]
}
src/Wima/Snake/json/LinearGenerator.SettingsGroup.json
View file @ 7e00907d
{
"version": 1,
"fileType": "FactMetaData",
"QGC.MetaData.Facts":
[
{
"name": "TransectDistance",
......@@ -28,3 +32,4 @@
"defaultValue": 5.0
}
]
}
src/Wima/json/CircularSurvey.SettingsGroup.json
View file @ 7e00907d
{
"version": 1,
"fileType": "FactMetaData",
"QGC.MetaData.Facts":
[
{
"name": "TransectDistance",
......@@ -53,3 +57,4 @@
"defaultValue": 0
}
]
}
src/ui/preferences/GeneralSettings.qml
View file @ 7e00907d
......@@ -1095,6 +1095,7 @@ Rectangle {
text: qsTr("WiMA")
visible: QGroundControl.settingsManager.wimaSettings.visible
}
Rectangle {
Layout.preferredWidth: wimaGrid.width + (_margins * 2)
Layout.preferredHeight: wimaGrid.height + (_margins * 2)
......@@ -1110,35 +1111,6 @@ Rectangle {
anchors.right: parent.right
columns: 4
QGCLabel {
text: qsTr("Battery Threshold")
visible: _userBrandImageIndoor.visible
}
FactTextField {
Layout.preferredWidth: _valueFieldWidth
fact: QGroundControl.settingsManager.wimaSettings.lowBatteryThreshold
Layout.columnSpan: 2
}
FactCheckBox {
text: "Enable Smart RTL"
fact: QGroundControl.settingsManager.wimaSettings.enableLowBatteryHandling
}
QGCLabel {
text: qsTr("Minimal remaining Mission Time")
visible: _userBrandImageIndoor.visible
}
FactTextField {
Layout.preferredWidth: _valueFieldWidth
fact: QGroundControl.settingsManager.wimaSettings.minimalRemainingMissionTime
Layout.columnSpan: 2
}
Item{
// dummy
width: 1
}
QGCLabel {
text: qsTr("ROS Bridge Connection String")
visible: _userBrandImageIndoor.visible
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment