Port to wx python 4.2.1 and Python3 (#2)

* Bump version to 3.4
* Refactor majority of UI to use wxPython 4.2.1
* Update workflow yml to include required build dependancies
* Add wxPython to setup dependancies

Author: chrisinabox

.github/workflows/python-package.yml

@@ -22,6 +22,9 @@ jobs:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
         cache-dependency-path: '**/setup.py'
+    - name: Install gtk3
+      run: |
+        sudo apt install libgtk-3-dev
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel

.github/workflows/python-publish.yml

@@ -30,6 +30,9 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+    - name: Install gtk3
+      run: |
+        sudo apt install libgtk-3-dev
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools wheel

setup.py

@@ -30,7 +30,7 @@
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='3.3.post1',  # Required
+    version='3.4.post1',  # Required
 
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field:
@@ -148,6 +148,7 @@
         'jsonschema',
         'colorama',
         'deepdiff',
+        'wxPython',
     ],
 
     # List additional groups of dependencies here (e.g. development

src/objdictgen/__init__.py

@@ -27,7 +27,7 @@
 LoadJson = Node.LoadJson
 
 ODG_PROGRAM = "odg"
-ODG_VERSION = "3.3"
+ODG_VERSION = "3.4"
 
 SCRIPT_DIRECTORY = os.path.split(__file__)[0]
 

src/objdictgen/node.py

@@ -984,7 +984,7 @@ def GetTypeList(self):
         list_ = Find.TypeList(MAPPING_DICTIONARY)
         for mapping in self.GetMappings():
             list_.extend(Find.TypeList(mapping))
-        return ",".join(sorted(list_))
+        return list_
 
     def GenerateMapName(self, name, index, subindex):  # pylint: disable=unused-argument
         return "%s (0x%4.4X)" % (name, index)
@@ -1036,7 +1036,7 @@ def GetMapList(self):
         Return the list of variables that can be mapped for the current node
         """
         list_ = ["None"] + [self.GenerateMapName(name, index, subindex) for index, subindex, size, name in self.GetMapVariableList()]
-        return ",".join(list_)
+        return list_
 
     def GetAllParameters(self, sort=False):
         """ Get a list of all the parameters """

src/objdictgen/nodemanager.py

@@ -335,14 +335,14 @@ def AddSubentriesToCurrent(self, index, number, node=None):
             default = subentry_infos["default"]
         else:
             default = self.GetTypeDefaultValue(subentry_infos["type"])
-        # First case entry is record
+        # First case entry is array
         if infos["struct"] & OD.IdenticalSubindexes:
             for i in range(1, min(number, subentry_infos["nbmax"] - length) + 1):
                 node.AddEntry(index, length + i, default)
             if not disable_buffer:
                 self.BufferCurrentNode()
             return
-        # Second case entry is array, only possible for manufacturer specific
+        # Second case entry is record (and array), only possible for manufacturer specific
         if infos["struct"] & OD.MultipleSubindexes and 0x2000 <= index <= 0x5FFF:
             values = {"name": "Undefined", "type": 5, "access": "rw", "pdo": True}
             for i in range(1, min(number, 0xFE - length) + 1):
@@ -363,8 +363,8 @@ def RemoveSubentriesFromCurrent(self, index, number):
             nbmin = infos["nbmin"]
         else:
             nbmin = 1
-        # Entry is a record, or is an array of manufacturer specific
-        if infos["struct"] & OD.IdenticalSubindexes or 0x2000 <= index <= 0x5FFF and infos["struct"] & OD.IdenticalSubindexes:
+        # Entry is an array, or is an array/record of manufacturer specific
+        if infos["struct"] & OD.IdenticalSubindexes or 0x2000 <= index <= 0x5FFF and infos["struct"] & OD.MultipleSubindexes:
             for i in range(min(number, length - nbmin)):
                 self.RemoveCurrentVariable(index, length - i)
             self.BufferCurrentNode()
@@ -1043,10 +1043,14 @@ def GetNodeEntryValues(self, node, index):
                                 dic["buffer_size"] = ""
                                 try:
                                     fmt = "0x%0" + str(int(values[1]) // 4) + "X"
-                                    dic["value"] = fmt % dic["value"]
                                 except ValueError as exc:
                                     log.debug("ValueError: '%s': %s" % (values[1], exc))
                                     raise  # FIXME: Originial code swallows exception
+                                try:
+                                    dic["value"] = fmt % dic["value"]
+                                except TypeError as exc:
+                                    log.debug("ValueError: '%s': %s" % (dic["value"], exc))
+                                    pass # FIXME: dict["value"] can contain $NODEID for PDOs which is not an int i.e. $NODEID+0x200
                                 editor["value"] = "string"
                             if values[0] == "INTEGER":
                                 editor["value"] = "number"