프로젝트

일반

사용자정보

개정판 b8bd98aa

IDb8bd98aa8f4e79801a9c7d0069d6ea9871e4e5f8
상위 c2fef4ca
하위 661893d7, 289e9573

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

dev issue #000 : label readerLine 폼 개발

Change-Id: I837241e93ce08c6f4f75a7abe37ac1917c6eb711

차이점 보기:

DTI_PID/BaseModel/Project_DB.cs
15 15
        const string SPPID_SYMBOL_MAPPING_TABLE = "T_SPPID_SYMBOL_MAPPING";
16 16
        const string SPPID_ATTRIBUTE_MAPPING_TABLE = "T_SPPID_ATTRIBUTE_MAPPING";
17 17
        const string SPPID_ETC_SETTING_TABLE = "T_SPPID_ETC_SETTING_TABLE";
18
        const string SPPID_LABEL_LOCATION_TABLE = "T_SPPID_LABEL_LOCATION";
18
        const string SPPID_LABEL_INFO_TABLE = "T_SPPID_LABEL_INFO";
19 19

  
20 20
        const string LineProperties_TABLE = "LineProperties";
21 21
        const string LineTypes_TABLE = "LineTypes";
......
206 206
                        cmd.CommandText = string.Format("CREATE TABLE {0} (UID TEXT PRIMARY KEY, SPPID_ATTRIBUTE TEXT)", SPPID_ATTRIBUTE_MAPPING_TABLE);
207 207
                        cmd.ExecuteNonQuery();
208 208
                    }
209
                    if (dt.Select(string.Format("NAME = '{0}'", SPPID_LABEL_LOCATION_TABLE)).Length == 0)
209
                    if (dt.Select(string.Format("NAME = '{0}'", SPPID_LABEL_INFO_TABLE)).Length == 0)
210 210
                    {
211
                        cmd.CommandText = string.Format("CREATE TABLE {0} (UID TEXT PRIMARY KEY, LOCATION INT DEFAULT 0)", SPPID_LABEL_LOCATION_TABLE);
211
                        cmd.CommandText = string.Format("CREATE TABLE {0} (UID TEXT PRIMARY KEY, LOCATION INT DEFAULT 0, LEADERLINE BOOLEAN)", SPPID_LABEL_INFO_TABLE);
212 212
                        cmd.ExecuteNonQuery();
213 213
                    }
214 214
                }
......
413 413
                    using (SQLiteCommand cmd = connection.CreateCommand())
414 414
                    {
415 415
                        cmd.CommandText = string.Format(@"
416
                            SELECT sa.UID, sa.DisplayAttribute, st.TYPE, spa.SPPID_ATTRIBUTE, sp.SPPID_SYMBOL_PATH, spl.LOCATION 
416
                            SELECT sa.UID, sa.DisplayAttribute, st.TYPE, spa.SPPID_ATTRIBUTE, sp.SPPID_SYMBOL_PATH, spl.LOCATION, spl.LEADERLINE 
417 417
                            FROM {1} as sa, {0} as st 
418 418
                                 LEFT OUTER JOIN {2} as sp 
419 419
                                      ON sa.UID = SP.UID 
......
421 421
                                     ON sa.UID = spa.UID
422 422
                                LEFT OUTER JOIN {4} as spl 
423 423
                                     ON sa.UID = spl.UID
424
                            WHERE sa.SymbolType_UID = st.UID;", SymbolType_TABLE, SymbolAttribute_TABLE, SPPID_SYMBOL_MAPPING_TABLE, SPPID_ATTRIBUTE_MAPPING_TABLE, SPPID_LABEL_LOCATION_TABLE);
424
                            WHERE sa.SymbolType_UID = st.UID;", SymbolType_TABLE, SymbolAttribute_TABLE, SPPID_SYMBOL_MAPPING_TABLE, SPPID_ATTRIBUTE_MAPPING_TABLE, SPPID_LABEL_INFO_TABLE);
425 425
                        using (SQLiteDataReader dr = cmd.ExecuteReader())
426 426
                            dt.Load(dr);
427 427
                    }
......
540 540
            return true;
541 541
        }
542 542

  
543
        public static bool InsertLocationMapping(List<Tuple<string, int>> datas)
