프로젝트

일반

사용자정보

개정판 dd27861e

IDdd27861eeda95cb65b371b89a2428a1ac1fc048a
상위 528aa878
하위 284fa2c9

이지연이(가) 약 3년 전에 추가함

issue #000: Revision HistoryForm 추가, Valve Grouping 공란 Row 추가, 공란 선택시 로직 수정, TieinPoint 로직 수정, Psn, Pathitem 컬럼 Ui 수정, Topologies Attribute Display Name으로 변경

Change-Id: I87a6a136079e49f1e195d622816cebd80375334a

차이점 보기:

DTI_PID/ID2PSN/Form/DBSettingForm.Designer.cs
99 99
            this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
100 100
            this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
101 101
            this.ribbonControl.ShowToolbarCustomizeItem = false;
102
            this.ribbonControl.Size = new System.Drawing.Size(400, 32);
102
            this.ribbonControl.Size = new System.Drawing.Size(378, 32);
103 103
            this.ribbonControl.Toolbar.ShowCustomizeItem = false;
104 104
            // 
105 105
            // layoutControl1
......
118 118
            this.layoutControl1.Name = "layoutControl1";
119 119
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(963, 307, 650, 400);
120 120
            this.layoutControl1.Root = this.Root;
121
            this.layoutControl1.Size = new System.Drawing.Size(400, 270);
121
            this.layoutControl1.Size = new System.Drawing.Size(378, 270);
122 122
            this.layoutControl1.TabIndex = 1;
123 123
            this.layoutControl1.Text = "layoutControl1";
124 124
            // 
125 125
            // btnClose
126 126
            // 
127 127
            this.btnClose.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnClose.ImageOptions.Image")));
128
            this.btnClose.Location = new System.Drawing.Point(318, 218);
128
            this.btnClose.Location = new System.Drawing.Point(296, 218);
129 129
            this.btnClose.Name = "btnClose";
130 130
            this.btnClose.Size = new System.Drawing.Size(70, 36);
131 131
            this.btnClose.StyleController = this.layoutControl1;
......
136 136
            // btnSave
137 137
            // 
138 138
            this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
139
            this.btnSave.Location = new System.Drawing.Point(226, 218);
139
            this.btnSave.Location = new System.Drawing.Point(204, 218);
140 140
            this.btnSave.Name = "btnSave";
141 141
            this.btnSave.Size = new System.Drawing.Size(68, 36);
142 142
            this.btnSave.StyleController = this.layoutControl1;
......
146 146
            // 
147 147
            // rgDbSetting
148 148
            // 
149
            this.rgDbSetting.Dock = System.Windows.Forms.DockStyle.Fill;
149 150
            this.rgDbSetting.Location = new System.Drawing.Point(24, 43);
150 151
            this.rgDbSetting.MenuManager = this.ribbonControl;
151 152
            this.rgDbSetting.Name = "rgDbSetting";
......
163 164
            this.txHost.Location = new System.Drawing.Point(89, 84);
164 165
            this.txHost.MenuManager = this.ribbonControl;
165 166
            this.txHost.Name = "txHost";
166
            this.txHost.Size = new System.Drawing.Size(287, 20);
167
            this.txHost.Size = new System.Drawing.Size(265, 20);
167 168
            this.txHost.StyleController = this.layoutControl1;
168 169
            this.txHost.TabIndex = 8;
169 170
            // 
......
172 173
            this.txDBName.Location = new System.Drawing.Point(89, 108);
173 174
            this.txDBName.MenuManager = this.ribbonControl;
174 175
            this.txDBName.Name = "txDBName";
175
            this.txDBName.Size = new System.Drawing.Size(287, 20);
176
            this.txDBName.Size = new System.Drawing.Size(265, 20);
176 177
            this.txDBName.StyleController = this.layoutControl1;
177 178
            this.txDBName.TabIndex = 9;
178 179
            // 
......
181 182
            this.txUser.Location = new System.Drawing.Point(89, 132);
182 183
            this.txUser.MenuManager = this.ribbonControl;
183 184
            this.txUser.Name = "txUser";
184
            this.txUser.Size = new System.Drawing.Size(287, 20);
185
            this.txUser.Size = new System.Drawing.Size(265, 20);
185 186
            this.txUser.StyleController = this.layoutControl1;
186 187
            this.txUser.TabIndex = 10;
187 188
            // 
......
190 191
            this.txPassword.Location = new System.Drawing.Point(89, 156);
191 192
            this.txPassword.MenuManager = this.ribbonControl;
192 193
            this.txPassword.Name = "txPassword";
193
            this.txPassword.Size = new System.Drawing.Size(287, 20);
194
            this.txPassword.Size = new System.Drawing.Size(265, 20);
194 195
            this.txPassword.StyleController = this.layoutControl1;
195 196
            this.txPassword.TabIndex = 11;
196 197
            // 
197 198
            // btnFolder
198 199
            // 
199
            this.btnFolder.Location = new System.Drawing.Point(346, 180);
200
            this.btnFolder.Location = new System.Drawing.Point(326, 180);
200 201
            this.btnFolder.Name = "btnFolder";
201
            this.btnFolder.Size = new System.Drawing.Size(30, 22);
202
            this.btnFolder.Size = new System.Drawing.Size(28, 22);
202 203
            this.btnFolder.StyleController = this.layoutControl1;
203 204
            this.btnFolder.TabIndex = 12;
204 205
            this.btnFolder.Text = "...";
......
209 210
            this.txID2Filepath.Location = new System.Drawing.Point(89, 180);
210 211
            this.txID2Filepath.MenuManager = this.ribbonControl;
211 212
            this.txID2Filepath.Name = "txID2Filepath";
212
            this.txID2Filepath.Size = new System.Drawing.Size(253, 20);
213
            this.txID2Filepath.Size = new System.Drawing.Size(233, 20);
213 214
            this.txID2Filepath.StyleController = this.layoutControl1;
214 215
            this.txID2Filepath.TabIndex = 13;
215 216
            // 
......
224 225
            this.layoutControlGroup1,
225 226
            this.emptySpaceItem1});
226 227
            this.Root.Name = "Root";
227
            this.Root.Size = new System.Drawing.Size(400, 270);
228
            this.Root.Size = new System.Drawing.Size(378, 270);
228 229
            this.Root.TextVisible = false;
229 230
            // 
230 231
            // layoutControlItem4
231 232
            // 
232 233
            this.layoutControlItem4.Control = this.btnSave;
233
            this.layoutControlItem4.Location = new System.Drawing.Point(214, 206);
234
            this.layoutControlItem4.Location = new System.Drawing.Point(192, 206);
234 235
            this.layoutControlItem4.MaxSize = new System.Drawing.Size(72, 40);
235 236
            this.layoutControlItem4.MinSize = new System.Drawing.Size(72, 40);
236 237
            this.layoutControlItem4.Name = "layoutControlItem4";
......
242 243
            // layoutControlItem5
243 244
            // 
244 245
            this.layoutControlItem5.Control = this.btnClose;
245
            this.layoutControlItem5.Location = new System.Drawing.Point(306, 206);
246
            this.layoutControlItem5.Location = new System.Drawing.Point(284, 206);
246 247
            this.layoutControlItem5.MaxSize = new System.Drawing.Size(74, 40);
247 248
            this.layoutControlItem5.MinSize = new System.Drawing.Size(74, 40);
248 249
            this.layoutControlItem5.Name = "layoutControlItem5";
......
254 255
            // emptySpaceItem2
255 256
            // 
256 257
            this.emptySpaceItem2.AllowHotTrack = false;
257
            this.emptySpaceItem2.Location = new System.Drawing.Point(286, 206);
258
            this.emptySpaceItem2.Location = new System.Drawing.Point(264, 206);
258 259
            this.emptySpaceItem2.MaxSize = new System.Drawing.Size(20, 40);
259 260
            this.emptySpaceItem2.MinSize = new System.Drawing.Size(20, 40);
260 261
            this.emptySpaceItem2.Name = "emptySpaceItem2";
......
270 271
            this.group1});
271 272
            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
272 273
            this.layoutControlGroup1.Name = "layoutControlGroup1";
