개정판 eb2d256e
issue #000: fix vedor and line place, update script
Change-Id: I790e64a822183338cec4e6f3c83c42720e9c6c8e
| DTI_PID/DTI_PID/AppDocData.py | ||
|---|---|---|
| 594 | 594 |
# Close the db connection |
| 595 | 595 |
conn.close() |
| 596 | 596 |
|
| 597 |
configs = [Config('app', 'mode', 'advanced'), Config('app', 'error origin point', '51,72')]
|
|
| 598 |
self.saveAppConfigs(configs) |
|
| 599 |
|
|
| 597 | 600 |
''' |
| 598 | 601 |
@brief load app style |
| 599 | 602 |
@author humkyung |
| DTI_PID/DTI_PID/MainWindow.py | ||
|---|---|---|
| 851 | 851 |
@history 2018.06.27 Jeongwoo Chnage method to initialize command [Set None → DefaultCommand] |
| 852 | 852 |
''' |
| 853 | 853 |
def actionGroupTriggered(self, action): |
| 854 |
if hasattr(self.actionLine, 'tag'): |
|
| 855 |
self.actionLine.tag.onRejected.emit(None) |
|
| 856 |
|
|
| 857 |
if hasattr(self.actionVendor, 'tag'): |
|
| 858 |
self.actionVendor.tag.onRejected.emit(None) |
|
| 859 |
|
|
| 854 | 860 |
if self.graphicsView.command is not None: |
| 855 | 861 |
self.graphicsView.useDefaultCommand() |
| 856 | 862 |
|
| ... | ... | |
| 1362 | 1368 |
self.graphicsView.scene.removeItem(self.actionLine.tag._polyline) |
| 1363 | 1369 |
self.graphicsView.scene.update() |
| 1364 | 1370 |
self.actionLine.tag.reset() |
| 1371 |
if hasattr(self.actionVendor, 'tag') and self.actionVendor.tag._polyline: |
|
| 1372 |
self.graphicsView.scene.removeItem(self.actionVendor.tag._polyline) |
|
| 1373 |
self.graphicsView.scene.update() |
|
| 1374 |
self.actionVendor.tag.reset() |
|
| 1365 | 1375 |
self.actionLine.setChecked(False) |
| 1366 | 1376 |
self.actionZoom.setChecked(False) |
| 1367 | 1377 |
self.actionOCR.setChecked(False) |
| DTI_PID/DTI_PID/Scripts/Attributes.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS Attributes ( |
| 2 |
UID TEXT PRIMARY KEY, |
|
| 3 |
Components_UID TEXT REFERENCES Components (UID), |
|
| 4 |
SymbolAttribute_UID TEXT REFERENCES SymbolAttribute (UID), |
|
| 5 |
Value TEXT, |
|
| 6 |
UNIQUE ( |
|
| 7 |
Components_UID, |
|
| 8 |
SymbolAttribute_UID |
|
| 9 |
) |
|
| 2 |
UID TEXT PRIMARY KEY, |
|
| 3 |
Components_UID TEXT NOT NULL REFERENCES Components (UID), |
|
| 4 |
SymbolAttribute_UID TEXT NOT NULL REFERENCES SymbolAttribute (UID), |
|
| 5 |
Value TEXT, |
|
| 6 |
FOREIGN KEY (SymbolAttribute_UID) REFERENCES SymbolAttribute (UID), |
|
| 7 |
UNIQUE (Components_UID, SymbolAttribute_UID) |
|
| 10 | 8 |
); |
| 11 | 9 |
|
| 10 |
|
|
| DTI_PID/DTI_PID/Scripts/Colors.sql | ||
|---|---|---|
| 3 | 3 |
RED INTEGER, |
| 4 | 4 |
GREEN INTEGER, |
| 5 | 5 |
BLUE INTEGER, |
| 6 |
PROPERTY TEXT, |
|
| 7 |
VALUE TEXT, |
|
| 6 | 8 |
CONSTRAINT Colors_PK PRIMARY KEY (UID) |
| 7 | 9 |
); |
| DTI_PID/DTI_PID/Scripts/Components.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS Components ( |
| 2 |
UID TEXT PRIMARY KEY,
|
|
| 3 |
Drawings_UID TEXT REFERENCES Drawings (UID) NOT NULL,
|
|
| 4 |
Symbol_UID TEXT REFERENCES Symbol (UID) NOT NULL,
|
|
| 5 |
X INTEGER,
|
|
| 6 |
Y INTEGER,
|
|
| 7 |
Width INTEGER,
|
|
| 8 |
Height INTEGER,
|
|
| 9 |
Rotation INTEGER
|
|
| 10 |
); |
|
| 2 |
UID TEXT PRIMARY KEY, |
|
| 3 |
Drawings_UID TEXT REFERENCES Drawings (UID) NOT NULL,
|
|
| 4 |
Symbol_UID TEXT REFERENCES Symbol (UID) NOT NULL,
|
|
| 5 |
X INTEGER, |
|
| 6 |
Y INTEGER, |
|
| 7 |
Width INTEGER, |
|
| 8 |
Height INTEGER, |
|
| 9 |
Rotation INTEGER |
|
| 10 |
); |
|
| DTI_PID/DTI_PID/Scripts/FluidCode.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS [FluidCode]( |
| 2 |
[UID] TEXT CONSTRAINT [FluidCode_PK] PRIMARY KEY NOT NULL, |
|
| 3 |
[CODE] TEXT NOT NULL UNIQUE, |
|
| 4 |
[DESCRIPTION] TEXT); |
|
| 5 |
|
|
| 6 |
CREATE UNIQUE INDEX IF NOT EXISTS [FluidCode_CODE_IDX] ON [FluidCode]([CODE]); |
|
| 2 |
`UID` TEXT NOT NULL, |
|
| 3 |
`CODE` TEXT NOT NULL, |
|
| 4 |
`DESCRIPTION` TEXT, |
|
| 5 |
`Allowables` TEXT, |
|
| 6 |
CONSTRAINT `FluidCode_PK` PRIMARY KEY(`UID`) |
|
| 7 |
); |
|
| DTI_PID/DTI_PID/Scripts/InsulationPurpose.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS [InsulationPurpose]( |
| 2 |
[UID] TEXT CONSTRAINT [InsulationPurpose_PK] PRIMARY KEY NOT NULL, |
|
| 3 |
[CODE] TEXT NOT NULL UNIQUE, |
|
| 4 |
[DESCRIPTION] TEXT); |
|
| 2 |
`UID` TEXT NOT NULL, |
|
| 3 |
`CODE` TEXT NOT NULL UNIQUE, |
|
| 4 |
`DESCRIPTION` TEXT, |
|
| 5 |
`Allowables` TEXT, |
|
| 6 |
CONSTRAINT `InsulationPurpose_PK` PRIMARY KEY(`UID`) |
|
| 7 |
); |
|
| 5 | 8 |
|
| 6 | 9 |
CREATE UNIQUE INDEX IF NOT EXISTS [InsulationPurpose_CODE_IDX] ON [InsulationPurpose]([CODE]); |
| DTI_PID/DTI_PID/Scripts/PipingMaterialsClass.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS [PipingMaterialsClass]( |
| 2 |
[UID] TEXT CONSTRAINT [PipingMaterialsClass_PK] PRIMARY KEY NOT NULL, |
|
| 3 |
[CODE] TEXT NOT NULL UNIQUE, |
|
| 4 |
[DESCRIPTION] TEXT); |
|
| 2 |
`UID` TEXT NOT NULL, |
|
| 3 |
`CODE` TEXT NOT NULL UNIQUE, |
|
| 4 |
`DESCRIPTION` TEXT, |
|
| 5 |
`Allowables` TEXT, |
|
| 6 |
CONSTRAINT `PipingMaterialsClass_PK` PRIMARY KEY(`UID`) |
|
| 7 |
); |
|
| 5 | 8 |
|
| 6 | 9 |
CREATE UNIQUE INDEX IF NOT EXISTS [PipingMaterialsClass_CODE_IDX] ON [PipingMaterialsClass]([CODE]); |
| DTI_PID/DTI_PID/Scripts/ReservedWords.sql | ||
|---|---|---|
| 1 |
CREATE TABLE IF NOT EXISTS ReservedWords ( |
|
| 2 |
UID TEXT CONSTRAINT ReservedWords_PK PRIMARY KEY NOT NULL, Code TEXT NOT NULL UNIQUE, Description TEXT, Allowables TEXT |
|
| 3 |
); |
|
| DTI_PID/DTI_PID/Scripts/Symbol.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS "Symbol" ( |
| 2 |
`uid` INTEGER PRIMARY KEY AUTOINCREMENT, |
|
| 3 |
`symId` INTEGER NOT NULL, |
|
| 4 |
`name` TEXT NOT NULL, |
|
| 5 |
`type` TEXT, |
|
| 6 |
`threshold` NUMERIC NOT NULL DEFAULT 0.4, |
|
| 7 |
`minMatchPoint` INTEGER NOT NULL DEFAULT 0, |
|
| 8 |
`isDetectOrigin` INTEGER NOT NULL DEFAULT 0, |
|
| 9 |
`rotationCount` INTEGER NOT NULL DEFAULT 4, |
|
| 10 |
`ocrOption` INTEGER NOT NULL DEFAULT 0, |
|
| 11 |
`isContainChild` INTEGER NOT NULL DEFAULT 0, |
|
| 12 |
`originalPoint` TEXT, |
|
| 13 |
`connectionPoint` TEXT, |
|
| 14 |
`baseSymbol` TEXT, |
|
| 15 |
`additionalSymbol` TEXT, |
|
| 16 |
`isExceptDetect` INTEGER DEFAULT 0 |
|
| 2 |
`UID` INTEGER PRIMARY KEY AUTOINCREMENT, |
|
| 3 |
`Name` TEXT NOT NULL, |
|
| 4 |
`SymbolType_UID` TEXT NOT NULL, |
|
| 5 |
`Type` TEXT, |
|
| 6 |
`Threshold` NUMERIC NOT NULL DEFAULT (0.4), |
|
| 7 |
`MinMatchPoint` TEXT NOT NULL DEFAULT 0, |
|
| 8 |
`IsDetectOrigin` INTEGER NOT NULL DEFAULT 0, |
|
| 9 |
`RotationCount` INTEGER NOT NULL DEFAULT 4, |
|
| 10 |
`OCROption` INTEGER NOT NULL DEFAULT 0, |
|
| 11 |
`IsContainChild` INTEGER NOT NULL DEFAULT 0, |
|
| 12 |
`OriginalPoint` TEXT, |
|
| 13 |
`ConnectionPoint` TEXT, |
|
| 14 |
`BaseSymbol` TEXT, |
|
| 15 |
`AdditionalSymbol` TEXT, |
|
| 16 |
`IsExceptDetect` INTEGER DEFAULT 0, |
|
| 17 |
`HasInstrumentLabel` INTEGER DEFAULT 0, |
|
| 18 |
`Width` INTEGER, |
|
| 19 |
`Height` INTEGER, |
|
| 20 |
`Flip` INTEGER, |
|
| 21 |
FOREIGN KEY(`SymbolType_UID`) REFERENCES `SymbolType`(`UID`) |
|
| 17 | 22 |
); |
| DTI_PID/DTI_PID/Scripts/SymbolAttribute.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS SymbolAttribute ( |
| 2 |
UID TEXT NOT NULL, |
|
| 3 |
SymbolType TEXT NOT NULL, |
|
| 4 |
"Attribute" TEXT NOT NULL, |
|
| 5 |
"DisplayAttribute" TEXT NOT NULL, |
|
| 6 |
"AttributeType" TEXT NOT NULL, |
|
| 7 |
"Expression" TEXT, |
|
| 8 |
"Index" INTEGER NOT NULL, |
|
| 9 |
"AttrAt" INTEGER DEFAULT 0, |
|
| 10 |
PRIMARY KEY([SymbolType], [Attribute]) |
|
| 2 |
`UID` TEXT NOT NULL, |
|
| 3 |
`SymbolType_UID` TEXT, |
|
| 4 |
`Attribute` TEXT, |
|
| 5 |
`DisplayAttribute` TEXT NOT NULL, |
|
| 6 |
`AttributeType` TEXT NOT NULL, |
|
| 7 |
`Expression` BLOB, |
|
| 8 |
`index` INT NOT NULL, |
|
| 9 |
`AttrAt` INTEGER DEFAULT 0, |
|
| 10 |
`Target` TEXT DEFAULT 'ALL', |
|
| 11 |
PRIMARY KEY(`SymbolType_UID`,`Attribute`), |
|
| 12 |
FOREIGN KEY(`SymbolType_UID`) REFERENCES `SymbolType`(`UID`) |
|
| 11 | 13 |
); |
| 12 |
|
|
| 13 |
--CONSTRAINT SymbolAttribute_SymbolType_FK FOREIGN KEY (SymbolType) REFERENCES SymbolType(id) |
|
| DTI_PID/DTI_PID/Scripts/SymbolName.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS "SymbolName" ( |
| 2 |
`id` INTEGER PRIMARY KEY AUTOINCREMENT, |
|
| 3 |
`type` TEXT, |
|
| 4 |
`name` TEXT NOT NULL, |
|
| 5 |
`category` TEXT NOT NULL |
|
| 2 |
`UID` INTEGER NOT NULL, |
|
| 3 |
`SymbolType_UID` INTEGER, |
|
| 4 |
`Category` TEXT ( 2000000000 ) NOT NULL, |
|
| 5 |
`Type` TEXT ( 2000000000 ), |
|
| 6 |
`Name` TEXT ( 2000000000 ) NOT NULL, |
|
| 7 |
FOREIGN KEY(`SymbolType_UID`) REFERENCES `SymbolType`(`UID`), |
|
| 8 |
PRIMARY KEY(`UID`) |
|
| 6 | 9 |
); |
| DTI_PID/DTI_PID/Scripts/SymbolType.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS SymbolType( |
| 2 |
id INTEGER, |
|
| 3 |
category TEXT, |
|
| 4 |
"type" TEXT(2000000000)); |
|
| 2 |
`UID` INTEGER, |
|
| 3 |
`Category` TEXT ( 2000000000 ), |
|
| 4 |
`Type` TEXT ( 2000000000 ), |
|
| 5 |
PRIMARY KEY(`UID`) |
|
| 6 |
); |
|
| DTI_PID/DTI_PID/Scripts/UnitNumber.sql | ||
|---|---|---|
| 1 | 1 |
CREATE TABLE IF NOT EXISTS [UnitNumber]( |
| 2 |
[UID] TEXT CONSTRAINT [UnitNumber_PK] PRIMARY KEY NOT NULL, |
|
| 3 |
[CODE] TEXT NOT NULL UNIQUE, |
|
| 4 |
[DESCRIPTION] TEXT); |
|
| 5 |
|
|
| 6 |
CREATE UNIQUE INDEX IF NOT EXISTS [UnitNumber_CODE_IDX] ON [UnitNumber]([CODE]); |
|
| 2 |
`UID` TEXT NOT NULL, |
|
| 3 |
`CODE` TEXT NOT NULL UNIQUE, |
|
| 4 |
`DESCRIPTION` TEXT, |
|
| 5 |
`Allowables` TEXT, |
|
| 6 |
CONSTRAINT `UnitNumber_PK` PRIMARY KEY(`UID`) |
|
| 7 |
); |
|
| ID2.wxs | ||
|---|---|---|
| 655 | 655 |
<Component Id="cmp322D24927FB0BC30301401F7ECA86DA2" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="71B46282-C3E0-4E10-9A3E-45B620781E94"> |
| 656 | 656 |
<File Id="fil1E3A8033C7C63C829576D3223CFE8BF0" KeyPath="yes" Source=".\dist\App\Scripts\UnitNumber.sql" /> |
| 657 | 657 |
</Component> |
| 658 |
<Component Id="cmp03FD7D722E23175BDF5CDACE8CA968B2" Directory="dir970E7371CB13C6FB4B38EA6FC2A0C58A" Guid="2EC2F3C3-01B6-4763-A7E7-0886A8834A52"> |
|
| 658 |
<Component Id="cmp46D467CFDB0F4DBBA8D6DC0B4BC5B0A5" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="13FA2D60-EBEA-44F3-B882-153AAE9A0C87"> |
|
| 659 |
<File Id="filB84656E20C234334B3AB2043CD559A48" KeyPath="yes" Source=".\dist\App\Scripts\VendorPackages.sql" /> |
|
| 660 |
</Component> |
|
| 661 |
<Component Id="cmp9D7A19807F454851AA0924C40854C6F1" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="9E100EE8-14D1-46BF-8FFB-E8CE4E5052F7"> |
|
| 662 |
<File Id="fil0724012D7F08485093E3C8464B65F114" KeyPath="yes" Source=".\dist\App\Scripts\Attributes.sql" /> |
|
| 663 |
</Component> |
|
| 664 |
<Component Id="cmp1590C110197F483293F277F4DD21FC74" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="25F0D357-21A1-45D7-A774-B42C7EDB3601"> |
|
| 665 |
<File Id="filEE87C2AFFF8D44D6B787D6D791B1B768" KeyPath="yes" Source=".\dist\App\Scripts\Components.sql" /> |
|
| 666 |
</Component> |
|
| 667 |
<Component Id="cmp294230B64F1A4A609DB9A0C0D9B79AA9" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="EBA89497-B5F8-4AB2-B803-BA2504000A04"> |
|
| 668 |
<File Id="fil98245A7BA9B2464B870222E9DFC3B9D4" KeyPath="yes" Source=".\dist\App\Scripts\Drawings.sql" /> |
|
| 669 |
</Component> |
|
| 670 |
<Component Id="cmp9B508D07F4F94797825F0993323790BA" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="3655D75B-A303-42FC-855C-C3F2F5073D62"> |
|
| 671 |
<File Id="fil0BC57CC387BB434A8F26668E268F7FEE" KeyPath="yes" Source=".\dist\App\Scripts\EqpTagNames.sql" /> |
|
| 672 |
</Component> |
|
| 673 |
<Component Id="cmp8D779EAC3BD649FDA816826E6FFB0CAE" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="D9D91021-A015-499C-9363-E92A19B37257"> |
|
| 674 |
<File Id="fil61B71FCA46E64AA3A221B491A3601AF9" KeyPath="yes" Source=".\dist\App\Scripts\NOTE_DATA_LIST.sql" /> |
|
| 675 |
</Component> |
|
| 676 |
<Component Id="cmp55335A2F191D41EE9C7C9FD82FE9A52A" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="E3700F9D-4E98-4F56-82A4-8D3EFEC2D5ED"> |
|
| 677 |
<File Id="fil2BACFDB1DCD546BEB180DA584FE8E15C" KeyPath="yes" Source=".\dist\App\Scripts\Ports.sql" /> |
|
| 678 |
</Component> |
|
| 679 |
<Component Id="cmpE4AD7F0ACBFD4F97989FF59DEE773E9E" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="7F62C11B-9E40-420E-9068-25B1A13ABDF3"> |
|
| 680 |
<File Id="fil29FC251D9C62425E81FFB8C76522E89A" KeyPath="yes" Source=".\dist\App\Scripts\ReservedWords.sql" /> |
|
| 681 |
</Component> |
|
| 682 |
<Component Id="cmp56A7EC568A694A199FFE704494A21DD4" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="128461FB-A133-4D6E-B170-4F849BC7C209"> |
|
| 683 |
<File Id="filB7B9FE5319D445B59C8C92F21521E523" KeyPath="yes" Source=".\dist\App\Scripts\TitleBlockProperties.sql" /> |
|
| 684 |
</Component> |
|
| 685 |
<Component Id="cmpA5457ADA49144F04ABFF8265CD6D0E92" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="44EC7D52-2CAC-4626-9587-5EFD9A85A3A2"> |
|
| 686 |
<File Id="fil1EDB08D415DD4DE6B16A2975429FB679" KeyPath="yes" Source=".\dist\App\Scripts\TitleBlockValues.sql" /> |
|
| 687 |
</Component> |
|
| 688 |
<Component Id="cmpCA5E8E17FC51432395810216BB1F34F5" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="5B2BB956-2500-4136-BFB7-3850F707AAD5"> |
|
| 689 |
<File Id="filF1955947288B42A99A25C9B6149100C2" KeyPath="yes" Source=".\dist\App\Scripts\VALVE_DATA_LIST.sql" /> |
|
| 690 |
</Component> |
|
| 691 |
<Component Id="cmp3A83B159D3674656BC91CF7E3652913E" Directory="dir33A2F09B010813323099475AA1D7838F" Guid="80F19741-A273-4845-86B6-B277F8760AC2"> |
|
| 692 |
<File Id="filE0F354DBF4B2476390AB3AA122BE6069" KeyPath="yes" Source=".\dist\App\Scripts\ValveOperCodes.sql" /> |
|
| 693 |
</Component> |
|
| 694 |
<Component Id="cmp265C8EC2B8EA4FEBB591FFBF5DB2A1BA" Directory="dir970E7371CB13C6FB4B38EA6FC2A0C58A" Guid="2EC2F3C3-01B6-4763-A7E7-0886A8834A52"> |
|
| 659 | 695 |
<File Id="filF94F83D3983A74BDA08807765D87B5D7" KeyPath="yes" Source=".\dist\App\shapely\speedups\_speedups.cp36-win_amd64.pyd" /> |
| 660 | 696 |
</Component> |
| 661 | 697 |
<Component Id="cmp979495263725C132B866D0B13D4D6256" Directory="dir608A4CEF2C50A404903D91CDBC5FC19F" Guid="1FB281DF-0172-4A1B-8788-E8E870E27B53"> |
내보내기 Unified diff
