diff --git a/src/Model/BoundaryCondition/BoundaryCondition.py b/src/Model/BoundaryCondition/BoundaryCondition.py index fd62afe9..452fdd65 100644 --- a/src/Model/BoundaryCondition/BoundaryCondition.py +++ b/src/Model/BoundaryCondition/BoundaryCondition.py @@ -128,7 +128,8 @@ class BoundaryCondition(SQLSubModel): bc.node = None if row[3] != -1: - bc.node = next(filter(lambda n: n.id == row[3], data["nodes"])) + bc.node = next(filter(lambda n: n.id == row[3], data["nodes"]), + None) values = execute( "SELECT ind, data0, data1 FROM boundary_condition_data " + diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py index 313ad430..ed957137 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py +++ b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py @@ -106,8 +106,13 @@ class BoundaryConditionAdisTS(SQLSubModel): bc.node = None if row[3] != -1: - bc.node = next(filter( - lambda n: n.id == row[3], data["nodes"])).id + tmp = next(filter( + lambda n: n.id == row[3], data["nodes"]), + None) + if tmp != None: + bc.node = tmp.id + else: + bc.node = -1 values = execute( "SELECT data0, data1 FROM " + diff --git a/src/View/BoundaryConditionsAdisTS/Table.py b/src/View/BoundaryConditionsAdisTS/Table.py index b0676a67..e5554256 100644 --- a/src/View/BoundaryConditionsAdisTS/Table.py +++ b/src/View/BoundaryConditionsAdisTS/Table.py @@ -146,7 +146,12 @@ class TableModel(PamhyrTableModel): n = data[row].node if n is None: return self._trad["not_associated"] - return next(filter(lambda x: x.id == n, self._data._nodes)).name + tmp = next(filter(lambda x: x.id == n, self._data._nodes), + None) + if tmp != None: + return tmp.name + else: + return self._trad["not_associated"] elif self._headers[column] == "pol": n = data[row].pollutant if n is None or n == "not_associated" or n == "":