From 1ced7bbec3b7cf24031ceda1904f42d03d973553 Mon Sep 17 00:00:00 2001 From: uquzq <ventsi@DESKTOP-J41TDPJ> Date: Thu, 4 Jul 2024 12:13:20 +0200 Subject: [PATCH] Adjust plotjuggler tabs to new changes --- plotjuggler/1dof_plotjuggler.xml | 11 ++++++----- plotjuggler/2dof_plotjuggler.xml | 20 +++++++++++--------- plotjuggler/3dof_plotjuggler.xml | 21 ++++++++++++--------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/plotjuggler/1dof_plotjuggler.xml b/plotjuggler/1dof_plotjuggler.xml index 1880a97..88420ec 100644 --- a/plotjuggler/1dof_plotjuggler.xml +++ b/plotjuggler/1dof_plotjuggler.xml @@ -1,14 +1,15 @@ <?xml version='1.0' encoding='UTF-8'?> <root> <tabbed_widget name="Main Window" parent="main_window"> - <Tab containers="1" tab_name="1dof"> + <Tab tab_name="1dof" containers="1"> <Container> - <DockSplitter count="1" orientation="-" sizes="1"> + <DockSplitter sizes="1" count="1" orientation="-"> <DockArea name="..."> - <plot style="Lines" flip_x="false" mode="TimeSeries" flip_y="false"> - <range top="91.788750" left="1719391189.551869" bottom="-2.238750" right="1719391199.502832"/> + <plot flip_y="false" style="Lines" flip_x="false" mode="TimeSeries"> + <range top="91.788750" bottom="-2.238750" left="1720086654.971578" right="1720086664.971490"/> <limitY/> <curve name="/angles_1dof/plotjuggler/data" color="#1f77b4"/> + <curve name="/simple_robot/angles_1dof/plotjuggler/data" color="#1ac938"/> </plot> </DockArea> </DockSplitter> @@ -39,7 +40,7 @@ <max_array_size value="100"/> <boolean_strings_to_number value="true"/> <remove_suffix_from_strings value="true"/> - <selected_topics value="/angles_1dof/plotjuggler"/> + <selected_topics value="/simple_robot/angles_1dof/plotjuggler"/> </plugin> <plugin ID="UDP Server"/> <plugin ID="WebSocket Server"/> diff --git a/plotjuggler/2dof_plotjuggler.xml b/plotjuggler/2dof_plotjuggler.xml index ad71f03..4e03709 100644 --- a/plotjuggler/2dof_plotjuggler.xml +++ b/plotjuggler/2dof_plotjuggler.xml @@ -1,21 +1,23 @@ <?xml version='1.0' encoding='UTF-8'?> <root> - <tabbed_widget parent="main_window" name="Main Window"> + <tabbed_widget name="Main Window" parent="main_window"> <Tab tab_name="tab1" containers="1"> <Container> - <DockSplitter count="2" sizes="0.5;0.5" orientation="-"> + <DockSplitter sizes="0.500546;0.499454" count="2" orientation="-"> <DockArea name="..."> - <plot flip_x="false" style="Lines" mode="TimeSeries" flip_y="false"> - <range bottom="-2.238750" top="91.788750" left="44.599492" right="54.549759"/> + <plot flip_y="false" style="Lines" flip_x="false" mode="TimeSeries"> + <range top="91.788750" bottom="-2.238750" left="1.550179" right="11.500398"/> <limitY/> - <curve color="#1f77b4" name="/angle_2dof/plotjuggler/data"/> + <curve name="/angle_2dof/plotjuggler/data" color="#1f77b4"/> + <curve name="/simple_robot/angle_2dof/plotjuggler/data" color="#1f77b4"/> </plot> </DockArea> <DockArea name="..."> - <plot flip_x="false" style="Lines" mode="TimeSeries" flip_y="false"> - <range bottom="-0.024875" top="1.019875" left="44.599556" right="54.549822"/> + <plot flip_y="false" style="Lines" flip_x="false" mode="TimeSeries"> + <range top="1.019875" bottom="-0.024875" left="1.550294" right="11.500428"/> <limitY/> - <curve color="#d62728" name="/height_2dof/plotjuggler/data"/> + <curve name="/height_2dof/plotjuggler/data" color="#d62728"/> + <curve name="/simple_robot/height_2dof/plotjuggler/data" color="#d62728"/> </plot> </DockArea> </DockSplitter> @@ -46,7 +48,7 @@ <max_array_size value="100"/> <boolean_strings_to_number value="true"/> <remove_suffix_from_strings value="true"/> - <selected_topics value="/angle_2dof/plotjuggler;/height_2dof/plotjuggler"/> + <selected_topics value="/simple_robot/angle_2dof/plotjuggler;/simple_robot/height_2dof/plotjuggler"/> </plugin> <plugin ID="UDP Server"/> <plugin ID="WebSocket Server"/> diff --git a/plotjuggler/3dof_plotjuggler.xml b/plotjuggler/3dof_plotjuggler.xml index 95c0dca..7e3c721 100644 --- a/plotjuggler/3dof_plotjuggler.xml +++ b/plotjuggler/3dof_plotjuggler.xml @@ -1,28 +1,31 @@ <?xml version='1.0' encoding='UTF-8'?> <root> <tabbed_widget name="Main Window" parent="main_window"> - <Tab tab_name="tab1" containers="1"> + <Tab containers="1" tab_name="tab1"> <Container> - <DockSplitter sizes="0.333333;0.333333;0.333333" orientation="-" count="3"> + <DockSplitter orientation="-" count="3" sizes="0.333698;0.332604;0.333698"> <DockArea name="..."> <plot mode="TimeSeries" flip_x="false" style="Lines" flip_y="false"> - <range right="59.950827" bottom="-2.238750" left="50.000115" top="91.788750"/> + <range bottom="-2.238750" left="7.850299" right="17.799757" top="91.788750"/> <limitY/> - <curve name="/angle_3dof/plotjuggler/data" color="#1f77b4"/> + <curve color="#1f77b4" name="/angle_3dof/plotjuggler/data"/> + <curve color="#1f77b4" name="/simple_robot/angle_3dof/plotjuggler/data"/> </plot> </DockArea> <DockArea name="..."> <plot mode="TimeSeries" flip_x="false" style="Lines" flip_y="false"> - <range right="66.100593" bottom="-0.009150" left="60.000176" top="0.375150"/> + <range bottom="-0.004800" left="17.849878" right="21.050166" top="0.196800"/> <limitY/> - <curve name="/height_3dof/plotjuggler/data" color="#d62728"/> + <curve color="#d62728" name="/height_3dof/plotjuggler/data"/> + <curve color="#d62728" name="/simple_robot/height_3dof/plotjuggler/data"/> </plot> </DockArea> <DockArea name="..."> <plot mode="TimeSeries" flip_x="false" style="Lines" flip_y="false"> - <range right="66.100673" bottom="-0.005337" left="60.000236" top="0.218838"/> + <range bottom="-0.002800" left="17.849906" right="21.050229" top="0.114800"/> <limitY/> - <curve name="/length_3dof/plotjuggler/data" color="#1ac938"/> + <curve color="#1ac938" name="/length_3dof/plotjuggler/data"/> + <curve color="#1ac938" name="/simple_robot/length_3dof/plotjuggler/data"/> </plot> </DockArea> </DockSplitter> @@ -53,7 +56,7 @@ <max_array_size value="100"/> <boolean_strings_to_number value="true"/> <remove_suffix_from_strings value="true"/> - <selected_topics value="/angle_3dof/plotjuggler;/height_3dof/plotjuggler;/length_3dof/plotjuggler"/> + <selected_topics value="/simple_robot/height_3dof/plotjuggler;/simple_robot/length_3dof/plotjuggler;/simple_robot/angle_3dof/plotjuggler"/> </plugin> <plugin ID="UDP Server"/> <plugin ID="WebSocket Server"/> -- GitLab