프로젝트

일반

사용자정보

개정판 7f006591

ID7f0065913b9448ab8432c1fca36975588d0f74b4
상위 9f0676d9
하위 11c4093d

함의성이(가) 약 4년 전에 추가함

issue #1465: load attr for hmb data test

Change-Id: I673c0c31fa53946bea9efb29a65518fd174876f6

차이점 보기:

DTI_PID/DTI_PID/ItemDataExportDialog.py
517 517
            elif not phase:
518 518
                return False
519 519

  
520
            data['PHASE'] = phase
520
            data['PHASE'] = phase if 'PHASE' not in data else data['PHASE']
521 521

  
522 522
            datas = hmb_data.data
523 523

  
......
528 528
                    value_max = matches[0].value_max
529 529
                    value_min = matches[0].value_min
530 530
                    
531
                    data[name] = value
532
                    data[name + '_min'] = value_min
533
                    data[name + '_max'] = value_max
531
                    data[name] = value if name not in data else data[name]
532
                    data[name + '_min'] = value_min if name + '_min' not in data else data[name + '_min']
533
                    data[name + '_max'] = value_max if name + '_max' not in data else data[name + '_max']
534 534

  
535
                    data[name + '_' + matches[0].phase] = value
536
                    data[name + '_' + matches[0].phase + '_min'] = value_min
537
                    data[name + '_' + matches[0].phase + '_max'] = value_max
535
                    data[name + '_' + matches[0].phase] = value if name + '_' + matches[0].phase not in data else data[name + '_' + matches[0].phase]
536
                    data[name + '_' + matches[0].phase + '_min'] = value_min if name + '_' + matches[0].phase + '_min' not in data else data[name + '_' + matches[0].phase + '_min']
537
                    data[name + '_' + matches[0].phase + '_max'] = value_max if name + '_' + matches[0].phase + '_max' not in data else data[name + '_' + matches[0].phase + '_max']
538 538

  
539 539
                    matches = [data for data in datas if data.name == name and data.phase and data.phase != phase]
540 540
                    if matches:
541 541
                        for match in matches:
542
                            data[name + '_' + match.phase] = match.value
543
                            data[name + '_' + match.phase + '_min'] = match.value_min
544
                            data[name + '_' + match.phase + '_max'] = match.value_max
542
                            data[name + '_' + match.phase] = match.value if name + '_' + match.phase not in data else data[name + '_' + match.phase]
543
                            data[name + '_' + match.phase + '_min'] = match.value_min if name + '_' + match.phase + '_min' not in data else data[name + '_' + match.phase + '_min']
544
                            data[name + '_' + match.phase + '_max'] = match.value_max if name + '_' + match.phase + '_max' not in data else data[name + '_' + match.phase + '_max']
545 545

  
546 546
                else:
547 547
                    matches = [data for data in datas if data.name == name]
......
550 550
                        value_max = matches[0].value_max
551 551
                        value_min = matches[0].value_min
552 552
                        
553
                        data[name] = value
554
                        data[name + '_min'] = value_min
555
                        data[name + '_max'] = value_max
553
                        data[name] = value if name not in data else data[name]
554
                        data[name + '_min'] = value_min if name + '_min' not in data else data[name + '_min']
555
                        data[name + '_max'] = value_max if name + '_max' not in data else data[name + '_max']
556 556

  
557 557
            return data
558 558
        except Exception as ex:

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)