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

HydraulicStructure: Rename enable to enabled.

setup.py
Pierre-Antoine Rouby 2023-12-05 14:02:10 +01:00
parent 0a780e5f78
commit af4cce96ef
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Model/HydraulicStructures/Basic/HydraulicStructures.py
View File

@ -48,7 +48,7 @@ class BasicHS(SQLSubModel):
self._name = name
self._type = ""
self._enable = True
self._enabled = True
self._data = []
BasicHS._id_cnt = max(BasicHS._id_cnt + 1, self.id)
@ -60,7 +60,7 @@ class BasicHS(SQLSubModel):
id INTEGER NOT NULL PRIMARY KEY,
name TEXT NOT NULL,
type TEXT NOT NULL,
enable BOOLEAN NOT NULL,
enabled BOOLEAN NOT NULL,
hs INTEGER,
FOREIGN KEY(hs) REFERENCES hydraulic_structures(id)
)
@ -91,7 +91,7 @@ class BasicHS(SQLSubModel):
new = []
table = execute(
"SELECT id, name, type, enable, hs " +
"SELECT id, name, type, enabled, hs " +
"FROM hydraulic_structures "
)
@ -99,7 +99,7 @@ class BasicHS(SQLSubModel):
bhs_id = row[0]
name = row[1]
type = row[2]
enable = (row[3] == 1)
enabled = (row[3] == 1)
hs_id = row[4]
ctor = cls._get_ctor_from_type(type)
@ -109,7 +109,7 @@ class BasicHS(SQLSubModel):
status=data['status']
)
bhs.enable = enable
bhs.enabled = enabled
data['bhs_id'] = bhs_id
bhs._data = BasicHSValue._db_load(
@ -129,12 +129,12 @@ class BasicHS(SQLSubModel):
sql = (
"INSERT INTO " +
"hydraulic_structures_basic(id, name, type, enable, hs) " +
"hydraulic_structures_basic(id, name, type, enabled, hs) " +
"VALUES (" +
f"{self.id}, " +
f"'{self._db_format(self._name)}', " +
f"'{self._db_format(self._type)}', " +
f"{self._db_format(self.enable)}, " +
f"{self._db_format(self.enabled)}, " +
f"{hs_id} " +
")"
)
@ -173,12 +173,12 @@ class BasicHS(SQLSubModel):
self._status.modified()
@property
def enable(self):
return self._enable
def enabled(self):
return self._enabled
@enable.setter
def enable(self, enable):
self._enable = enable
@enabled.setter
def enabled(self, enabled):
self._enabled = enabled
self._status.modified()
@property

24
src/Model/HydraulicStructures/HydraulicStructures.py
View File

@ -49,7 +49,7 @@ class HydraulicStructure(SQLSubModel):
self._output_kp = None
self._input_reach = None
self._output_reach = None
self._enable = True
self._enabled = True
self._data = []
HydraulicStructure._id_cnt = max(HydraulicStructure._id_cnt + 1, self.id)
@ -60,7 +60,7 @@ class HydraulicStructure(SQLSubModel):
CREATE TABLE hydraulic_structures(
id INTEGER NOT NULL PRIMARY KEY,
name TEXT NOT NULL,
enable BOOLEAN NOT NULL,
enabled BOOLEAN NOT NULL,
input_kp INTEGER,
output_kp INTEGER,
input_reach INTEGER,
@ -86,7 +86,7 @@ class HydraulicStructure(SQLSubModel):
new = []
table = execute(
"SELECT id, name, enable, " +
"SELECT id, name, enabled, " +
"input_kp, output_kp, " +
"input_reach, output_reach " +
"FROM hydraulic_structures "
@ -97,7 +97,7 @@ class HydraulicStructure(SQLSubModel):
hs_id = next(it)
name = next(it)
enable = (next(it) == 1)
enabled = (next(it) == 1)
input_kp = next(it)
output_kp = next(it)
input_reach_id = next(it)
@ -109,7 +109,7 @@ class HydraulicStructure(SQLSubModel):
status=data['status']
)
hs.enable = enable
hs.enabled = enabled
hs.input_kp = input_kp
hs.output_kp = output_kp
@ -143,12 +143,12 @@ class HydraulicStructure(SQLSubModel):
sql = (
"INSERT INTO " +
"hydraulic_structures(" +
" id, name, enable, input_kp, output_kp, " +
" id, name, enabled, input_kp, output_kp, " +
" input_reach, output_reach" +
") " +
"VALUES (" +
f"{self.id}, '{self._db_format(self._name)}', " +
f"{self._db_format(self.enable)}, " +
f"{self._db_format(self.enabled)}, " +
f"{self.input_kp}, {self.input_kp}, " +
f"{input_reach_id}, {output_reach_id}" +
")"
@ -192,12 +192,12 @@ class HydraulicStructure(SQLSubModel):
self._status.modified()
@property
def enable(self):
return self._enable
def enabled(self):
return self._enabled
@enable.setter
def enable(self, enable):
self._enable = enable
@enabled.setter
def enabled(self, enabled):
self._enabled = enabled
self._status.modified()
@property