Merge branch 'master' into develop

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2021-04-15 CORE 7.5.1
+
+* core-pygui
+    * fixed issues creating and drawing custom nodes
+
 ## 2021-03-11 CORE 7.5.0
 
 * core-daemon

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 # this defines the CORE version number, must be static for AC_INIT
-AC_INIT(core, 7.5.0)
+AC_INIT(core, 7.5.1)
 
 # autoconf and automake initialization
 AC_CONFIG_SRCDIR([netns/version.h.in])

daemon/core/gui/dialogs/customnodes.py

@@ -76,9 +76,9 @@ class ServicesSelectDialog(Dialog):
         button.grid(row=0, column=1, sticky=tk.EW)
 
         # trigger group change
-        self.groups.listbox.event_generate("<<ListboxSelect>>")
+        self.handle_group_change()
 
-    def handle_group_change(self, event: tk.Event) -> None:
+    def handle_group_change(self, event: tk.Event = None) -> None:
         selection = self.groups.listbox.curselection()
         if selection:
             index = selection[0]
@@ -195,7 +195,7 @@ class CustomNodesDialog(Dialog):
             self.image_button.config(image=self.image)
 
     def click_services(self) -> None:
-        dialog = ServicesSelectDialog(self, self.app, self.services)
+        dialog = ServicesSelectDialog(self, self.app, set(self.services))
         dialog.show()
         if dialog.current_services is not None:
             self.services.clear()
@@ -238,12 +238,12 @@ class CustomNodesDialog(Dialog):
             node_draw.model = name
             node_draw.image_file = str(Path(self.image_file).absolute())
             node_draw.image = self.image
-            node_draw.services = self.services
+            node_draw.services = set(self.services)
             logging.debug(
                 "edit custom node (%s), image: (%s), services (%s)",
-                name,
-                self.image_file,
-                self.services,
+                node_draw.model,
+                node_draw.image_file,
+                node_draw.services,
             )
             self.app.core.custom_nodes[name] = node_draw
             self.nodes_list.listbox.delete(self.selected_index)

daemon/core/gui/nodeutils.py

@@ -172,7 +172,7 @@ class NodeDraw:
         node_draw.image_file = custom_node.image
         node_draw.image = images.from_file(custom_node.image, width=images.NODE_SIZE)
         node_draw.node_type = NodeType.DEFAULT
-        node_draw.services = custom_node.services
+        node_draw.services = set(custom_node.services)
         node_draw.label = custom_node.name
         node_draw.model = custom_node.name
         node_draw.tooltip = custom_node.name

daemon/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "core"
-version = "7.5.0"
+version = "7.5.1"
 description = "CORE Common Open Research Emulator"
 authors = ["Boeing Research and Technology"]
 license = "BSD-2-Clause"

docs/install.md

@@ -134,6 +134,9 @@ After installation has completed you should be able to run `core-daemon` and `co
 `install.sh` will attempt to determine your OS by way of `/etc/os-release`, currently it supports
 attempts to install OSs that are debian/redhat like (yum/apt).
 ```shell
+# make sure pip is the latest version before moving forward
+python3 -m pip install -U pip
+
 # clone CORE repo
 git clone https://github.com/coreemu/core.git
 cd core