543
        public static bool InsertLocationMapping(List<Tuple<string, int, bool>> datas)
544 544
        {
545 545
            Project_Info projectInfo = Project_Info.GetInstance();
546 546
            using (SQLiteConnection connection = new SQLiteConnection(string.Format(CultureInfo.CurrentCulture, "Data Source = {0}", projectInfo.DBFilePath)))
......
557 557
                                foreach (var item in datas)
558 558
                                {
559 559
                                    cmd.Parameters.Clear();
560
                                    cmd.CommandText = string.Format("INSERT OR REPLACE INTO {0} (UID, LOCATION) VALUES (@UID, @LOCATION)", SPPID_LABEL_LOCATION_TABLE);
560
                                    cmd.CommandText = string.Format("INSERT OR REPLACE INTO {0} (UID, LOCATION, LEADERLINE) VALUES (@UID, @LOCATION, @LEADERLINE)", SPPID_LABEL_INFO_TABLE);
561 561
                                    cmd.Parameters.AddWithValue("@UID", item.Item1);
562 562
                                    cmd.Parameters.AddWithValue("@LOCATION", item.Item2);
563
                                    cmd.Parameters.AddWithValue("@LEADERLINE", item.Item3);
563 564
                                    cmd.ExecuteNonQuery();
564 565
                                }
565 566
                            }
DTI_PID/SPPIDConverter/Form/MappingForm.Designer.cs
31 31
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MappingForm));
32 32
            this.ribbonControl = new DevExpress.XtraBars.Ribbon.RibbonControl();
33 33
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
34
            this.checkComboBoxLineNumberLocation = new DevExpress.XtraEditors.CheckedComboBoxEdit();
34 35
            this.checkComboBoxNoteLocation = new DevExpress.XtraEditors.CheckedComboBoxEdit();
35 36
            this.checkComboBoxTextLocation = new DevExpress.XtraEditors.CheckedComboBoxEdit();
36 37
            this.btnImageRefresh = new DevExpress.XtraEditors.SimpleButton();
......
62 63
            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
63 64
            this.splitterItem3 = new DevExpress.XtraLayout.SplitterItem();
64 65
            this.tabbedControlGroup = new DevExpress.XtraLayout.TabbedControlGroup();
65
            this.GroupETCSetting = new DevExpress.XtraLayout.LayoutControlGroup();
66
            this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
67
            this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup();
68
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
69
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
70
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
71
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
72
            this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
73
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
66
            this.GroupLineNumber = new DevExpress.XtraLayout.LayoutControlGroup();
67
            this.layoutControlGroup8 = new DevExpress.XtraLayout.LayoutControlGroup();
68
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
69
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
70
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
74 71
            this.GroupSymbol = new DevExpress.XtraLayout.LayoutControlGroup();
75 72
            this.splitterItem1 = new DevExpress.XtraLayout.SplitterItem();
76 73
            this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
......
83 80
            this.GroupLine = new DevExpress.XtraLayout.LayoutControlGroup();
84 81
            this.layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup();
85 82
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
86
            this.GroupLineNumber = new DevExpress.XtraLayout.LayoutControlGroup();
87
            this.layoutControlGroup8 = new DevExpress.XtraLayout.LayoutControlGroup();
88
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
89
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
90 83
            this.GroupAttribute = new DevExpress.XtraLayout.LayoutControlGroup();
91 84
            this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup();
92 85
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
86
            this.GroupETCSetting = new DevExpress.XtraLayout.LayoutControlGroup();
87
            this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
88
            this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup();
89
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
90
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
91
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
92
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
93
            this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup();
94
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
93 95
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
94 96
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
95 97
            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
96
            this.checkComboBoxLineNumberLocation = new DevExpress.XtraEditors.CheckedComboBoxEdit();
97
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
98 98
            ((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit();
99 99
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
100 100
            this.layoutControl1.SuspendLayout();
101
            ((System.ComponentModel.ISupportInitialize)(this.checkComboBoxLineNumberLocation.Properties)).BeginInit();
101 102
            ((System.ComponentModel.ISupportInitialize)(this.checkComboBoxNoteLocation.Properties)).BeginInit();
102 103
            ((System.ComponentModel.ISupportInitialize)(this.checkComboBoxTextLocation.Properties)).BeginInit();
103 104
            ((System.ComponentModel.ISupportInitialize)(this.textBoxDrainValveSize.Properties)).BeginInit();
......
126 127
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
127 128
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem3)).BeginInit();
128 129
            ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup)).BeginInit();
