프로젝트

일반

사용자정보

개정판 401efcff

ID401efcffcc98d682dd7e6d61a23a52fc1eec3735
상위 73415441
하위 7cbb1038

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

dev issue #000 : SPPID Attribute Mapping 필요없는 값 Query 수정

Change-Id: I4db9fef9491d4ad50ac8fcb08d4cbc02794402c2

차이점 보기:

DTI_PID/SPPIDConverter/DB/Project_DB.cs
427 427
                    using (SQLiteCommand cmd = connection.CreateCommand())
428 428
                    {
429 429
                        cmd.CommandText = string.Format(@"
430
                            SELECT sa.UID, sa.DisplayAttribute, st.TYPE, spa.SPPID_ATTRIBUTE, sp.SPPID_SYMBOL_PATH, spl.LOCATION, spl.LEADERLINE 
430
                            SELECT sa.UID, sa.DisplayAttribute, st.TYPE, spa.SPPID_ATTRIBUTE, sp.SPPID_SYMBOL_PATH, spl.LOCATION, spl.LEADERLINE, sa.Property
431 431
                            FROM {1} as sa, {0} as st 
432 432
                                 LEFT OUTER JOIN {2} as sp 
433 433
                                      ON sa.UID = SP.UID 
......
435 435
                                     ON sa.UID = spa.UID
436 436
                                LEFT OUTER JOIN {4} as spl 
437 437
                                     ON sa.UID = spl.UID
438
                            WHERE sa.SymbolType_UID = st.UID;", SymbolType_TABLE, SymbolAttribute_TABLE, SPPID_SYMBOL_MAPPING_TABLE, SPPID_ATTRIBUTE_MAPPING_TABLE, SPPID_LABEL_INFO_TABLE);
438
                            WHERE sa.SymbolType_UID = st.UID AND (sa.Property != 2 OR sa.Property IS NULL);", SymbolType_TABLE, SymbolAttribute_TABLE, SPPID_SYMBOL_MAPPING_TABLE, SPPID_ATTRIBUTE_MAPPING_TABLE, SPPID_LABEL_INFO_TABLE);
439 439
                        using (SQLiteDataReader dr = cmd.ExecuteReader())
440 440
                            dt.Load(dr);
441 441
                    }
DTI_PID/SPPIDConverter/Form/MappingForm.Designer.cs
63 63
            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
64 64
            this.splitterItem3 = new DevExpress.XtraLayout.SplitterItem();
65 65
            this.tabbedControlGroup = new DevExpress.XtraLayout.TabbedControlGroup();
66
            this.GroupAttribute = new DevExpress.XtraLayout.LayoutControlGroup();
67
            this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup();
68
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
66 69
            this.GroupSymbol = new DevExpress.XtraLayout.LayoutControlGroup();
67 70
            this.splitterItem1 = new DevExpress.XtraLayout.SplitterItem();
68 71
            this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
......
80 83
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
81 84
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
82 85
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
83
            this.GroupAttribute = new DevExpress.XtraLayout.LayoutControlGroup();
84
            this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup();
85
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
86 86
            this.GroupETCSetting = new DevExpress.XtraLayout.LayoutControlGroup();
87 87
            this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
88 88
            this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup();
......
127 127
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
128 128
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem3)).BeginInit();
129 129
            ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup)).BeginInit();
130
            ((System.ComponentModel.ISupportInitialize)(this.GroupAttribute)).BeginInit();
131
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit();
132
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
130 133
            ((System.ComponentModel.ISupportInitialize)(this.GroupSymbol)).BeginInit();
131 134
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit();
132 135
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
......
144 147
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
145 148
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
146 149
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
147
            ((System.ComponentModel.ISupportInitialize)(this.GroupAttribute)).BeginInit();