273
            this.layoutControlGroup1.Size = new System.Drawing.Size(380, 206);
274
            this.layoutControlGroup1.Size = new System.Drawing.Size(358, 206);
274 275
            this.layoutControlGroup1.Text = "DB ";
275 276
            // 
276 277
            // layoutControlItem1
......
280 281
            this.layoutControlItem1.MaxSize = new System.Drawing.Size(334, 41);
281 282
            this.layoutControlItem1.MinSize = new System.Drawing.Size(334, 41);
282 283
            this.layoutControlItem1.Name = "layoutControlItem1";
283
            this.layoutControlItem1.Size = new System.Drawing.Size(356, 41);
284
            this.layoutControlItem1.Size = new System.Drawing.Size(334, 41);
284 285
            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
285 286
            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
286 287
            this.layoutControlItem1.TextVisible = false;
......
293 294
            this.lcID2FilePath});
294 295
            this.group2.Location = new System.Drawing.Point(0, 137);
295 296
            this.group2.Name = "group2";
296
            this.group2.Size = new System.Drawing.Size(356, 26);
297
            this.group2.Size = new System.Drawing.Size(334, 26);
297 298
            this.group2.TextVisible = false;
298 299
            // 
299 300
            // layoutControlItem2
300 301
            // 
301 302
            this.layoutControlItem2.Control = this.btnFolder;
302
            this.layoutControlItem2.Location = new System.Drawing.Point(322, 0);
303
            this.layoutControlItem2.Location = new System.Drawing.Point(302, 0);
303 304
            this.layoutControlItem2.Name = "layoutControlItem2";
304
            this.layoutControlItem2.Size = new System.Drawing.Size(34, 26);
305
            this.layoutControlItem2.Size = new System.Drawing.Size(32, 26);
305 306
            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
306 307
            this.layoutControlItem2.TextVisible = false;
307 308
            // 
......
310 311
            this.lcID2FilePath.Control = this.txID2Filepath;
311 312
            this.lcID2FilePath.Location = new System.Drawing.Point(0, 0);
312 313
            this.lcID2FilePath.Name = "lcID2FilePath";
313
            this.lcID2FilePath.Size = new System.Drawing.Size(322, 26);
314
            this.lcID2FilePath.Size = new System.Drawing.Size(302, 26);
314 315
            this.lcID2FilePath.Text = "ID2 Project";
315 316
            this.lcID2FilePath.TextSize = new System.Drawing.Size(62, 14);
316 317
            // 
......
325 326
            this.lcUser});
326 327
            this.group1.Location = new System.Drawing.Point(0, 41);
327 328
            this.group1.Name = "group1";
328
            this.group1.Size = new System.Drawing.Size(356, 96);
329
            this.group1.Size = new System.Drawing.Size(334, 96);
329 330
            this.group1.Text = "layoutControlGroup1";
330 331
            this.group1.TextVisible = false;
331 332
            // 
......
334 335
            this.lcPassword.Control = this.txPassword;
335 336
            this.lcPassword.Location = new System.Drawing.Point(0, 72);
336 337
            this.lcPassword.Name = "lcPassword";
337
            this.lcPassword.Size = new System.Drawing.Size(356, 24);
338
            this.lcPassword.Size = new System.Drawing.Size(334, 24);
338 339
            this.lcPassword.Text = "Password";
339 340
            this.lcPassword.TextSize = new System.Drawing.Size(62, 14);
340 341
            // 
......
343 344
            this.lcHost.Control = this.txHost;
344 345
            this.lcHost.Location = new System.Drawing.Point(0, 0);
345 346
            this.lcHost.Name = "lcHost";
346
            this.lcHost.Size = new System.Drawing.Size(356, 24);
347
            this.lcHost.Size = new System.Drawing.Size(334, 24);
347 348
            this.lcHost.Text = "Host";
348 349
            this.lcHost.TextLocation = DevExpress.Utils.Locations.Left;
349 350
            this.lcHost.TextSize = new System.Drawing.Size(62, 14);
......
353 354
            this.lcDBName.Control = this.txDBName;
354 355
            this.lcDBName.Location = new System.Drawing.Point(0, 24);
355 356
            this.lcDBName.Name = "lcDBName";
356
            this.lcDBName.Size = new System.Drawing.Size(356, 24);
357
            this.lcDBName.Size = new System.Drawing.Size(334, 24);
357 358
            this.lcDBName.Text = "DB Name";
358 359
            this.lcDBName.TextSize = new System.Drawing.Size(62, 14);
359 360
            // 
......
362 363
            this.lcUser.Control = this.txUser;
363 364
            this.lcUser.Location = new System.Drawing.Point(0, 48);
364 365
            this.lcUser.Name = "lcUser";
365
            this.lcUser.Size = new System.Drawing.Size(356, 24);
366
            this.lcUser.Size = new System.Drawing.Size(334, 24);
366 367
            this.lcUser.Text = "User";
367 368
            this.lcUser.TextSize = new System.Drawing.Size(62, 14);
368 369
            // 
......
372 373
            this.emptySpaceItem1.CustomizationFormText = "emptySpaceItem3";
373 374
            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 206);
374 375
            this.emptySpaceItem1.Name = "emptySpaceItem1";
375
            this.emptySpaceItem1.Size = new System.Drawing.Size(214, 44);
376
            this.emptySpaceItem1.Size = new System.Drawing.Size(192, 44);
376 377
            this.emptySpaceItem1.Text = "emptySpaceItem3";
377 378
            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
378 379
            // 
......
380 381
            // 
381 382
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
382 383
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
383
            this.ClientSize = new System.Drawing.Size(400, 302);
384
            this.ClientSize = new System.Drawing.Size(378, 302);
384 385
            this.Controls.Add(this.layoutControl1);
385 386
            this.Controls.Add(this.ribbonControl);
386 387
            this.Name = "DBSettingForm";
DTI_PID/ID2PSN/Form/HistoryForm.Designer.cs
1
namespace ID2PSN
2
{
3
    partial class HistoryForm
4
    {
5
        /// <summary>
6
        /// Required designer variable.
7
        /// </summary>
8
        private System.ComponentModel.IContainer components = null;
9

  
10
        /// <summary>
11
        /// Clean up any resources being used.
12
        /// </summary>
13
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
14
        protected override void Dispose(bool disposing)
15
        {
16
            if (disposing && (components != null))
17
            {
18
                components.Dispose();
19
            }
20
            base.Dispose(disposing);
21
        }
22

  
23
        #region Windows Form Designer generated code
24

  
25
        /// <summary>
26
        /// Required method for Designer support - do not modify
27
        /// the contents of this method with the code editor.
28
        /// </summary>
29
        private void InitializeComponent()
30
        {
31
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HistoryForm));
32
            this.ribbonControl = new DevExpress.XtraBars.Ribbon.RibbonControl();
33
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
34
            this.gridHistory = new DevExpress.XtraGrid.GridControl();
35
            this.gridViewHistory = new DevExpress.XtraGrid.Views.Grid.GridView();
36
            this.btnClose = new DevExpress.XtraEditors.SimpleButton();
37
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
38
            this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
39
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
40
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
41
            ((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).BeginInit();
42
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
43
            this.layoutControl1.SuspendLayout();
44
            ((System.ComponentModel.ISupportInitialize)(this.gridHistory)).BeginInit();
45
            ((System.ComponentModel.ISupportInitialize)(this.gridViewHistory)).BeginInit();
46
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
47
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
48
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
49
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
50
            this.SuspendLayout();
51
            // 
52
            // ribbonControl
53
            // 
54
            this.ribbonControl.ExpandCollapseItem.Id = 0;
55
            this.ribbonControl.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
56
            this.ribbonControl.ExpandCollapseItem,
57
            this.ribbonControl.SearchEditItem});
58
            this.ribbonControl.Location = new System.Drawing.Point(0, 0);
59
            this.ribbonControl.MaxItemId = 1;
60
            this.ribbonControl.Name = "ribbonControl";
61
            this.ribbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
62
            this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
63
            this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
64
            this.ribbonControl.ShowToolbarCustomizeItem = false;
