개정판 4aba6868
dev issue #1227 : fix OPC Mapping
Change-Id: Ie52b847115bd9bb1f07505452b9dd9ccfb139d25
| DTI_PID/APIDConverter/APIDConverterExplorer.Designer.cs | ||
|---|---|---|
| 133 | 133 |
// |
| 134 | 134 |
// textDrawingX |
| 135 | 135 |
// |
| 136 |
this.textDrawingX.Location = new System.Drawing.Point(35, 156);
|
|
| 136 |
this.textDrawingX.Location = new System.Drawing.Point(63, 156);
|
|
| 137 | 137 |
this.textDrawingX.Name = "textDrawingX"; |
| 138 |
this.textDrawingX.Size = new System.Drawing.Size(173, 20);
|
|
| 138 |
this.textDrawingX.Size = new System.Drawing.Size(145, 20);
|
|
| 139 | 139 |
this.textDrawingX.StyleController = this.layoutControl1; |
| 140 | 140 |
this.textDrawingX.TabIndex = 5; |
| 141 | 141 |
// |
| ... | ... | |
| 145 | 145 |
this.layoutControlItem2.Location = new System.Drawing.Point(0, 26); |
| 146 | 146 |
this.layoutControlItem2.Name = "layoutControlItem2"; |
| 147 | 147 |
this.layoutControlItem2.Size = new System.Drawing.Size(188, 24); |
| 148 |
this.layoutControlItem2.Text = "X";
|
|
| 149 |
this.layoutControlItem2.TextSize = new System.Drawing.Size(8, 14);
|
|
| 148 |
this.layoutControlItem2.Text = "Width";
|
|
| 149 |
this.layoutControlItem2.TextSize = new System.Drawing.Size(36, 14);
|
|
| 150 | 150 |
// |
| 151 | 151 |
// layoutControlGroup2 |
| 152 | 152 |
// |
| ... | ... | |
| 157 | 157 |
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 85); |
| 158 | 158 |
this.layoutControlGroup2.Name = "layoutControlGroup2"; |
| 159 | 159 |
this.layoutControlGroup2.Size = new System.Drawing.Size(212, 119); |
| 160 |
this.layoutControlGroup2.Text = "Drawing Size Setting"; |
|
| 160 | 161 |
// |
| 161 | 162 |
// btnDrawingSize |
| 162 | 163 |
// |
| ... | ... | |
| 179 | 180 |
// |
| 180 | 181 |
// textDrawingY |
| 181 | 182 |
// |
| 182 |
this.textDrawingY.Location = new System.Drawing.Point(35, 180);
|
|
| 183 |
this.textDrawingY.Location = new System.Drawing.Point(63, 180);
|
|
| 183 | 184 |
this.textDrawingY.Name = "textDrawingY"; |
| 184 |
this.textDrawingY.Size = new System.Drawing.Size(173, 20);
|
|
| 185 |
this.textDrawingY.Size = new System.Drawing.Size(145, 20);
|
|
| 185 | 186 |
this.textDrawingY.StyleController = this.layoutControl1; |
| 186 | 187 |
this.textDrawingY.TabIndex = 7; |
| 187 | 188 |
// |
| ... | ... | |
| 191 | 192 |
this.layoutControlItem4.Location = new System.Drawing.Point(0, 50); |
| 192 | 193 |
this.layoutControlItem4.Name = "layoutControlItem4"; |
| 193 | 194 |
this.layoutControlItem4.Size = new System.Drawing.Size(188, 24); |
| 194 |
this.layoutControlItem4.Text = "Y";
|
|
| 195 |
this.layoutControlItem4.TextSize = new System.Drawing.Size(8, 14);
|
|
| 195 |
this.layoutControlItem4.Text = "Height";
|
|
| 196 |
this.layoutControlItem4.TextSize = new System.Drawing.Size(36, 14);
|
|
| 196 | 197 |
// |
| 197 | 198 |
// APIDConverterExplorer |
| 198 | 199 |
// |
| DTI_PID/APIDConverter/DB/Project_DB.cs | ||
|---|---|---|
| 153 | 153 |
LEFT OUTER JOIN {2} as sp
|
| 154 | 154 |
ON s.UID = SP.UID |
| 155 | 155 |
WHERE s.SymbolType_UID = st.UID |
| 156 |
AND st.Type != 'Instrument OPC''s' AND st.Type != 'Piping OPC''s' |
|
| 156 | 157 |
ORDER BY st.TYPE ASC;", Symbol_TABLE, SymbolType_TABLE, APID_SYMBOL_MAPPING_TABLE); |
| 157 | 158 |
using (SQLiteDataReader dr = cmd.ExecuteReader()) |
| 158 | 159 |
dt.Load(dr); |
| ... | ... | |
| 193 | 194 |
LEFT OUTER JOIN {2} as sp
|
| 194 | 195 |
ON CONVERT(VARCHAR(255), s.UID) = CONVERT(VARCHAR(255), SP.UID) |
| 195 | 196 |
WHERE s.SymbolType_UID = st.UID |
| 197 |
AND st.Type != 'Instrument OPC''s' AND st.Type != 'Piping OPC''s' |
|
| 196 | 198 |
ORDER BY st.TYPE ASC;", Symbol_TABLE, SymbolType_TABLE, APID_SYMBOL_MAPPING_TABLE); |
| 197 | 199 |
using (SqlDataReader dr = cmd.ExecuteReader()) |
| 198 | 200 |
dt.Load(dr); |
| DTI_PID/APIDConverter/Form/MappingForm.Designer.cs | ||
|---|---|---|
| 29 | 29 |
private void InitializeComponent() |
| 30 | 30 |
{
|
| 31 | 31 |
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MappingForm)); |
| 32 |
DevExpress.XtraBars.Ribbon.GalleryItemGroup galleryItemGroup1 = new DevExpress.XtraBars.Ribbon.GalleryItemGroup();
|
|
| 32 |
DevExpress.XtraBars.Ribbon.GalleryItemGroup galleryItemGroup3 = new DevExpress.XtraBars.Ribbon.GalleryItemGroup();
|
|
| 33 | 33 |
this.ribbonControl = new DevExpress.XtraBars.Ribbon.RibbonControl(); |
| 34 | 34 |
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); |
| 35 | 35 |
this.gridControlLine = new DevExpress.XtraGrid.GridControl(); |
| ... | ... | |
| 47 | 47 |
this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); |
| 48 | 48 |
this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); |
| 49 | 49 |
this.tabbedControlGroup = new DevExpress.XtraLayout.TabbedControlGroup(); |
| 50 |
this.GroupLine = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
| 51 |
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
| 52 |
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
| 53 | 50 |
this.GroupSymbol = new DevExpress.XtraLayout.LayoutControlGroup(); |
| 54 | 51 |
this.splitterItem2 = new DevExpress.XtraLayout.SplitterItem(); |
| 55 | 52 |
this.splitterItem3 = new DevExpress.XtraLayout.SplitterItem(); |
| ... | ... | |
| 59 | 56 |
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); |
| 60 | 57 |
this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup(); |
| 61 | 58 |
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); |
| 59 |
this.GroupLine = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
| 60 |
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
| 61 |
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
| 62 | 62 |
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); |
| 63 | 63 |
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); |
| 64 | 64 |
this.splitterItem1 = new DevExpress.XtraLayout.SplitterItem(); |
| ... | ... | |
| 69 | 69 |
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); |
| 70 | 70 |
this.splitterItem4 = new DevExpress.XtraLayout.SplitterItem(); |
| 71 | 71 |
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); |
| 72 |
this.GroupSpecificSymbol = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
| 72 | 73 |
((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit(); |
| 73 | 74 |
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); |
| 74 | 75 |
this.layoutControl1.SuspendLayout(); |
| ... | ... | |
| 84 | 85 |
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); |
| 85 | 86 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); |
| 86 | 87 |
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup)).BeginInit(); |
| 87 |
((System.ComponentModel.ISupportInitialize)(this.GroupLine)).BeginInit(); |
|
| 88 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); |
|
| 89 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); |
|
| 90 | 88 |
((System.ComponentModel.ISupportInitialize)(this.GroupSymbol)).BeginInit(); |
| 91 | 89 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem2)).BeginInit(); |
| 92 | 90 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem3)).BeginInit(); |
| ... | ... | |
| 96 | 94 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); |
| 97 | 95 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit(); |
| 98 | 96 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); |
| 97 |
((System.ComponentModel.ISupportInitialize)(this.GroupLine)).BeginInit(); |
|
| 98 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); |
|
| 99 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); |
|
| 99 | 100 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); |
| 100 | 101 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); |
| 101 | 102 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit(); |
| ... | ... | |
| 106 | 107 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); |
| 107 | 108 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem4)).BeginInit(); |
| 108 | 109 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); |
| 110 |
((System.ComponentModel.ISupportInitialize)(this.GroupSpecificSymbol)).BeginInit(); |
|
| 109 | 111 |
this.SuspendLayout(); |
| 110 | 112 |
// |
| 111 | 113 |
// ribbonControl |
| ... | ... | |
| 176 | 178 |
// |
| 177 | 179 |
// |
| 178 | 180 |
// |
| 179 |
galleryItemGroup1.Caption = "Items";
|
|
| 181 |
galleryItemGroup3.Caption = "Items";
|
|
| 180 | 182 |
this.galleryControlAvevaSymbols.Gallery.Groups.AddRange(new DevExpress.XtraBars.Ribbon.GalleryItemGroup[] {
|
| 181 |
galleryItemGroup1});
|
|
| 183 |
galleryItemGroup3});
|
|
| 182 | 184 |
this.galleryControlAvevaSymbols.Gallery.ItemDoubleClick += new DevExpress.XtraBars.Ribbon.GalleryItemClickEventHandler(this.galleryControlAvevaSymbols_Gallery_ItemDoubleClick); |
| 183 | 185 |
this.galleryControlAvevaSymbols.Location = new System.Drawing.Point(795, 357); |
| 184 | 186 |
this.galleryControlAvevaSymbols.Name = "galleryControlAvevaSymbols"; |
| ... | ... | |
| 299 | 301 |
this.tabbedControlGroup.Size = new System.Drawing.Size(761, 670); |
| 300 | 302 |
this.tabbedControlGroup.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
| 301 | 303 |
this.GroupSymbol, |
| 302 |
this.GroupLine}); |
|
| 303 |
// |
|
| 304 |
// GroupLine |
|
| 305 |
// |
|
| 306 |
this.GroupLine.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
|
| 307 |
this.layoutControlGroup1}); |
|
| 308 |
this.GroupLine.Location = new System.Drawing.Point(0, 0); |
|
| 309 |
this.GroupLine.Name = "GroupLine"; |
|
| 310 |
this.GroupLine.Size = new System.Drawing.Size(737, 624); |
|
| 311 |
this.GroupLine.Text = "Line"; |
|
| 312 |
// |
|
| 313 |
// layoutControlGroup1 |
|
| 314 |
// |
|
| 315 |
this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
|
| 316 |
this.layoutControlItem9}); |
|
| 317 |
this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0); |
|
| 318 |
this.layoutControlGroup1.Name = "layoutControlGroup1"; |
|
| 319 |
this.layoutControlGroup1.Size = new System.Drawing.Size(737, 624); |
|
| 320 |
this.layoutControlGroup1.Text = "ID2 Line List"; |
|
| 321 |
// |
|
| 322 |
// layoutControlItem9 |
|
| 323 |
// |
|
| 324 |
this.layoutControlItem9.Control = this.gridControlLine; |
|
| 325 |
this.layoutControlItem9.Location = new System.Drawing.Point(0, 0); |
|
| 326 |
this.layoutControlItem9.Name = "layoutControlItem9"; |
|
| 327 |
this.layoutControlItem9.Size = new System.Drawing.Size(713, 579); |
|
| 328 |
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); |
|
| 329 |
this.layoutControlItem9.TextVisible = false; |
|
| 304 |
this.GroupLine, |
|
| 305 |
this.GroupSpecificSymbol}); |
|
| 330 | 306 |
// |
| 331 | 307 |
// GroupSymbol |
| 332 | 308 |
// |
| ... | ... | |
| 409 | 385 |
this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); |
| 410 | 386 |
this.layoutControlItem4.TextVisible = false; |
| 411 | 387 |
// |
| 388 |
// GroupLine |
|
| 389 |
// |
|
| 390 |
this.GroupLine.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
|
| 391 |
this.layoutControlGroup1}); |
|
| 392 |
this.GroupLine.Location = new System.Drawing.Point(0, 0); |
|
| 393 |
this.GroupLine.Name = "GroupLine"; |
|
| 394 |
this.GroupLine.Size = new System.Drawing.Size(737, 624); |
|
| 395 |
this.GroupLine.Text = "Line"; |
|
| 396 |
// |
|
| 397 |
// layoutControlGroup1 |
|
| 398 |
// |
|
| 399 |
this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
|
|
| 400 |
this.layoutControlItem9}); |
|
| 401 |
this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0); |
|
| 402 |
this.layoutControlGroup1.Name = "layoutControlGroup1"; |
|
| 403 |
this.layoutControlGroup1.Size = new System.Drawing.Size(737, 624); |
|
| 404 |
this.layoutControlGroup1.Text = "ID2 Line List"; |
|
| 405 |
// |
|
| 406 |
// layoutControlItem9 |
|
| 407 |
// |
|
| 408 |
this.layoutControlItem9.Control = this.gridControlLine; |
|
| 409 |
this.layoutControlItem9.Location = new System.Drawing.Point(0, 0); |
|
| 410 |
this.layoutControlItem9.Name = "layoutControlItem9"; |
|
| 411 |
this.layoutControlItem9.Size = new System.Drawing.Size(713, 579); |
|
| 412 |
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); |
|
| 413 |
this.layoutControlItem9.TextVisible = false; |
|
| 414 |
// |
|
| 412 | 415 |
// layoutControlItem2 |
| 413 | 416 |
// |
| 414 | 417 |
this.layoutControlItem2.Control = this.btnSave; |
| ... | ... | |
| 503 | 506 |
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); |
| 504 | 507 |
this.layoutControlItem8.TextVisible = false; |
| 505 | 508 |
// |
| 509 |
// GroupSpecificSymbol |
|
| 510 |
// |
|
| 511 |
this.GroupSpecificSymbol.Location = new System.Drawing.Point(0, 0); |
|
| 512 |
this.GroupSpecificSymbol.Name = "GroupSpecificSymbol"; |
|
| 513 |
this.GroupSpecificSymbol.Size = new System.Drawing.Size(737, 624); |
|
| 514 |
this.GroupSpecificSymbol.Text = "Specific Symbol"; |
|
| 515 |
// |
|
| 506 | 516 |
// MappingForm |
| 507 | 517 |
// |
| 508 | 518 |
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); |
| ... | ... | |
| 531 | 541 |
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); |
| 532 | 542 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); |
| 533 | 543 |
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup)).EndInit(); |
| 534 |
((System.ComponentModel.ISupportInitialize)(this.GroupLine)).EndInit(); |
|
| 535 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); |
|
| 536 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); |
|
| 537 | 544 |
((System.ComponentModel.ISupportInitialize)(this.GroupSymbol)).EndInit(); |
| 538 | 545 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem2)).EndInit(); |
| 539 | 546 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem3)).EndInit(); |
| ... | ... | |
| 543 | 550 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); |
| 544 | 551 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit(); |
| 545 | 552 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); |
| 553 |
((System.ComponentModel.ISupportInitialize)(this.GroupLine)).EndInit(); |
|
| 554 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); |
|
| 555 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); |
|
| 546 | 556 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); |
| 547 | 557 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); |
| 548 | 558 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit(); |
| ... | ... | |
| 553 | 563 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); |
| 554 | 564 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem4)).EndInit(); |
| 555 | 565 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); |
| 566 |
((System.ComponentModel.ISupportInitialize)(this.GroupSpecificSymbol)).EndInit(); |
|
| 556 | 567 |
this.ResumeLayout(false); |
| 557 | 568 |
this.PerformLayout(); |
| 558 | 569 |
|
| ... | ... | |
| 599 | 610 |
private DevExpress.XtraGrid.Views.Grid.GridView gridViewLine; |
| 600 | 611 |
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; |
| 601 | 612 |
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; |
| 613 |
private DevExpress.XtraLayout.LayoutControlGroup GroupSpecificSymbol; |
|
| 602 | 614 |
} |
| 603 | 615 |
} |
내보내기 Unified diff
