Modif création fichier ccrubs

CRUBS · Sep 13, 2022 · ad4e839 · ad4e839
1 parent cd342d2
commit ad4e839
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/additional/init_data_avec_accents.docx b/additional/init_data_avec_accents.docx
diff --git a/src/data/init.py b/src/data/init.py
@@ -380,7 +380,8 @@ def __init__(self):
             # Les fichiers ccrubs sont des fichiers qui contiennent les coordonnees ou doit se rendre le robot
             # alors que le fichier gcrubs indique les deplacements a effectuer par le robot
             'convert_gcrubs_cb_name': "Convertir le gcrubs en ccrubs",
-            'convert_gcrubs_checked': True
+            'convert_gcrubs_checked': True,
+            'ccrubs_separator': ';;'
         }  # End self.main_robot
 
         self.second_robot = {  # Contient les donnees pour le robot secondaire

diff --git a/src/ui/robot.py b/src/ui/robot.py
@@ -928,7 +928,8 @@ def _set_origin(self):
                         y=round(self.robot.get_coord()[1]),
                         angle=round(self.robot.get_angle())))
 
-                    self.ccrubs = str(round(self.robot.get_coord()[0])) + ';;' + str(round(self.robot.get_coord()[1]))
+                    self.ccrubs = str(round(self.robot.get_coord()[0])) + self.init_data.get_main_robot(
+                        'ccrubs_separator') + str(round(self.robot.get_coord()[1]))
                 else:
                     self.sequence_text.setText(self.robot.get_sequence())
                     for line in self.robot.get_sequence().split('\n'):

diff --git a/src/widget/viewWidget.py b/src/widget/viewWidget.py
@@ -341,7 +341,8 @@ def _go_up(self, event, elem, mvt: tuple, speed: int):
                         elem.get_window().update_last_track(speed, 0, self.dist)
 
                     elem.get_window().set_sequence_text(self.sequence_text)
-                    elem.get_window().set_ccrubs(self.ccrubs_text + '\n' + str(round(elem.get_coord()[0])) + ';;'
+                    elem.get_window().set_ccrubs(self.ccrubs_text + '\n' + str(round(elem.get_coord()[0]))
+                                                 + self.init_data.get_main_robot('ccrubs_separator')
                                                  + str(round(elem.get_coord()[1])))
                     try:
                         elem.get_window().add_sequence_text(
@@ -390,7 +391,8 @@ def _go_down(self, event, elem, mvt: tuple, speed: int):
                         elem.get_window().update_last_track(-speed, 0, self.dist)
 
                     elem.get_window().set_sequence_text(self.sequence_text)
-                    elem.get_window().set_ccrubs(self.ccrubs_text + '\n' + str(round(elem.get_coord()[0])) + ';;'
+                    elem.get_window().set_ccrubs(self.ccrubs_text + '\n' + str(round(elem.get_coord()[0]))
+                                                 + self.init_data.get_main_robot('ccrubs_separator')
                                                  + str(round(elem.get_coord()[1])))
                     try:
                         elem.get_window().add_sequence_text(
@@ -439,7 +441,8 @@ def _go_left(self, event, elem, mvt: tuple, speed: int):
                         elem.get_window().update_last_track(-speed, self.dist, 0)
 
                     elem.get_window().set_sequence_text(self.sequence_text)
-                    elem.get_window().set_ccrubs(self.ccrubs_text + '\n' + str(round(elem.get_coord()[0])) + ';;'
+                    elem.get_window().set_ccrubs(self.ccrubs_text + '\n' + str(round(elem.get_coord()[0]))
+                                                 + self.init_data.get_main_robot('ccrubs_separator')
                                                  + str(round(elem.get_coord()[1])))
                     try:
                         elem.get_window().add_sequence_text(
@@ -487,7 +490,8 @@ def _go_right(self, event, elem, mvt: tuple, speed: int):
                         elem.get_window().update_last_track(speed, self.dist, 0)
 
                     elem.get_window().set_sequence_text(self.sequence_text)
-                    elem.get_window().set_ccrubs(self.ccrubs_text + '\n' + str(round(elem.get_coord()[0])) + ';;'
+                    elem.get_window().set_ccrubs(self.ccrubs_text + '\n' + str(round(elem.get_coord()[0]))
+                                                 + self.init_data.get_main_robot('ccrubs_separator')
                                                  + str(round(elem.get_coord()[1])))
                     try:
                         elem.get_window().add_sequence_text(