개정판 1f81e32d
edit issue #581: 라인 색상 설정에서 Tag Seq No 제거 / Nominal Diameter Sort 변경
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 1140 | 1140 |
kyouho 2018.07.04 forCheckLineNumber get only inch or metric |
| 1141 | 1141 |
kyouho 2018.07.16 edit query order by code |
| 1142 | 1142 |
''' |
| 1143 |
def getNomialPipeSizeData(self, forCheckLineNumber = False): |
|
| 1143 |
def getNomialPipeSizeData(self, forCheckLineNumber = False, orderStr = "CODE"):
|
|
| 1144 | 1144 |
res = [] |
| 1145 | 1145 |
try: |
| 1146 | 1146 |
configs = self.getConfigs('Line No', 'Size Unit')
|
| ... | ... | |
| 1152 | 1152 |
# Get a cursor object |
| 1153 | 1153 |
cursor = conn.cursor() |
| 1154 | 1154 |
|
| 1155 |
sql = "select Code,Metric,Inch,InchStr,MetricStr from 'NOMINAL PIPE SIZE' ORDER BY CODE ASC"
|
|
| 1155 |
sql = "select Code,Metric,Inch,InchStr,MetricStr from 'NOMINAL PIPE SIZE' ORDER BY {} ASC".format(orderStr)
|
|
| 1156 | 1156 |
cursor.execute(sql) |
| 1157 | 1157 |
rows = cursor.fetchall() |
| 1158 | 1158 |
for row in rows: |
| DTI_PID/DTI_PID/ConfigurationDialog.py | ||
|---|---|---|
| 123 | 123 |
properties = docData.getLineProperties() |
| 124 | 124 |
for prop in properties: |
| 125 | 125 |
self.ui.comboBoxProperties.addItem(prop) |
| 126 |
self.ui.comboBoxColorOption.addItem(prop) |
|
| 126 |
if prop != "Tag Seq No": |
|
| 127 |
self.ui.comboBoxColorOption.addItem(prop) |
|
| 127 | 128 |
|
| 128 | 129 |
configs = docData.getConfigs('Line No', 'Configuration')
|
| 129 | 130 |
if len(configs) == 1 and configs[0].value is not None: |
| ... | ... | |
| 261 | 262 |
# Size 표기 가져옴 |
| 262 | 263 |
configs = docData.getConfigs('Line No', 'Size Unit')
|
| 263 | 264 |
# Size 관련 Table 가져옴 |
| 264 |
result = docData.getNomialPipeSizeData() |
|
| 265 |
result = docData.getNomialPipeSizeData(False, "Metric")
|
|
| 265 | 266 |
|
| 266 | 267 |
for pipeSize in result: |
| 267 | 268 |
if not pipeSize.inchStr or not pipeSize.metricStr: |
내보내기 Unified diff