129
            ((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).BeginInit();
130
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
131
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit();
132
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
133
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
134
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
135
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
136
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit();
137
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
130
            ((System.ComponentModel.ISupportInitialize)(this.GroupLineNumber)).BeginInit();
131
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).BeginInit();
132
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
133
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
134
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
138 135
            ((System.ComponentModel.ISupportInitialize)(this.GroupSymbol)).BeginInit();
139 136
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit();
140 137
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
......
147 144
            ((System.ComponentModel.ISupportInitialize)(this.GroupLine)).BeginInit();
148 145
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).BeginInit();
149 146
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
150
            ((System.ComponentModel.ISupportInitialize)(this.GroupLineNumber)).BeginInit();
151
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).BeginInit();
152
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
153
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
154 147
            ((System.ComponentModel.ISupportInitialize)(this.GroupAttribute)).BeginInit();
155 148
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit();
156 149
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
150
            ((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).BeginInit();
151
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
152
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit();
153
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
154
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
155
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
156
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
157
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit();
158
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
157 159
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
158 160
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
159 161
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
160
            ((System.ComponentModel.ISupportInitialize)(this.checkComboBoxLineNumberLocation.Properties)).BeginInit();
161
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
162 162
            this.SuspendLayout();
163 163
            // 
164 164
            // ribbonControl
......
204 204
            this.layoutControl1.TabIndex = 2;
205 205
            this.layoutControl1.Text = "layoutControl1";
206 206
            // 
207
            // checkComboBoxLineNumberLocation
208
            // 
209
            this.checkComboBoxLineNumberLocation.Location = new System.Drawing.Point(529, 79);
210
            this.checkComboBoxLineNumberLocation.MenuManager = this.ribbonControl;
211
            this.checkComboBoxLineNumberLocation.Name = "checkComboBoxLineNumberLocation";
212
            this.checkComboBoxLineNumberLocation.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
213
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
214
            this.checkComboBoxLineNumberLocation.Size = new System.Drawing.Size(170, 20);
215
            this.checkComboBoxLineNumberLocation.StyleController = this.layoutControl1;
216
            this.checkComboBoxLineNumberLocation.TabIndex = 30;
217
            // 
207 218
            // checkComboBoxNoteLocation
208 219
            // 
209 220
            this.checkComboBoxNoteLocation.Location = new System.Drawing.Point(522, 103);
......
513 524
            // 
514 525
            this.tabbedControlGroup.Location = new System.Drawing.Point(0, 0);
515 526
            this.tabbedControlGroup.Name = "tabbedControlGroup";
516
            this.tabbedControlGroup.SelectedTabPage = this.GroupLineNumber;
527
            this.tabbedControlGroup.SelectedTabPage = this.GroupSymbol;
517 528
            this.tabbedControlGroup.Size = new System.Drawing.Size(715, 678);
518 529
            this.tabbedControlGroup.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
519 530
            this.GroupSymbol,
......
522 533
            this.GroupAttribute,
523 534
            this.GroupETCSetting});
524 535
            // 
525
            // GroupETCSetting
526
            // 
527
            this.GroupETCSetting.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
528
            this.emptySpaceItem3,
529
            this.layoutControlGroup9,
530
            this.layoutControlGroup10});
531
            this.GroupETCSetting.Location = new System.Drawing.Point(0, 0);
532
            this.GroupETCSetting.Name = "GroupETCSetting";
533
            this.GroupETCSetting.Size = new System.Drawing.Size(691, 632);
534
            this.GroupETCSetting.Text = "ETC Setting";
535
            // 
536
            // emptySpaceItem3
537
            // 
538
            this.emptySpaceItem3.AllowHotTrack = false;
539
            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 162);
540
            this.emptySpaceItem3.Name = "emptySpaceItem3";
541
            this.emptySpaceItem3.Size = new System.Drawing.Size(691, 470);
