프로젝트

일반

사용자정보

개정판 51ae61b9

ID51ae61b92ede515a72891d11a1fce094ad78aa3e
상위 a0965e07
하위 bf31a6f6, b66a2996

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

dev issue #000 : fix bug

Change-Id: I0fbfda81ee393a9e70ea82114c1519449e4fbca0

차이점 보기:

DTI_PID/SPPIDConverter/AutoModeling.cs
986 986
                    {
987 987
                        Line nextLine = linePointInfo[i + 1].Item2;
988 988
                        SlopeType nextSlopeType = SPPIDUtil.CalcSlope(nextLine.SPPID.START_X, nextLine.SPPID.START_Y, nextLine.SPPID.END_X, nextLine.SPPID.END_Y);
989
                        if (prevSlopeType == SlopeType.HORIZONTAL)
989
                        if (slopeType == SlopeType.HORIZONTAL)
990 990
                            y = linePointInfo[i + 1].Item5;
991
                        else if (prevSlopeType == SlopeType.VERTICAL)
991
                        else if (slopeType == SlopeType.VERTICAL)
992 992
                            x = linePointInfo[i + 1].Item4;
993 993
                    }
994 994
                }
DTI_PID/SPPIDConverter/ConverterDocking.cs
35 35

  
36 36
#if DEBUG
37 37
            simpleButton1.Visible = true;
38

  
39
            Project_Info _ProjectInfo = Project_Info.GetInstance();
40
            _ProjectInfo.DefaultPath = Settings.Default.LatestProjectPath;
41
            if (Project_DB.ConnTestAndCreateTable())
42
            {
43
                
44
            }
45
            else
46
            {
47

  
48
            }
38 49
#endif
39 50
        }
40 51

  
......
77 88
            Placement placement = new Placement();
78 89
            LMADataSource dataSource = placement.PIDDataSource;
79 90

  
91
            StringBuilder sb = new StringBuilder();
92
            sb.AppendLine(dataSource.ProjectNumber);
93
            sb.AppendLine(radApp.DisplayAlerts.ToString());
94
           
95

  
96
            MessageBox.Show(sb.ToString());
97

  
98
            return;
99

  
100
            
101
            
80 102
            Ingr.RAD2D.Symbol2d symbol2d = radApp.ActiveSelectSet[0] as Ingr.RAD2D.Symbol2d;
81 103
            if (symbol2d != null)
