diff --git a/ground/src/plugins/opmap/opmap_controlpanel.ui b/ground/src/plugins/opmap/opmap_controlpanel.ui
index 1556625f3..8a49ac0e0 100644
--- a/ground/src/plugins/opmap/opmap_controlpanel.ui
+++ b/ground/src/plugins/opmap/opmap_controlpanel.ui
@@ -6,8 +6,8 @@
0
0
- 321
- 588
+ 327
+ 757
@@ -36,13 +36,16 @@
OPMap Control Panel
+
+ background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(210, 210, 210, 255), stop:1 rgba(180, 180, 180, 255));
+
- 5
- 7
- 309
- 561
+ 0
+ 10
+ 318
+ 731
@@ -66,6 +69,12 @@
-
+
+
+ 75
+ true
+
+
MapType
@@ -83,15 +92,28 @@
5
-
-
+
+
+
+ 50
+ false
+
+
+
-
+
+
+ 75
+ true
+
+
- Goto Place
+ Find Place
Qt::AlignCenter
@@ -109,15 +131,35 @@
-
-
-
+
+
+
+ 50
+ false
+
+
+
-
+
+
+ 50
+ false
+
+
OpenHandCursor
- GO
+
+
+
+
+ :/core/images/find.png:/core/images/find.png
+
+
+ true
@@ -125,9 +167,20 @@
-
+
+
+ 8
+ 75
+ false
+ true
+
+
GeoCoderStatusCode
+
+ Qt::AlignCenter
+
@@ -135,6 +188,12 @@
-
+
+
+ 75
+ true
+
+
Way Points
@@ -155,21 +214,53 @@
-
+
+
+ 50
+ false
+
+
OpenHandCursor
+
+ Add a new Way Point
+
- Add
+
+
+
+
+ :/core/images/plus.png:/core/images/plus.png
+
+
+ true
-
+
+
+ 50
+ false
+
+
OpenHandCursor
+
+ Delete a Way Point
+
- Delete
+
+
+
+
+ :/core/images/minus.png:/core/images/minus.png
+
+
+ true
@@ -177,6 +268,12 @@
-
+
+
+ 50
+ false
+
+
QFrame::WinPanel
@@ -185,8 +282,249 @@
+ -
+
+
+
+ 75
+ true
+
+
+
+ Home Geo Fence Distance
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
-
+
+
-
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+
+
+
+
+ :/core/images/minus.png:/core/images/minus.png
+
+
+ true
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+
+
+
+
+ :/core/images/plus.png:/core/images/plus.png
+
+
+ true
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Meters
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 9
+ 75
+ true
+
+
+
+ 50
+
+
+ 2000
+
+
+ 50
+
+
+ 100
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Zoom
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
-
+
+
-
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+
+
+
+
+ :/core/images/minus.png:/core/images/minus.png
+
+
+ true
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+
+
+
+
+ :/core/images/plus.png:/core/images/plus.png
+
+
+ true
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Increment
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 9
+ 75
+ false
+ true
+
+
+
+ ArrowCursor
+
+
+ 0.100000000000000
+
+
+ 1.000000000000000
+
+
+
+
+
+ -
+
+
+
+ 9
+ 75
+ true
+
+
+
+ CurrentZoom=
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
-
+
+
+ 75
+ true
+
+
Rotate
@@ -205,31 +543,70 @@
-
+
+
+ 50
+ false
+
+
OpenHandCursor
- Left
+
+
+
+
+ :/core/images/undo.png:/core/images/undo.png
+
+
+ true
-
+
+
+ 50
+ false
+
+
OpenHandCursor
- Center
+
+
+
+
+ :/core/images/clear.png:/core/images/clear.png
+
+
+ true
-
+
+
+ 50
+ false
+
+
OpenHandCursor
- Right
+
+
+
+
+ :/core/images/redo.png:/core/images/redo.png
+
+
+ true
@@ -237,9 +614,16 @@
-
-
+
+
+
+ 75
+ false
+ true
+
+
- Zoom
+ Misc
Qt::AlignCenter
@@ -247,137 +631,126 @@
true
-
+
+
+ 5
+
+
+ 5
+
-
-
+
-
-
+
+
+
+ 50
+ false
+ false
+
+
OpenHandCursor
- +
+ ShowGridLines
+
+
+ false
-
-
+
+
+
+ 50
+ false
+ false
+
+
OpenHandCursor
- -
-
-
-
- -
-
-
- ZoomIncrement
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- OpenHandCursor
-
-
- 0.100000000000000
-
-
- 1.000000000000000
+ UseOpenGL
-
-
+
+
+
+ 50
+ false
+ false
+
+
+
+ OpenHandCursor
+
+
+ background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(160, 160, 160, 255), stop:1 rgba(180, 180, 180, 255));
+
- CurrentZoom=
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Misc
-
-
- Qt::AlignCenter
+ Reload Map
- true
+ false
-
-
- 5
-
-
- 5
-
-
-
-
-
-
-
-
- OpenHandCursor
-
-
- ShowGridLines
-
-
- false
-
-
-
- -
-
-
- OpenHandCursor
-
-
- UseOpenGL
-
-
-
-
-
- -
-
-
- OpenHandCursor
-
-
- ReloadMap
-
-
-
-
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Map Progress
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
+ 5
+
+
+ 5
+
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
+
0
@@ -404,6 +777,8 @@
-
+
+
+
diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/src/plugins/opmap/opmapgadgetwidget.cpp
index 9a31d8667..e38745ff2 100644
--- a/ground/src/plugins/opmap/opmapgadgetwidget.cpp
+++ b/ground/src/plugins/opmap/opmapgadgetwidget.cpp
@@ -270,4 +270,23 @@ void OPMapGadgetWidget::on_checkBox_2_clicked(bool checked)
map->SetUseOpenGL(checked);
}
+void OPMapGadgetWidget::on_pushButtonGeoFenceM_clicked()
+{
+ int geo_fence_distance = controlpanel_ui->spinBoxGeoFenceDistance->value();
+ int step = controlpanel_ui->spinBoxGeoFenceDistance->singleStep();
+ controlpanel_ui->spinBoxGeoFenceDistance->setValue(geo_fence_distance - step);
+
+ geo_fence_distance = controlpanel_ui->spinBoxGeoFenceDistance->value();
+}
+
+void OPMapGadgetWidget::on_pushButtonGeoFenceP_clicked()
+{
+ int geo_fence_distance = controlpanel_ui->spinBoxGeoFenceDistance->value();
+ int step = controlpanel_ui->spinBoxGeoFenceDistance->singleStep();
+ controlpanel_ui->spinBoxGeoFenceDistance->setValue(geo_fence_distance + step);
+
+ geo_fence_distance = controlpanel_ui->spinBoxGeoFenceDistance->value();
+}
+
+
// *************************************************************************************
diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.h b/ground/src/plugins/opmap/opmapgadgetwidget.h
index 0f7e107a7..89f30ecff 100644
--- a/ground/src/plugins/opmap/opmapgadgetwidget.h
+++ b/ground/src/plugins/opmap/opmapgadgetwidget.h
@@ -68,6 +68,8 @@ private slots:
void on_pushButtonRL_clicked();
void on_pushButtonZoomM_clicked();
void on_pushButtonZoomP_clicked();
+ void on_pushButtonGeoFenceM_clicked();
+ void on_pushButtonGeoFenceP_clicked();
void zoomChanged(double zoom);
void on_checkBox_2_clicked(bool checked);