diff --git a/ground/src/plugins/opmap/images/Gtk-media-forward-ltr.svg b/ground/src/plugins/opmap/images/Gtk-media-forward-ltr.svg new file mode 100644 index 000000000..17620f8a3 --- /dev/null +++ b/ground/src/plugins/opmap/images/Gtk-media-forward-ltr.svg @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Gtk-media-next-ltr.svg b/ground/src/plugins/opmap/images/Gtk-media-next-ltr.svg new file mode 100644 index 000000000..1d2f30031 --- /dev/null +++ b/ground/src/plugins/opmap/images/Gtk-media-next-ltr.svg @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Gtk-media-play-ltr.svg b/ground/src/plugins/opmap/images/Gtk-media-play-ltr.svg new file mode 100644 index 000000000..455934c8a --- /dev/null +++ b/ground/src/plugins/opmap/images/Gtk-media-play-ltr.svg @@ -0,0 +1,119 @@ + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Gtk-media-previous-ltr.svg b/ground/src/plugins/opmap/images/Gtk-media-previous-ltr.svg new file mode 100644 index 000000000..3ee97d5a9 --- /dev/null +++ b/ground/src/plugins/opmap/images/Gtk-media-previous-ltr.svg @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Gtk-media-stop.svg b/ground/src/plugins/opmap/images/Gtk-media-stop.svg new file mode 100644 index 000000000..65f807cba --- /dev/null +++ b/ground/src/plugins/opmap/images/Gtk-media-stop.svg @@ -0,0 +1,123 @@ + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Media-playback-pause.svg b/ground/src/plugins/opmap/images/Media-playback-pause.svg new file mode 100644 index 000000000..c27384ec2 --- /dev/null +++ b/ground/src/plugins/opmap/images/Media-playback-pause.svg @@ -0,0 +1,412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Playback Pause + + + Lapo Calamandrei + + + + + + media + pause + playback + video + music + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Media-playback-start.svg b/ground/src/plugins/opmap/images/Media-playback-start.svg new file mode 100644 index 000000000..b1ec82c9e --- /dev/null +++ b/ground/src/plugins/opmap/images/Media-playback-start.svg @@ -0,0 +1,381 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Playback Start + + + Lapo Calamandrei + + + + + + play + media + music + video + player + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Media-playback-stop.svg b/ground/src/plugins/opmap/images/Media-playback-stop.svg new file mode 100644 index 000000000..406bcde12 --- /dev/null +++ b/ground/src/plugins/opmap/images/Media-playback-stop.svg @@ -0,0 +1,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Playback Stop + + + Lapo Calamandrei + + + + + + player + media + stop + video + music + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Media-seek-backward.svg b/ground/src/plugins/opmap/images/Media-seek-backward.svg new file mode 100644 index 000000000..afe63ff98 --- /dev/null +++ b/ground/src/plugins/opmap/images/Media-seek-backward.svg @@ -0,0 +1,396 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Seek Backward + + + Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Media-seek-forward.svg b/ground/src/plugins/opmap/images/Media-seek-forward.svg new file mode 100644 index 000000000..d4a007205 --- /dev/null +++ b/ground/src/plugins/opmap/images/Media-seek-forward.svg @@ -0,0 +1,393 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Seek Forward + + + Lapo Calamandrei + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/Media-skip-backward.svg b/ground/src/plugins/opmap/images/Media-skip-backward.svg new file mode 100644 index 000000000..512d0f5c6 Binary files /dev/null and b/ground/src/plugins/opmap/images/Media-skip-backward.svg differ diff --git a/ground/src/plugins/opmap/images/Media-skip-forward.svg b/ground/src/plugins/opmap/images/Media-skip-forward.svg new file mode 100644 index 000000000..2eaefcc2f --- /dev/null +++ b/ground/src/plugins/opmap/images/Media-skip-forward.svg @@ -0,0 +1,449 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Media Skip Forward + + + Lapo Calamandrei + + + + + + media + seek + skip + forward + player + music + video + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/src/plugins/opmap/images/gcs.png b/ground/src/plugins/opmap/images/gcs.png index 8c569c441..d1e13338d 100644 Binary files a/ground/src/plugins/opmap/images/gcs.png and b/ground/src/plugins/opmap/images/gcs.png differ diff --git a/ground/src/plugins/opmap/images/go.png b/ground/src/plugins/opmap/images/go.png new file mode 100644 index 000000000..f30c82667 Binary files /dev/null and b/ground/src/plugins/opmap/images/go.png differ diff --git a/ground/src/plugins/opmap/images/go.psp b/ground/src/plugins/opmap/images/go.psp new file mode 100644 index 000000000..a9727cd65 Binary files /dev/null and b/ground/src/plugins/opmap/images/go.psp differ diff --git a/ground/src/plugins/opmap/images/home.png b/ground/src/plugins/opmap/images/home.png new file mode 100644 index 000000000..4df6df8ab Binary files /dev/null and b/ground/src/plugins/opmap/images/home.png differ diff --git a/ground/src/plugins/opmap/images/pause.png b/ground/src/plugins/opmap/images/pause.png new file mode 100644 index 000000000..a6d804f07 Binary files /dev/null and b/ground/src/plugins/opmap/images/pause.png differ diff --git a/ground/src/plugins/opmap/images/stop.png b/ground/src/plugins/opmap/images/stop.png new file mode 100644 index 000000000..972b6d61a Binary files /dev/null and b/ground/src/plugins/opmap/images/stop.png differ diff --git a/ground/src/plugins/opmap/opmap.qrc b/ground/src/plugins/opmap/opmap.qrc index 9435d2fa3..1ef1d90bb 100644 --- a/ground/src/plugins/opmap/opmap.qrc +++ b/ground/src/plugins/opmap/opmap.qrc @@ -1,10 +1,13 @@ - images/gcs.png images/uav.png images/waypoint.png images/minus.png images/plus.png images/ok.png + images/go.png + images/home.png + images/pause.png + images/gcs.png diff --git a/ground/src/plugins/opmap/opmap_widget.ui b/ground/src/plugins/opmap/opmap_widget.ui index 6dca7e7be..6d812d3a0 100644 --- a/ground/src/plugins/opmap/opmap_widget.ui +++ b/ground/src/plugins/opmap/opmap_widget.ui @@ -6,8 +6,8 @@ 0 0 - 656 - 171 + 704 + 273 @@ -410,6 +410,115 @@ color: rgb(255, 255, 255); + + + + Center map over home position + + + background-color: rgba(255, 255, 255, 0); +color: rgb(255, 255, 255); + + + + + + + :/opmap/images/gcs.png:/opmap/images/gcs.png + + + + 16 + 16 + + + + true + + + true + + + + + + + Center map over UAV position + + + background-color: rgba(255, 255, 255, 0); +color: rgb(255, 255, 255); + + + + + + + :/opmap/images/uav.png:/opmap/images/uav.png + + + + 16 + 16 + + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + Add a waypoint + + + background-color: rgba(255, 255, 255, 0); +color: rgb(255, 255, 255); + + + + + + + :/opmap/images/waypoint.png:/opmap/images/waypoint.png + + + + 16 + 16 + + + + true + + + true + + + @@ -431,20 +540,183 @@ color: rgb(255, 255, 255); - - - - 0 - 0 - + + + 0 - - false - - - background-color: rgb(0, 0, 0); - - + + + + + 0 + 0 + + + + false + + + background-color: rgb(0, 0, 0); + + widgetFlightControls + + + + + + + 0 + 0 + + + + + 0 + 50 + + + + + 16777215 + 16777215 + + + + false + + + background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(72, 72, 72, 255), stop:1 rgba(117, 117, 117, 255)); + + + + 0 + + + + + + 0 + 0 + + + + Show/Hide Flight Controls + + + background-color: rgba(255, 255, 255, 0); + + + + + + + :/core/images/next.png:/core/images/next.png + + + true + + + + + + + + 0 + 0 + + + + background-color: rgba(255, 255, 255, 0); + + + + + + UAV go home + + + background-color: rgba(255, 255, 255, 0); +color: rgb(255, 255, 255); + + + + + + + :/opmap/images/home.png:/opmap/images/home.png + + + + 70 + 70 + + + + true + + + + + + + UAV hover + + + background-color: rgba(255, 255, 255, 0); +color: rgb(255, 255, 255); + + + + + + + :/opmap/images/pause.png:/opmap/images/pause.png + + + + 70 + 70 + + + + true + + + + + + + UAV go! + + + background-color: rgba(255, 255, 255, 0); +color: rgb(255, 255, 255); + + + + + + + :/opmap/images/go.png:/opmap/images/go.png + + + + 70 + 70 + + + + true + + + + + + + + + + @@ -484,9 +756,18 @@ color: rgb(255, 255, 255); 0 - + 0 + + 0 + + + 0 + + + 5 + @@ -658,6 +939,7 @@ border: none; + diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/src/plugins/opmap/opmapgadgetwidget.cpp index 94f2807b5..281827f1a 100644 --- a/ground/src/plugins/opmap/opmapgadgetwidget.cpp +++ b/ground/src/plugins/opmap/opmapgadgetwidget.cpp @@ -512,12 +512,28 @@ void OPMapGadgetWidget::on_pushButtonGeoFenceP_clicked() void OPMapGadgetWidget::on_comboBoxZoom_currentIndexChanged(int index) { - bool ok; - int i = (int)m_widget->comboBoxZoom->itemData(index).toInt(&ok); - setZoom(2 + index); + if (m_widget) + { + bool ok; + int i = (int)m_widget->comboBoxZoom->itemData(index).toInt(&ok); + setZoom(2 + index); + } } +void OPMapGadgetWidget::on_toolButtonFlightControlsShowHide_clicked() +{ + if (m_widget) + { + m_widget->widgetFlightControlButtons->setVisible(!m_widget->widgetFlightControlButtons->isVisible()); + + if (m_widget->widgetFlightControlButtons->isVisible()) + m_widget->toolButtonFlightControlsShowHide->setIcon(QIcon(QString::fromUtf8(":/core/images/next.png"))); + else + m_widget->toolButtonFlightControlsShowHide->setIcon(QIcon(QString::fromUtf8(":/core/images/prev.png"))); + } +} + // ************************************************************************************* // public functions diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.h b/ground/src/plugins/opmap/opmapgadgetwidget.h index 3cdf95dab..ad54a158e 100644 --- a/ground/src/plugins/opmap/opmapgadgetwidget.h +++ b/ground/src/plugins/opmap/opmapgadgetwidget.h @@ -68,7 +68,7 @@ private slots: void zoomIn(); void zoomOut(); - // control panel signals + // user control signals void on_toolButtonReload_clicked(); void on_toolButtonFindPlace_clicked(); void on_toolButtonRR_clicked(); @@ -79,6 +79,8 @@ private slots: void on_pushButtonGeoFenceM_clicked(); void on_pushButtonGeoFenceP_clicked(); void on_comboBoxZoom_currentIndexChanged(int index); + void on_toolButtonFlightControlsShowHide_clicked(); + // map signals void zoomChanged(double zoom);