82 104
            {
DTI_PID/SPPIDConverter/ConverterForm.Designer.cs
109 109
            this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
110 110
            this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
111 111
            this.ribbonControl.ShowToolbarCustomizeItem = false;
112
            this.ribbonControl.Size = new System.Drawing.Size(1226, 27);
112
            this.ribbonControl.Size = new System.Drawing.Size(1234, 32);
113 113
            this.ribbonControl.Toolbar.ShowCustomizeItem = false;
114 114
            // 
115 115
            // layoutControl1
......
121 121
            this.layoutControl1.Controls.Add(this.gridControlConverter);
122 122
            this.layoutControl1.Controls.Add(this.btnID2Project);
123 123
            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
124
            this.layoutControl1.Location = new System.Drawing.Point(0, 27);
124
            this.layoutControl1.Location = new System.Drawing.Point(0, 32);
125 125
            this.layoutControl1.Name = "layoutControl1";
126 126
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(982, 292, 650, 400);
127 127
            this.layoutControl1.Root = this.Root;
128
            this.layoutControl1.Size = new System.Drawing.Size(1226, 566);
128
            this.layoutControl1.Size = new System.Drawing.Size(1234, 565);
129 129
            this.layoutControl1.TabIndex = 1;
130 130
            this.layoutControl1.Text = "layoutControl1";
131 131
            // 
132 132
            // btnRun
133 133
            // 
134 134
            this.btnRun.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnRun.ImageOptions.SvgImage")));
135
            this.btnRun.Location = new System.Drawing.Point(849, 64);
135
            this.btnRun.Location = new System.Drawing.Point(855, 58);
136 136
            this.btnRun.Name = "btnRun";
137 137
            this.btnRun.Size = new System.Drawing.Size(79, 36);
138 138
            this.btnRun.StyleController = this.layoutControl1;
......
143 143
            // btnLoadFile
144 144
            // 
145 145
            this.btnLoadFile.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnLoadFile.ImageOptions.SvgImage")));
146
            this.btnLoadFile.Location = new System.Drawing.Point(24, 64);
146
            this.btnLoadFile.Location = new System.Drawing.Point(24, 58);
147 147
            this.btnLoadFile.Name = "btnLoadFile";
148 148
            this.btnLoadFile.Size = new System.Drawing.Size(110, 36);
149 149
            this.btnLoadFile.StyleController = this.layoutControl1;
......
154 154
            // btnItemMapping
155 155
            // 
156 156
            this.btnItemMapping.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnItemMapping.ImageOptions.SvgImage")));
157
            this.btnItemMapping.Location = new System.Drawing.Point(961, 330);
157
            this.btnItemMapping.Location = new System.Drawing.Point(972, 310);
158 158
            this.btnItemMapping.Name = "btnItemMapping";
159
            this.btnItemMapping.Size = new System.Drawing.Size(241, 38);
159
            this.btnItemMapping.Size = new System.Drawing.Size(238, 36);
160 160
            this.btnItemMapping.StyleController = this.layoutControl1;
161 161
            this.btnItemMapping.TabIndex = 7;
162 162
            this.btnItemMapping.Text = "Item Mapping Setting";
......
165 165
            // btnSPPIDDB
166 166
            // 
167 167
            this.btnSPPIDDB.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnSPPIDDB.ImageOptions.SvgImage")));
168
            this.btnSPPIDDB.Location = new System.Drawing.Point(961, 188);
168
            this.btnSPPIDDB.Location = new System.Drawing.Point(972, 176);
169 169
            this.btnSPPIDDB.Name = "btnSPPIDDB";
170
            this.btnSPPIDDB.Size = new System.Drawing.Size(241, 38);
170
            this.btnSPPIDDB.Size = new System.Drawing.Size(238, 36);
171 171
            this.btnSPPIDDB.StyleController = this.layoutControl1;
172 172
            this.btnSPPIDDB.TabIndex = 5;
173 173
            this.btnSPPIDDB.Text = "Setting";
......
175 175
            // 
176 176
            // gridControlConverter
177 177
            // 
178
            this.gridControlConverter.Location = new System.Drawing.Point(24, 104);
178
            this.gridControlConverter.Location = new System.Drawing.Point(24, 98);
179 179
            this.gridControlConverter.MainView = this.gridViewConverter;
180 180
            this.gridControlConverter.MenuManager = this.ribbonControl;
181 181
            this.gridControlConverter.Name = "gridControlConverter";
182
            this.gridControlConverter.Size = new System.Drawing.Size(904, 438);
182
            this.gridControlConverter.Size = new System.Drawing.Size(910, 443);
183 183
            this.gridControlConverter.TabIndex = 4;
184 184
            this.gridControlConverter.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
185 185
            this.gridViewConverter});
......
194 194
            // 
195 195
            // btnID2Project
196 196
            // 
197
            this.btnID2Project.Location = new System.Drawing.Point(999, 64);
197
            this.btnID2Project.Location = new System.Drawing.Point(1010, 58);
198 198
            this.btnID2Project.MenuManager = this.ribbonControl;
199 199
            this.btnID2Project.Name = "btnID2Project";
200 200
            this.btnID2Project.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
201 201
            new DevExpress.XtraEditors.Controls.EditorButton()});
202 202
            this.btnID2Project.Properties.ReadOnly = true;
203
            this.btnID2Project.Size = new System.Drawing.Size(203, 20);
203
            this.btnID2Project.Size = new System.Drawing.Size(200, 20);
204 204
            this.btnID2Project.StyleController = this.layoutControl1;
205 205
            this.btnID2Project.TabIndex = 10;
206 206
            this.btnID2Project.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.btnID2Project_ButtonClick);
......
217 217
            this.layoutControlGroupID2Project,
218 218
            this.splitterItem1});
219 219
            this.Root.Name = "Root";
220
            this.Root.Size = new System.Drawing.Size(1226, 566);
220
            this.Root.Size = new System.Drawing.Size(1234, 565);
221 221
            this.Root.TextVisible = false;
222 222
            // 
223 223
            // layoutControlGroupSPPIDDB
......
230 230
            this.layoutControlItem2,
231 231
            this.simpleLabelItem2,
232 232
            this.simpleLabelItem1});
233
            this.layoutControlGroupSPPIDDB.Location = new System.Drawing.Point(937, 124);
233
            this.layoutControlGroupSPPIDDB.Location = new System.Drawing.Point(948, 118);
