2024.1.1 hotfix (#302)

* Fixes to editing parts in assembly and combined (#301) * Now reads all rotations correctly * Only runs if there are assembly inserts in the yaml file * Fixed part editing issue * Updates to available part types in combined order * Fixes to assembly part types available during editing * Increment version numbers * Removed conveyor.yaml
usnistgov · Feb 1, 2024 · 683909c · 683909c
1 parent 87badc5
commit 683909c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/ariac_controllers/package.xml b/ariac_controllers/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ariac_controllers</name>
-  <version>2024.1.0</version>
+  <version>2024.1.1</version>
   <description>ros2 controllers for ARIAC simulation</description>
   <maintainer email="justin.albrecht@nist.gov"> Justin Albrecht</maintainer>
   <license>NIST</license>

diff --git a/ariac_description/package.xml b/ariac_description/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ariac_description</name>
-  <version>2024.1.0</version>
+  <version>2024.1.1</version>
   <description>Package containing URDF descriptions for all robots in the ARIAC simulation</description>
   <maintainer email="justin.albrecht@nist.gov">justin</maintainer>
   <license>NIST</license>

diff --git a/ariac_gazebo/package.xml b/ariac_gazebo/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ariac_gazebo</name>
-  <version>2024.1.0</version>
+  <version>2024.1.1</version>
   <description>ARIAC ROS2 port</description>
   <maintainer email="jalbrecht23@gmail.com">justin</maintainer>
   <license>NIST</license>

diff --git a/ariac_gui/ariac_gui/trial_generator.py b/ariac_gui/ariac_gui/trial_generator.py
@@ -1936,6 +1936,7 @@ def add_assembly_part(self, assembly_part = None, index = -1):
             a_part_dict["agv"].set(str(assembly_part.agv))
             a_part_dict["quadrant"].set(str(assembly_part.quadrant))
             a_part_dict["rotation"].set(float(assembly_part.rotation))
+            available_part_types+=[_part_type_str[assembly_part.part.type].lower()]
             edit_flag = True
 
 
@@ -2035,8 +2036,9 @@ def add_combined_part(self, combined_part = None, index = -1):
             c_part_dict["color"].set(PART_COLORS[0])
             c_part_dict["pType"].set(available_part_types[0])
         else:
-            c_part_dict["color"].set(_part_color_str[combined_part.part.color].lower())
-            c_part_dict["pType"].set(_part_type_str[combined_part.part.type].lower())
+            c_part_dict["color"].set(_part_color_str[combined_part.color].lower())
+            c_part_dict["pType"].set(_part_type_str[combined_part.type].lower())
+            available_part_types+=[_part_type_str[combined_part.type].lower()]
 
         color_label = ctk.CTkLabel(add_c_part_wind, text="Select the color for the assembly part")
         color_label.pack()

diff --git a/ariac_gui/package.xml b/ariac_gui/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ariac_gui</name>
-  <version>2024.1.0</version>
+  <version>2024.1.1</version>
   <description>GUI for creating trial configurations</description>
   <maintainer email="joseph.fernandez@nist.gov">Joseph Fernandez</maintainer>
   <license>NIST</license>

diff --git a/ariac_moveit_config/package.xml b/ariac_moveit_config/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ariac_moveit_config</name>
-  <version>2024.1.0</version>
+  <version>2024.1.1</version>
   <description> An package with MoveIt2 configurations for ARIAC robots</description>
   <maintainer email="justin.albrecht@nist.gov">Justin Albrecht</maintainer>
   <license>NIST</license>

diff --git a/ariac_msgs/package.xml b/ariac_msgs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ariac_msgs</name>
-  <version>2024.1.0</version>
+  <version>2024.1.1</version>
   <description>Interface definitions for ARIAC</description>
   <maintainer email="justin.albrecht@nist.gov">justin</maintainer>
   <license>NIST</license>

diff --git a/ariac_plugins/package.xml b/ariac_plugins/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ariac_plugins</name>
-  <version>2024.1.0</version>
+  <version>2024.1.1</version>
   <description>Gazebo/ROS2 plugins for the ARAIC competition</description>
   <maintainer email="justin.albrecht@nist.gov">justin albrecht</maintainer>
   <maintainer email="zeid.kootbally@nist.gov">zeid kootbally</maintainer>

diff --git a/ariac_sensors/package.xml b/ariac_sensors/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>ariac_sensors</name>
-  <version>2024.1.0</version>
+  <version>2024.1.1</version>
   <description>Gazebo plugins for the ARIAC sensors</description>
   <maintainer email="justin.albrecht@nist.gov">justin</maintainer>
   <license>NIST</license>