Plugin updates.

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
gazebosim · Jul 19, 2024 · 1f28e07 · 1f28e07
1 parent 8db1277
commit 1f28e07
Show file tree

Hide file tree

Showing 17 changed files with 217 additions and 198 deletions.
diff --git a/include/gz/gui/qml/GzColor.qml b/include/gz/gui/qml/GzColor.qml
@@ -55,7 +55,9 @@ Item {
     id: gzColorDialog
     title: "Choose a color"
     visible: false
-    showAlphaChannel: true
+    options: {
+      ShowAlphaChannel: true
+    }
     onAccepted: {
       r = gzColorDialog.color.r
       g = gzColorDialog.color.g

diff --git a/include/gz/gui/qml/PlottingInterface.qml b/include/gz/gui/qml/PlottingInterface.qml
@@ -17,7 +17,6 @@
 import QtQuick
 import QtCharts
 import QtQuick.Controls
-import QtQuick.Controls.Styles
 import QtQuick.Controls.Material
 import QtQuick.Layouts
 import Qt.labs.platform

diff --git a/src/plugins/GridConfig/GridConfig.qml b/src/plugins/GridConfig/GridConfig.qml
@@ -112,10 +112,10 @@ GridLayout {
     Layout.columnSpan: 2
     Layout.fillWidth: true
     id: verticalCellCount
-    maximumValue: Number.MAX_VALUE
-    minimumValue: 0
+    to: Number.MAX_VALUE
+    from: 0
     value: 0
-    onEditingFinished: GridConfig.UpdateVCellCount(verticalCellCount.value)
+    onValueChanged: GridConfig.UpdateVCellCount(verticalCellCount.value)
   }
 
   Text {
@@ -129,10 +129,10 @@ GridLayout {
     Layout.columnSpan: 2
     Layout.fillWidth: true
     id: horizontalCellCount
-    maximumValue: Number.MAX_VALUE
-    minimumValue: 1
+    to: Number.MAX_VALUE
+    from: 1
     value: 20
-    onEditingFinished: GridConfig.UpdateHCellCount(horizontalCellCount.value)
+    onValueChanged: GridConfig.UpdateHCellCount(horizontalCellCount.value)
   }
 
   Text {
@@ -153,12 +153,12 @@ GridLayout {
     Layout.columnSpan: 2
     Layout.fillWidth: true
     id: cellLength
-    maximumValue: Number.MAX_VALUE
-    minimumValue: 0.0000001
-    value: 1.00
-    decimals: gzHelpers.getDecimals(cellLength.width)
-    stepSize: 0.01
-    onEditingFinished: GridConfig.UpdateCellLength(cellLength.value)
+    to: Number.MAX_VALUE
+    from: 0
+    value: 1
+    //decimals: gzHelpers.getDecimals(cellLength.width)
+    stepSize: 1
+    onValueChanged: GridConfig.UpdateCellLength(cellLength.value)
   }
 
   Text {

diff --git a/src/plugins/MinimalScene/MinimalScene.qml b/src/plugins/MinimalScene/MinimalScene.qml
@@ -39,7 +39,7 @@ Rectangle {
     anchors.fill: parent
     hoverEnabled: true
     acceptedButtons: Qt.NoButton
-    visible: MinimalScene.loadingError.length == 0
+    visible: MinimalScene.loadingError.length === 0
     onEntered: {
       MinimalScene.OnFocusWindow()
     }

diff --git a/src/plugins/NavsatMap/CMakeLists.txt b/src/plugins/NavsatMap/CMakeLists.txt
@@ -3,6 +3,8 @@ gz_gui_add_plugin(NavSatMap
     NavSatMap.cc
   QT_HEADERS
     NavSatMap.hh
+  QML_SOURCES
+    NavSatMap.qml
   QML_URI
     NavSatMap
 )
diff --git a/src/plugins/Plotting/CMakeLists.txt b/src/plugins/Plotting/CMakeLists.txt
@@ -3,6 +3,8 @@ gz_gui_add_plugin(TransportPlotting
     TransportPlotting.cc
   QT_HEADERS
     TransportPlotting.hh
+  QML_SOURCES
+    TransportPlotting.qml
   QML_URI
     TransportPlotting
 )
diff --git a/src/plugins/PointCloud/CMakeLists.txt b/src/plugins/PointCloud/CMakeLists.txt
@@ -3,6 +3,8 @@ gz_gui_add_plugin(PointCloud
     PointCloud.cc
   QT_HEADERS
     PointCloud.hh
+  QML_SOURCES
+    PointCloud.qml
   PUBLIC_LINK_LIBS
     gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
   TEST_SOURCES

diff --git a/src/plugins/PointCloud/PointCloud.qml b/src/plugins/PointCloud/PointCloud.qml
@@ -121,10 +121,9 @@ ColumnLayout {
     GzSpinBox {
       id: pointSizeSpin
       value: PointCloud.pointSize
-      minimumValue: 1
-      maximumValue: 1000
-      decimals: 0
-      onEditingFinished: {
+      from: 1
+      to: 1000
+      onValueChanged: {
         PointCloud.SetPointSize(pointSizeSpin.value)
       }
     }

diff --git a/src/plugins/ShutdownButton/CMakeLists.txt b/src/plugins/ShutdownButton/CMakeLists.txt
@@ -3,6 +3,8 @@ gz_gui_add_plugin(ShutdownButton
     ShutdownButton.cc
   QT_HEADERS
     ShutdownButton.hh
+  QML_SOURCES
+    ShutdownButton.qml
   TEST_SOURCES
     ShutdownButton_TEST.cc
   QML_URI

diff --git a/src/plugins/TapeMeasure/CMakeLists.txt b/src/plugins/TapeMeasure/CMakeLists.txt
@@ -1,6 +1,10 @@
 gz_gui_add_plugin(TapeMeasure
-  SOURCES TapeMeasure.cc
-  QT_HEADERS TapeMeasure.hh
+  SOURCES
+    TapeMeasure.cc
+  QT_HEADERS
+    TapeMeasure.hh
+  QML_SOURCES
+    TapeMeasure.qml
   PRIVATE_LINK_LIBS
     gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
   QML_URI

diff --git a/src/plugins/TapeMeasure/TapeMeasure.qml b/src/plugins/TapeMeasure/TapeMeasure.qml
@@ -20,15 +20,14 @@ import QtQuick.Controls
 import QtQuick.Controls.Material
 import QtQuick.Controls.Material.impl
 import QtQuick.Layouts
-import QtQuick.Controls.Styles
 import "qrc:/gz/gui/qml"
 
 ToolBar {
   id: tapeMeasure
   Layout.minimumWidth: 250
   Layout.minimumHeight: 100
 
-  property var distance: 0.0
+  property real distance: 0.0
 
   function updateDistance() {
     distance = TapeMeasure.Distance();

diff --git a/src/plugins/Teleop/CMakeLists.txt b/src/plugins/Teleop/CMakeLists.txt
@@ -3,6 +3,8 @@ gz_gui_add_plugin(Teleop
     Teleop.cc
   QT_HEADERS
     Teleop.hh
+  QML_SOURCES
+    Teleop.qml
   TEST_SOURCES
     Teleop_TEST.cc
   QML_URI

diff --git a/src/plugins/Teleop/Teleop.qml b/src/plugins/Teleop/Teleop.qml
@@ -18,9 +18,9 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Controls.Material
-import QtQuick.Controls.Styles
 import QtQuick.Layouts
 import gz.gui
+import "qrc:/gz/gui/qml"
 
 ColumnLayout {
   Layout.minimumWidth: 400
@@ -123,11 +123,11 @@ ColumnLayout {
       id: maxForwardVelField
       Layout.fillWidth: true
       value: maxForwardVel
-      maximumValue: 10000.0
-      minimumValue: 0.0
-      decimals: 2
-      stepSize: 0.10
-      onEditingFinished:{
+      to: 10000
+      from: 0
+      // decimals: 2
+      stepSize: 1
+      onValueChanged:{
         Teleop.SetMaxForwardVel(value)
       }
     }
@@ -142,11 +142,11 @@ ColumnLayout {
       id: maxVerticalVelField
       Layout.fillWidth: true
       value: maxVerticalVel
-      maximumValue: 10000.0
-      minimumValue: 0.0
-      decimals: 2
-      stepSize: 0.10
-      onEditingFinished:{
+      to: 10000
+      from: 0
+      // decimals: 2
+      stepSize: 1
+      onValueChanged:{
         Teleop.SetMaxVerticalVel(value)
       }
     }
@@ -161,11 +161,11 @@ ColumnLayout {
       id: maxYawVelField
       Layout.fillWidth: true
       value: maxYawVel
-      maximumValue: 10000.0
-      minimumValue: 0.0
-      decimals: 2
-      stepSize: 0.10
-      onEditingFinished:{
+      to: 10000
+      from: 0
+      // decimals: 2
+      stepSize: 1
+      onValueChanged:{
         Teleop.SetMaxYawVel(value)
       }
     }

diff --git a/src/plugins/TopicEcho/CMakeLists.txt b/src/plugins/TopicEcho/CMakeLists.txt
@@ -3,6 +3,8 @@ gz_gui_add_plugin(TopicEcho
     TopicEcho.cc
   QT_HEADERS
     TopicEcho.hh
+  QML_SOURCES
+    TopicEcho.qml
   TEST_SOURCES
     TopicEcho_TEST.cc
   QML_URI

diff --git a/src/plugins/TopicViewer/CMakeLists.txt b/src/plugins/TopicViewer/CMakeLists.txt
@@ -3,6 +3,8 @@ gz_gui_add_plugin(TopicViewer
     TopicViewer.cc
   QT_HEADERS
     TopicViewer.hh
+  QML_SOURCES
+    TopicViewer.qml
   TEST_SOURCES
     TopicViewer_TEST.cc
   PUBLIC_LINK_LIBS