개정판 33b2ea2b
issue #1465: min max test
Change-Id: I1e5eff4951109a0d8c9d37acc0720b0ad692d3ed
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 2520 | 2520 |
"""save hmb data value""" |
| 2521 | 2521 |
index = 0 |
| 2522 | 2522 |
for data in hmb.data: |
| 2523 |
sql = f"insert into HMB_Value(UID, HMB_LIST_UID, Stream_No_UID, Value) values(?,?,?,?)"
|
|
| 2524 |
params = (str(uuid.uuid4()), list_uids[index], hmb.uid, data.value) |
|
| 2523 |
sql = f"insert into HMB_Value(UID, HMB_LIST_UID, Stream_No_UID, Value, Value_Min, Value_max) values(?,?,?,?,?,?)"
|
|
| 2524 |
params = (str(uuid.uuid4()), list_uids[index], hmb.uid, data.value, data.value_min, data.value_max)
|
|
| 2525 | 2525 |
cursor.execute(sql, params) |
| 2526 | 2526 |
index = index + 1 |
| 2527 | 2527 |
|
| ... | ... | |
| 2545 | 2545 |
with app_doc_data.project.database.connect() as conn: |
| 2546 | 2546 |
try: |
| 2547 | 2547 |
cursor = conn.cursor() |
| 2548 |
sql = f"SELECT v.Value, r.Name, r.Unit, r.[index], r.[Type], s.Stream_No, s.[From], s.[To], s.UID, s.[Type] as Phase FROM " \ |
|
| 2548 |
sql = f"SELECT v.Value, v.Value_Min, v.Value_Max, r.Name, r.Unit, r.[index], r.[Type], s.Stream_No, s.[From], s.[To], s.UID, s.[Type] as Phase FROM " \
|
|
| 2549 | 2549 |
f"HMB_VALUE v " \ |
| 2550 | 2550 |
f"INNER JOIN HMB_LIST r ON v.HMB_LIST_UID=r.UID " \ |
| 2551 | 2551 |
f"INNER JOIN Stream_No s ON v.Stream_No_UID=s.UID " \ |
| DTI_PID/DTI_PID/HMBDialog.py | ||
|---|---|---|
| 136 | 136 |
|
| 137 | 137 |
# find min max value |
| 138 | 138 |
value_normal = value |
| 139 |
value_max = None
|
|
| 140 |
value_min = None
|
|
| 139 |
value_max = ''
|
|
| 140 |
value_min = ''
|
|
| 141 | 141 |
|
| 142 | 142 |
#if value_normal and value_normal != '-' and len(sheets) > 1: |
| 143 | 143 |
if value_normal and type(value_normal) is float and len(sheets) > 1: |
| ... | ... | |
| 152 | 152 |
continue |
| 153 | 153 |
|
| 154 | 154 |
if diff > 0: |
| 155 |
if value_min is None or value < value_min:
|
|
| 155 |
if value_min == '' or value < value_min:
|
|
| 156 | 156 |
value_min = value |
| 157 | 157 |
elif diff < 0: |
| 158 |
if value_max is None or value > value_max:
|
|
| 158 |
if value_max == '' or value > value_max:
|
|
| 159 | 159 |
value_max = value |
| 160 | 160 |
|
| 161 |
data.append(StreamData(name, unit, value_normal, row, name_type, value_max, value_min))
|
|
| 161 |
data.append(StreamData(name, unit, value_normal, row, name_type, value_min, value_max))
|
|
| 162 | 162 |
|
| 163 | 163 |
hmb.data = data |
| 164 | 164 |
hmb_list.append(hmb) |
| DTI_PID/DTI_PID/HMBTable.py | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
|
| 9 | 9 |
class StreamData: |
| 10 |
def __init__(self, name, unit='', value='', index=0, phase='', value_max='', value_min=''):
|
|
| 10 |
def __init__(self, name, unit='', value='', index=0, phase='', value_min='', value_max=''):
|
|
| 11 | 11 |
self.name = name |
| 12 | 12 |
self.unit = unit |
| 13 | 13 |
self.value = value |
| 14 | 14 |
self.index = index |
| 15 | 15 |
self.phase = phase |
| 16 |
self.value_max = value_max |
|
| 17 | 16 |
self.value_min = value_min |
| 17 |
self.value_max = value_max |
|
| 18 | 18 |
|
| 19 | 19 |
|
| 20 | 20 |
class HMBData: |
| ... | ... | |
| 122 | 122 |
value = _data['Value'] |
| 123 | 123 |
index = _data['index'] |
| 124 | 124 |
phase = _data['Type'] |
| 125 |
hmb_data.append(StreamData(name, unit, value, index, phase)) |
|
| 125 |
value_min = _data['Value_Min'] if _data['Value_Min'] else '' |
|
| 126 |
value_max = _data['Value_Max'] if _data['Value_Max'] else '' |
|
| 127 |
hmb_data.append(StreamData(name, unit, value, index, phase, value_min, value_max)) |
|
| 126 | 128 |
|
| 127 | 129 |
hmb.data = hmb_data |
| 128 | 130 |
hmbs.append(hmb) |
| DTI_PID/DTI_PID/Scripts/MSSQL/ID2.sql | ||
|---|---|---|
| 3266 | 3266 |
[HMB_LIST_UID] VARCHAR ( 37 ), |
| 3267 | 3267 |
[Stream_No_UID] VARCHAR ( 37 ), |
| 3268 | 3268 |
[Value] VARCHAR ( 37 ), |
| 3269 |
[Value_Min] VARCHAR ( 37 ), |
|
| 3270 |
[Value_Max] VARCHAR ( 37 ), |
|
| 3269 | 3271 |
PRIMARY KEY([UID]), |
| 3270 | 3272 |
FOREIGN KEY([Stream_No_UID]) REFERENCES [Stream_No]([UID]) ON DELETE CASCADE, |
| 3271 | 3273 |
FOREIGN KEY([HMB_LIST_UID]) REFERENCES [HMB_LIST]([UID]) ON DELETE CASCADE |
| DTI_PID/DTI_PID/Scripts/SQLite_Project.tables.sql | ||
|---|---|---|
| 109 | 109 |
`HMB_LIST_UID` VARCHAR ( 37 ), |
| 110 | 110 |
`Stream_No_UID` VARCHAR ( 37 ), |
| 111 | 111 |
`Value` VARCHAR ( 37 ), |
| 112 |
`Value_Min` VARCHAR ( 37 ), |
|
| 113 |
`Value_Max` VARCHAR ( 37 ), |
|
| 112 | 114 |
PRIMARY KEY(`UID`), |
| 113 | 115 |
FOREIGN KEY(`Stream_No_UID`) REFERENCES `Stream_No`(`UID`) ON DELETE CASCADE, |
| 114 | 116 |
FOREIGN KEY(`HMB_LIST_UID`) REFERENCES `HMB_LIST`(`UID`) ON DELETE CASCADE |
내보내기 Unified diff