234 234
            this.layoutControlGroupSPPIDDB.Name = "layoutControlGroupSPPIDDB";
235
            this.layoutControlGroupSPPIDDB.Size = new System.Drawing.Size(269, 142);
235
            this.layoutControlGroupSPPIDDB.Size = new System.Drawing.Size(266, 134);
236 236
            this.layoutControlGroupSPPIDDB.Text = "SPPID DB";
237 237
            // 
238 238
            // labelSPPIDPlantName
239 239
            // 
240 240
            this.labelSPPIDPlantName.AllowHotTrack = false;
241 241
            this.labelSPPIDPlantName.AppearanceItemCaption.Options.UseForeColor = true;
242
            this.labelSPPIDPlantName.Location = new System.Drawing.Point(78, 42);
242
            this.labelSPPIDPlantName.Location = new System.Drawing.Point(78, 40);
243 243
            this.labelSPPIDPlantName.Name = "labelSPPIDPlantName";
244
            this.labelSPPIDPlantName.Size = new System.Drawing.Size(167, 18);
244
            this.labelSPPIDPlantName.Size = new System.Drawing.Size(164, 18);
245 245
            this.labelSPPIDPlantName.Text = "SPPIDPlantName";
246 246
            this.labelSPPIDPlantName.TextSize = new System.Drawing.Size(93, 14);
247 247
            // 
......
249 249
            // 
250 250
            this.labelSPPIDDBStatus.AllowHotTrack = false;
251 251
            this.labelSPPIDDBStatus.AppearanceItemCaption.Options.UseForeColor = true;
252
            this.labelSPPIDDBStatus.Location = new System.Drawing.Point(51, 60);
252
            this.labelSPPIDDBStatus.Location = new System.Drawing.Point(51, 58);
253 253
            this.labelSPPIDDBStatus.Name = "labelSPPIDDBStatus";
254
            this.labelSPPIDDBStatus.Size = new System.Drawing.Size(194, 18);
254
            this.labelSPPIDDBStatus.Size = new System.Drawing.Size(191, 18);
255 255
            this.labelSPPIDDBStatus.Text = "SPPIDDBStatus";
256 256
            this.labelSPPIDDBStatus.TextSize = new System.Drawing.Size(93, 14);
257 257
            // 
......
260 260
            this.layoutControlItem2.Control = this.btnSPPIDDB;
261 261
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
262 262
            this.layoutControlItem2.Name = "layoutControlItem2";
263
            this.layoutControlItem2.Size = new System.Drawing.Size(245, 42);
263
            this.layoutControlItem2.Size = new System.Drawing.Size(242, 40);
264 264
            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
265 265
            this.layoutControlItem2.TextVisible = false;
266 266
            // 
......
268 268
            // 
269 269
            this.simpleLabelItem2.AllowHotTrack = false;
270 270
            this.simpleLabelItem2.AppearanceItemCaption.Options.UseForeColor = true;
271
            this.simpleLabelItem2.Location = new System.Drawing.Point(0, 60);
271
            this.simpleLabelItem2.Location = new System.Drawing.Point(0, 58);
272 272
            this.simpleLabelItem2.MaxSize = new System.Drawing.Size(51, 18);
273 273
            this.simpleLabelItem2.MinSize = new System.Drawing.Size(51, 18);
274 274
            this.simpleLabelItem2.Name = "simpleLabelItem2";
......
282 282
            // 
283 283
            this.simpleLabelItem1.AllowHotTrack = false;
284 284
            this.simpleLabelItem1.AppearanceItemCaption.Options.UseForeColor = true;
285
            this.simpleLabelItem1.Location = new System.Drawing.Point(0, 42);
285
            this.simpleLabelItem1.Location = new System.Drawing.Point(0, 40);
286 286
            this.simpleLabelItem1.MaxSize = new System.Drawing.Size(78, 18);
287 287
            this.simpleLabelItem1.MinSize = new System.Drawing.Size(78, 18);
288 288
            this.simpleLabelItem1.Name = "simpleLabelItem1";
......
300 300
            this.layoutControlItem4,
301 301
            this.labelItemMappingStatus,
302 302
            this.simpleLabelItem5});
303
            this.layoutControlGroupItemMapping.Location = new System.Drawing.Point(937, 266);
303
            this.layoutControlGroupItemMapping.Location = new System.Drawing.Point(948, 252);