148
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit();
149
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
150 150
            ((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).BeginInit();
151 151
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
152 152
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit();
......
173 173
            this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
174 174
            this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
175 175
            this.ribbonControl.ShowToolbarCustomizeItem = false;
176
            this.ribbonControl.Size = new System.Drawing.Size(1094, 32);
176
            this.ribbonControl.Size = new System.Drawing.Size(1094, 27);
177 177
            this.ribbonControl.Toolbar.ShowCustomizeItem = false;
178 178
            // 
179 179
            // layoutControl1
......
197 197
            this.layoutControl1.Controls.Add(this.pictureEditID2Symbol);
198 198
            this.layoutControl1.Controls.Add(this.pictureEditMapped);
199 199
            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
200
            this.layoutControl1.Location = new System.Drawing.Point(0, 32);
200
            this.layoutControl1.Location = new System.Drawing.Point(0, 27);
201 201
            this.layoutControl1.Name = "layoutControl1";
202 202
            this.layoutControl1.Root = this.Root;
203
            this.layoutControl1.Size = new System.Drawing.Size(1094, 738);
203
            this.layoutControl1.Size = new System.Drawing.Size(1094, 743);
204 204
            this.layoutControl1.TabIndex = 2;
205 205
            this.layoutControl1.Text = "layoutControl1";
206 206
            // 
207 207
            // checkComboBoxLineNumberLocation
208 208
            // 
209
            this.checkComboBoxLineNumberLocation.Location = new System.Drawing.Point(529, 79);
209
            this.checkComboBoxLineNumberLocation.Location = new System.Drawing.Point(529, 78);
210 210
            this.checkComboBoxLineNumberLocation.MenuManager = this.ribbonControl;
211 211
            this.checkComboBoxLineNumberLocation.Name = "checkComboBoxLineNumberLocation";
212 212
            this.checkComboBoxLineNumberLocation.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
......
217 217
            // 
218 218
            // checkComboBoxNoteLocation
219 219
            // 
220
            this.checkComboBoxNoteLocation.Location = new System.Drawing.Point(522, 103);
220
            this.checkComboBoxNoteLocation.Location = new System.Drawing.Point(522, 102);
221 221
            this.checkComboBoxNoteLocation.MenuManager = this.ribbonControl;
222 222
            this.checkComboBoxNoteLocation.Name = "checkComboBoxNoteLocation";
223 223
            this.checkComboBoxNoteLocation.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
......
228 228
            // 
229 229
            // checkComboBoxTextLocation
230 230
            // 
231
            this.checkComboBoxTextLocation.Location = new System.Drawing.Point(522, 79);
231
            this.checkComboBoxTextLocation.Location = new System.Drawing.Point(522, 78);
232 232
            this.checkComboBoxTextLocation.MenuManager = this.ribbonControl;
233 233
            this.checkComboBoxTextLocation.Name = "checkComboBoxTextLocation";
234 234
            this.checkComboBoxTextLocation.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
......
240 240
            // btnImageRefresh
241 241
            // 
242 242
            this.btnImageRefresh.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnImageRefresh.ImageOptions.SvgImage")));
243
            this.btnImageRefresh.Location = new System.Drawing.Point(749, 638);
243
            this.btnImageRefresh.Location = new System.Drawing.Point(744, 641);
244 244
            this.btnImageRefresh.Name = "btnImageRefresh";
245
            this.btnImageRefresh.Size = new System.Drawing.Size(321, 36);
245
            this.btnImageRefresh.Size = new System.Drawing.Size(326, 38);
246 246
            this.btnImageRefresh.StyleController = this.layoutControl1;
247 247
            this.btnImageRefresh.TabIndex = 27;
248 248
            this.btnImageRefresh.Text = "Refresh SPPID Image";
......
250 250
            // 
251 251
            // textBoxDrainValveSize
252 252
            // 
253
            this.textBoxDrainValveSize.Location = new System.Drawing.Point(175, 172);
253
            this.textBoxDrainValveSize.Location = new System.Drawing.Point(175, 169);
254 254
            this.textBoxDrainValveSize.MenuManager = this.ribbonControl;
255 255
            this.textBoxDrainValveSize.Name = "textBoxDrainValveSize";
256 256
            this.textBoxDrainValveSize.Size = new System.Drawing.Size(524, 20);
......
259 259
            // 
260 260
            // textBoxNoteSymbolPath
261 261
            // 
262
            this.textBoxNoteSymbolPath.Location = new System.Drawing.Point(175, 103);
262
            this.textBoxNoteSymbolPath.Location = new System.Drawing.Point(175, 102);
263 263
            this.textBoxNoteSymbolPath.MenuManager = this.ribbonControl;
264 264
            this.textBoxNoteSymbolPath.Name = "textBoxNoteSymbolPath";
265 265
            this.textBoxNoteSymbolPath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
......
271 271
            // 
272 272
            // textBoxTextSymbolPath
273 273
            // 
274
            this.textBoxTextSymbolPath.Location = new System.Drawing.Point(175, 79);
274
            this.textBoxTextSymbolPath.Location = new System.Drawing.Point(175, 78);
275 275
            this.textBoxTextSymbolPath.MenuManager = this.ribbonControl;
276 276
            this.textBoxTextSymbolPath.Name = "textBoxTextSymbolPath";
277 277
            this.textBoxTextSymbolPath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
......
283 283
            // 
284 284
            // textBoxLineNumberPath
285 285
            // 
286
            this.textBoxLineNumberPath.Location = new System.Drawing.Point(208, 79);
286
            this.textBoxLineNumberPath.Location = new System.Drawing.Point(208, 78);
287 287
            this.textBoxLineNumberPath.MenuManager = this.ribbonControl;
288 288
            this.textBoxLineNumberPath.Name = "textBoxLineNumberPath";
289 289
            this.textBoxLineNumberPath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
......
296 296
            // 
297 297
            // gridControlLineNumber
298 298
            // 
299
            this.gridControlLineNumber.Location = new System.Drawing.Point(36, 103);
299
            this.gridControlLineNumber.Location = new System.Drawing.Point(36, 102);
300 300
            this.gridControlLineNumber.MainView = this.gridViewLineNumber;
301 301
            this.gridControlLineNumber.MenuManager = this.ribbonControl;
302 302
            this.gridControlLineNumber.Name = "gridControlLineNumber";
303
            this.gridControlLineNumber.Size = new System.Drawing.Size(663, 559);
303
            this.gridControlLineNumber.Size = new System.Drawing.Size(663, 565);
304 304
            this.gridControlLineNumber.TabIndex = 21;
305 305
            this.gridControlLineNumber.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
306 306
            this.gridViewLineNumber});