65
            this.ribbonControl.Size = new System.Drawing.Size(1599, 32);
66
            this.ribbonControl.Toolbar.ShowCustomizeItem = false;
67
            // 
68
            // layoutControl1
69
            // 
70
            this.layoutControl1.Controls.Add(this.gridHistory);
71
            this.layoutControl1.Controls.Add(this.btnClose);
72
            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
73
            this.layoutControl1.Location = new System.Drawing.Point(0, 32);
74
            this.layoutControl1.Name = "layoutControl1";
75
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(488, 408, 650, 400);
76
            this.layoutControl1.Root = this.Root;
77
            this.layoutControl1.Size = new System.Drawing.Size(1599, 861);
78
            this.layoutControl1.TabIndex = 1;
79
            this.layoutControl1.Text = "layoutControl1";
80
            // 
81
            // gridHistory
82
            // 
83
            this.gridHistory.Location = new System.Drawing.Point(12, 12);
84
            this.gridHistory.MainView = this.gridViewHistory;
85
            this.gridHistory.MenuManager = this.ribbonControl;
86
            this.gridHistory.Name = "gridHistory";
87
            this.gridHistory.Size = new System.Drawing.Size(1575, 797);
88
            this.gridHistory.TabIndex = 6;
89
            this.gridHistory.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
90
            this.gridViewHistory});
91
            // 
92
            // gridViewHistory
93
            // 
94
            this.gridViewHistory.GridControl = this.gridHistory;
95
            this.gridViewHistory.Name = "gridViewHistory";
96
            this.gridViewHistory.OptionsView.ShowGroupPanel = false;
97
            // 
98
            // btnClose
99
            // 
100
            this.btnClose.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnClose.ImageOptions.Image")));
101
            this.btnClose.Location = new System.Drawing.Point(1517, 813);
102
            this.btnClose.Name = "btnClose";
103
            this.btnClose.Size = new System.Drawing.Size(70, 36);
104
            this.btnClose.StyleController = this.layoutControl1;
105
            this.btnClose.TabIndex = 5;
106
            this.btnClose.Text = "Close";
107
            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
108
            // 
109
            // Root
110
            // 
111
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
112
            this.Root.GroupBordersVisible = false;
113
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
114
            this.emptySpaceItem3,
115
            this.layoutControlItem5,
116
            this.layoutControlItem1});
117
            this.Root.Name = "Root";
118
            this.Root.Size = new System.Drawing.Size(1599, 861);
119
            this.Root.TextVisible = false;
120
            // 
121
            // emptySpaceItem3
122
            // 
123
            this.emptySpaceItem3.AllowHotTrack = false;
124
            this.emptySpaceItem3.Location = new System.Drawing.Point(0, 801);
125
            this.emptySpaceItem3.Name = "emptySpaceItem3";
126
            this.emptySpaceItem3.Size = new System.Drawing.Size(1505, 40);
127
            this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
128
            // 
129
            // layoutControlItem5
130
            // 
131
            this.layoutControlItem5.Control = this.btnClose;
132
            this.layoutControlItem5.Location = new System.Drawing.Point(1505, 801);
133
            this.layoutControlItem5.MaxSize = new System.Drawing.Size(74, 40);
134
            this.layoutControlItem5.MinSize = new System.Drawing.Size(74, 40);
135
            this.layoutControlItem5.Name = "layoutControlItem5";
136
            this.layoutControlItem5.Size = new System.Drawing.Size(74, 40);
137
            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
138
            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
139
            this.layoutControlItem5.TextVisible = false;
140
            // 
141
            // layoutControlItem1
142
            // 
143
            this.layoutControlItem1.Control = this.gridHistory;
144
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
145
            this.layoutControlItem1.Name = "layoutControlItem1";
146
            this.layoutControlItem1.Size = new System.Drawing.Size(1579, 801);
147
            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
148
            this.layoutControlItem1.TextVisible = false;
149
            // 
150
            // HistoryForm
151
            // 
152
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
153
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
154
            this.ClientSize = new System.Drawing.Size(1599, 893);
155
            this.Controls.Add(this.layoutControl1);
156
            this.Controls.Add(this.ribbonControl);
157
            this.Name = "HistoryForm";
158
            this.Ribbon = this.ribbonControl;
159
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
160
            this.Text = "Revision History";
161
            ((System.ComponentModel.ISupportInitialize)(this.ribbonControl)).EndInit();
162
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
163
            this.layoutControl1.ResumeLayout(false);
164
            ((System.ComponentModel.ISupportInitialize)(this.gridHistory)).EndInit();
165
            ((System.ComponentModel.ISupportInitialize)(this.gridViewHistory)).EndInit();
166
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
167
            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
168
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
169
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
170
            this.ResumeLayout(false);
171
            this.PerformLayout();
172

  
173
        }
174

  
175
        #endregion
176

  
177
        private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl;
178
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
179
        private DevExpress.XtraLayout.LayoutControlGroup Root;
180
        private DevExpress.XtraEditors.SimpleButton btnClose;
181
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
182
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
183
        private DevExpress.XtraGrid.GridControl gridHistory;
184
        private DevExpress.XtraGrid.Views.Grid.GridView gridViewHistory;
185
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
186
    }
