parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reservoir: Fix delete reservoir (load and display).

scenarios
Pierre-Antoine 2025-09-09 09:39:44 +02:00
parent 1b70e22a58
commit 89a5d78ced
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Reservoir/Reservoir.py
View File

@ -157,7 +157,7 @@ class Data(SQLSubModel):
owner_scenario=owner_scenario owner_scenario=owner_scenario
) )
if deleted: if deleted:
f.set_as_deleted() nd.set_as_deleted()
nd._data = [elevation, surface] nd._data = [elevation, surface]
@ -307,7 +307,7 @@ class Reservoir(SQLSubModel):
owner_scenario=owner_scenario owner_scenario=owner_scenario
) )
if deleted: if deleted:
f.set_as_deleted() new_reservoir.set_as_deleted()
new_reservoir._node = None new_reservoir._node = None
if node_id != -1: if node_id != -1:

9
src/View/Network/GraphWidget.py
View File

@ -73,10 +73,13 @@ class NodeItem(QGraphicsItem):
def shape(self): def shape(self):
path = QPainterPath() path = QPainterPath()
if self.graph.graph._reservoir.get_assoc_to_node(self.node) is None: reservoir = self.graph.graph._reservoir.get_assoc_to_node(self.node)
if reservoir is None or reservoir.is_deleted():
path.addEllipse(-10, -10, 20, 20) path.addEllipse(-10, -10, 20, 20)
else: else:
path.addRect(-10, -10, 20, 20) path.addRect(-10, -10, 20, 20)
return path return path
@timer @timer
@ -98,7 +101,9 @@ class NodeItem(QGraphicsItem):
color = Qt.green color = Qt.green
painter.setBrush(QBrush(color)) painter.setBrush(QBrush(color))
if self.graph.graph._reservoir.get_assoc_to_node(self.node) is None: reservoir = self.graph.graph._reservoir.get_assoc_to_node(self.node)
if reservoir is None or reservoir.is_deleted():
painter.drawEllipse(-10, -10, 20, 20) painter.drawEllipse(-10, -10, 20, 20)
else: else:
painter.drawRect(-10, -10, 20, 20) painter.drawRect(-10, -10, 20, 20)