304 304
            this.layoutControlGroupItemMapping.Name = "layoutControlGroupItemMapping";
305
            this.layoutControlGroupItemMapping.Size = new System.Drawing.Size(269, 124);
305
            this.layoutControlGroupItemMapping.Size = new System.Drawing.Size(266, 116);
306 306
            this.layoutControlGroupItemMapping.Text = "Item Mapping";
307 307
            // 
308 308
            // layoutControlItem4
......
310 310
            this.layoutControlItem4.Control = this.btnItemMapping;
311 311
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
312 312
            this.layoutControlItem4.Name = "layoutControlItem4";
313
            this.layoutControlItem4.Size = new System.Drawing.Size(245, 42);
313
            this.layoutControlItem4.Size = new System.Drawing.Size(242, 40);
314 314
            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
315 315
            this.layoutControlItem4.TextVisible = false;
316 316
            // 
......
318 318
            // 
319 319
            this.labelItemMappingStatus.AllowHotTrack = false;
320 320
            this.labelItemMappingStatus.AppearanceItemCaption.Options.UseForeColor = true;
321
            this.labelItemMappingStatus.Location = new System.Drawing.Point(51, 42);
321
            this.labelItemMappingStatus.Location = new System.Drawing.Point(51, 40);
322 322
            this.labelItemMappingStatus.Name = "labelItemMappingStatus";
323
            this.labelItemMappingStatus.Size = new System.Drawing.Size(194, 18);
323
            this.labelItemMappingStatus.Size = new System.Drawing.Size(191, 18);
324 324
            this.labelItemMappingStatus.Text = "MappingStatus";
325 325
            this.labelItemMappingStatus.TextSize = new System.Drawing.Size(93, 14);
326 326
            // 
......
328 328
            // 
329 329
            this.simpleLabelItem5.AllowHotTrack = false;
330 330
            this.simpleLabelItem5.AppearanceItemCaption.Options.UseForeColor = true;
331
            this.simpleLabelItem5.Location = new System.Drawing.Point(0, 42);
331
            this.simpleLabelItem5.Location = new System.Drawing.Point(0, 40);
332 332
            this.simpleLabelItem5.MaxSize = new System.Drawing.Size(51, 18);
333 333
            this.simpleLabelItem5.MinSize = new System.Drawing.Size(51, 18);
334 334
            this.simpleLabelItem5.Name = "simpleLabelItem5";
......
349 349
            this.layoutControlItem6});
350 350
            this.layoutControlGroupAutoConverter.Location = new System.Drawing.Point(0, 0);
351 351
            this.layoutControlGroupAutoConverter.Name = "layoutControlGroupAutoConverter";
352
            this.layoutControlGroupAutoConverter.Size = new System.Drawing.Size(932, 546);
352
            this.layoutControlGroupAutoConverter.Size = new System.Drawing.Size(938, 545);
353 353
            this.layoutControlGroupAutoConverter.Text = "Auto Converter";
354 354
            // 
355 355
            // layoutControlItem1
......
357 357
            this.layoutControlItem1.Control = this.gridControlConverter;
358 358
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 40);
359 359
            this.layoutControlItem1.Name = "layoutControlItem1";
360
            this.layoutControlItem1.Size = new System.Drawing.Size(908, 442);
360
            this.layoutControlItem1.Size = new System.Drawing.Size(914, 447);
361 361
            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
362 362
            this.layoutControlItem1.TextVisible = false;
363 363
            // 
......
378 378
            this.emptySpaceItem2.AllowHotTrack = false;
379 379
            this.emptySpaceItem2.Location = new System.Drawing.Point(114, 0);
380 380
            this.emptySpaceItem2.Name = "emptySpaceItem2";
381
            this.emptySpaceItem2.Size = new System.Drawing.Size(711, 40);
381
            this.emptySpaceItem2.Size = new System.Drawing.Size(717, 40);
382 382
            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
383 383
            // 
384 384
            // layoutControlItem6
385 385
            // 
386 386
            this.layoutControlItem6.Control = this.btnRun;
387
            this.layoutControlItem6.Location = new System.Drawing.Point(825, 0);
387
            this.layoutControlItem6.Location = new System.Drawing.Point(831, 0);
388 388
            this.layoutControlItem6.MaxSize = new System.Drawing.Size(83, 40);
389 389
            this.layoutControlItem6.MinSize = new System.Drawing.Size(83, 40);
390 390
            this.layoutControlItem6.Name = "layoutControlItem6";