187
}
DTI_PID/ID2PSN/Form/HistoryForm.cs
1
using System;
2
using System.Collections.Generic;
3
using System.ComponentModel;
4
using System.Data;
5
using System.Drawing;
6
using System.Linq;
7
using System.Text;
8
using System.Threading.Tasks;
9
using System.Windows.Forms;
10
using System.IO;
11
using DevExpress.XtraEditors.Repository;
12
using DevExpress.XtraGrid.Columns;
13
using DevExpress.XtraGrid;
14
using DevExpress.XtraGrid.Views.Grid;
15
using DevExpress.Utils.StructuredStorage.Internal.Reader;
16
using DevExpress.XtraTreeList;
17
using DevExpress.XtraTreeList.Columns;
18
using DevExpress.XtraTreeList.Nodes;
19
using DevExpress.Utils.Extensions;
20
using DevExpress.Utils;
21
using DevExpress.Utils.Drawing;
22

  
23
namespace ID2PSN
24
{
25
    public partial class HistoryForm : DevExpress.XtraBars.Ribbon.RibbonForm
26
    {
27
        ID2Info ID2Info = ID2Info.GetInstance();
28

  
29
        public HistoryForm()
30
        {
31
            InitializeComponent();
32
            InitGridRevisionHistory();   
33
            InitData();            
34
        }
35
        
36
        public void InitGridRevisionHistory()
37
        {
38
            /*
39
             ProjectCode] nvarchar(255), [RevNumber] int ,[UserName] nvarchar(255) ,[TimeData] nvarchar(255) ," +
40
                            $"[PSNDatabasePath] nvarchar(255) ,	[PsnByPBSFilter] varchar(20) ,[PsnByNPDFilter] varchar(20) ,[PidDrawings] int ,	" +
41
                            $"[PipeSystems] int ,[PipeLines] int ,[Topologies] int ,[PipeSystemNetworks] int ,[InValidPSNs] int ,[E2E] int ," +
42
                            $"[E2B] int ,[B2E] int ,[HDE] int ,[HD2] int ,[HDB] int ,[B2B] int, [LastModificationdate] nvarchar(255), [ID2_PSN] nvarchar(10))
43
             */
44

  
45
          
46
            DataTable dtRevisionHistory = new DataTable();
47
            dtRevisionHistory.Columns.Add("ProjectCode");
48
            dtRevisionHistory.Columns.Add("RevNumber");
49
            dtRevisionHistory.Columns.Add("UserName");
50
            dtRevisionHistory.Columns.Add("TimeData");
51
            dtRevisionHistory.Columns.Add("PSNDatabasePath");
52

  
53
            dtRevisionHistory.Columns.Add("PidDrawings");
54
            dtRevisionHistory.Columns.Add("PipeSystems");
55
            dtRevisionHistory.Columns.Add("PipeLines");
56
            dtRevisionHistory.Columns.Add("Topologies");
57
            dtRevisionHistory.Columns.Add("PipeSystemNetworks");
58
            dtRevisionHistory.Columns.Add("InValidPSNs");
59

  
60
            dtRevisionHistory.Columns.Add("E2E");
61
            dtRevisionHistory.Columns.Add("E2B");
62
            dtRevisionHistory.Columns.Add("B2E");
63
            dtRevisionHistory.Columns.Add("HDE");
64
            dtRevisionHistory.Columns.Add("HD2");
65
            dtRevisionHistory.Columns.Add("HDB");
66
            dtRevisionHistory.Columns.Add("B2B");
67

  
68
            dtRevisionHistory.Columns.Add("LastModificationdate");
69
            dtRevisionHistory.Columns.Add("ID2_PSN");
70

  
71
            gridHistory.DataSource = dtRevisionHistory;
72
            gridViewHistory.OptionsBehavior.AllowPixelScrolling = DefaultBoolean.True;
73
            
74
            GridColumn gridColumn = gridViewHistory.Columns[0];            
75
            gridColumn.Name = "ProjectCode";
76
            gridColumn.Caption = "Project Code";
77
            gridColumn.OptionsColumn.AllowEdit = false;
78
            gridColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
79
            gridColumn.VisibleIndex = 0;
80

  
81
            gridColumn = gridViewHistory.Columns[1];
82
            gridColumn.Name = "RevNumber";
83
            gridColumn.Caption = "Revision";
84
            gridColumn.OptionsColumn.AllowEdit = false;
85
            gridColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
86
            gridColumn.VisibleIndex = 1;
87

  
88
            gridColumn = gridViewHistory.Columns[2];
89
            gridColumn.Name = "UserName";
90
            gridColumn.Caption = "User Info";
91
            gridColumn.OptionsColumn.AllowEdit = false;
92
            gridColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
93
            gridColumn.VisibleIndex = 2;
94

  
95
            gridColumn = gridViewHistory.Columns[3];
96
            gridColumn.Name = "TimeData";
97
            gridColumn.Caption = "Time Stamp";
98
            gridColumn.OptionsColumn.AllowEdit = false;
99
            gridColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
100
            gridColumn.VisibleIndex = 3;
101

  
102
            gridColumn = gridViewHistory.Columns[4];
103
            gridColumn.Name = "PSNDatabasePath";
104
            gridColumn.Caption = "PSN Database";
105
            gridColumn.OptionsColumn.AllowEdit = false;
106
            gridColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
107
            gridColumn.VisibleIndex = 4;
108

  
109
            gridViewHistory.OptionsBehavior.Editable = false;
110
            gridViewHistory.BestFitColumns();
111
        }
112

  
113
        public void InitData()
114
        {
115
            DataTable dt = DB.SelectRevision();
116
            gridHistory.DataSource = dt;
117
        }      
118

  
119
        private void btnClose_Click(object sender, EventArgs e)
120
        {
121
            DialogResult = DialogResult.Cancel;
122
        }
123
    }
124
}
DTI_PID/ID2PSN/Form/HistoryForm.resx
1
<?xml version="1.0" encoding="utf-8"?>
2
<root>
3
  <!-- 
4
    Microsoft ResX Schema 
5
    
6
    Version 2.0
7
    
8
    The primary goals of this format is to allow a simple XML format 
9
    that is mostly human readable. The generation and parsing of the 
10
    various data types are done through the TypeConverter classes 
11
    associated with the data types.
12
    
13
    Example:
14
    
15
    ... ado.net/XML headers & schema ...
16
    <resheader name="resmimetype">text/microsoft-resx</resheader>
17
    <resheader name="version">2.0</resheader>
18
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23
        <value>[base64 mime encoded serialized .NET Framework object]</value>
24
    </data>
25
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27
        <comment>This is a comment</comment>
28
    </data>
29
                
30
    There are any number of "resheader" rows that contain simple 
31
    name/value pairs.
32
    
33
    Each data row contains a name, and value. The row also contains a 
34
    type or mimetype. Type corresponds to a .NET class that support 
35
    text/value conversion through the TypeConverter architecture. 
36
    Classes that don't support this are serialized and stored with the 
37
    mimetype set.
38
    
39
    The mimetype is used for serialized objects, and tells the 
40
    ResXResourceReader how to depersist the object. This is currently not 
41
    extensible. For a given mimetype the value must be set accordingly:
42
    
43
    Note - application/x-microsoft.net.object.binary.base64 is the format 
44
    that the ResXResourceWriter will generate, however the reader can 
45
    read any of the formats listed below.
46
    
47
    mimetype: application/x-microsoft.net.object.binary.base64
48
    value   : The object must be serialized with 
49
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50
            : and then encoded with base64 encoding.
51
    
52
    mimetype: application/x-microsoft.net.object.soap.base64
53
    value   : The object must be serialized with 
54
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55
            : and then encoded with base64 encoding.
56

  
57
    mimetype: application/x-microsoft.net.object.bytearray.base64
58
    value   : The object must be serialized into a byte array 
59
            : using a System.ComponentModel.TypeConverter
60
            : and then encoded with base64 encoding.
61
    -->
62
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64
    <xsd:element name="root" msdata:IsDataSet="true">
65
      <xsd:complexType>
66
        <xsd:choice maxOccurs="unbounded">
67
          <xsd:element name="metadata">
68
            <xsd:complexType>
69
              <xsd:sequence>
70
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
71
              </xsd:sequence>
72
              <xsd:attribute name="name" use="required" type="xsd:string" />
73
              <xsd:attribute name="type" type="xsd:string" />
74
              <xsd:attribute name="mimetype" type="xsd:string" />
75
              <xsd:attribute ref="xml:space" />
76
            </xsd:complexType>
77
          </xsd:element>
78
          <xsd:element name="assembly">
79
            <xsd:complexType>
80
              <xsd:attribute name="alias" type="xsd:string" />
81
              <xsd:attribute name="name" type="xsd:string" />
82
            </xsd:complexType>
83
          </xsd:element>
84
          <xsd:element name="data">
85
            <xsd:complexType>
86
              <xsd:sequence>
87
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89
              </xsd:sequence>
90
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93
              <xsd:attribute ref="xml:space" />
94
            </xsd:complexType>
95
          </xsd:element>
96
          <xsd:element name="resheader">
97
            <xsd:complexType>
98
              <xsd:sequence>
99
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100
              </xsd:sequence>
101
              <xsd:attribute name="name" type="xsd:string" use="required" />
102
            </xsd:complexType>
103
          </xsd:element>
104
        </xsd:choice>
105
      </xsd:complexType>
106
    </xsd:element>
107
  </xsd:schema>
108
  <resheader name="resmimetype">
109
    <value>text/microsoft-resx</value>
110
  </resheader>
111
  <resheader name="version">
112
    <value>2.0</value>
113
  </resheader>
114
  <resheader name="reader">
115
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116
  </resheader>
117
  <resheader name="writer">
118
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119
  </resheader>
120
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121
  <data name="btnClose.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
122
    <value>
123
        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
163
</value>
164
  </data>
165
</root>
DTI_PID/ID2PSN/Form/MainForm.Designer.cs
57 57
            this.PBSSetting = new DevExpress.XtraEditors.SimpleButton();
58 58
            this.btnValveGroupItemsSetting = new DevExpress.XtraEditors.SimpleButton();
59 59
            this.btnEquipment = new DevExpress.XtraEditors.SimpleButton();
60
            this.btnHistory = new DevExpress.XtraEditors.SimpleButton();
60 61
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
61 62
            this.layoutControlGroupMain = new DevExpress.XtraLayout.LayoutControlGroup();
62 63
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
......
79 80
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
80 81
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
81 82
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
83
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
82 84
            this.contextMenuPSN = new System.Windows.Forms.ContextMenuStrip(this.components);
83 85
            this.toolStripMenuItemPathItems = new System.Windows.Forms.ToolStripMenuItem();
84 86
            this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::ID2PSN.WaitForm), true, true);
......
119 121
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
120 122
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
121 123
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
124
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
122 125
            this.contextMenuPSN.SuspendLayout();
123 126
            this.SuspendLayout();
124 127
            // 
