From dcbe4a999c61632305628301733c7204ac936623 Mon Sep 17 00:00:00 2001
From: Fabrice Salvaire <fabrice.salvaire@orange.fr>
Date: Tue, 25 Dec 2018 13:31:37 +0100
Subject: [PATCH] Config fixes

---
 PythonicGcodeMachine/Gcode/Rs274/Config.py    | 26 ++++++-------------
 .../Gcode/Rs274/data/make-rst.py              |  5 +++-
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/PythonicGcodeMachine/Gcode/Rs274/Config.py b/PythonicGcodeMachine/Gcode/Rs274/Config.py
index 2a8d795..84c64a4 100644
--- a/PythonicGcodeMachine/Gcode/Rs274/Config.py
+++ b/PythonicGcodeMachine/Gcode/Rs274/Config.py
@@ -417,7 +417,7 @@ class ExecutionOrder(YamlMixin, RstMixin):
         self._write_rst(
             path,
             headers=('Order', 'G-codes', 'Comment'),
-            columns=('index', 'gcodes', 'meaning'),
+            columns=('index', 'raw_gcodes', 'meaning'),
             str_gcodes=lambda item: ' '.join(item),
         )
 
@@ -492,7 +492,7 @@ class ModalGroups(YamlMixin, RstMixin):
             path,
             headers=('Group', 'G-codes', 'Comment'),
             columns=('index', 'gcodes', 'meaning'),
-            str_gcodes=lambda item: ' '.join(item),
+            str_gcodes=lambda gcodes: ' '.join([str(gcode) for gcode in gcodes]),
         )
 
 ####################################################################################################
@@ -515,37 +515,29 @@ class Config:
                  parameters,
     ):
 
-        """Each argument is a path to the corresponding YAML file. Files are loaded on demand (lazy loading).
+        """Each argument is a path to the corresponding YAML file.
+
         """
 
+        self._gcodes = GcodeSet(gcodes)
+        self._execution_order = ExecutionOrder(execution_order, self._gcodes)
+        self._modal_groups = ModalGroups(modal_groups, self._gcodes)
+
         # self._letters = str(letters)
         # self._parameters = str(parameters)
-
-        # self._gcodes = str(gcodes)
-        # self._modal_groups = str(modal_groups)
-        # self._execution_order = str(execution_order)
-
         self._letters = Letters(letters)
         self._parameters = ParameterSet(parameters)
 
-        self._gcodes = GcodeSet(gcodes)
-        self._execution_order = ExecutionOrder(execution_order, self._gcodes)
-        self._modal_groups = ModalGroups(modal_groups, self._gcodes)
-
     ##############################################
 
     @property
     def execution_order(self):
         """:class:`ExecutionOrder` instance"""
-        # if isinstance(self._execution_order, str):
-        #     self._execution_order = ExecutionOrder(self._execution_order)
         return self._execution_order
 
     @property
     def gcodes(self):
         """:class:`GcodeSet` instance"""
-        # if isinstance(self._gcodes, str):
-        #     self._gcodes = GcodeSet(self._gcodes)
         return self._gcodes
 
     @property
@@ -558,8 +550,6 @@ class Config:
     @property
     def modal_groups(self):
         """:class:`ModalGroups` instance"""
-        # if isinstance(self._modal_groups, str):
-        #     self._modal_groups = ModalGroups(self._modal_groups)
         return self._modal_groups
 
     @property
diff --git a/PythonicGcodeMachine/Gcode/Rs274/data/make-rst.py b/PythonicGcodeMachine/Gcode/Rs274/data/make-rst.py
index 69a6fdf..95d09c0 100755
--- a/PythonicGcodeMachine/Gcode/Rs274/data/make-rst.py
+++ b/PythonicGcodeMachine/Gcode/Rs274/data/make-rst.py
@@ -28,10 +28,13 @@
 
 import pathlib
 
-from PythonicGcodeMachine.Gcode.Rs274 import config
+from PythonicGcodeMachine.Gcode.Rs274.Machine import GcodeMachine
 
 ####################################################################################################
 
+machine = GcodeMachine()
+config = machine.config
+
 source_path = pathlib.Path(__file__).absolute().parents[4]
 print('Source:', source_path)
 rst_path = source_path.joinpath('doc', 'sphinx', 'source', 'gcode-reference', 'rs-274')
-- 
GitLab