Commit 95d2def8 authored by Don Gagne's avatar Don Gagne

Survey no longer hidden behind setting

parent a45f9080
......@@ -542,7 +542,6 @@ QGCView {
RoundButton {
id: addShapeButton
buttonImage: "/qmlimages/MapDrawShape.svg"
visible: QGroundControl.experimentalSurvey
lightBorders: _lightWidgetBorders
onClicked: {
......
......@@ -43,8 +43,9 @@ Rectangle {
}
QGCLabel {
text: qsTr("Fly a grid pattern over a defined area.")
wrapMode: Text.WordWrap
wrapMode: Text.WordWrap
font.pointSize: ScreenTools.smallFontPointSize
text: qsTr("Work in progress, be careful!")
}
Repeater {
......
......@@ -143,7 +143,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
text: missionItem.sequenceNumber == 0 ?
qsTr("Planned Home Position") :
(missionItem.isSimpleItem ? missionItem.commandName : qsTr("Survey"))
(missionItem.isSimpleItem ? missionItem.commandName : qsTr("Survey (WIP)"))
color: _outerTextColor
}
......
......@@ -207,21 +207,6 @@ void QGroundControlQmlGlobal::setBaseFontPointSize(qreal size)
}
}
bool QGroundControlQmlGlobal::experimentalSurvey(void) const
{
QSettings settings;
return settings.value("ExperimentalSurvey", false).toBool();
}
void QGroundControlQmlGlobal::setExperimentalSurvey(bool experimentalSurvey)
{
QSettings settings;
settings.setValue("ExperimentalSurvey", experimentalSurvey);
emit experimentalSurveyChanged(experimentalSurvey);
}
Fact* QGroundControlQmlGlobal::offlineEditingFirmwareType(void)
{
if (!_offlineEditingFirmwareTypeFact) {
......
......@@ -93,9 +93,6 @@ public:
Q_PROPERTY(QString missionFileExtension READ missionFileExtension CONSTANT)
Q_PROPERTY(QString telemetryFileExtension READ telemetryFileExtension CONSTANT)
/// @ return: true: experimental survey ip code is turned on
Q_PROPERTY(bool experimentalSurvey READ experimentalSurvey WRITE setExperimentalSurvey NOTIFY experimentalSurveyChanged)
/// Returns the string for distance units which has configued by user
Q_PROPERTY(QString appSettingsDistanceUnitsString READ appSettingsDistanceUnitsString CONSTANT)
......@@ -178,9 +175,6 @@ public:
void setIsVersionCheckEnabled (bool enable);
void setMavlinkSystemID (int id);
bool experimentalSurvey(void) const;
void setExperimentalSurvey(bool experimentalSurvey);
QString parameterFileExtension(void) const { return QGCApplication::parameterFileExtension; }
QString missionFileExtension(void) const { return QGCApplication::missionFileExtension; }
QString telemetryFileExtension(void) const { return QGCApplication::telemetryFileExtension; }
......@@ -200,7 +194,6 @@ signals:
void mavlinkSystemIDChanged (int id);
void flightMapPositionChanged (QGeoCoordinate flightMapPosition);
void flightMapZoomChanged (double flightMapZoom);
void experimentalSurveyChanged (bool experimentalSurvey);
private:
FlightMapSettings* _flightMapSettings;
......
......@@ -398,14 +398,6 @@ QGCView {
height: ScreenTools.defaultFontPixelHeight / 2
width: parent.width
}
//-----------------------------------------------------------------
//-- Experimental Survey settings
QGCCheckBox {
text: qsTr("Experimental Survey [WIP - no bugs reports please]")
checked: QGroundControl.experimentalSurvey
onClicked: QGroundControl.experimentalSurvey = checked
}
}
}
} // QGCViewPanel
......
Markdown is supported
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