......
396 396
            // emptySpaceItem1
397 397
            // 
398 398
            this.emptySpaceItem1.AllowHotTrack = false;
399
            this.emptySpaceItem1.Location = new System.Drawing.Point(937, 390);
399
            this.emptySpaceItem1.Location = new System.Drawing.Point(948, 368);
400 400
            this.emptySpaceItem1.Name = "emptySpaceItem1";
401
            this.emptySpaceItem1.Size = new System.Drawing.Size(269, 156);
401
            this.emptySpaceItem1.Size = new System.Drawing.Size(266, 177);
402 402
            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
403 403
            // 
404 404
            // layoutControlGroupID2Project
......
411 411
            this.layoutControlItem7,
412 412
            this.simpleLabelItem3,
413 413
            this.simpleLabelItem4});
414
            this.layoutControlGroupID2Project.Location = new System.Drawing.Point(937, 0);
414
            this.layoutControlGroupID2Project.Location = new System.Drawing.Point(948, 0);
415 415
            this.layoutControlGroupID2Project.Name = "layoutControlGroupID2Project";
416
            this.layoutControlGroupID2Project.Size = new System.Drawing.Size(269, 124);
416
            this.layoutControlGroupID2Project.Size = new System.Drawing.Size(266, 118);
417 417
            this.layoutControlGroupID2Project.Text = "ID2 Project";
418 418
            // 
419 419
            // labelID2ProjectName
......
422 422
            this.labelID2ProjectName.AppearanceItemCaption.Options.UseForeColor = true;
423 423
            this.labelID2ProjectName.Location = new System.Drawing.Point(90, 24);
424 424
            this.labelID2ProjectName.Name = "labelID2ProjectName";
425
            this.labelID2ProjectName.Size = new System.Drawing.Size(155, 18);
425
            this.labelID2ProjectName.Size = new System.Drawing.Size(152, 18);
426 426
            this.labelID2ProjectName.Text = "ID2ProjectName";
427 427
            this.labelID2ProjectName.TextSize = new System.Drawing.Size(93, 14);
428 428
            // 
......
432 432
            this.labelID2ProjectStatus.AppearanceItemCaption.Options.UseForeColor = true;
433 433
            this.labelID2ProjectStatus.Location = new System.Drawing.Point(51, 42);
434 434
            this.labelID2ProjectStatus.Name = "labelID2ProjectStatus";
435
            this.labelID2ProjectStatus.Size = new System.Drawing.Size(194, 18);
435
            this.labelID2ProjectStatus.Size = new System.Drawing.Size(191, 18);
436 436
            this.labelID2ProjectStatus.Text = "ID2ProjectStatus";
437 437
            this.labelID2ProjectStatus.TextSize = new System.Drawing.Size(93, 14);
438 438
            // 
......
441 441
            this.layoutControlItem7.Control = this.btnID2Project;
442 442
            this.layoutControlItem7.Location = new System.Drawing.Point(0, 0);
443 443
            this.layoutControlItem7.Name = "layoutControlItem7";
444
            this.layoutControlItem7.Size = new System.Drawing.Size(245, 24);
444
            this.layoutControlItem7.Size = new System.Drawing.Size(242, 24);
445 445
            this.layoutControlItem7.Text = "Path :";
446 446
            this.layoutControlItem7.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
447 447
            this.layoutControlItem7.TextSize = new System.Drawing.Size(33, 14);
......
478 478
            // splitterItem1
479 479
            // 
480 480
            this.splitterItem1.AllowHotTrack = true;
481
            this.splitterItem1.Location = new System.Drawing.Point(932, 0);
481
            this.splitterItem1.Location = new System.Drawing.Point(938, 0);
482 482
            this.splitterItem1.Name = "splitterItem1";
483
            this.splitterItem1.Size = new System.Drawing.Size(5, 546);
483
            this.splitterItem1.Size = new System.Drawing.Size(10, 545);
484 484
            // 
485 485
            // xtraFolderBrowserDialog
486 486
            // 
......
497 497
            // 
498 498
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
499 499
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
500
            this.ClientSize = new System.Drawing.Size(1226, 593);
500
            this.ClientSize = new System.Drawing.Size(1234, 597);
501 501
            this.Controls.Add(this.layoutControl1);
502 502
            this.Controls.Add(this.ribbonControl);
503 503
            this.Name = "ConverterForm";

내보내기 Unified diff

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