......
159 162
            this.layoutControl1.Controls.Add(this.PBSSetting);
160 163
            this.layoutControl1.Controls.Add(this.btnValveGroupItemsSetting);
161 164
            this.layoutControl1.Controls.Add(this.btnEquipment);
165
            this.layoutControl1.Controls.Add(this.btnHistory);
162 166
            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
163 167
            this.layoutControl1.Location = new System.Drawing.Point(0, 32);
164 168
            this.layoutControl1.Name = "layoutControl1";
......
171 175
            // btnSaveAs
172 176
            // 
173 177
            this.btnSaveAs.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSaveAs.ImageOptions.Image")));
174
            this.btnSaveAs.Location = new System.Drawing.Point(24, 834);
178
            this.btnSaveAs.Location = new System.Drawing.Point(24, 794);
175 179
            this.btnSaveAs.Name = "btnSaveAs";
176 180
            this.btnSaveAs.Size = new System.Drawing.Size(233, 36);
177 181
            this.btnSaveAs.StyleController = this.layoutControl1;
......
182 186
            // btnExportPSN
183 187
            // 
184 188
            this.btnExportPSN.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnExportPSN.ImageOptions.SvgImage")));
185
            this.btnExportPSN.Location = new System.Drawing.Point(24, 714);
189
            this.btnExportPSN.Location = new System.Drawing.Point(24, 674);
186 190
            this.btnExportPSN.Name = "btnExportPSN";
187 191
            this.btnExportPSN.Size = new System.Drawing.Size(233, 36);
188 192
            this.btnExportPSN.StyleController = this.layoutControl1;
......
203 207
            // btnSave
204 208
            // 
205 209
            this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
206
            this.btnSave.Location = new System.Drawing.Point(24, 794);
210
            this.btnSave.Location = new System.Drawing.Point(24, 754);
207 211
            this.btnSave.Name = "btnSave";
208 212
            this.btnSave.Size = new System.Drawing.Size(233, 36);
209 213
            this.btnSave.StyleController = this.layoutControl1;
......
224 228
            // btnRun
225 229
            // 
226 230
            this.btnRun.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnRun.ImageOptions.Image")));
227
            this.btnRun.Location = new System.Drawing.Point(24, 754);
231
            this.btnRun.Location = new System.Drawing.Point(24, 714);
228 232
            this.btnRun.Name = "btnRun";
229 233
            this.btnRun.Size = new System.Drawing.Size(233, 36);
230 234
            this.btnRun.StyleController = this.layoutControl1;
......
402 406
            this.btnEquipment.Text = "Equipment Setting";
403 407
            this.btnEquipment.Click += new System.EventHandler(this.btnNoPocketSetting_Click);
404 408
            // 
409
            // btnHistory
410
            // 
411
            this.btnHistory.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnHistory.ImageOptions.Image")));
412
            this.btnHistory.Location = new System.Drawing.Point(24, 834);
413
            this.btnHistory.Name = "btnHistory";
414
            this.btnHistory.Size = new System.Drawing.Size(233, 36);
415
            this.btnHistory.StyleController = this.layoutControl1;
416
            this.btnHistory.TabIndex = 26;
417
            this.btnHistory.Text = "View Revision History";
418
            this.btnHistory.Click += new System.EventHandler(this.btnHistory_Click);
419
            // 
405 420
            // Root
406 421
            // 
407 422
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
......
431 446
            this.layoutControlItem8});
432 447
            this.layoutControlGroupMain.Location = new System.Drawing.Point(0, 0);
433 448
            this.layoutControlGroupMain.Name = "layoutControlGroupMain";
434
            this.layoutControlGroupMain.Size = new System.Drawing.Size(261, 671);
449
            this.layoutControlGroupMain.Size = new System.Drawing.Size(261, 631);
435 450
            this.layoutControlGroupMain.Text = "PSN Setting";
436 451
            // 
437 452
            // layoutControlItem3
......
457 472
            this.emptySpaceItem1.AllowHotTrack = false;
458 473
            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 234);
459 474
            this.emptySpaceItem1.Name = "emptySpaceItem1";
460
            this.emptySpaceItem1.Size = new System.Drawing.Size(237, 394);
475
            this.emptySpaceItem1.Size = new System.Drawing.Size(237, 354);
461 476
            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
462 477
            // 
463 478
            // layoutControlItem5
......
578 593
            this.layoutControlItem4,
579 594
            this.layoutControlItem6,
580 595
            this.layoutControlItem11,
581
            this.layoutControlItem13});
582
            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 671);
596
            this.layoutControlItem13,
597
            this.layoutControlItem17});
598
            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 631);
583 599
            this.layoutControlGroup1.Name = "layoutControlGroup1";
584
            this.layoutControlGroup1.Size = new System.Drawing.Size(261, 203);
600
            this.layoutControlGroup1.Size = new System.Drawing.Size(261, 243);
585 601
            this.layoutControlGroup1.Text = "PSN";
586 602
            this.layoutControlGroup1.TextLocation = DevExpress.Utils.Locations.Default;
587 603
            // 
......
621 637
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
622 638
            this.layoutControlItem13.TextVisible = false;
623 639
            // 
640
            // layoutControlItem17
641
            // 
642
            this.layoutControlItem17.Control = this.btnHistory;
643
            this.layoutControlItem17.Location = new System.Drawing.Point(0, 160);
644
            this.layoutControlItem17.Name = "layoutControlItem17";
645
            this.layoutControlItem17.Size = new System.Drawing.Size(237, 40);
646
            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
647
            this.layoutControlItem17.TextVisible = false;
648
            // 
624 649
            // contextMenuPSN
625 650
            // 
626 651
            this.contextMenuPSN.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
......
691 716
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
692 717
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
693 718
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
719
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
694 720
            this.contextMenuPSN.ResumeLayout(false);
695 721
            this.ResumeLayout(false);
696 722
            this.PerformLayout();
......
752 778
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
753 779
        private DevExpress.XtraEditors.SimpleButton btnEquipment;
754 780
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
781
        private DevExpress.XtraEditors.SimpleButton btnHistory;
782
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
755 783
    }
756 784
}
757 785

  
DTI_PID/ID2PSN/Form/MainForm.cs
52 52

  
53 53
            this.Text += string.Format(" v.{0}", Assembly.GetExecutingAssembly().GetName().Version.ToString()); 
54 54
            toolStripMenuItemPathItems.Click += toolStripPathItemsClick;
55

  
56

  
57

  
58
            // Equip Attr
59
            //comboBoxEditEquipTagName.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
60
            //string equipTag = Settings.Default.EquipTagAttribute;
61
            //DataTable dt = DB.SelectSymbolAttribute();
62
            //foreach (DataRow row in dt.Rows)
63
            //{
64
            //    string value = row["Attribute"].ToString();
65
            //    comboBoxEditEquipTagName.Properties.Items.Add(value);
66
            //    if (!string.IsNullOrEmpty(equipTag) && value.Equals(equipTag))
67
            //        comboBoxEditEquipTagName.SelectedItem = value;
68
            //}
69

  
70
            //checkEditEquipTag.Checked = Settings.Default.UseEquipTag;
71
            //comboBoxEditEquipTagName.Enabled = checkEditEquipTag.Checked;
72

  
73

  
74
            //PBS
75
            //spinEditStart.Properties.Mask.EditMask = "f0";
76
            //spinEditEnd.Properties.Mask.EditMask = "f0";
77
            //comboBoxEditPBSAttr.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
78
            //radioGroupPBS.SelectedIndex = -1;
79
            //SetPBSSettingUI();
80

  
81
            //for (int i = 0; i < radioGroupPBS.Properties.Items.Count; i++)
82
            //{
83
            //    if (string.IsNullOrEmpty(Settings.Default.PBSSetting))
84
            //    {
85
            //        radioGroupPBS.SelectedIndex = 4;
86
            //        break;
87
            //    }
88

  
89
            //    if (radioGroupPBS.Properties.Items[i].Value.Equals(Settings.Default.PBSSetting))
90
            //    {
91
            //        radioGroupPBS.SelectedIndex = i;
92
            //        break;
93
            //    }
