mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
kp to rk
This commit is contained in:
1 parent
334633f0fb
commit
143f468c26
40 files changed
+353
-353
No files matched your search
@@ -43,8 +43,8 @@ class DIFAdisTSSpec(SQLSubModel):
|
||||
|
||||
self._method = method
|
||||
self._reach = None
|
||||
self._start_kp = None
|
||||
self._end_kp = None
|
||||
self._start_rk = None
|
||||
self._end_rk = None
|
||||
self._dif = None
|
||||
self._b = None
|
||||
self._c = None
|
||||
@@ -60,8 +60,8 @@ class DIFAdisTSSpec(SQLSubModel):
|
||||
dif_default INTEGER NOT NULL,
|
||||
method TEXT NOT NULL,
|
||||
reach INTEGER NOT NULL,
|
||||
start_kp REAL NOT NULL,
|
||||
end_kp REAL NOT NULL,
|
||||
start_rk REAL NOT NULL,
|
||||
end_rk REAL NOT NULL,
|
||||
dif REAL NOT NULL,
|
||||
b REAL,
|
||||
c REAL,
|
||||
@@ -87,7 +87,7 @@ class DIFAdisTSSpec(SQLSubModel):
|
||||
new = []
|
||||
|
||||
table = execute(
|
||||
"SELECT id, dif_default, method, reach, start_kp, end_kp, " +
|
||||
"SELECT id, dif_default, method, reach, start_rk, end_rk, " +
|
||||
"dif, b, c, enabled " +
|
||||
"FROM dif_spec " +
|
||||
f"WHERE dif_default = {data['dif_default_id']} "
|
||||
@@ -97,8 +97,8 @@ class DIFAdisTSSpec(SQLSubModel):
|
||||
id = row[0]
|
||||
method = row[2]
|
||||
reach = row[3]
|
||||
start_kp = row[4]
|
||||
end_kp = row[5]
|
||||
start_rk = row[4]
|
||||
end_rk = row[5]
|
||||
dif = row[6]
|
||||
b = row[7]
|
||||
c = row[8]
|
||||
@@ -111,8 +111,8 @@ class DIFAdisTSSpec(SQLSubModel):
|
||||
)
|
||||
|
||||
new_spec.reach = reach
|
||||
new_spec.start_kp = start_kp
|
||||
new_spec.end_kp = end_kp
|
||||
new_spec.start_rk = start_rk
|
||||
new_spec.end_rk = end_rk
|
||||
new_spec.dif = dif
|
||||
new_spec.b = b
|
||||
new_spec.c = c
|
||||
@@ -128,14 +128,14 @@ class DIFAdisTSSpec(SQLSubModel):
|
||||
sql = (
|
||||
"INSERT INTO " +
|
||||
"dif_spec(id, dif_default, method, reach, " +
|
||||
"start_kp, end_kp, dif, b, c, enabled) " +
|
||||
"start_rk, end_rk, dif, b, c, enabled) " +
|
||||
"VALUES (" +
|
||||
f"{self.id}, " +
|
||||
f"{dif_default}, " +
|
||||
f"'{self._db_format(self._method)}', " +
|
||||
f"{self._reach}, " +
|
||||
f"{self._start_kp}, " +
|
||||
f"{self._end_kp}, " +
|
||||
f"{self._start_rk}, " +
|
||||
f"{self._end_rk}, " +
|
||||
f"{self._dif}, " +
|
||||
f"{self._b}, " +
|
||||
f"{self._c}, " +
|
||||
@@ -165,21 +165,21 @@ class DIFAdisTSSpec(SQLSubModel):
|
||||
self._status.modified()
|
||||
|
||||
@property
|
||||
def start_kp(self):
|
||||
return self._start_kp
|
||||
def start_rk(self):
|
||||
return self._start_rk
|
||||
|
||||
@start_kp.setter
|
||||
def start_kp(self, start_kp):
|
||||
self._start_kp = start_kp
|
||||
@start_rk.setter
|
||||
def start_rk(self, start_rk):
|
||||
self._start_rk = start_rk
|
||||
self._status.modified()
|
||||
|
||||
@property
|
||||
def end_kp(self):
|
||||
return self._end_kp
|
||||
def end_rk(self):
|
||||
return self._end_rk
|
||||
|
||||
@end_kp.setter
|
||||
def end_kp(self, end_kp):
|
||||
self._end_kp = end_kp
|
||||
@end_rk.setter
|
||||
def end_rk(self, end_rk):
|
||||
self._end_rk = end_rk
|
||||
self._status.modified()
|
||||
|
||||
@property
|
||||
|
||||
Reference in new issue
Block a user