......
315 315
            // btnClose
316 316
            // 
317 317
            this.btnClose.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnClose.ImageOptions.SvgImage")));
318
            this.btnClose.Location = new System.Drawing.Point(996, 690);
318
            this.btnClose.Location = new System.Drawing.Point(996, 695);
319 319
            this.btnClose.Name = "btnClose";
320 320
            this.btnClose.Size = new System.Drawing.Size(86, 36);
321 321
            this.btnClose.StyleController = this.layoutControl1;
......
325 325
            // 
326 326
            // gridControlAttribute
327 327
            // 
328
            this.gridControlAttribute.Location = new System.Drawing.Point(36, 79);
328
            this.gridControlAttribute.Location = new System.Drawing.Point(36, 78);
329 329
            this.gridControlAttribute.MainView = this.gridViewAttribute;
330 330
            this.gridControlAttribute.MenuManager = this.ribbonControl;
331 331
            this.gridControlAttribute.Name = "gridControlAttribute";
332
            this.gridControlAttribute.Size = new System.Drawing.Size(663, 583);
332
            this.gridControlAttribute.Size = new System.Drawing.Size(663, 589);
333 333
            this.gridControlAttribute.TabIndex = 19;
334 334
            this.gridControlAttribute.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
335 335
            this.gridViewAttribute});
......
343 343
            // 
344 344
            // gridControlLine
345 345
            // 
346
            this.gridControlLine.Location = new System.Drawing.Point(36, 79);
346
            this.gridControlLine.Location = new System.Drawing.Point(36, 78);
347 347
            this.gridControlLine.MainView = this.gridViewLine;
348 348
            this.gridControlLine.MenuManager = this.ribbonControl;
349 349
            this.gridControlLine.Name = "gridControlLine";
350
            this.gridControlLine.Size = new System.Drawing.Size(663, 583);
350
            this.gridControlLine.Size = new System.Drawing.Size(663, 589);
351 351
            this.gridControlLine.TabIndex = 18;
352 352
            this.gridControlLine.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
353 353
            this.gridViewLine});
......
361 361
            // 
362 362
            // gridControlSymbol
363 363
            // 
364
            this.gridControlSymbol.Location = new System.Drawing.Point(36, 79);
364
            this.gridControlSymbol.Location = new System.Drawing.Point(36, 78);
365 365
            this.gridControlSymbol.MainView = this.gridViewSymbol;
366 366
            this.gridControlSymbol.MenuManager = this.ribbonControl;
367 367
            this.gridControlSymbol.Name = "gridControlSymbol";
368
            this.gridControlSymbol.Size = new System.Drawing.Size(663, 265);
368
            this.gridControlSymbol.Size = new System.Drawing.Size(663, 269);
369 369
            this.gridControlSymbol.TabIndex = 16;
370 370
            this.gridControlSymbol.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
371 371
            this.gridViewSymbol});
......
381 381
            // 
382 382
            // pictureEditSPPIDSymbol
383 383
            // 
384
            this.pictureEditSPPIDSymbol.Location = new System.Drawing.Point(761, 381);
384
            this.pictureEditSPPIDSymbol.Location = new System.Drawing.Point(756, 375);
385 385
            this.pictureEditSPPIDSymbol.MenuManager = this.ribbonControl;
386 386
            this.pictureEditSPPIDSymbol.Name = "pictureEditSPPIDSymbol";
387 387
            this.pictureEditSPPIDSymbol.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.Auto;
388 388
            this.pictureEditSPPIDSymbol.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Squeeze;
389
            this.pictureEditSPPIDSymbol.Size = new System.Drawing.Size(297, 241);
389
            this.pictureEditSPPIDSymbol.Size = new System.Drawing.Size(302, 250);
390 390
            this.pictureEditSPPIDSymbol.StyleController = this.layoutControl1;
391 391
            this.pictureEditSPPIDSymbol.TabIndex = 15;
392 392
            // 
393 393
            // btnSave
394 394
            // 
395 395
            this.btnSave.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnSave.ImageOptions.SvgImage")));
396
            this.btnSave.Location = new System.Drawing.Point(893, 690);
396
            this.btnSave.Location = new System.Drawing.Point(893, 695);
397 397
            this.btnSave.Name = "btnSave";
398 398
            this.btnSave.Size = new System.Drawing.Size(84, 36);
399 399
            this.btnSave.StyleController = this.layoutControl1;
......
404 404
            // treeListSPPIDTreeList
405 405
            // 
