개정판 45f97b1f
issue #563: spec break auto angle added and default symattrs added
Change-Id: Idafcc3de438c7bfba1167427ec79ae1d26a4bee3
| DTI_PID/DTI_PID/LineNoTracer.py | ||
|---|---|---|
| 732 | 732 |
if 2 == len(symbol.getOriginalPoint().split(',')):
|
| 733 | 733 |
tokens = symbol.getOriginalPoint().split(',')
|
| 734 | 734 |
origin = [pt[0] + float(tokens[0]), pt[1] + float(tokens[1])] |
| 735 |
end_break.buildItem(svgFileName, symbol.getType(), 5.7, pt,
|
|
| 735 |
end_break.buildItem(svgFileName, symbol.getType(), 3.83, pt,
|
|
| 736 | 736 |
[end_break.boundingRect().width(), end_break.boundingRect().height()], |
| 737 | 737 |
origin, [], symbol.getBaseSymbol(), symbol.getAdditionalSymbol(), |
| 738 | 738 |
symbol.getHasInstrumentLabel()) |
| ... | ... | |
| 1007 | 1007 |
spec_break.loc = [new_x - spec_break.symbolOrigin[0], |
| 1008 | 1008 |
new_y - spec_break.symbolOrigin[1]] |
| 1009 | 1009 |
spec_break.origin = [new_x, new_y] |
| 1010 |
|
|
| 1011 |
pivot = None |
|
| 1012 |
for connector in spec[0].connectors: |
|
| 1013 |
if connector.connectedItem is spec[1]: |
|
| 1014 |
pivot = connector.sceneBoundingRect().center() |
|
| 1015 |
break |
|
| 1016 |
|
|
| 1010 | 1017 |
if abs(up_down_find[0].center().x() - up_down_find[ |
| 1011 | 1018 |
1].center().x()) < abs( |
| 1012 | 1019 |
up_down_find[0].center().y() - up_down_find[1].center().y()): |
| 1013 |
spec_break.angle = 1.57 |
|
| 1020 |
if new_x > pivot.x(): |
|
| 1021 |
spec_break.angle = 1.57 |
|
| 1022 |
else: |
|
| 1023 |
spec_break.angle = 4.71239 |
|
| 1014 | 1024 |
else: |
| 1015 |
spec_break.angle = 3.14 |
|
| 1025 |
if new_y > pivot.y(): |
|
| 1026 |
spec_break.angle = 3.14 |
|
| 1027 |
else: |
|
| 1028 |
spec_break.angle = 0 |
|
| 1016 | 1029 |
|
| 1017 | 1030 |
spec_break_items.append(spec_break) |
| 1018 | 1031 |
|
| DTI_PID/DTI_PID/Scripts/MSSQL/ID2.sql | ||
|---|---|---|
| 1520 | 1520 |
INSERT INTO SymbolAttribute |
| 1521 | 1521 |
(UID, SymbolType_UID, "Attribute", DisplayAttribute, AttributeType, Expression, "index", AttrAt, "Length", Target, Property) |
| 1522 | 1522 |
VALUES('83ffef92-3c94-47ce-a6ec-737ba4a79a93', '40', 'To_eq', 'To_eq', 'EQ Item', 'item.EvaluatedName', 1, 1, NULL, 'ALL', 2);
|
| 1523 |
INSERT INTO SymbolAttribute |
|
| 1524 |
(UID, SymbolType_UID, "Attribute", DisplayAttribute, AttributeType, Expression, "index", AttrAt, "Length", Target, Property) |
|
| 1525 |
VALUES('37dec918-c089-4a15-8a14-ac1267e014f6', '31', 'From_To', 'From_To', 'Text Item', 'item.text()', 0, 0, NULL, 'ALL', 2);
|
|
| 1526 |
INSERT INTO SymbolAttribute |
|
| 1527 |
(UID, SymbolType_UID, "Attribute", DisplayAttribute, AttributeType, Expression, "index", AttrAt, "Length", Target, Property) |
|
| 1528 |
VALUES('aab2e6ec-67d1-4eec-8e79-47334b5d4787', '25', 'Alarm1', 'Alarm1', 'Text Item', 'item.text()', 4, 2, NULL, 'ALL', 0);
|
|
| 1529 |
INSERT INTO SymbolAttribute |
|
| 1530 |
(UID, SymbolType_UID, "Attribute", DisplayAttribute, AttributeType, Expression, "index", AttrAt, "Length", Target, Property) |
|
| 1531 |
VALUES('9fdc7a1e-c7b9-4bb3-bea4-c40f9b1e0ad1', '25', 'Alarm2', 'Alarm2', 'Text Item', 'item.text()', 5, 3, NULL, 'ALL', 0);
|
|
| 1532 |
INSERT INTO SymbolAttribute |
|
| 1533 |
(UID, SymbolType_UID, "Attribute", DisplayAttribute, AttributeType, Expression, "index", AttrAt, "Length", Target, Property) |
|
| 1534 |
VALUES('ee46d7d8-d000-4d66-b2a5-932cdbd0b5cd', '25', 'Alarm3', 'Alarm3', 'Text Item', 'item.text()', 6, 5, NULL, 'ALL', 0);
|
|
| 1535 |
INSERT INTO SymbolAttribute |
|
| 1536 |
(UID, SymbolType_UID, "Attribute", DisplayAttribute, AttributeType, Expression, "index", AttrAt, "Length", Target, Property) |
|
| 1537 |
VALUES('85310e1f-1556-4008-9ee5-8fcef0abe080', '25', 'Alarm4', 'Alarm4', 'Text Item', 'item.text()', 7, 4, NULL, 'ALL', 0);
|
|
| 1523 | 1538 |
|
| 1524 | 1539 |
CREATE TABLE Attributes ( |
| 1525 | 1540 |
UID VARCHAR (37) PRIMARY KEY, |
| ... | ... | |
| 1803 | 1818 |
'LineTypes' |
| 1804 | 1819 |
), |
| 1805 | 1820 |
( |
| 1806 |
'#005500,15,SolidLine,50',
|
|
| 1821 |
'#005500,15,DashLine,50',
|
|
| 1807 | 1822 |
'Connect To Process', |
| 1808 | 1823 |
'LineTypes' |
| 1809 | 1824 |
), |
내보내기 Unified diff