542
            this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
543
            // 
544
            // layoutControlGroup9
545
            // 
546
            this.layoutControlGroup9.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
547
            this.layoutControlItem5,
548
            this.layoutControlItem7,
549
            this.layoutControlItem16,
550
            this.layoutControlItem17});
551
            this.layoutControlGroup9.Location = new System.Drawing.Point(0, 0);
552
            this.layoutControlGroup9.Name = "layoutControlGroup9";
553
            this.layoutControlGroup9.Size = new System.Drawing.Size(691, 93);
554
            this.layoutControlGroup9.Text = "Text && Note Setting";
555
            // 
556
            // layoutControlItem5
557
            // 
558
            this.layoutControlItem5.Control = this.textBoxTextSymbolPath;
559
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 0);
560
            this.layoutControlItem5.Name = "layoutControlItem5";
561
            this.layoutControlItem5.Size = new System.Drawing.Size(403, 24);
562
            this.layoutControlItem5.Text = "SPPID Text Symbol Path";
563
            this.layoutControlItem5.TextSize = new System.Drawing.Size(136, 14);
564
            // 
565
            // layoutControlItem7
536
            // GroupLineNumber
566 537
            // 
567
            this.layoutControlItem7.Control = this.textBoxNoteSymbolPath;
568
            this.layoutControlItem7.Location = new System.Drawing.Point(0, 24);
569
            this.layoutControlItem7.Name = "layoutControlItem7";
570
            this.layoutControlItem7.Size = new System.Drawing.Size(403, 24);
571
            this.layoutControlItem7.Text = "SPPID Note Symbol Path";
572
            this.layoutControlItem7.TextSize = new System.Drawing.Size(136, 14);
538
            this.GroupLineNumber.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
539
            this.layoutControlGroup8});
540
            this.GroupLineNumber.Location = new System.Drawing.Point(0, 0);
541
            this.GroupLineNumber.Name = "GroupLineNumber";
542
            this.GroupLineNumber.Size = new System.Drawing.Size(691, 632);
543
            this.GroupLineNumber.Text = "Line Number";
573 544
            // 
574
            // layoutControlItem16
545
            // layoutControlGroup8
575 546
            // 
576
            this.layoutControlItem16.Control = this.checkComboBoxTextLocation;
577
            this.layoutControlItem16.Location = new System.Drawing.Point(403, 0);
578
            this.layoutControlItem16.Name = "layoutControlItem16";
579
            this.layoutControlItem16.Size = new System.Drawing.Size(264, 24);
580
            this.layoutControlItem16.Text = "Label Location";
581
            this.layoutControlItem16.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
582
            this.layoutControlItem16.TextSize = new System.Drawing.Size(78, 14);
583
            this.layoutControlItem16.TextToControlDistance = 5;
547
            this.layoutControlGroup8.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
548
            this.layoutControlItem13,
549
            this.layoutControlItem3,
550
            this.layoutControlItem18});
551
            this.layoutControlGroup8.Location = new System.Drawing.Point(0, 0);
552
            this.layoutControlGroup8.Name = "layoutControlGroup8";
553
            this.layoutControlGroup8.Size = new System.Drawing.Size(691, 632);
554
            this.layoutControlGroup8.Text = "ID2 Line Number";
584 555
            // 
585
            // layoutControlItem17
556
            // layoutControlItem13
586 557
            // 
587
            this.layoutControlItem17.Control = this.checkComboBoxNoteLocation;
588
            this.layoutControlItem17.Location = new System.Drawing.Point(403, 24);
589
            this.layoutControlItem17.Name = "layoutControlItem17";
590
            this.layoutControlItem17.Size = new System.Drawing.Size(264, 24);
591
            this.layoutControlItem17.Text = "Label Location";
592
            this.layoutControlItem17.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
593
            this.layoutControlItem17.TextSize = new System.Drawing.Size(78, 14);
594
            this.layoutControlItem17.TextToControlDistance = 5;
558
            this.layoutControlItem13.Control = this.gridControlLineNumber;
559
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 24);
560
            this.layoutControlItem13.Name = "layoutControlItem13";
561
            this.layoutControlItem13.Size = new System.Drawing.Size(667, 563);