406 406
            this.treeListSPPIDTreeList.Cursor = System.Windows.Forms.Cursors.Default;
407
            this.treeListSPPIDTreeList.Location = new System.Drawing.Point(749, 45);
407
            this.treeListSPPIDTreeList.Location = new System.Drawing.Point(744, 43);
408 408
            this.treeListSPPIDTreeList.Name = "treeListSPPIDTreeList";
409
            this.treeListSPPIDTreeList.Size = new System.Drawing.Size(321, 289);
409
            this.treeListSPPIDTreeList.Size = new System.Drawing.Size(326, 292);
410 410
            this.treeListSPPIDTreeList.TabIndex = 12;
411 411
            this.treeListSPPIDTreeList.FocusedNodeChanged += new DevExpress.XtraTreeList.FocusedNodeChangedEventHandler(this.treeListSPPIDTreeList_FocusedNodeChanged);
412 412
            this.treeListSPPIDTreeList.DoubleClick += new System.EventHandler(this.treeListSPPIDTreeList_DoubleClick);
413 413
            // 
414 414
            // pictureEditID2Symbol
415 415
            // 
416
            this.pictureEditID2Symbol.Location = new System.Drawing.Point(36, 403);
416
            this.pictureEditID2Symbol.Location = new System.Drawing.Point(36, 399);
417 417
            this.pictureEditID2Symbol.MenuManager = this.ribbonControl;
418 418
            this.pictureEditID2Symbol.Name = "pictureEditID2Symbol";
419 419
            this.pictureEditID2Symbol.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.Auto;
420 420
            this.pictureEditID2Symbol.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Squeeze;
421
            this.pictureEditID2Symbol.Size = new System.Drawing.Size(316, 259);
421
            this.pictureEditID2Symbol.Size = new System.Drawing.Size(316, 268);
422 422
            this.pictureEditID2Symbol.StyleController = this.layoutControl1;
423 423
            this.pictureEditID2Symbol.TabIndex = 4;
424 424
            // 
425 425
            // pictureEditMapped
426 426
            // 
427
            this.pictureEditMapped.Location = new System.Drawing.Point(390, 403);
427
            this.pictureEditMapped.Location = new System.Drawing.Point(385, 399);
428 428
            this.pictureEditMapped.MenuManager = this.ribbonControl;
429 429
            this.pictureEditMapped.Name = "pictureEditMapped";
430 430
            this.pictureEditMapped.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.Auto;
431 431
            this.pictureEditMapped.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Squeeze;
432
            this.pictureEditMapped.Size = new System.Drawing.Size(309, 259);
432
            this.pictureEditMapped.Size = new System.Drawing.Size(314, 268);
433 433
            this.pictureEditMapped.StyleController = this.layoutControl1;
434 434
            this.pictureEditMapped.TabIndex = 5;
435 435
            // 
......
446 446
            this.layoutControlItem4,
447 447
            this.emptySpaceItem1});
448 448
            this.Root.Name = "Root";
449
            this.Root.Size = new System.Drawing.Size(1094, 738);
449
            this.Root.Size = new System.Drawing.Size(1094, 743);
450 450
            this.Root.TextVisible = false;
451 451
            // 
452 452
            // layoutControlGroup2
......
456 456
            this.layoutControlGroup5,
457 457
            this.splitterItem5,
458 458
            this.layoutControlItem15});
459
            this.layoutControlGroup2.Location = new System.Drawing.Point(725, 0);
459
            this.layoutControlGroup2.Location = new System.Drawing.Point(720, 0);
460 460
            this.layoutControlGroup2.Name = "layoutControlGroup2";
461
            this.layoutControlGroup2.Size = new System.Drawing.Size(349, 678);
461
            this.layoutControlGroup2.Size = new System.Drawing.Size(354, 683);
462 462
            this.layoutControlGroup2.Text = "SPPID Symbol";
463 463
            // 
464 464
            // layoutControlItem8
......
466 466
            this.layoutControlItem8.Control = this.treeListSPPIDTreeList;
467 467
            this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
468 468
            this.layoutControlItem8.Name = "layoutControlItem8";
469
            this.layoutControlItem8.Size = new System.Drawing.Size(325, 293);
469
            this.layoutControlItem8.Size = new System.Drawing.Size(330, 296);
470 470
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
471 471
            this.layoutControlItem8.TextVisible = false;
472 472
            // 
......
474 474
            // 
475 475
            this.layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
476 476
            this.layoutControlItem9});
477
            this.layoutControlGroup5.Location = new System.Drawing.Point(0, 303);
477
            this.layoutControlGroup5.Location = new System.Drawing.Point(0, 301);
478 478
            this.layoutControlGroup5.Name = "layoutControlGroup5";
479
            this.layoutControlGroup5.Size = new System.Drawing.Size(325, 290);
479
            this.layoutControlGroup5.Size = new System.Drawing.Size(330, 297);
480 480
            this.layoutControlGroup5.Text = "SPPID Image";
