Merge branch 'master' into scenarios.

src/Model/Network/Edge.py

@@ -41,9 +41,9 @@ class Edge(SQLSubModel):
         elif name == "id":
             ret = self.pamhyr_id
         elif name == "node1":
-            ret = self.node1.name
+            ret = self.node1
         elif name == "node2":
-            ret = self.node2.name
+            ret = self.node2
         elif name == "enable":
             ret = self._enable
 
@@ -69,10 +69,7 @@ class Edge(SQLSubModel):
 
     @property
     def name(self):
-        name = self._name
-        if self._name == "":
-            name = f"{self.node1.name} -> {self.node2.name}"
-        return name
+        return self._name
 
     def is_enable(self):
         return self._enable

src/Model/Network/Node.py

@@ -26,11 +26,7 @@ class Node(SQLSubModel):
                  **kwargs):
         super(Node, self).__init__(id=id, **kwargs)
 
-        if name == "":
-            self._name = f"Node #{self.pamhyr_id}"
-        else:
-            self._name = name
-
+        self._name = name
         self.pos = Point(x, y)
 
     def __getitem__(self, key):