562
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
563
            this.layoutControlItem13.TextVisible = false;
595 564
            // 
596
            // layoutControlGroup10
565
            // layoutControlItem3
597 566
            // 
598
            this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
599
            this.layoutControlItem14});
600
            this.layoutControlGroup10.Location = new System.Drawing.Point(0, 93);
601
            this.layoutControlGroup10.Name = "layoutControlGroup10";
602
            this.layoutControlGroup10.Size = new System.Drawing.Size(691, 69);
603
            this.layoutControlGroup10.Text = "Drain Valve Setting";
567
            this.layoutControlItem3.Control = this.textBoxLineNumberPath;
568
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
569
            this.layoutControlItem3.Name = "layoutControlItem3";
570
            this.layoutControlItem3.Size = new System.Drawing.Size(410, 24);
571
            this.layoutControlItem3.Text = "SPPID Line Number Label Path";
572
            this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
573
            this.layoutControlItem3.TextSize = new System.Drawing.Size(167, 14);
574
            this.layoutControlItem3.TextToControlDistance = 5;
604 575
            // 
605
            // layoutControlItem14
576
            // layoutControlItem18
606 577
            // 
607
            this.layoutControlItem14.Control = this.textBoxDrainValveSize;
608
            this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
609
            this.layoutControlItem14.Name = "layoutControlItem14";
610
            this.layoutControlItem14.Size = new System.Drawing.Size(667, 24);
611
            this.layoutControlItem14.Text = "Drain Valve Size";
612
            this.layoutControlItem14.TextSize = new System.Drawing.Size(136, 14);
578
            this.layoutControlItem18.Control = this.checkComboBoxLineNumberLocation;
579
            this.layoutControlItem18.Location = new System.Drawing.Point(410, 0);
580
            this.layoutControlItem18.Name = "layoutControlItem18";
581
            this.layoutControlItem18.Size = new System.Drawing.Size(257, 24);
582
            this.layoutControlItem18.Text = "Label Location";
583
            this.layoutControlItem18.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
584
            this.layoutControlItem18.TextSize = new System.Drawing.Size(78, 14);
585
            this.layoutControlItem18.TextToControlDistance = 5;
613 586
            // 
614 587
            // GroupSymbol
615 588
            // 
......
719 692
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
720 693
            this.layoutControlItem10.TextVisible = false;
721 694
            // 
722
            // GroupLineNumber
723
            // 
724
            this.GroupLineNumber.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
725
            this.layoutControlGroup8});
726
            this.GroupLineNumber.Location = new System.Drawing.Point(0, 0);
727
            this.GroupLineNumber.Name = "GroupLineNumber";
728
            this.GroupLineNumber.Size = new System.Drawing.Size(691, 632);
729
            this.GroupLineNumber.Text = "Line Number";
730
            // 
731
            // layoutControlGroup8
732
            // 
733
            this.layoutControlGroup8.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
734
            this.layoutControlItem13,
735
            this.layoutControlItem3,
736
            this.layoutControlItem18});
737
            this.layoutControlGroup8.Location = new System.Drawing.Point(0, 0);
738
            this.layoutControlGroup8.Name = "layoutControlGroup8";
739
            this.layoutControlGroup8.Size = new System.Drawing.Size(691, 632);
740
            this.layoutControlGroup8.Text = "ID2 Line Number";
741
            // 
742
            // layoutControlItem13
743
            // 
744
            this.layoutControlItem13.Control = this.gridControlLineNumber;
745
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 24);
746
            this.layoutControlItem13.Name = "layoutControlItem13";
747
            this.layoutControlItem13.Size = new System.Drawing.Size(667, 563);
748
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
749
            this.layoutControlItem13.TextVisible = false;
750
            // 
751
            // layoutControlItem3
752
            // 
753
            this.layoutControlItem3.Control = this.textBoxLineNumberPath;
754
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
755
            this.layoutControlItem3.Name = "layoutControlItem3";
756
            this.layoutControlItem3.Size = new System.Drawing.Size(410, 24);
757
            this.layoutControlItem3.Text = "SPPID Line Number Label Path";
758
            this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
759
            this.layoutControlItem3.TextSize = new System.Drawing.Size(167, 14);