481 481
            // 
482 482
            // layoutControlItem9
......
484 484
            this.layoutControlItem9.Control = this.pictureEditSPPIDSymbol;
485 485
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 0);
486 486
            this.layoutControlItem9.Name = "layoutControlItem9";
487
            this.layoutControlItem9.Size = new System.Drawing.Size(301, 245);
487
            this.layoutControlItem9.Size = new System.Drawing.Size(306, 254);
488 488
            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
489 489
            this.layoutControlItem9.TextVisible = false;
490 490
            // 
491 491
            // splitterItem5
492 492
            // 
493 493
            this.splitterItem5.AllowHotTrack = true;
494
            this.splitterItem5.Location = new System.Drawing.Point(0, 293);
494
            this.splitterItem5.Location = new System.Drawing.Point(0, 296);
495 495
            this.splitterItem5.Name = "splitterItem5";
496
            this.splitterItem5.Size = new System.Drawing.Size(325, 10);
496
            this.splitterItem5.Size = new System.Drawing.Size(330, 5);
497 497
            // 
498 498
            // layoutControlItem15
499 499
            // 
500 500
            this.layoutControlItem15.Control = this.btnImageRefresh;
501
            this.layoutControlItem15.Location = new System.Drawing.Point(0, 593);
501
            this.layoutControlItem15.Location = new System.Drawing.Point(0, 598);
502 502
            this.layoutControlItem15.Name = "layoutControlItem15";
503
            this.layoutControlItem15.Size = new System.Drawing.Size(325, 40);
503
            this.layoutControlItem15.Size = new System.Drawing.Size(330, 42);
504 504
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
505 505
            this.layoutControlItem15.TextVisible = false;
506 506
            // 
507 507
            // emptySpaceItem2
508 508
            // 
509 509
            this.emptySpaceItem2.AllowHotTrack = false;
510
            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 678);
510
            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 683);
511 511
            this.emptySpaceItem2.Name = "emptySpaceItem2";
512 512
            this.emptySpaceItem2.Size = new System.Drawing.Size(881, 40);
513 513
            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
......
517 517
            this.splitterItem3.AllowHotTrack = true;
518 518
            this.splitterItem3.Location = new System.Drawing.Point(715, 0);
519 519
            this.splitterItem3.Name = "splitterItem3";
520
            this.splitterItem3.Size = new System.Drawing.Size(10, 678);
520
            this.splitterItem3.Size = new System.Drawing.Size(5, 683);
521 521
            // 
522 522
            // tabbedControlGroup
523 523
            // 
524 524
            this.tabbedControlGroup.Location = new System.Drawing.Point(0, 0);
525 525
            this.tabbedControlGroup.Name = "tabbedControlGroup";
526 526
            this.tabbedControlGroup.SelectedTabPage = this.GroupSymbol;
527
            this.tabbedControlGroup.Size = new System.Drawing.Size(715, 678);
527
            this.tabbedControlGroup.Size = new System.Drawing.Size(715, 683);
528 528
            this.tabbedControlGroup.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
529 529
            this.GroupSymbol,
530 530
            this.GroupLine,
......
532 532
            this.GroupAttribute,
533 533
            this.GroupETCSetting});
534 534
            // 
535
            // GroupAttribute
536
            // 
537
            this.GroupAttribute.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
538
            this.layoutControlGroup7});
539
            this.GroupAttribute.Location = new System.Drawing.Point(0, 0);
540
            this.GroupAttribute.Name = "GroupAttribute";
541
            this.GroupAttribute.Size = new System.Drawing.Size(691, 636);
542
            this.GroupAttribute.Text = "Attribute";
543
            // 
544
            // layoutControlGroup7
545
            // 
546
            this.layoutControlGroup7.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
547
            this.layoutControlItem11});
548
            this.layoutControlGroup7.Location = new System.Drawing.Point(0, 0);
549
            this.layoutControlGroup7.Name = "layoutControlGroup7";
550
            this.layoutControlGroup7.Size = new System.Drawing.Size(691, 636);
551
            this.layoutControlGroup7.Text = "ID2 Attribute List";
552
            // 
553
            // layoutControlItem11
554
            // 
555
            this.layoutControlItem11.Control = this.gridControlAttribute;
556
            this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
557
            this.layoutControlItem11.Name = "layoutControlItem11";
558
            this.layoutControlItem11.Size = new System.Drawing.Size(667, 593);
559
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
560
            this.layoutControlItem11.TextVisible = false;
561
            // 
535 562
            // GroupSymbol
536 563
            // 
537 564
            this.GroupSymbol.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
......
542 569
            this.layoutControlGroup1});
543 570
            this.GroupSymbol.Location = new System.Drawing.Point(0, 0);
544 571
            this.GroupSymbol.Name = "GroupSymbol";
545
            this.GroupSymbol.Size = new System.Drawing.Size(691, 632);
572
            this.GroupSymbol.Size = new System.Drawing.Size(691, 636);
546 573
            this.GroupSymbol.Text = "Symbol";
