Modified codes based on reviews-2

ROBOTIS-GIT · Dec 10, 2024 · 30fff3a · 30fff3a
1 parent d7a5392
commit 30fff3a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 38 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/open_manipulator/package.xml b/open_manipulator/package.xml
@@ -19,9 +19,11 @@
   <author email="wsh@robotis.com">Sungho Woo</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
-  <exec_depend>open_manipulator_x_controller</exec_depend>
+  <exec_depend>open_manipulator_x_bringup</exec_depend>
   <exec_depend>open_manipulator_x_description</exec_depend>
-  <exec_depend>open_manipulator_x_libs</exec_depend>
+  <exec_depend>open_manipulator_x_gui</exec_depend>
+  <exec_depend>open_manipulator_x_moveit_config</exec_depend>
+  <exec_depend>open_manipulator_x_playground</exec_depend>
   <exec_depend>open_manipulator_x_teleop</exec_depend>
   <export>
     <build_type>ament_cmake</build_type>

diff --git a/open_manipulator_x.repos b/open_manipulator_x.repos
diff --git a/open_manipulator_x_gui/src/main_window.cpp b/open_manipulator_x_gui/src/main_window.cpp
@@ -400,6 +400,7 @@ namespace open_manipulator_x_gui
 
     std::thread([this, repeatCount]()
     {
+      ui.btn_reset_task->setEnabled(false);
       for (int repeat = 0; repeat < repeatCount; ++repeat)
       {
         if (qnode.isStopRequested())
@@ -520,7 +521,9 @@ namespace open_manipulator_x_gui
             tableWidget->item(row, col)->setBackground(Qt::white);
           }
           tableWidget->item(row, 5)->setText("Done");
-        } }, Qt::QueuedConnection); })
+        }
+        ui.btn_reset_task->setEnabled(true);
+      }, Qt::QueuedConnection); })
     .detach();
   }
 

diff --git a/open_manipulator_x_gui/ui/main_window.ui b/open_manipulator_x_gui/ui/main_window.ui
@@ -172,7 +172,7 @@
             <item row="4" column="2">
              <widget class="QLabel" name="label_39">
               <property name="text">
-               <string>rad</string>
+               <string>m</string>
               </property>
              </widget>
             </item>
@@ -230,7 +230,7 @@
                <enum>Qt::LeftToRight</enum>
               </property>
               <property name="text">
-               <string>0.00</string>
+               <string>0.000</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -533,7 +533,7 @@
            </size>
           </property>
           <property name="currentIndex">
-           <number>2</number>
+           <number>0</number>
           </property>
           <widget class="QWidget" name="tab_js">
            <property name="enabled">