diff --git a/ground/src/plugins/opmap/opmap_controlpanel.ui b/ground/src/plugins/opmap/opmap_controlpanel.ui
index 8a49ac0e0..c859b4580 100644
--- a/ground/src/plugins/opmap/opmap_controlpanel.ui
+++ b/ground/src/plugins/opmap/opmap_controlpanel.ui
@@ -6,8 +6,8 @@
0
0
- 327
- 757
+ 426
+ 702
@@ -37,15 +37,15 @@
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));
+ background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(215, 215, 215, 255), stop:1 rgba(190, 190, 190, 255));
0
10
- 318
- 731
+ 416
+ 691
@@ -68,15 +68,309 @@
5
-
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 7
+ 50
+ true
+ false
+
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ Map Type
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ false
+
+
+
+ Qt::LeftToRight
+
+
+ false
+
+
+ background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(180, 180, 180, 255), stop:1 rgba(200, 200, 200, 255));
+
+
+ false
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 7
+ 50
+ true
+ false
+
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ Find Place
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(180, 180, 180, 255), stop:1 rgba(200, 200, 200, 255));
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+
+
+
+
+ :/core/images/find.png:/core/images/find.png
+
+
+ true
+
+
+
+ -
+
+
+
+ 8
+ 50
+ false
+ false
+
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ GeoCoderStatusCode
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 7
+ 50
+ true
+ false
+
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ Home Geo Fence Distance
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 9
+ 75
+ true
+
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ 50
+
+
+ 2000
+
+
+ 50
+
+
+ 100
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ false
+
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ Meters
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+
+
+
+
+ :/core/images/minus.png:/core/images/minus.png
+
+
+
+ 12
+ 12
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+
+
+
+
+ :/core/images/plus.png:/core/images/plus.png
+
+
+
+ 12
+ 12
+
+
+
+ true
+
+
+
+
+
+ -
+
+ 7
75
true
- MapType
+ Map
Qt::AlignCenter
@@ -84,112 +378,346 @@
true
-
+
+
+ 0
+
5
+
+ 0
+
5
-
-
-
-
- 50
- false
-
-
-
+
+
-
+
+
-
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+ Rotate Anticlockwise
+
+
+
+
+
+
+ :/core/images/undo.png:/core/images/undo.png
+
+
+
+ 12
+ 12
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+ Reset Rotation
+
+
+
+
+
+
+ :/core/images/clear.png:/core/images/clear.png
+
+
+
+ 12
+ 12
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+ Rotate Clockwise
+
+
+
+
+
+
+ :/core/images/redo.png:/core/images/redo.png
+
+
+
+ 12
+ 12
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 75
+ false
+ true
+
+
+
+ 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));
+
+
+ Reload
+
+
+ true
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ true
+ false
+
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ Zoom Increment
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 9
+ 75
+ false
+ true
+
+
+
+ ArrowCursor
+
+
+ false
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+ QAbstractSpinBox::UpDownArrows
+
+
+ 0.100000000000000
+
+
+ 1.000000000000000
+
+
+
+ -
+
+
+
+ 8
+ 75
+ true
+
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ Zoom=
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+
+
+
+
+ :/core/images/minus.png:/core/images/minus.png
+
+
+
+ 12
+ 12
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 50
+ false
+
+
+
+ OpenHandCursor
+
+
+
+
+
+
+ :/core/images/plus.png:/core/images/plus.png
+
+
+
+ 12
+ 12
+
+
+
+ true
+
+
+
+
+
+
-
-
-
-
- 75
- true
-
+
+
+ Qt::Horizontal
-
- Find Place
-
-
- Qt::AlignCenter
-
-
- true
-
-
-
- 5
-
-
- 5
-
-
-
-
-
-
-
-
-
- 50
- false
-
-
-
-
- -
-
-
-
- 50
- false
-
-
-
- OpenHandCursor
-
-
-
-
-
-
- :/core/images/find.png:/core/images/find.png
-
-
- true
-
-
-
-
-
- -
-
-
-
- 8
- 75
- false
- true
-
-
-
- GeoCoderStatusCode
-
-
- Qt::AlignCenter
-
-
-
-
+ -
+
+
-
+
+
+
+ 50
+ false
+ false
+
+
+
+ OpenHandCursor
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ ShowGridLines
+
+
+ false
+
+
+
+ -
+
+
+
+ 50
+ false
+ false
+
+
+
+ OpenHandCursor
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ UseOpenGL
+
+
+
+
+
-
+ 7
75
true
@@ -204,9 +732,15 @@
true
+
+ 0
+
5
+
+ 0
+
5
@@ -233,6 +767,12 @@
:/core/images/plus.png:/core/images/plus.png
+
+
+ 12
+ 12
+
+
true
@@ -259,6 +799,12 @@
:/core/images/minus.png:/core/images/minus.png
+
+
+ 12
+ 12
+
+
true
@@ -274,6 +820,9 @@
false
+
+ background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(180, 180, 180, 255), stop:1 rgba(200, 200, 200, 255));
+
QFrame::WinPanel
@@ -283,496 +832,56 @@
-
-
-
-
- 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
-
-
- Qt::AlignCenter
-
-
- true
-
-
-
- 5
-
-
- 5
-
-
-
-
-
-
- 50
- false
-
-
-
- OpenHandCursor
-
-
-
-
-
-
- :/core/images/undo.png:/core/images/undo.png
-
-
- true
-
-
-
- -
-
-
-
- 50
- false
-
-
-
- OpenHandCursor
-
-
-
-
-
-
- :/core/images/clear.png:/core/images/clear.png
-
-
- true
-
-
-
- -
-
-
-
- 50
- false
-
-
-
- OpenHandCursor
-
-
-
-
-
-
- :/core/images/redo.png:/core/images/redo.png
-
-
- true
-
-
-
-
-
-
- -
-
-
-
- 75
- false
- true
-
-
-
- Misc
-
-
- Qt::AlignCenter
-
-
- true
-
-
-
- 5
-
-
- 5
-
-
-
-
-
-
-
-
-
- 50
- false
- false
-
-
-
- OpenHandCursor
-
-
- ShowGridLines
-
-
- false
-
-
-
- -
-
-
-
- 50
- false
- false
-
-
-
- OpenHandCursor
-
-
- 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));
-
-
- Reload Map
-
-
- false
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- Map Progress
-
-
- Qt::AlignCenter
-
-
- true
-
-
-
- 5
-
-
- 5
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 10
-
-
-
- 0
-
-
- false
-
-
-
-
-
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ true
+ false
+
+
+
+ background-color: rgba(255, 255, 255, 0);
+
+
+ Map Progress
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 10
+
+
+
+ 0
+
+
+ false
+
+
+
+
diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/src/plugins/opmap/opmapgadgetwidget.cpp
index e38745ff2..9e7f705a7 100644
--- a/ground/src/plugins/opmap/opmapgadgetwidget.cpp
+++ b/ground/src/plugins/opmap/opmapgadgetwidget.cpp
@@ -252,8 +252,8 @@ void OPMapGadgetWidget::on_pushButtonZoomP_clicked()
{
if (map)
{
- double x = map->Zoom();
- double y = controlpanel_ui->doubleSpinBox->value();
+// double x = map->Zoom();
+// double y = controlpanel_ui->doubleSpinBox->value();
map->SetZoom(map->Zoom() + controlpanel_ui->doubleSpinBox->value());
}
}