547 574
            // 
548 575
            // splitterItem1
549 576
            // 
550 577
            this.splitterItem1.AllowHotTrack = true;
551
            this.splitterItem1.Location = new System.Drawing.Point(0, 314);
578
            this.splitterItem1.Location = new System.Drawing.Point(0, 316);
552 579
            this.splitterItem1.Name = "splitterItem1";
553
            this.splitterItem1.Size = new System.Drawing.Size(691, 10);
580
            this.splitterItem1.Size = new System.Drawing.Size(691, 5);
554 581
            // 
555 582
            // layoutControlGroup3
556 583
            // 
557 584
            this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
558 585
            this.layoutControlItem1});
559
            this.layoutControlGroup3.Location = new System.Drawing.Point(0, 324);
586
            this.layoutControlGroup3.Location = new System.Drawing.Point(0, 321);
560 587
            this.layoutControlGroup3.Name = "layoutControlGroup3";
561
            this.layoutControlGroup3.Size = new System.Drawing.Size(344, 308);
588
            this.layoutControlGroup3.Size = new System.Drawing.Size(344, 315);
562 589
            this.layoutControlGroup3.Text = "ID2 Image";
563 590
            // 
564 591
            // layoutControlItem1
......
566 593
            this.layoutControlItem1.Control = this.pictureEditID2Symbol;
567 594
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
568 595
            this.layoutControlItem1.Name = "layoutControlItem1";
569
            this.layoutControlItem1.Size = new System.Drawing.Size(320, 263);
596
            this.layoutControlItem1.Size = new System.Drawing.Size(320, 272);
570 597
            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
571 598
            this.layoutControlItem1.TextVisible = false;
572 599
            // 
......
574 601
            // 
575 602
            this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
576 603
            this.layoutControlItem2});
577
            this.layoutControlGroup4.Location = new System.Drawing.Point(354, 324);
604
            this.layoutControlGroup4.Location = new System.Drawing.Point(349, 321);
578 605
            this.layoutControlGroup4.Name = "layoutControlGroup4";
579
            this.layoutControlGroup4.Size = new System.Drawing.Size(337, 308);
606
            this.layoutControlGroup4.Size = new System.Drawing.Size(342, 315);
580 607
            this.layoutControlGroup4.Text = "Mapped Image";
581 608
            // 
582 609
            // layoutControlItem2
......
584 611
            this.layoutControlItem2.Control = this.pictureEditMapped;
585 612
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
586 613
            this.layoutControlItem2.Name = "layoutControlItem2";
587
            this.layoutControlItem2.Size = new System.Drawing.Size(313, 263);
614
            this.layoutControlItem2.Size = new System.Drawing.Size(318, 272);
588 615
            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
589 616
            this.layoutControlItem2.TextVisible = false;
590 617
            // 
591 618
            // splitterItem4
592 619
            // 
593 620
            this.splitterItem4.AllowHotTrack = true;
594
            this.splitterItem4.Location = new System.Drawing.Point(344, 324);
621
            this.splitterItem4.Location = new System.Drawing.Point(344, 321);
595 622
            this.splitterItem4.Name = "splitterItem4";
596
            this.splitterItem4.Size = new System.Drawing.Size(10, 308);
623
            this.splitterItem4.Size = new System.Drawing.Size(5, 315);
597 624
            // 
598 625
            // layoutControlGroup1
599 626
            // 
......
601 628
            this.layoutControlItem6});
602 629
            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
603 630
            this.layoutControlGroup1.Name = "layoutControlGroup1";
604
            this.layoutControlGroup1.Size = new System.Drawing.Size(691, 314);
631
            this.layoutControlGroup1.Size = new System.Drawing.Size(691, 316);
605 632
            this.layoutControlGroup1.Text = "ID2 Symbol List";
606 633
            // 
607 634
            // layoutControlItem6
......
609 636
            this.layoutControlItem6.Control = this.gridControlSymbol;
610 637
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 0);
611 638
            this.layoutControlItem6.Name = "layoutControlItem6";
612
            this.layoutControlItem6.Size = new System.Drawing.Size(667, 269);
639
            this.layoutControlItem6.Size = new System.Drawing.Size(667, 273);
613 640
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
614 641
            this.layoutControlItem6.TextVisible = false;
615 642
            // 
......
619 646
            this.layoutControlGroup6});
620 647
            this.GroupLine.Location = new System.Drawing.Point(0, 0);
621 648
            this.GroupLine.Name = "GroupLine";
622
            this.GroupLine.Size = new System.Drawing.Size(691, 632);
649
            this.GroupLine.Size = new System.Drawing.Size(691, 636);
623 650
            this.GroupLine.Text = "Line";
624 651
            // 
625 652
            // layoutControlGroup6
......
628 655
            this.layoutControlItem10});
629 656
            this.layoutControlGroup6.Location = new System.Drawing.Point(0, 0);
630 657
            this.layoutControlGroup6.Name = "layoutControlGroup6";
