del scenario,gym_gz from env_manager + refactoring

This commit is contained in:
shalenikol 2025-05-20 12:07:15 +03:00
parent 8d83e3d708
commit 9c6cdfa291
5 changed files with 22 additions and 15 deletions

View file

@ -7,8 +7,8 @@
<maintainer email="ur.narmak@gmail.com">narmak</maintainer>
<license>Apache-2.0</license>
<depend>scenario</depend>
<depend>gym_gz</depend>
<!-- <depend>scenario</depend> -->
<!-- <depend>gym_gz</depend> -->
<test_depend>ament_copyright</test_depend>
<test_depend>ament_flake8</test_depend>

View file

@ -17,8 +17,8 @@
<depend>geometry_msgs</depend>
<depend>lifecycle_msgs</depend>
<depend>rbs_skill_interfaces</depend>
<depend>open3d</depend>
<depend>opencv</depend>
<!-- <depend>open3d</depend> -->
<!-- <depend>opencv</depend> -->
<depend>tf_transformations</depend>
<test_depend>ament_lint_auto</test_depend>

View file

@ -37,6 +37,18 @@
],
"typeAction": "ACTION"
},
{ "name": "isAruco", "type": "if", "typeAction": "CONDITION",
"param": [
{
"type": "formBuilder",
"dependency": {
"output": {
"aruco_id": "25"
}
}
}
]
},
{ "name": "arucoStop", "type": "stop", "param": [], "typeAction": "ACTION" }
],
"topicsOut": [

View file

@ -34,14 +34,12 @@ Parameters:
Version: 2025-04-16
"""
# ROS2 imports
import rclpy
from rclpy.qos import qos_profile_sensor_data
from cv_bridge import CvBridge
import message_filters
from rclpy.lifecycle import Node
# from rclpy.lifecycle import Publisher
from rclpy.lifecycle import LifecycleState
from rclpy.lifecycle import TransitionCallbackReturn
@ -205,9 +203,6 @@ class ArucoLcNode(Node):
self.depth_image_topic = topic_name
else:
self.image_topic = topic_name
# elif par["type"] == "formBuilder":
# self.objName = dependency["output"]["object_name"]
# val = dependency["output"]["process"]["selectProcess"]["value"]
# camera info topic for the camera calibration parameters
self.info_sub = self.create_subscription(CameraInfo, self.info_topic, self.info_callback, qos_profile_sensor_data)
@ -368,12 +363,6 @@ class ArucoLcNode(Node):
self.image_pub.publish(self.bridge.cv2_to_imgmsg(frame, "rgb8"))
def main():
# rclpy.init()
# node = ArucoNode()
# rclpy.spin(node)
# node.destroy_node()
# rclpy.shutdown()
rclpy.init()
executor = rclpy.executors.SingleThreadedExecutor()

View file

@ -4,6 +4,7 @@
ROS 2 program for Object Detection
@shalenikol release 0.4
...
"""
from typing import Optional
@ -49,6 +50,7 @@ class ObjectDetection(Node):
self._is_image_mode = False
self.yolov8_weights_file = ""
self.model = None
self.is_detection = False # object detection indicator in the frame
# for other nodes
kwargs["allow_undeclared_parameters"] = True
@ -100,6 +102,8 @@ class ObjectDetection(Node):
# res = self._cli_getstate.call(req) # the program freezes
id_,_ = self._state_machine.current_state
_is = (id_ == State.PRIMARY_STATE_ACTIVE)
elif request.command == "isDetection":
_is = self.is_detection
response.ok = _is
return response
@ -206,6 +210,7 @@ class ObjectDetection(Node):
return
msg = BoundBox()
msg.is_detection = False
self.is_detection = False
#from ultralytics.engine.results
cconf = self._threshold # threshold
bb = None
@ -218,6 +223,7 @@ class ObjectDetection(Node):
bb = c
if bb:
msg.is_detection = True
self.is_detection = True
msg.name = self.objName
msg.x = float(bb.xywhn[0,0])
msg.y = float(bb.xywhn[0,1])