94
            //}
95 55
        }
96 56

  
97 57
        private void showButton_Click(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
......
209 169
                    return;
210 170
                }
211 171

  
172
                
212 173
                splashScreenManager1.ShowWaitForm();
213 174
                splashScreenManager1.SetWaitFormCaption("Generate PSN..");
214 175
                splashScreenManager1.SetWaitFormDescription("Wating...");
......
324 285
                //PSNPageDT.Rows.Clear();
325 286

  
326 287
                // topology table
288
                DataTable oldPSN = DB.GetPipeSystemNetwork(); 
327 289
                bool bCheck = false;
328 290
                foreach (DataRow row in PSNPageDT.Rows)
329 291
                {
330
                    DataRow selectRow = currentPSN.PipeSystemNetwork.Select(string.Format("OID = '{0}' AND OrderNumber = '{1}'", row["OID"].ToString(), row["OrderNumber"].ToString())).FirstOrDefault();
292
                    DataRow selectRow = oldPSN.Select(string.Format("OID = '{0}' AND OrderNumber = '{1}'", row["OID"].ToString(), row["OrderNumber"].ToString())).FirstOrDefault();
331 293

  
332 294
                    if (selectRow == null)
333 295
                        bCheck = true;
......
412 374
                            //테이블 없으면 생성
413 375
                            DB.ConnCreateRevisionTable(dicColCheck, names);
414 376
                        }
415

  
416
                       
377
                                               
417 378
                        DataTable revision = DB.SelectRevision();
418 379

  
419 380
                        foreach(DataRow dr in revision.Rows)
......
520 481
            PSNPageDT.Columns.Add("TopologySet_OID_Key", typeof(string));
521 482
            PSNPageDT.Columns.Add("PSNRevisionNumber", typeof(string));
522 483
            PSNPageDT.Columns.Add("PBS", typeof(string));
523
            PSNPageDT.Columns.Add("Drawings", typeof(string));
484
            PSNPageDT.Columns.Add("Drawings", typeof(string));          
485
            
486
            PSNPageDT.Columns.Add("EGTag", typeof(string));
487
            PSNPageDT.Columns.Add("HasMLTags", typeof(string));
488
            PSNPageDT.Columns.Add("Pocket", typeof(string));
524 489
            PSNPageDT.Columns.Add("IsValid", typeof(string));
525
            PSNPageDT.Columns.Add("Status", typeof(string));                   
490
            PSNPageDT.Columns.Add("Status", typeof(string));
526 491
            PSNPageDT.Columns.Add("IncludingVirtualData", typeof(string));
527 492
            PSNPageDT.Columns.Add("PSNAccuracy", typeof(string));
528
            PSNPageDT.Columns.Add("Pocket", typeof(string));
529
            PSNPageDT.Columns.Add("EGTag", typeof(string));
530
            PSNPageDT.Columns.Add("HasMLTags", typeof(string));
493

  
531 494
            PSNPageDT.Columns.Add("Show", typeof(string));
532 495

  
533 496

  
......
541 504
            gridViewPSN.Columns["PSNRevisionNumber"].Caption = "Revision";
542 505
            gridViewPSN.Columns["Show"].Caption = " ";
543 506
            gridViewPSN.Columns["PSNAccuracy"].DisplayFormat.FormatString = "{ 0:#.##}";
544

  
507
            gridViewPSN.Columns["EGTag"].DisplayFormat.FormatString = "EG Tag";
508
            gridViewPSN.Columns["HasMLTags"].DisplayFormat.FormatString = "ML Tags";
509
            gridViewPSN.Columns["IsValid"].DisplayFormat.FormatString = "Validity";
545 510

  
546 511
            repositoryGroupType2 = new RepositoryItemComboBox();
547 512
            repositoryGroupType2.Items.AddRange(new string[] { "Yes", "No" });
......
591 556
            gridViewPathItems.Columns["TopologySet_OID"].Caption = "Topology ID";
592 557
            gridViewPathItems.Columns["SubClass"].Caption = "Sub-Class";
593 558
            gridViewPathItems.Columns["GROUPTAG"].Caption = "Valve Group Tag";
594
            gridViewPathItems.Columns["EqpGroupTag"].Caption = "AFC Group Tag";
595
            gridViewPathItems.Columns["MainLineTag"].Caption = "Main Line Tag";
559
            gridViewPathItems.Columns["EqpGroupTag"].Caption = "EG Tag";
560
            gridViewPathItems.Columns["MainLineTag"].Caption = "ML Tag";
561
            gridViewPathItems.Columns["EGTConnectedPoint"].Caption = "EG Point";
562
            gridViewPathItems.Columns["EGFlowDirection"].Caption = "EG Flow";
596 563
            //AFC Group Tag, Main Line
597 564
            #endregion
598 565

  
......
1068 1035
            form.ShowDialog();
1069 1036
        }
1070 1037

  
1038
        private void btnHistory_Click(object sender, EventArgs e)
1039
        {
1040
            HistoryForm form = new HistoryForm();
1041
            form.ShowDialog();
1042
        }
1043

  
1071 1044
        //private void AirFinCoolerSetting_Click(object sender, EventArgs e)
1072 1045
        //{
1073 1046
        //    AirFinCoolerSetting form = new AirFinCoolerSetting();
DTI_PID/ID2PSN/Form/MainForm.resx
293 293
        ui+7ks1RdiltwVif71q+BKmzktRZSeqsY1h9A4ZDkwafEbAVAAAAAElFTkSuQmCC
294 294
</value>
295 295
  </data>
296
  <data name="btnHistory.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
297
    <value>
298
        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
343
        IbOtAAAAAElFTkSuQmCC
344
</value>
345
  </data>
296 346
  <metadata name="contextMenuPSN.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
297 347
    <value>359, 17</value>
298 348
  </metadata>
......
300 350
    <value>507, 17</value>
301 351
  </metadata>
302 352
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
303
    <value>48</value>
353
    <value>25</value>
304 354
  </metadata>
305 355
</root>
DTI_PID/ID2PSN/Form/ValveGroupingSetting.cs
163 163
                    return;
164 164
                }
165 165

  
166
                repositoryAttributeItem.Items.Clear();                
166
                repositoryAttributeItem.Items.Clear();
167
                repositoryAttributeItem.Items.Add("");
167 168
                repositoryAttributeItem.Items.Add("NoSelection");
168 169
                foreach (DataRow dr in SymbolList.Rows)
169 170
                {
DTI_PID/ID2PSN/ID2PSN.csproj
114 114
    <Compile Include="Form\DBSettingForm.Designer.cs">
115 115
      <DependentUpon>DBSettingForm.cs</DependentUpon>
116 116
    </Compile>
117
    <Compile Include="Form\HistoryForm.cs">
118
      <SubType>Form</SubType>
119
    </Compile>
120
    <Compile Include="Form\HistoryForm.Designer.cs">
121
      <DependentUpon>HistoryForm.cs</DependentUpon>
122
    </Compile>
117 123
    <Compile Include="Form\PBSSetting.cs">
118 124
      <SubType>Form</SubType>
119 125
    </Compile>
......
211 217
      <DependentUpon>DBSettingForm.cs</DependentUpon>
212 218
      <SubType>Designer</SubType>
213 219
    </EmbeddedResource>
220
    <EmbeddedResource Include="Form\HistoryForm.resx">
221
      <DependentUpon>HistoryForm.cs</DependentUpon>
222
    </EmbeddedResource>
214 223
    <EmbeddedResource Include="Form\PBSSetting.resx">
215 224
      <DependentUpon>PBSSetting.cs</DependentUpon>
216 225
    </EmbeddedResource>
DTI_PID/ID2PSN/PSN.cs
243 243
            // Update Keyword
244 244
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateKeywordForPSN ( 55 % )");
245 245
            UpdateKeywordForPSN();
246
            // Vent/Drain PSN 데이터 제거
247
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  DeleteVentDrain ( 60 % )");
248
            DeleteVentDrain();
246
          
249 247
            // Topology의 subtype을 update(bypass, Header, 등등) 
250
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateSubType ( 65 % )");
248
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateSubType ( 60 % )");
251 249
            UpdateSubType();
252 250
            // Update Error
253
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateErrorForPSN ( 70 % )");
251
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateErrorForPSN ( 65 % )");
252
            PathItemSorting();
254 253
            UpdateErrorForPSN();
255 254
            // Insert Tee
256
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  InsertTeePSN ( 75 % )");
255
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  InsertTeePSN ( 70 % )");
257 256
            InsertTeePSN();
258
            // 확도 계산
259
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateAccuracy ( 80 % )");
260
            UpdateAccuracy();
257
         
261 258
            // ValveGrouping
262
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateValveGrouping ( 85 % )");
259
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateValveGrouping ( 75 % )");
263 260
            UpdateValveGrouping();
264 261

  
265
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  PathItemSorting ( 90 % )");
262
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  PathItemSorting ( 80 % )");
266 263
            PathItemSorting();
267 264

  
268 265
            // AirFinCooler 
269
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateAirFinCooler ( 95 % )");
266
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateAirFinCooler ( 85 % )");
270 267
            UpdateAirFinCooler();
271 268

  
269
            // Vent/Drain PSN 데이터 제거
270
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  DeleteVentDrain ( 90 % )");
271
            DeleteVentDrain();
272

  
273
            // 확도 계산
274
            splashScreenManager1.SetWaitFormDescription(i++ + " / 19  UpdateAccuracy ( 95 % )");
275
            UpdateAccuracy();
276

  
277
            //UpdatePSNType();
278

  
279
        }
