Skip to content

Commit d29dacb

Browse files
committed
clean up seven joint arm script
1 parent 65debdc commit d29dacb

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

ArmNavigation/seven_joint_arm_to_point_control/rrt_star_seven_joint_arm.py renamed to ArmNavigation/rrt_star_seven_joint_arm_control/rrt_star_seven_joint_arm_control.py

+12-7
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def generate_final_course(self, goal_ind):
224224
path.append(node.x)
225225
node = node.parent
226226
path.append(node.x)
227-
227+
reversed(path)
228228
return path
229229

230230
def calc_dist_to_goal(self, x):
@@ -385,17 +385,22 @@ def main():
385385
# Draw final path
386386
if show_animation:
387387
ax = rrt_star.draw_graph()
388-
for i, q in enumerate(reversed(path)):
388+
389+
# Plot final configuration
390+
x_points, y_points, z_points = seven_joint_arm.get_points(path[-1])
391+
ax.plot([x for x in x_points],
392+
[y for y in y_points],
393+
[z for z in z_points],
394+
"o-", color="red", ms=5, mew=0.5)
395+
396+
for i, q in enumerate(path):
389397
x_points, y_points, z_points = seven_joint_arm.get_points(q)
390-
if i == 0 or i == len(path) - 1:
391-
color = None
392-
else:
393-
color = "grey"
394398
ax.plot([x for x in x_points],
395399
[y for y in y_points],
396400
[z for z in z_points],
397-
"o-", color=color, ms=4, mew=0.5)
401+
"o-", color="grey", ms=4, mew=0.5)
398402
plt.pause(0.01)
403+
399404
plt.show()
400405

401406

tests/test_rrt_star_seven_joint_arm.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from unittest import TestCase
44

55
sys.path.append(os.path.dirname(os.path.abspath(__file__)) +
6-
"/../ArmNavigation/seven_joint_arm_to_point_control/")
6+
"/../ArmNavigation/rrt_star_seven_joint_arm_control/")
77

88
try:
9-
import rrt_star_seven_joint_arm as m
9+
import rrt_star_seven_joint_arm_control as m
1010
except ImportError:
1111
raise
1212

0 commit comments

Comments
 (0)