Pamhyr2: Some fixes to prepare db update to 0.1.0.

src/Model/Network/Edge.py

@@ -20,24 +20,15 @@ from Model.Network.Node import Node
 
 
 class Edge(object):
-    _id_cnt = 0
-
     def __init__(self, id: int, name: str,
                  node1: Node = None,
                  node2: Node = None,
                  status=None):
-        super(Edge, self).__init__()
+        super(Edge, self).__init__(id)
 
         self._status = status
 
-        if id == -1:
-            type(self)._id_cnt += 1
-            self.id = type(self)._id_cnt
-        else:
-            self.id = id
-
         self._name = name
-
         self.node1 = node1
         self.node2 = node2
 
@@ -49,7 +40,7 @@ class Edge(object):
         if name == "name":
             ret = self.name
         elif name == "id":
-            ret = self.id
+            ret = self.pamhyr_id
         elif name == "node1":
             ret = self.node1.name
         elif name == "node2":
@@ -63,7 +54,7 @@ class Edge(object):
         if name == "name":
             self._name = value
         elif name == "id":
-            self.id = value
+            self.pamhyr_id = value
         elif name == "node1":
             self.node1 = value
         elif name == "node2":
@@ -73,6 +64,10 @@ class Edge(object):
 
         self._status.modified()
 
+    @property
+    def id(self):
+        return self.pamhyr_id
+
     @property
     def name(self):
         name = self._name

src/Model/Network/Node.py

@@ -20,23 +20,15 @@ from Model.Network.Point import Point
 
 
 class Node(object):
-    _id_cnt = 0
-
     def __init__(self, id: int, name: str,
                  x: float = 0.0, y: float = 0.0,
                  status=None):
-        super(Node, self).__init__()
+        super(Node, self).__init__(id)
 
         self._status = status
 
-        if id == -1:
-            type(self)._id_cnt += 1
-            self.id = type(self)._id_cnt
-        else:
-            self.id = id
-
         if name == "":
-            self._name = f"Node {self.id}"
+            self._name = f"Node #{self.pamhyr_id}"
         else:
             self._name = name
 
@@ -48,7 +40,7 @@ class Node(object):
         if key == "name":
             ret = self._name
         elif key == "id":
-            ret = self.id
+            ret = self.pamhyr_id
         elif key == "pos":
             ret = f"({self.pos.x},{self.pos.y})"
 
@@ -58,7 +50,7 @@ class Node(object):
         if key == "name":
             self._name = value
         elif key == "id":
-            self.id = value
+            self.pamhyr_id = value
 
         self._status.modified()