프로젝트

일반

사용자정보

개정판 1dbb865c

ID1dbb865c2823f9ed52e2d2181b15ede7e96b3881
상위 01ca0061
하위 c7613906

gaqhf 이(가) 6년 이상 전에 추가함

dev issue #563: 라인 연계 로직 수정

차이점 보기:

DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py
224 224 
            startPt = obj.startPoint()
225 225 
            endPt = obj.endPoint()
226 226 
            for i in range(len(self.connectors)):
227 
                if (self.connectors[i].connectedItem is None) and (Point(startPt[0], startPt[1]).distance(Point(self.connectors[i].sceneConnectPoint[0], self.connectors[i].sceneConnectPoint[1])) < toler):
228 
                    self.connectors[i].connectedItem = obj
229 
                    obj.connectors[0].connectedItem = self
227 
                if (Point(startPt[0], startPt[1]).distance(Point(self.connectors[i].sceneConnectPoint[0], self.connectors[i].sceneConnectPoint[1])) < toler):
228 
                    if self.connectors[i].connectedItem is None:
229 
                        self.connectors[i].connectedItem = obj
230 
                    if obj.connectors[0].connectedItem is None:
231 
                        obj.connectors[0].connectedItem = self
232
230 233 
                    res.append(obj)
231 
                if (self.connectors[i].connectedItem is None) and (Point(endPt[0], endPt[1]).distance(Point(self.connectors[i].sceneConnectPoint[0], self.connectors[i].sceneConnectPoint[1])) < toler):
232 
                    self.connectors[i].connectedItem = obj
233 
                    obj.connectors[1].connectedItem = self
234 
                if (Point(endPt[0], endPt[1]).distance(Point(self.connectors[i].sceneConnectPoint[0], self.connectors[i].sceneConnectPoint[1])) < toler):
235 
                    if self.connectors[i].connectedItem is None:
236 
                        self.connectors[i].connectedItem = obj
237 
                    if obj.connectors[1].connectedItem is None:
238 
                        obj.connectors[1].connectedItem = self
239
234 240 
                    res.append(obj)
235 241 
        elif issubclass(type(obj), SymbolSvgItem):
236 242 
            for i in range(len(self.connectors)):
237 243 
                for j in range(len(obj.connectors)):
238 244 
                    _pt = Point(obj.connectors[j].sceneConnectPoint[0], obj.connectors[j].sceneConnectPoint[1])
239 
                    if (self.connectors[i].connectedItem is None) and (_pt.distance(Point(self.connectors[i].sceneConnectPoint[0], self.connectors[i].sceneConnectPoint[1])) < toler):
240 
                        self.connectors[i].connectedItem = obj
241 
                        obj.connectors[j].connectedItem = self
245 
                    if (_pt.distance(Point(self.connectors[i].sceneConnectPoint[0], self.connectors[i].sceneConnectPoint[1])) < toler):
246 
                        if self.connectors[i].connectedItem is None:
247 
                            self.connectors[i].connectedItem = obj
248 
                        if obj.connectors[j].connectedItem is none :
249 
                            obj.connectors[j].connectedItem = self
250 

  		




  242
  251
  
    
                        res.append(obj)


  		




  243
  252
  
    

  		




  244
  253
  
    
        return res


  		












내보내기  Unified diff