프로젝트

일반

사용자정보

개정판 acc497e8

IDacc497e87a219dfcbef047122bd3b3de58fa1d8a
상위 0a67282a
하위 1413f8e6, c13fb6ef

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

issue #563: fix max recursive

Change-Id: I7adfb08dc04415a4ece1f4a194a5b9db4d70a288

차이점 보기:

DTI_PID/DTI_PID/MainWindow.py
631 631
                item) is not QEngineeringLineNoTextItem and type(item) is not QEngineeringUnknownItem]
632 632
            db_items.extend([item for item in items if type(item) is QEngineeringLineNoTextItem])
633 633
            db_items.extend([line for line in appDocData.tracerLineNos if type(line) is QEngineeringTrimLineNoTextItem])
634
            #db_items.extend(titleBlockItems)
634
            db_items.extend(titleBlockItems)
635 635
            configs = appDocData.getConfigs('Data Load', 'Xml First')
636 636
            if configs and int(configs[0].value) is 1:
637 637
                db_items.extend([item for item in items if type(item) is QEngineeringUnknownItem])
......
1909 1909
            for match in matches:
1910 1910
                if item is match.prop('From'):
1911 1911
                    match.set_property('From', None)
1912
                elif item is match.prop('To'):
1912
                if item is match.prop('To'):
1913 1913
                    match.set_property('To', None)
1914 1914

  
1915 1915
                for run in match.runs:
......
2131 2131
                    continue
2132 2132

  
2133 2133
                for textInfo in textInfos[1]:
2134
                    x = textInfo.getX()
2135
                    y = textInfo.getY()
2136
                    width = textInfo.getW()
2137
                    height = textInfo.getH()
2138
                    angle = round(math.radians(textInfo.getAngle()), 2)
2139
                    text = textInfo.getText()
2134
                    x = textInfo[1][0].getX()
2135
                    y = textInfo[1][0].getY()
2136
                    width = textInfo[1][0].getW()
2137
                    height = textInfo[1][0].getH()
2138
                    angle = round(math.radians(textInfo[1][0].getAngle()), 2)
2139
                    text = textInfo[1][0].getText()
2140 2140
                    item = TextItemFactory.instance().createTextItem(textInfo)
2141 2141

  
2142 2142
                    if item is not None:
2143 2143
                        item.loc = [x, y]
2144 2144
                        item.size = (width, height)
2145 2145
                        item.angle = angle
2146
                        item.area = textInfos[0]
2146
                        item.area = textInfo[0]
2147 2147
                        # self.addTextItemToScene(item)
2148 2148
                        # appDocData.texts.append(item)
2149 2149
                        appDocData.allItems.append(item)
DTI_PID/DTI_PID/Shapes/EngineeringInstrumentItem.py
193 193
                        if self.add_assoc_item(attr):
194 194
                            attr.owner = self  # set owner of text
195 195

  
196
                elif issubclass(type(attr), SymbolSvgItem):
196
                elif False: #issubclass(type(attr), SymbolSvgItem):
197 197
                    dx = attr.center().x() - center.x()
198 198
                    dy = attr.center().y() - center.y()
199 199

  

내보내기 Unified diff

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