프로젝트

일반

사용자정보

개정판 f70c69e8

IDf70c69e865435360abc210bec8dce1f0f75a50fb
상위 436fcd01
하위 311c0f13

백흠경이(가) 약 5년 전에 추가함

issue #581: allow to input delimiter character to line no configuration

Change-Id: Ida2a3f6eaeed7426360227f20e3d5e58d6c1833d

차이점 보기:

DTI_PID/DTI_PID/ConfigurationDialog.py
1 1
# coding: utf-8
2
""" This is Configuratio dialog module """
2
""" This is Configuration dialog module """
3 3

  
4
import io
4 5
import os
5 6
import sys
6 7
from PyQt5.QtCore import *
......
22 23

  
23 24

  
24 25
class QConfigurationDialog(QDialog):
26
    ESCAPE_CHAR = '^'
27

  
25 28
    """ 
26 29
        @history    humkyung 2018.05.05 read configuration for instrument and opc tag no rule
27 30
                    humkyung 2018.05.09 read line no tag rule configuration
......
34 37
    """
35 38

  
36 39
    def __init__(self, parent):
40
        import csv
37 41
        from LineTypeConditions import LineTypeConditions
38 42

  
39 43
        QDialog.__init__(self, parent)
......
107 111
            configs) else self.ui.spinBoxFlowMarkLength.setValue(200)
108 112

  
109 113
        configs = docData.getConfigs('Filter', 'MinimumSize')
110
        self.ui.spinBoxMinimumSize.setValue(int(configs[0].value)) if 1 == len(
111
            configs) else self.ui.spinBoxMinimumSize.setValue(30)
114
        self.ui.spinBoxMinimumSize.setValue(int(configs[0].value)) if 1 == len(configs) else \
115
            self.ui.spinBoxMinimumSize.setValue(30)
112 116
        configs = docData.getConfigs('Filter', 'ErodeSize')
113
        self.ui.spinBoxUnrecognitionIgnoreStep.setValue(int(configs[0].value)) if 1 == len(
114
            configs) else self.ui.spinBoxUnrecognitionIgnoreStep.setValue(3)
117
        self.ui.spinBoxUnrecognitionIgnoreStep.setValue(int(configs[0].value)) if 1 == len(configs) else \
118
            self.ui.spinBoxUnrecognitionIgnoreStep.setValue(3)
115 119
        configs = docData.getConfigs('Filter', 'DilateSize')
116 120
        self.ui.spinBoxDilateSize.setValue(int(configs[0].value)) if 1 == len(
117 121
            configs) else self.ui.spinBoxDilateSize.setValue(0)
......
232 236
            index = 0
233 237
            for lineNo in configs[0].value.split(self.lineNoDelimiter):
234 238
                displayLineNo = ''
235
                for value in lineNo.split(self.delimiter):
239

  
240
                values = list(csv.reader([lineNo], delimiter=self.delimiter,
241
                                         escapechar=QConfigurationDialog.ESCAPE_CHAR))[0]
242
                for value in values:
236 243
                    lineProp = docData.getLinePropertiesByUID(value)
237 244
                    if lineProp:
238 245
                        displayLineNo = displayLineNo + lineProp[0].DisplayAttribute
......
1049 1056

  
1050 1057
            # Line No Configuration
1051 1058
            sizeUnit = None
1052
            configuration = None
1059
            configuration = []
1053 1060
            lineInsideDelimiter = None
1054 1061
            for i in range(self.ui.listWidgetLineNo.count()):
1055 1062
                item = self.ui.listWidgetLineNo.item(i)
1056
                if configuration is None:
1063
                if not configuration:
1057 1064
                    sizeUnit = item.tag[0]
1058 1065
                    configuration = item.tag[1]
1059 1066
                    lineInsideDelimiter = item.tag[2]

내보내기 Unified diff

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