631
            this.layoutControlGroup6.Size = new System.Drawing.Size(691, 632);
658
            this.layoutControlGroup6.Size = new System.Drawing.Size(691, 636);
632 659
            this.layoutControlGroup6.Text = "ID2 Line List";
633 660
            // 
634 661
            // layoutControlItem10
......
636 663
            this.layoutControlItem10.Control = this.gridControlLine;
637 664
            this.layoutControlItem10.Location = new System.Drawing.Point(0, 0);
638 665
            this.layoutControlItem10.Name = "layoutControlItem10";
639
            this.layoutControlItem10.Size = new System.Drawing.Size(667, 587);
666
            this.layoutControlItem10.Size = new System.Drawing.Size(667, 593);
640 667
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
641 668
            this.layoutControlItem10.TextVisible = false;
642 669
            // 
......
646 673
            this.layoutControlGroup8});
647 674
            this.GroupLineNumber.Location = new System.Drawing.Point(0, 0);
648 675
            this.GroupLineNumber.Name = "GroupLineNumber";
649
            this.GroupLineNumber.Size = new System.Drawing.Size(691, 632);
676
            this.GroupLineNumber.Size = new System.Drawing.Size(691, 636);
650 677
            this.GroupLineNumber.Text = "Line Number";
651 678
            // 
652 679
            // layoutControlGroup8
......
657 684
            this.layoutControlItem18});
658 685
            this.layoutControlGroup8.Location = new System.Drawing.Point(0, 0);
659 686
            this.layoutControlGroup8.Name = "layoutControlGroup8";
660
            this.layoutControlGroup8.Size = new System.Drawing.Size(691, 632);
687
            this.layoutControlGroup8.Size = new System.Drawing.Size(691, 636);
661 688
            this.layoutControlGroup8.Text = "ID2 Line Number";
662 689
            // 
663 690
            // layoutControlItem13
......
665 692
            this.layoutControlItem13.Control = this.gridControlLineNumber;
666 693
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 24);
667 694
            this.layoutControlItem13.Name = "layoutControlItem13";
668
            this.layoutControlItem13.Size = new System.Drawing.Size(667, 563);
695
            this.layoutControlItem13.Size = new System.Drawing.Size(667, 569);
669 696
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
670 697
            this.layoutControlItem13.TextVisible = false;
671 698
            // 
......
691 718
            this.layoutControlItem18.TextSize = new System.Drawing.Size(78, 14);
692 719
            this.layoutControlItem18.TextToControlDistance = 5;
693 720
            // 
694
            // GroupAttribute
695
            // 
696
            this.GroupAttribute.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
697
            this.layoutControlGroup7});
698
            this.GroupAttribute.Location = new System.Drawing.Point(0, 0);
699
            this.GroupAttribute.Name = "GroupAttribute";
700
            this.GroupAttribute.Size = new System.Drawing.Size(691, 632);
701
            this.GroupAttribute.Text = "Attribute";
702
            // 
703
            // layoutControlGroup7
704
            // 
705
            this.layoutControlGroup7.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
706
            this.layoutControlItem11});
707
            this.layoutControlGroup7.Location = new System.Drawing.Point(0, 0);
708
            this.layoutControlGroup7.Name = "layoutControlGroup7";
709
            this.layoutControlGroup7.Size = new System.Drawing.Size(691, 632);
710
            this.layoutControlGroup7.Text = "ID2 Attribute List";
711
            // 
712
            // layoutControlItem11
713
            // 
714
            this.layoutControlItem11.Control = this.gridControlAttribute;
715
            this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
716
            this.layoutControlItem11.Name = "layoutControlItem11";
717
            this.layoutControlItem11.Size = new System.Drawing.Size(667, 587);
718
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
719
            this.layoutControlItem11.TextVisible = false;
720
            // 
721 721
            // GroupETCSetting
722 722
            // 
723 723
            this.GroupETCSetting.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
......
726 726
            this.layoutControlGroup10});
727 727
            this.GroupETCSetting.Location = new System.Drawing.Point(0, 0);
728 728
            this.GroupETCSetting.Name = "GroupETCSetting";
729
            this.GroupETCSetting.Size = new System.Drawing.Size(691, 632);
729
            this.GroupETCSetting.Size = new System.Drawing.Size(691, 636);
730 730
            this.GroupETCSetting.Text = "ETC Setting";
731 731
            // 
732 732
            // emptySpaceItem3
733 733
            // 
734 734
            this.emptySpaceItem3.AllowHotTrack = false;
735
            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 162);
735
            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 158);
736 736
            this.emptySpaceItem3.Name = "emptySpaceItem3";
737
            this.emptySpaceItem3.Size = new System.Drawing.Size(691, 470);
737
            this.emptySpaceItem3.Size = new System.Drawing.Size(691, 478);
738 738
            this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
739 739
            // 
740 740
            // layoutControlGroup9
......
746 746
            this.layoutControlItem17});
