/ - Diff - HYTOS - 일정관리

개정판 6d7f2097

ID	6d7f2097d02ddaee4e83c16ca93f97150f0cdd30
상위	3b93962e
하위	cc4ddc30

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

issue #563: inst add line type, add attribute, expression, priority on going

Change-Id: I07c4a36eb650ca10ce866c538bff01ee411510dc

                     table.cellChanged.connect(self.cellValueChanged)
                     self.checkRowAndAddRow(tableName, table)
                 else:
                     table.setColumnCount(4)
                     if not self.inst:
                         table.setColumnCount(4)
                         table.setHorizontalHeaderLabels(['UID', 'Code', 'Desc.', 'Allowables'])
                     else:
                         table.setHorizontalHeaderLabels(['UID', 'Code', 'Symbols', 'New Code'])
                         table.setColumnCount(7)
                         table.setHorizontalHeaderLabels(['UID', 'Code', 'Symbols', 'Attribute', 'New Code', 'Expression', 'Priority'])
                     table.hideColumn(0)
                     self.fill_codes(table, tableDatas)

                     contours, _ = cv2.findContours(image_line, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
                     # skip piping line
                     if len(contours) < 3 or (sum([cv2.contourArea(contour) for contour in contours]) / len(contours)) > max_avg_area * 1.3:
                     if len(contours) < 3 or (sum([cv2.contourArea(contour) for contour in contours]) / len(contours)) > max_avg_area * 2:
                         max_x, max_y, min_x, min_y = 0, 0, sys.maxsize, sys.maxsize
                         for rect in [cv2.boundingRect(contour) for contour in contours]:
                             if rect[0] < min_x:

             """ return new attribute code """
             from AppDocData import AppDocData
             from CodeTables import CodeTable
             from LineTypeConditions import LineTypeConditions
             from EngineeringLineItem import QEngineeringLineItem
             import re
             try:
-...
                     items = [item for item in items[0] if issubclass(type(item), SymbolSvgItem)]
                 table = CodeTable.instance(code_name, inst=True)
                 line_types = [condition.name for condition in LineTypeConditions.items()]
                 new_codes = []
                 for value in table.values:
                     # symbol, line type
                     if not [attr for attr in value[2] if 'attr(' in attr]:
                         for item in items:
                             match = re.search(value[1][0], old_code, re.DOTALL)
                             if (old_code in value[1] or (match and match.start() is 0 and match.end() is len(old_code))) \
                                 and item.name in value[2]:
                                 dx = item.origin[0] - self.origin[0]
                                 dy = item.origin[1] - self.origin[1]
                                 length = math.sqrt(dx*dx + dy*dy)
                                 new_codes.append([length, value[3]])
                         # symbol
                         if not [line_type for line_type in line_types if line_type in value[2]]:
                             for item in items:
                                 match = re.search(value[1][0], old_code, re.DOTALL)
                                 if (old_code in value[1] or (match and match.start() is 0 and match.end() is len(old_code))) \
                                     and item.name in value[2]:
                                     dx = item.origin[0] - self.origin[0]
                                     dy = item.origin[1] - self.origin[1]
                                     length = math.sqrt(dx*dx + dy*dy)
                                     new_codes.append([length, value[3]])
                         # line
                         else:
                             types = [conn.connectedItem.lineType for conn in self.connectors if conn.connectedItem and type(conn.connectedItem) is QEngineeringLineItem]
                             if [line_type for line_type in value[2] if line_type in types]:
                                 new_codes.append([0, value[3]])
                     # self attribute
                     elif len(value[2]) == 1:
                         attr_value = [attr for attr in value[2] if 'attr(' in attr][0].replace('attr(', '')[:-1]
                         for key, _value in self.attrs.items():
                             if _value == attr_value:
                                 new_codes.append([0, value[3]])
                     # symbol + attribute
                     elif len(value[2]) == 2:
                         for item in items:
                             match = re.search(value[1][0], old_code, re.DOTALL)
-...
                                     if _value == attr_value:
                                         new_codes.append([length, value[3]])
                 # default
                 for value in table.values:
                     if old_code in value[1] and len(value[2]) == 1 and value[2][0] == '':
                         new_codes.append([sys.maxsize, value[3]])

DTI_PID/DTI_PID/TextItemFactory.py
123	123	docData.tracerLineNos.append(item)
124	124	elif tagResult[0]:
125	125	item = QEngineeringTagNoTextItem()
	126	text = ''.join(tagResult[1])
126	127	item.setToolTip('TAG NO = {}'.format(text))
127	128	item.setPlainText(text)
128	129	else:

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 6d7f2097