760
            this.layoutControlItem3.TextToControlDistance = 5;
761
            // 
762 695
            // GroupAttribute
763 696
            // 
764 697
            this.GroupAttribute.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
......
786 719
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
787 720
            this.layoutControlItem11.TextVisible = false;
788 721
            // 
722
            // GroupETCSetting
723
            // 
724
            this.GroupETCSetting.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
725
            this.emptySpaceItem3,
726
            this.layoutControlGroup9,
727
            this.layoutControlGroup10});
728
            this.GroupETCSetting.Location = new System.Drawing.Point(0, 0);
729
            this.GroupETCSetting.Name = "GroupETCSetting";
730
            this.GroupETCSetting.Size = new System.Drawing.Size(691, 632);
731
            this.GroupETCSetting.Text = "ETC Setting";
732
            // 
733
            // emptySpaceItem3
734
            // 
735
            this.emptySpaceItem3.AllowHotTrack = false;
736
            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 162);
737
            this.emptySpaceItem3.Name = "emptySpaceItem3";
738
            this.emptySpaceItem3.Size = new System.Drawing.Size(691, 470);
739
            this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
740
            // 
741
            // layoutControlGroup9
742
            // 
743
            this.layoutControlGroup9.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
744
            this.layoutControlItem5,
745
            this.layoutControlItem7,
746
            this.layoutControlItem16,
747
            this.layoutControlItem17});
748
            this.layoutControlGroup9.Location = new System.Drawing.Point(0, 0);
749
            this.layoutControlGroup9.Name = "layoutControlGroup9";
750
            this.layoutControlGroup9.Size = new System.Drawing.Size(691, 93);
751
            this.layoutControlGroup9.Text = "Text && Note Setting";
752
            // 
753
            // layoutControlItem5
754
            // 
755
            this.layoutControlItem5.Control = this.textBoxTextSymbolPath;
756
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 0);
757
            this.layoutControlItem5.Name = "layoutControlItem5";
758
            this.layoutControlItem5.Size = new System.Drawing.Size(403, 24);
759
            this.layoutControlItem5.Text = "SPPID Text Symbol Path";
760
            this.layoutControlItem5.TextSize = new System.Drawing.Size(136, 14);
761
            // 
762
            // layoutControlItem7
763
            // 
764
            this.layoutControlItem7.Control = this.textBoxNoteSymbolPath;
765
            this.layoutControlItem7.Location = new System.Drawing.Point(0, 24);
766
            this.layoutControlItem7.Name = "layoutControlItem7";
767
            this.layoutControlItem7.Size = new System.Drawing.Size(403, 24);
768
            this.layoutControlItem7.Text = "SPPID Note Symbol Path";
769
            this.layoutControlItem7.TextSize = new System.Drawing.Size(136, 14);
770
            // 
771
            // layoutControlItem16
772
            // 
773
            this.layoutControlItem16.Control = this.checkComboBoxTextLocation;
774
            this.layoutControlItem16.Location = new System.Drawing.Point(403, 0);
775
            this.layoutControlItem16.Name = "layoutControlItem16";
776
            this.layoutControlItem16.Size = new System.Drawing.Size(264, 24);
777
            this.layoutControlItem16.Text = "Label Location";
778
            this.layoutControlItem16.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
779
            this.layoutControlItem16.TextSize = new System.Drawing.Size(78, 14);
780
            this.layoutControlItem16.TextToControlDistance = 5;
781
            // 
782
            // layoutControlItem17
783
            // 
784
            this.layoutControlItem17.Control = this.checkComboBoxNoteLocation;
785
            this.layoutControlItem17.Location = new System.Drawing.Point(403, 24);
786
            this.layoutControlItem17.Name = "layoutControlItem17";
787
            this.layoutControlItem17.Size = new System.Drawing.Size(264, 24);
788
            this.layoutControlItem17.Text = "Label Location";
789
            this.layoutControlItem17.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
790
            this.layoutControlItem17.TextSize = new System.Drawing.Size(78, 14);
791
            this.layoutControlItem17.TextToControlDistance = 5;
792
            // 
793
            // layoutControlGroup10
794
            // 
795
            this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
