Skip to content

Commit 53907d6

Browse files
committed
params && workaround for empty texture urdf elems
1 parent 07d73aa commit 53907d6

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

server/src/xbot2_gui_server/joint_states.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ def on_aux_recv(self, msg: CustomState, aux: list):
104104
async def get_urdf_handler(self, request: web.Request):
105105
print('retrieving robot description..')
106106
urdf = rospy.get_param('xbotcore/robot_description', default='')
107+
urdf = urdf.replace('<texture/>', '')
107108
return web.Response(text=json.dumps({'urdf': urdf}))
108109

109110

@@ -152,14 +153,14 @@ async def get_joint_info_handler(self, request: web.Request):
152153
# get urdf
153154
print('retrieving robot description..')
154155
urdf = rospy.get_param('xbotcore/robot_description', default='')
156+
urdf = urdf.replace('<texture/>', '')
155157
if len(urdf) == 0:
156158
joint_info['message'] = 'unable to get robot description'
157159
joint_info['success'] = False
158160
return web.Response(text=json.dumps(joint_info))
159161

160162
# parse urdf
161163
print('parsing urdf..')
162-
urdf = urdf.replace('<texture/>', '')
163164
model = urdf_parser.Robot.from_xml_string(urdf)
164165

165166
# read joint limits from urdf

server/src/xbot2_gui_server/main.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,14 @@ async def load_extensions():
151151
except BaseException as e:
152152
print('Exception ', type(e), e)
153153

154+
try:
155+
from .parameters import ParameterHandler
156+
ext = ParameterHandler(srv, cfg.get('parameters', {}))
157+
extensions.append(ext)
158+
print(ext)
159+
except BaseException as e:
160+
print('Exception ', type(e), e)
161+
154162
srv.extensions = extensions
155163

156164
print('load extensions completed', extensions)

server/src/xbot2_gui_server/visual.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ async def visual_get_mesh_entities(self, request):
4747

4848
# parse urdf
4949
urdf = rospy.get_param('xbotcore/robot_description')
50+
urdf = urdf.replace('<texture/>', '')
5051
model = urdf_parser.Robot.from_xml_string(urdf)
5152

5253
# get list of visuals
@@ -96,6 +97,7 @@ async def visual_get_mesh_tfs(self, request: web.Request):
9697

9798
# parse urdf
9899
urdf = rospy.get_param('xbotcore/robot_description')
100+
urdf = urdf.replace('<texture/>', '')
99101
model = urdf_parser.Robot.from_xml_string(urdf)
100102
root = 'base_link'
101103

0 commit comments

Comments
 (0)