280

  
281
        private void UpdatePSNType()
282
        {
283
            try
284
            {
285
                foreach (PSNItem PSNItem in PSNItems)
286
                {    
287
                    foreach (Group group in PSNItem.Groups)
288
                    {
289
                        foreach (Item item in group.Items)
290
                        {
291
                            DataRow[] pipeSystems = PipeSystemNetwork.Select(string.Format("OID = '{0}'", PSNItem.PSN_OID()));
292
                           // PSNItem PSNItem = PSNItems.Find(x => x.PSN_OID() == dataRow["OID"].ToString());
293

  
294
                            foreach(DataRow dr in pipeSystems)
295
                            {
296
                                dr["Type"] = PSNItem.GetPSNType();
297
                            }                            
298
                        }
299
                    }                
300
                }
301
            }
302
            catch (Exception ex)
303
            {
304
                MessageBox.Show(ex.Message, "ID2 ", MessageBoxButtons.OK, MessageBoxIcon.Error);
305
            }
272 306
        }
273 307

  
274 308
        private void PathItemSorting()
......
320 354
        {
321 355
            try
322 356
            {
323
                int afcTagNum = 0;
357
                
324 358
                int pumpTagNum = 0;
325 359
                #region EquipmentAirFinCooler Info
326 360
                EquipmentAirFinCoolerInfo EquipmentAirFinCooler = new EquipmentAirFinCoolerInfo();
......
335 369
                }
336 370
                #endregion
337 371

  
338
                DataRow[] airFinCoolerRows = PipeSystemNetwork.Select("AFC = 'P1'");
372
                
339 373
                DataRow[] pumpRows = PipeSystemNetwork.Select("PUMP = 'PUMP'");
340 374
                // 1, 2번
341 375
                foreach (DataRow dataRow in pumpRows) 
......
632 666
                    }                   
633 667
                }
634 668
                
669
                int afcTagNum = 0;
670
                DataRow[] airFinCoolerRows = PipeSystemNetwork.Select("AFC = 'P1'");
635 671
                foreach (DataRow dataRow in airFinCoolerRows)
636 672
                {
637 673
                    afcTagNum++;
674
                    DataRow[] pathItemRows = PathItems.Select(string.Format("PipeSystemNetwork_OID = '{0}'", dataRow["OID"].ToString()));
675
                    foreach (DataRow dr in pathItemRows)
676
                    {
677
                        dr["EqpGroupTag"] = "AFC" + string.Format("-{0}", string.Format("{0:D3}", afcTagNum));
678
                    }
679
                }
680
                
681
                foreach (DataRow dataRow in airFinCoolerRows)
682
                {
683
                    
638 684
                    string EGFlowDirection = string.Empty;
639

  
685
                    
640 686
                    PSNItem PSNItem = PSNItems.Find(x => x.PSN_OID() == dataRow["OID"].ToString());
641 687
                    if (PSNItem.Groups.First().Items.First().Equipment != null)
642 688
                    {
......
654 700
                    }
655 701

  
656 702
                    DataRow[] pathItemRows = PathItems.Select(string.Format("PipeSystemNetwork_OID = '{0}'", dataRow["OID"].ToString()));
657
                    List<string> lstViewPipeSystemNetwork_OID = pathItemRows.Select(x => x.Field<string>("ViewPipeSystemNetwork_OID")).Distinct().ToList();
703
                    string AFCTag = pathItemRows.Where(x => !string.IsNullOrEmpty(x.Field<string>("EqpGroupTag"))).First().Field<string>("EqpGroupTag");
704
                    List<string> lstViewPipeSystemNetwork_OID = pathItemRows.Select(x => x.Field<string>("ViewPipeSystemNetwork_OID")).ToList();
658 705
                    //ViewPipeSystemNetwork_OID
659 706
                    string MainLineTag = "";
660 707
                    if (dataRow["Type"].ToString() == "E2E")
......
673 720
                            DataRow dr = PipeSystemNetwork.Select(string.Format("OID = '{0}'", viewOID)).First();
674 721
                            if (dr.Field<string>("AFC") != "P1")
675 722
                            {
676
                                bCount++;
677
                                string[] arr = dr.Field<string>("AFC").Split('_');
678
                                if (arr.Length == 1)
679
                                    dr["AFC"] = arr[0] + "_1";
680
                                else
723
                                if (lstViewPipeSystemNetwork_OID.Where(x => x.Equals(viewOID)).Count() == 1)
724
                                {
725
                                    MainLineTag = "M";
726
                                    dataRow["AFC"] = "P3";
727
                                }
728
                                else if(lstViewPipeSystemNetwork_OID.Where(x => x.Equals(viewOID)).Count() > 1)
681 729
                                {
682
                                    dr["AFC"] = arr[0] + "_" + Convert.ToInt32(arr[1]) + 1;
683
                                    afcTagNum++;
730
                                    DataRow[] viewpipeSystem = PipeSystemNetwork.Select(string.Format("OID = '{0}'", viewOID));
731
                                    foreach (DataRow row in viewpipeSystem)
732
                                    {
733
                                        row["AFC"] = "P4";
734
                                    }
735

  
684 736
                                    DataRow[] viewpathItemRows = PathItems.Select(string.Format("PipeSystemNetwork_OID = '{0}'", viewOID));
737

  
738
                                    if(viewpathItemRows.Where(x => !string.IsNullOrEmpty(x.Field<string>("EqpGroupTag"))).Count() > 0)
739
                                        AFCTag = viewpathItemRows.Where(x => !string.IsNullOrEmpty(x.Field<string>("EqpGroupTag"))).First().Field<string>("EqpGroupTag");                                    
740

  
685 741
                                    foreach (DataRow viewdr in viewpathItemRows)
686 742
                                    {
687
                                        viewdr["EqpGroupTag"] = "AFC" + string.Format("-{0}", string.Format("{0:D3}", afcTagNum));  //ATG Sequence No Rule 여쭤봐야함.
743
                                       // viewdr["EqpGroupTag"] = AFCTag;
688 744
                                        viewdr["MainLineTag"] = "M";
689 745
                                    }
690 746
                                }
691

  
692 747
                            }
693
                        }
694
                        
695
                        if(bCount == 1)
696
                        {
697
                            MainLineTag = "M";
698
                           // dataRow["AFC"] = "P3";
699
                        }
700
                            
748
                        }                            
701 749
                    }
702 750

  
703 751
                    foreach (DataRow dr in pathItemRows)