796
            this.layoutControlItem14});
797
            this.layoutControlGroup10.Location = new System.Drawing.Point(0, 93);
798
            this.layoutControlGroup10.Name = "layoutControlGroup10";
799
            this.layoutControlGroup10.Size = new System.Drawing.Size(691, 69);
800
            this.layoutControlGroup10.Text = "Drain Valve Setting";
801
            // 
802
            // layoutControlItem14
803
            // 
804
            this.layoutControlItem14.Control = this.textBoxDrainValveSize;
805
            this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
806
            this.layoutControlItem14.Name = "layoutControlItem14";
807
            this.layoutControlItem14.Size = new System.Drawing.Size(667, 24);
808
            this.layoutControlItem14.Text = "Drain Valve Size";
809
            this.layoutControlItem14.TextSize = new System.Drawing.Size(136, 14);
810
            // 
789 811
            // layoutControlItem12
790 812
            // 
791 813
            this.layoutControlItem12.Control = this.btnClose;
......
821 843
            this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
822 844
            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
823 845
            // 
824
            // checkComboBoxLineNumberLocation
825
            // 
826
            this.checkComboBoxLineNumberLocation.Location = new System.Drawing.Point(529, 79);
827
            this.checkComboBoxLineNumberLocation.MenuManager = this.ribbonControl;
828
            this.checkComboBoxLineNumberLocation.Name = "checkComboBoxLineNumberLocation";
829
            this.checkComboBoxLineNumberLocation.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
830
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
831
            this.checkComboBoxLineNumberLocation.Size = new System.Drawing.Size(170, 20);
832
            this.checkComboBoxLineNumberLocation.StyleController = this.layoutControl1;
833
            this.checkComboBoxLineNumberLocation.TabIndex = 30;
834
            // 
835
            // layoutControlItem18
836
            // 
837
            this.layoutControlItem18.Control = this.checkComboBoxLineNumberLocation;
838
            this.layoutControlItem18.Location = new System.Drawing.Point(410, 0);
839
            this.layoutControlItem18.Name = "layoutControlItem18";
840
            this.layoutControlItem18.Size = new System.Drawing.Size(257, 24);
841
            this.layoutControlItem18.Text = "Label Location";
842
            this.layoutControlItem18.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
843
            this.layoutControlItem18.TextSize = new System.Drawing.Size(78, 14);
844
            this.layoutControlItem18.TextToControlDistance = 5;
845
            // 
846 846
            // MappingForm
847 847
            // 
848 848
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
......
859 859
            ((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).EndInit();
860 860
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
861 861
            this.layoutControl1.ResumeLayout(false);
862
            ((System.ComponentModel.ISupportInitialize)(this.checkComboBoxLineNumberLocation.Properties)).EndInit();
862 863
            ((System.ComponentModel.ISupportInitialize)(this.checkComboBoxNoteLocation.Properties)).EndInit();
863 864
            ((System.ComponentModel.ISupportInitialize)(this.checkComboBoxTextLocation.Properties)).EndInit();
864 865
            ((System.ComponentModel.ISupportInitialize)(this.textBoxDrainValveSize.Properties)).EndInit();
......
887 888
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
888 889
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem3)).EndInit();
889 890
            ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup)).EndInit();
890
            ((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).EndInit();
891
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
892
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit();
893
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
894
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
895
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
896
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
897
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit();
898
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
891
            ((System.ComponentModel.ISupportInitialize)(this.GroupLineNumber)).EndInit();
892
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).EndInit();
893
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
894
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
895
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
899 896
            ((System.ComponentModel.ISupportInitialize)(this.GroupSymbol)).EndInit();
900 897
            ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit();
901 898
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
......
908 905
            ((System.ComponentModel.ISupportInitialize)(this.GroupLine)).EndInit();
909 906
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).EndInit();
910 907
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
911
            ((System.ComponentModel.ISupportInitialize)(this.GroupLineNumber)).EndInit();
912
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup8)).EndInit();
913
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
914
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
915 908
            ((System.ComponentModel.ISupportInitialize)(this.GroupAttribute)).EndInit();