747 747
            this.layoutControlGroup9.Location = new System.Drawing.Point(0, 0);
748 748
            this.layoutControlGroup9.Name = "layoutControlGroup9";
749
            this.layoutControlGroup9.Size = new System.Drawing.Size(691, 93);
749
            this.layoutControlGroup9.Size = new System.Drawing.Size(691, 91);
750 750
            this.layoutControlGroup9.Text = "Text && Note Setting";
751 751
            // 
752 752
            // layoutControlItem5
......
793 793
            // 
794 794
            this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
795 795
            this.layoutControlItem14});
796
            this.layoutControlGroup10.Location = new System.Drawing.Point(0, 93);
796
            this.layoutControlGroup10.Location = new System.Drawing.Point(0, 91);
797 797
            this.layoutControlGroup10.Name = "layoutControlGroup10";
798
            this.layoutControlGroup10.Size = new System.Drawing.Size(691, 69);
798
            this.layoutControlGroup10.Size = new System.Drawing.Size(691, 67);
799 799
            this.layoutControlGroup10.Text = "Drain Valve Setting";
800 800
            // 
801 801
            // layoutControlItem14
......
810 810
            // layoutControlItem12
811 811
            // 
812 812
            this.layoutControlItem12.Control = this.btnClose;
813
            this.layoutControlItem12.Location = new System.Drawing.Point(984, 678);
813
            this.layoutControlItem12.Location = new System.Drawing.Point(984, 683);
814 814
            this.layoutControlItem12.MaxSize = new System.Drawing.Size(90, 40);
815 815
            this.layoutControlItem12.MinSize = new System.Drawing.Size(90, 40);
816 816
            this.layoutControlItem12.Name = "layoutControlItem12";
......
822 822
            // layoutControlItem4
823 823
            // 
824 824
            this.layoutControlItem4.Control = this.btnSave;
825
            this.layoutControlItem4.Location = new System.Drawing.Point(881, 678);
825
            this.layoutControlItem4.Location = new System.Drawing.Point(881, 683);
826 826
            this.layoutControlItem4.MaxSize = new System.Drawing.Size(88, 40);
827 827
            this.layoutControlItem4.MinSize = new System.Drawing.Size(88, 40);
828 828
            this.layoutControlItem4.Name = "layoutControlItem4";
......
834 834
            // emptySpaceItem1
835 835
            // 
836 836
            this.emptySpaceItem1.AllowHotTrack = false;
837
            this.emptySpaceItem1.Location = new System.Drawing.Point(969, 678);
837
            this.emptySpaceItem1.Location = new System.Drawing.Point(969, 683);
838 838
            this.emptySpaceItem1.MaxSize = new System.Drawing.Size(15, 40);
839 839
            this.emptySpaceItem1.MinSize = new System.Drawing.Size(15, 40);
840 840
            this.emptySpaceItem1.Name = "emptySpaceItem1";
......
887 887
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
888 888
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem3)).EndInit();
889 889
            ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup)).EndInit();
890
            ((System.ComponentModel.ISupportInitialize)(this.GroupAttribute)).EndInit();
891
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit();
892
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
890 893
            ((System.ComponentModel.ISupportInitialize)(this.GroupSymbol)).EndInit();
891 894
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit();
892 895
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
......
904 907
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
905 908
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
906 909
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
907
            ((System.ComponentModel.ISupportInitialize)(this.GroupAttribute)).EndInit();
908
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit();
909
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
910 910
            ((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).EndInit();
911 911
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
912 912
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit();
DTI_PID/SPPIDConverter/Form/MappingForm.cs
129 129
            gridControlLine.RepositoryItems.Add(clearButton);
130 130
            gridViewLine.ExpandAllGroups();
131 131

  
132
            // Association GridView
132
            // Attribute GridView
133 133
            gridControlAttribute.DataSource = attributeDT;
134 134
            gridViewAttribute.Columns["UID"].Visible = false;
135 135
            gridViewAttribute.Columns["DisplayAttribute"].Caption = "Attribute Name";
......
139 139
            gridViewAttribute.Columns["SPPID_SYMBOL_PATH"].OptionsColumn.AllowEdit = false;
140 140
            gridViewAttribute.Columns["LOCATION"].Caption = "Label Location";
141 141
            gridViewAttribute.Columns["LEADERLINE"].Caption = "Show Leader Line";
142
            gridViewAttribute.Columns["Property"].Visible = false;
142 143

  
143 144
            RepositoryItemCheckedComboBoxEdit checkedComboEdit = new RepositoryItemCheckedComboBoxEdit();
144 145
            foreach (DataRow item in attributeDT.Rows)
......
382 383
                MessageBox.Show(Msg.FailSave, Msg.Warning, MessageBoxButtons.OK, MessageBoxIcon.Warning);
383 384
            Cursor = Cursors.Default;
384 385
        }
386

  
385 387
        private void btnClose_Click(object sender, EventArgs e)
386 388
        {
387 389
            DialogResult = DialogResult.Cancel;

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)