프로젝트

일반

사용자정보

개정판 b389e939

IDb389e9396e7594fe02bd44d465bee81dabf79d62
상위 61943ed9
하위 553d54e4

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

issue #000: fix point scene point

Change-Id: Ia499e69e3a393436353ae9e54c9690fd82a4e248

차이점 보기:

DTI_PID/DTI_PID/AppDocData.py
2745 2745
                conn.rollback()
2746 2746

  
2747 2747
                from App import App
2748
                print(sql)
2748
                #print(sql)
2749 2749
                message = 'error occured({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename, sys.exc_info()[-1].tb_lineno)
2750 2750
                App.mainWnd().addMessage.emit(MessageType.Error, message)
2751 2751

  
DTI_PID/DTI_PID/Scripts/SymbolAttribute.sql
21 21
);
22 22

  
23 23

  
24
INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '3bf98d8c-5736-4b4a-8008-deb36e09056b',-1,'LineType','Line Type','String',0 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='LineType' AND SymbolType_UID=-1);
25
INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '2c413303-cc5a-4d4c-af24-a837041276f4',-1,'Thickness','Thickness','Int',1 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='Thickness' AND SymbolType_UID=-1);
26
INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT 'b8f6c3a5-4abb-462b-b90f-66afac591aab',-1,'FlowMark','Flow Mark','String',2 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='FlowMark' AND SymbolType_UID=-1);
27
INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '60c3f3bc-a69d-42b2-b198-9b6ee0dd2594',-1,'LineIndicator','Line Indicator','String',3 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='LineIndicator' AND SymbolType_UID=-1);
28
INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '86699578-706a-4158-b636-6b5dc8a11ad7',-1,'From','From','String',4 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='From' AND SymbolType_UID=-1);
29
INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '3329313c-cd06-4b89-a10b-795dcdf5830f',-1,'To','To','Int',5 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='To' AND SymbolType_UID=-1);
30
INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '61190fa0-8074-4f25-8b47-8b0b686e1ede',-1,'Freeze','Freeze','Int',6 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='Freeze' AND SymbolType_UID=-1);
24
--INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '3bf98d8c-5736-4b4a-8008-deb36e09056b',-1,'LineType','Line Type','String',0 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='LineType' AND SymbolType_UID=-1);
25
--INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '2c413303-cc5a-4d4c-af24-a837041276f4',-1,'Thickness','Thickness','Int',1 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='Thickness' AND SymbolType_UID=-1);
26
--INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT 'b8f6c3a5-4abb-462b-b90f-66afac591aab',-1,'FlowMark','Flow Mark','String',2 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='FlowMark' AND SymbolType_UID=-1);
27
--INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '60c3f3bc-a69d-42b2-b198-9b6ee0dd2594',-1,'LineIndicator','Line Indicator','String',3 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='LineIndicator' AND SymbolType_UID=-1);
28
--INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '86699578-706a-4158-b636-6b5dc8a11ad7',-1,'From','From','String',4 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='From' AND SymbolType_UID=-1);
29
--INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '3329313c-cd06-4b89-a10b-795dcdf5830f',-1,'To','To','Int',5 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='To' AND SymbolType_UID=-1);
30
--INSERT INTO SymbolAttribute(UID,SymbolType_UID,Attribute,DisplayAttribute,AttributeType,[Index]) SELECT '61190fa0-8074-4f25-8b47-8b0b686e1ede',-1,'Freeze','Freeze','Int',6 FROM SymbolAttribute WHERE not EXISTS(SELECT 1 FROM SymbolAttribute WHERE Attribute='Freeze' AND SymbolType_UID=-1);
DTI_PID/DTI_PID/Shapes/EngineeringConnectorItem.py
536 536
        cols = ['Components_UID', '[Index]', 'X', 'Y', 'Connected', 'Connected_At']
537 537
        values = ['?', '?', '?', '?', '?', '?']
538 538
        param = [#str(self.uid), 
539
                str(self.parentItem()), self._label.toPlainText(), self.connectPoint[0], self.connectPoint[1],\
539
                str(self.parentItem()), self._label.toPlainText(), self.sceneConnectPoint[0], self.sceneConnectPoint[1],\
540 540
                str(self.connectedItem.uid) if self.connectedItem else None,\
541 541
                str(self._connected_at)]
542
        sql = 'insert or replace into Points({}) values({})'.format(','.join(cols), ','.join(values))
542
        sql = 'insert into Points({}) values({})'.format(','.join(cols), ','.join(values))
543

  
544
        #print(self.sceneConnectPoint)
543 545

  
544 546
        return (sql, tuple(param))
545 547

  
DTI_PID/DTI_PID/Shapes/SymbolSvgItem.py
445 445
            for connector in self.connectors:
446 446
                params.append(\
447 447
                    (#str(connector.uid),
448
                    str(self.uid), index, connector.connectPoint[0], connector.connectPoint[1],\
448
                    str(self.uid), index, connector.sceneConnectPoint[0], connector.sceneConnectPoint[1],\
449 449
                    str(connector.connectedItem.uid) if connector.connectedItem else None,\
450 450
                    str(connector._connected_at))\
451 451
                        )

내보내기 Unified diff