Skip to content

Commit

Permalink
Merge pull request #1 from oroca/develop
Browse files Browse the repository at this point in the history
Modified exec commands
  • Loading branch information
robotpilot authored Mar 30, 2021
2 parents 088137b + 7ff93cd commit 57ff39e
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $ cd ~/robot_ws && colcon build --symlink-install

## Run oroca_rqt_command package
```
$ ros2 run oroca_rqt_command rqt_example
$ ros2 run oroca_rqt_command rqt_command
```

## Run oroca_rqt_command package with turtlesim_node
Expand Down
2 changes: 1 addition & 1 deletion oroca_rqt_command/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ install(DIRECTORY
)

install(PROGRAMS
scripts/rqt_example
scripts/rqt_command
DESTINATION lib/${PROJECT_NAME}
)

Expand Down
2 changes: 1 addition & 1 deletion oroca_rqt_command/launch/turtlesim.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def generate_launch_description():
Node(
namespace='turtle1',
package='oroca_rqt_command',
executable='rqt_example',
executable='rqt_command',
name='rqt_command',
output='screen'),

Expand Down
2 changes: 1 addition & 1 deletion oroca_rqt_command/plugin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<library path="src">
<class name="Examples" type="oroca_rqt_command.examples.Examples" base_class_type="rqt_gui_py::Plugin">
<class name="Command" type="oroca_rqt_command.rqt_command.Command" base_class_type="rqt_gui_py::Plugin">
<description>
A plugin visualizing messages and services values
</description>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import sys

from rqt_gui.main import Main

from oroca_rqt_command.examples import Examples
from oroca_rqt_command.rqt_command import Command

plugin = 'oroca_rqt_command.examples.Examples'
plugin = 'oroca_rqt_command.rqt_command.Command'
main = Main(filename=plugin)
sys.exit(main.main(standalone=plugin))
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from oroca_rqt_command.examples_widget import ExamplesWidget
from oroca_rqt_command.rqt_command_widget import CommandWidget

from rqt_gui_py.plugin import Plugin


class Examples(Plugin):
class Command(Plugin):

def __init__(self, context):
super(Examples, self).__init__(context)
super(Command, self).__init__(context)
self.setObjectName('OROCA RQt Command')
self.widget = ExamplesWidget(context.node)
self.widget = CommandWidget(context.node)
serial_number = context.serial_number()
if serial_number > 1:
self.widget.setWindowTitle(self.widget.windowTitle() + ' ({0})'.format(serial_number))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
from std_srvs.srv import SetBool


class ExamplesWidget(QWidget):
class CommandWidget(QWidget):

def __init__(self, node):
super(ExamplesWidget, self).__init__()
self.setObjectName('ExamplesWidget')
super(CommandWidget, self).__init__()
self.setObjectName('CommandWidget')

self.node = node

Expand All @@ -42,7 +42,7 @@ def __init__(self, node):
self.CMD_VEL_YAW_FACTOR = -10.0

pkg_name = 'oroca_rqt_command'
ui_filename = 'rqt_example.ui'
ui_filename = 'rqt_command.ui'
topic_name = 'cmd_vel'
service_name = 'led_control'

Expand Down

0 comments on commit 57ff39e

Please sign in to comment.