704 752
                    {
705
                        dr["EqpGroupTag"] = "AFC" + string.Format("-{0}", string.Format("{0:D3}", afcTagNum));  //ATG Sequence No Rule 여쭤봐야함.
753
                        dr["EqpGroupTag"] = AFCTag;// "AFC" + string.Format("-{0}", string.Format("{0:D3}", afcTagNum));  //ATG Sequence No Rule 여쭤봐야함.
706 754
                        dr["MainLineTag"] = MainLineTag; 
707 755
                        dr["EGFlowDirection"] = EGFlowDirection; 
708 756
                    }
......
716 764
                    {
717 765
                        List<string> lstViewPipeSystemNetwork_OID = pathItemRows.Select(x => x.Field<string>("ViewPipeSystemNetwork_OID")).Distinct().ToList();
718 766
                        List<string> lstpsn = new List<string>();
767
                        List<string> lstAll = new List<string>();
719 768
                        string EqpGroupTag = string.Empty;
720 769
                        foreach (string viewOID in lstViewPipeSystemNetwork_OID)
721 770
                        {
......
735 784
                                {
736 785
                                    dr["EqpGroupTag"] = EqpGroupTag;
737 786

  
738
                                    if (!string.IsNullOrEmpty(dr.Field<string>("ViewPipeSystemNetwork_OID")) && !lstpsn.Contains("ViewPipeSystemNetwork_OID"))
787
                                    if (!string.IsNullOrEmpty(dr.Field<string>("ViewPipeSystemNetwork_OID")) && !lstpsn.Contains(dr.Field<string>("ViewPipeSystemNetwork_OID")))
788
                                    {
739 789
                                        lstpsn.Add(dr.Field<string>("ViewPipeSystemNetwork_OID"));
790
                                        lstAll.Add(dr.Field<string>("ViewPipeSystemNetwork_OID"));
791
                                    }
740 792
                                }
741 793
                            }
742 794
                            
743 795
                        }
744 796

  
745
                        while(lstpsn.Count() != 0)
797
                        while (lstpsn.Count() != 0)
746 798
                        {
747
                            foreach(string psn in lstpsn)
799
                            int lstCount = lstpsn.Count;
800
                            for (int i = 0; i < lstpsn.Count(); i++) //string psn in lstpsn
748 801
                            {
749
                                DataRow[] rule4pathItems = PathItems.Select(string.Format("PipeSystemNetwork_OID = '{0}'", psn));
802
                                
803
                                DataRow[] rule4pathItems = PathItems.Select(string.Format("PipeSystemNetwork_OID = '{0}'", lstpsn[i]));
750 804
                                foreach (DataRow dr in rule4pathItems)
751 805
                                {
752
                                    dr["EqpGroupTag"] = EqpGroupTag;
753

  
754
                                    if (!string.IsNullOrEmpty(dr.Field<string>("ViewPipeSystemNetwork_OID")) && !lstpsn.Contains("ViewPipeSystemNetwork_OID"))
806
                                    if (!string.IsNullOrEmpty(dr.Field<string>("ViewPipeSystemNetwork_OID")) && !lstAll.Contains(dr.Field<string>("ViewPipeSystemNetwork_OID")))
807
                                    {
755 808
                                        lstpsn.Add(dr.Field<string>("ViewPipeSystemNetwork_OID"));
809
                                        lstAll.Add(dr.Field<string>("ViewPipeSystemNetwork_OID"));
810
                                    }
811

  
812
                                    if (dr["EqpGroupTag"].Equals(EqpGroupTag))
813
                                        continue;
814

  
815
                                    dr["EqpGroupTag"] = EqpGroupTag;                                  
756 816
                                }
757 817

  
758
                                lstpsn.Remove(psn);
818
                                lstpsn.Remove(lstpsn[i]);
759 819
                            }                        
760 820

  
761 821
                        }
......
886 946
                    int bCnt = 0;
887 947

  
888 948
                    //bool bCheck = false;
949
                    if (drPathitem["PipeSystemNetwork_OID"].ToString().Contains("901"))
950
                    {
951

  
952
                    }
889 953
                    List<DataRow> lstitem = new List<DataRow>();
890 954
                    foreach (DataRow dr in pathItemRows)
891 955
                    {
892 956
                        //if (!string.IsNullOrEmpty(dr["GROUPTAG"].ToString()))
893 957
                        //    break;
894 958

  
895
                       if (!string.IsNullOrEmpty(dr["BranchTopologySet_OID"].ToString()))
959
                        if (!string.IsNullOrEmpty(dr["BranchTopologySet_OID"].ToString()))
896 960
                        {
897 961
                            DataRow[] rows = TopologySet.Select(string.Format("OID = '{0}'", dr["BranchTopologySet_OID"].ToString()));
898 962
                            if (dr["GROUPTAG"].ToString() == "Scope Break")
899 963
                            {
900 964
                                dr["GROUPTAG"] = string.Empty;
901
                                break;
902
                            }
903

  
904
                            if (rows.First()["SubType"].ToString() != "Bypass" && rows.First()["SubType"].ToString() != "Vent_Drain")
905
                            {
906
                               // bCheck = true;
907
                                lstitem.Add(dr);
908 965
                                keyValuePairs.Add(bCnt, lstitem.ToList());
909 966
                                bCnt++;
910 967
                                lstitem.Clear();
968
                                //break;
911 969
                            }
912 970
                            else
913
                                lstitem.Add(dr);
971
                            {
972
                                if (rows.First()["SubType"].ToString() != "Bypass" && rows.First()["SubType"].ToString() != "Vent_Drain")
973
                                {
974
                                    // bCheck = true;
975
                                    if (lstitem.ToList().Where(x => !string.IsNullOrEmpty(x.Field<string>("GROUPTAG"))).Count() > 0)
976
                                    {
977
                                        lstitem.Add(dr);
978
                                        keyValuePairs.Add(bCnt, lstitem.ToList());
979
                                        lstitem.Clear();
980
                                    }
981
                                    else
982
                                    {
983
                                        keyValuePairs.Add(bCnt, lstitem.ToList());
984
                                        lstitem.Clear();
985
                                        lstitem.Add(dr);
986
                                    }
987
                                    bCnt++;
988

  
989
                                }
990
                                else
991
                                    lstitem.Add(dr);
992
                            }
993

  
914 994
                        }
915 995
                        else
916 996
                            lstitem.Add(dr);
......
926 1006
                        continue;
927 1007

  
928 1008
                    string VGTag = string.Empty;
929
                    if (valveitem.AttributeName == "NoSelection")
1009
                    if (valveitem.AttributeName == "NoSelection" || valveitem.AttributeName == string.Empty)
930 1010
                    {
931 1011
                        VGTag = valveitem.TagIdentifier + string.Format("-{0}", string.Format("{0:D5}", vgTagNum));
932 1012
                        vgTagNum++;
933 1013
                    }
934 1014
                    else
935 1015
                    {
936
                        VGTag = valveitem.TagIdentifier + "-" + valvetag[1];
1016
                        if(string.IsNullOrEmpty(valvetag[1]))
1017
                            VGTag = valveitem.TagIdentifier + string.Format("-{0}", string.Format("{0:D5}", vgTagNum));
1018
                        else
1019
                            VGTag = valveitem.TagIdentifier + "-" + valvetag[1] + string.Format("-{0}", string.Format("{0:D5}", vgTagNum));
1020

  
1021
                        vgTagNum++;
937 1022
                    }
938 1023

  
939 1024
                    foreach (KeyValuePair<int, List<DataRow>> keyValuePair in keyValuePairs)
......
943 1028
                            foreach (DataRow dr in keyValuePair.Value)
944 1029
                            {
945 1030
                                dr["GROUPTAG"] = VGTag;
1031

  
1032
                                if(!string.IsNullOrEmpty(dr["BranchTopologySet_OID"].ToString()))
1033
                                {
1034
                                    if(TopologySet.Select(string.Format("OID = '{0}'", dr["BranchTopologySet_OID"].ToString())).First().Field<string>("SubType") == "Bypass")
1035
                                    {
1036
                                        DataRow[] rows = keyValuePair.Value.Where(x => x.Field<string>("ViewPipeSystemNetwork_OID").Equals(dr["ViewPipeSystemNetwork_OID"].ToString())).ToArray();
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

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