Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename to rqt_gauges #23

Merged
merged 3 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
required-ros-distributions: humble
- uses: ros-tooling/[email protected]
with:
package-name: rqt_gauges_2
package-name: rqt_gauges
target-ros2-distro: humble
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gauges2
# RQT gauges

`rqt_gauges_2` is and `rqt` Python plugin. It allows to create the different types of gauges:
`rqt_gauges` is and `rqt` Python plugin. It allows to create the different types of gauges:

- Speedometer
- Steering wheel position
Expand All @@ -20,7 +20,7 @@ The following features are added to this widget:

```bash
cd <workspace-with-the-package>
colcon build --packages-select rqt_gauges_2
colcon build --packages-select rqt_gauges
source install/setup.bash
```

Expand Down Expand Up @@ -61,7 +61,7 @@ Go to the following path on the menu tab: Plugins -> Visualization ->
Run the standalone node:

```bash
ros2 run rqt_gauges_2 rqt_gauges_2
ros2 run rqt_gauges rqt_gauges
```

## How to use it
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rqt_gauges_2</name>
<name>rqt_gauges</name>
<version>0.0.1</version>
<description>Visualization plugin for several sensors.</description>

Expand Down
6 changes: 3 additions & 3 deletions plugin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<library path="src">
<class name="Speedometer" type="rqt_gauges_2.speedometer.Speedometer" base_class_type="rqt_gui_py::Plugin">
<class name="Speedometer" type="rqt_gauges.speedometer.Speedometer" base_class_type="rqt_gui_py::Plugin">
<description>
A Visualization tool that shows the "speed" according to a topic.
</description>
Expand All @@ -14,7 +14,7 @@
<statustip>Gauges visualization tool.</statustip>
</qtgui>
</class>
<class name="SteeringWheel" type="rqt_gauges_2.steering_wheel.SteeringWheel" base_class_type="rqt_gui_py::Plugin">
<class name="SteeringWheel" type="rqt_gauges.steering_wheel.SteeringWheel" base_class_type="rqt_gui_py::Plugin">
<description>
A Visualization tool to keep track of the steering angle.
</description>
Expand All @@ -29,7 +29,7 @@
<statustip>Gauges visualization tool.</statustip>
</qtgui>
</class>
<class name="ThrottleBrakePedals" type="rqt_gauges_2.throttle_brake_pedals.ThrottleBrakePedals" base_class_type="rqt_gui_py::Plugin">
<class name="ThrottleBrakePedals" type="rqt_gauges.throttle_brake_pedals.ThrottleBrakePedals" base_class_type="rqt_gui_py::Plugin">
<description>
A Visualization tool that shows how much of the throttle and brake pedals are being pressed (0-1).
</description>
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions resource/speedometer.ui
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,13 @@ p, li { white-space: pre-wrap; }
<customwidget>
<class>SpeedometerGauge</class>
<extends>QWidget</extends>
<header>rqt_gauges_2.speedometer_gauge.h</header>
<header>rqt_gauges.speedometer_gauge.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>TopicQLineEdit</class>
<extends>QLineEdit</extends>
<header>rqt_gauges_2.topic_q_line_edit.h</header>
<header>rqt_gauges.topic_q_line_edit.h</header>
</customwidget>
</customwidgets>
<resources/>
Expand Down
4 changes: 2 additions & 2 deletions resource/steering_wheel.ui
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ p, li { white-space: pre-wrap; }
<customwidget>
<class>SteeringWheelGauge</class>
<extends>QWidget</extends>
<header>rqt_gauges_2.steering_wheel_gauge.h</header>
<header>rqt_gauges.steering_wheel_gauge.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>TopicQLineEdit</class>
<extends>QLineEdit</extends>
<header>rqt_gauges_2.topic_q_line_edit.h</header>
<header>rqt_gauges.topic_q_line_edit.h</header>
</customwidget>
</customwidgets>
<resources/>
Expand Down
2 changes: 1 addition & 1 deletion resource/throttle_brake_pedals.ui
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@
<customwidget>
<class>TopicQLineEdit</class>
<extends>QLineEdit</extends>
<header>rqt_gauges_2.topic_q_line_edit.h</header>
<header>rqt_gauges.topic_q_line_edit.h</header>
</customwidget>
</customwidgets>
<resources/>
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[develop]
script-dir=$base/lib/rqt_gauges_2
script-dir=$base/lib/rqt_gauges
[install]
install-scripts=$base/lib/rqt_gauges_2
install-scripts=$base/lib/rqt_gauges
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import setup

package_name = 'rqt_gauges_2'
package_name = 'rqt_gauges'

setup(
name=package_name,
Expand All @@ -23,13 +23,13 @@
maintainer='Eloy Briceno',
maintainer_email='[email protected]',
description=(
'rqt_gauges_2 is a Python GUI plugin providing a visualization tool for several sensors.'
'rqt_gauges is a Python GUI plugin providing a visualization tool for several sensors.'
),
license='BSD Clause 3',
tests_require=['pytest'],
entry_points={
'console_scripts': [
'rqt_gauges_2 = ' + package_name + '.main:main',
'rqt_gauges = ' + package_name + '.main:main',
],
},
)
File renamed without changes.
2 changes: 1 addition & 1 deletion src/rqt_gauges_2/main.py → src/rqt_gauges/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


def main():
plugin = 'rqt_gauges_2.speedometer.Speedometer'
plugin = 'rqt_gauges.speedometer.Speedometer'
main = Main(filename=plugin)
sys.exit(main.main(sys.argv, standalone=plugin))

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ def __init__(self, node):
self.node = node
self.sub = None

_, package_path = get_resource('packages', 'rqt_gauges_2')
ui_file = os.path.join(package_path, 'share', 'rqt_gauges_2', 'resource', 'speedometer.ui')
_, package_path = get_resource('packages', 'rqt_gauges')
ui_file = os.path.join(package_path, 'share', 'rqt_gauges', 'resource', 'speedometer.ui')
loadUi(ui_file, self)

self.topic_to_subscribe.setNode(self.node)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ def __init__(self, node):
self.node = node
self.sub = None

_, package_path = get_resource('packages', 'rqt_gauges_2')
ui_file = os.path.join(package_path, 'share', 'rqt_gauges_2',
_, package_path = get_resource('packages', 'rqt_gauges')
ui_file = os.path.join(package_path, 'share', 'rqt_gauges',
'resource', 'steering_wheel.ui')
loadUi(ui_file, self)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ def __init__(self, node):
self.throttle_sub = None
self.brake_sub = None

_, package_path = get_resource('packages', 'rqt_gauges_2')
_, package_path = get_resource('packages', 'rqt_gauges')
ui_file = os.path.join(package_path, 'share',
'rqt_gauges_2', 'resource', 'throttle_brake_pedals.ui')
'rqt_gauges', 'resource', 'throttle_brake_pedals.ui')
loadUi(ui_file, self)

# Throttle Topic Completer
Expand Down
File renamed without changes.
Loading