916 909
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit();
917 910
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
911
            ((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).EndInit();
912
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
913
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit();
914
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
915
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
916
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
917
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
918
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit();
919
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
918 920
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
919 921
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
920 922
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
921
            ((System.ComponentModel.ISupportInitialize)(this.checkComboBoxLineNumberLocation.Properties)).EndInit();
922
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
923 923
            this.ResumeLayout(false);
924 924
            this.PerformLayout();
925 925

  
DTI_PID/SPPIDConverter/Form/MappingForm.cs
131 131
            gridViewAttribute.Columns["Type"].GroupIndex = 0;
132 132
            gridViewAttribute.Columns["SPPID_SYMBOL_PATH"].OptionsColumn.AllowEdit = false;
133 133
            gridViewAttribute.Columns["LOCATION"].Caption = "Label Location";
134
            gridViewAttribute.Columns["LEADERLINE"].Caption = "Show Leader Line";
134 135

  
135 136
            RepositoryItemCheckedComboBoxEdit checkedComboEdit = new RepositoryItemCheckedComboBoxEdit();
136 137
            foreach (DataRow item in attributeDT.Rows)
......
140 141
                    item["LOCATION"] = 0;
141 142
                else if (!int.TryParse(item["LOCATION"].ToString(), out i))
142 143
                    item["LOCATION"] = 0;
144

  
145
                if (DBNull.Value.Equals(item["LEADERLINE"]))
146
                    item["LEADERLINE"] = false;
143 147
            }
144 148
                
145 149
            checkedComboEdit.EditValueChanging += TextEdit1_EditValueChanging;
......
306 310
            Cursor = Cursors.WaitCursor;
307 311
            List<Tuple<string, string, string>> symbolDatas = new List<Tuple<string, string, string>>();
308 312
            List<Tuple<string, string>> attributeDatas = new List<Tuple<string, string>>();
309
            List<Tuple<string, int>> locationDatas = new List<Tuple<string, int>>();
313
            List<Tuple<string, int, bool>> labelDatas = new List<Tuple<string, int, bool>>();
310 314
            foreach (DataRow row in symbolDT.Rows)
311 315
            {
312 316
                string _uid = row["UID"].ToString();
......
346 350
                attributeDatas.Add(new Tuple<string, string>(_uid, _SPPID_Attribute));
347 351

  
348 352
                int _LOCATION = (int)row["LOCATION"];
349
                locationDatas.Add(new Tuple<string, int>(_uid, _LOCATION));
353
                bool _LEADERLINE = (bool)row["LEADERLINE"];
354
                labelDatas.Add(new Tuple<string, int, bool>(_uid, _LOCATION, _LEADERLINE));
350 355
            }
351 356

  
352 357
            #region ETC Setting
......
362 367

  
363 368
            if (Project_DB.InsertSymbolMapping(symbolDatas) &&
364 369
                Project_DB.InsertAttributeMapping(attributeDatas) &&
365
                Project_DB.InsertLocationMapping(locationDatas) &&
370
                Project_DB.InsertLocationMapping(labelDatas) &&
366 371
                Project_DB.SaveETCSetting(jsonString))
367 372
                MessageBox.Show(Msg.SuccessSave, Msg.Information, MessageBoxButtons.OK, MessageBoxIcon.Information);
368 373
            else
......
414 419
            {
415 420
                if (gridview.FocusedColumn.Name != "colClear" && 
416 421
                    gridview.FocusedColumn.Name != "colSPPID_ATTRIBUTE" &&
417
                    gridview.FocusedColumn.Name != "colLOCATION")
422
                    gridview.FocusedColumn.Name != "colLOCATION" && 
423
                    gridview.FocusedColumn.Name != "colLEADERLINE")
418 424
                    e.Cancel = true;
419 425
            }
420 426
        }
DTI_PID/SPPIDConverter/SPPIDConverter.csproj
5 5
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6 6
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7 7
    <ProjectGuid>{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}</ProjectGuid>
8
    <OutputType>Library</OutputType>
8
    <OutputType>WinExe</OutputType>
9 9
    <AppDesignerFolder>Properties</AppDesignerFolder>
10 10
    <RootNamespace>Converter.SPPID</RootNamespace>
11 11
    <AssemblyName>SPPIDConverter</AssemblyName>

내보내기 Unified diff

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