개정판 cfb63645
issue #1461: min max ongoing
Change-Id: Id05ad2ac81eb8034da3f819d8edb2dc3cfa90f7e
DTI_PID/DTI_PID/HMBDialog.py | ||
---|---|---|
125 | 125 |
name = value_ if value_ else '' |
126 | 126 |
|
127 | 127 |
if name in self.keywords and name != name_type: |
128 |
name_type = self.keywords_match[self.keywords.index(name)]
|
|
128 |
name_type = self.keywords_match[self.keywords.index(name)] |
|
129 | 129 |
continue |
130 | 130 |
|
131 | 131 |
value_ = df.iloc[row, 1] |
... | ... | |
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: |
144 | 144 |
for sheet in sheets[1:]: |
145 |
value_ = df.iloc[row, col] |
|
145 |
sheets_name_x, df_x = sheet |
|
146 |
value_ = df_x.iloc[row, col] |
|
146 | 147 |
value = value_ if (type(value_) is str) or (type(value_) is float and not math.isnan(value_)) \ |
147 | 148 |
else '' |
148 | 149 |
if value and type(value) is float: |
DTI_PID/DTI_PID/ItemDataExportDialog.py | ||
---|---|---|
488 | 488 |
for data in hmb_datas[0].data: |
489 | 489 |
if data.name not in names: |
490 | 490 |
names.append(data.name) |
491 |
names.append(data.name + '_min') |
|
492 |
names.append(data.name + '_max') |
|
491 | 493 |
header_list.extend(names) |
492 | 494 |
|
493 | 495 |
return header_list |
... | ... | |
527 | 529 |
matches = [data for data in datas if data.name == name and data.phase == phase] |
528 | 530 |
if matches: |
529 | 531 |
value = matches[0].value |
532 |
value_max = matches[0].value_max |
|
533 |
value_min = matches[0].value_min |
|
534 |
|
|
530 | 535 |
data[name] = value |
536 |
data[name + '_min'] = value_min |
|
537 |
data[name + '_max'] = value_max |
|
538 |
|
|
531 | 539 |
else: |
532 | 540 |
matches = [data for data in datas if data.name == name] |
533 | 541 |
if matches: |
534 | 542 |
value = matches[0].value |
543 |
value_max = matches[0].value_max |
|
544 |
value_min = matches[0].value_min |
|
545 |
|
|
535 | 546 |
data[name] = value |
547 |
data[name + '_min'] = value_min |
|
548 |
data[name + '_max'] = value_max |
|
536 | 549 |
|
537 | 550 |
return dataList |
538 | 551 |
|
내보내기 Unified diff