프로젝트

일반

사용자정보

개정판 534ca9c5

ID534ca9c5e86adbb5f736b106866ae614e5413fa7
상위 cf26ab05
하위 4b64beee

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

dev issue #1227 : mapping ui and remve db file

Change-Id: I85a9520fda256fe2f45aa7485da15665fdc8ad24

차이점 보기:

DTI_PID/APIDConverter/AVEVA.PID.CustomizationUtility_ACAD2018_x64.csproj
171 171
    <Compile Include="AutoModeling.cs" />
172 172
    <Compile Include="Aveva.PID.AssemblyInfo.cs" />
173 173
    <Compile Include="ConverterRibbonUI.cs" />
174
    <Compile Include="DB\DB.cs" />
175 174
    <Compile Include="Form\MappingForm.cs">
176 175
      <SubType>Form</SubType>
177 176
    </Compile>
DTI_PID/APIDConverter/AutoModeling.cs
79 79
            try
80 80
            {
81 81
                connection = new SqlConnection();
82
                connection.ConnectionString = DB.DB.GetConnectionString();
82
                connection.ConnectionString = DB.Project_DB.GetAvevaConnectionString();
83 83
                connection.Open();
84 84

  
85 85
                string strQry = string.Format("Select Handle from Pipe Where id = (SELECT MAX(id) FROM Pipe WHERE DrawingId = '{0}')", "Test");
DTI_PID/APIDConverter/DB/DB.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Linq;
4
using System.Text;
5
using System.Threading.Tasks;
6

  
7
namespace AVEVA.PID.CustomizationUtility.DB
8
{
9
    public class DB
10
    {
11
        public static string GetConnectionString()
12
        {
13
            string strConn = string.Empty;
14
            if (Utilities.strSQLWinAuthentication.ToUpper() == "YES")
15
            {
16
                strConn = String.Format("Data Source=" + Utilities.strSQLServerName + ";Integrated Security=SSPI;Initial Catalog={0};", Utilities.strSQLDatabaseName);
17
            }
18
            else if (Utilities.strSQLWinAuthentication.ToUpper() == "NO")
19
            {
20
                string strAccessString = "User ID=" + Utilities.strSQLUserName + ";Password=" + Utilities.strSQLPassword;
21
                strConn = String.Format("Data Source=" + Utilities.strSQLServerName + ";Initial Catalog=" + Utilities.strSQLDatabaseName + ";" + strAccessString);
22
            }
23

  
24
            return strConn;
25
        }
26
    }
27
}
DTI_PID/APIDConverter/DB/Project_DB.cs
302 302

  
303 303

  
304 304
        #region AVEVA
305
        private static string GetAvevaConnectionString()
305
        public static string GetAvevaConnectionString()
306 306
        {
307 307
            string strConn = string.Empty;
308 308
            if (Utilities.strSQLWinAuthentication.ToUpper() == "YES")
......
318 318
            return strConn;
319 319
        }
320 320

  
321
        private static string GetAvevaConnectionString_Reports()
321
        public static string GetAvevaConnectionString_Reports()
322 322
        {
323 323
            string strConn = string.Empty;
324 324
            if (Utilities.strSQLWinAuthentication.ToUpper() == "YES")
......
334 334
            return strConn;
335 335
        }
336 336

  
337
        private static string GetAvevaConnectionString_Admin()
337
        public static string GetAvevaConnectionString_Admin()
338 338
        {
339 339
            string strConn = string.Empty;
340 340
            if (Utilities.strSQLWinAuthentication.ToUpper() == "YES")
DTI_PID/APIDConverter/Form/MappingForm.Designer.cs
104 104
            this.ribbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
105 105
            this.ribbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
106 106
            this.ribbonControl.ShowToolbarCustomizeItem = false;
107
            this.ribbonControl.Size = new System.Drawing.Size(979, 32);
107
            this.ribbonControl.Size = new System.Drawing.Size(1123, 32);
108 108
            this.ribbonControl.Toolbar.ShowCustomizeItem = false;
109 109
            // 
110 110
            // layoutControl1
......
120 120
            this.layoutControl1.Location = new System.Drawing.Point(0, 32);
121 121
            this.layoutControl1.Name = "layoutControl1";
122 122
            this.layoutControl1.Root = this.Root;
123
            this.layoutControl1.Size = new System.Drawing.Size(979, 597);
123
            this.layoutControl1.Size = new System.Drawing.Size(1123, 730);
124 124
            this.layoutControl1.TabIndex = 1;
125 125
            this.layoutControl1.Text = "layoutControl1";
126 126
            // 
......
139 139
            this.layoutControlGroup6,
140 140
            this.splitterItem4});
141 141
            this.Root.Name = "Root";
142
            this.Root.Size = new System.Drawing.Size(979, 597);
142
            this.Root.Size = new System.Drawing.Size(1123, 730);
143 143
            this.Root.TextVisible = false;
144 144
            // 
145 145
            // emptySpaceItem1
146 146
            // 
147 147
            this.emptySpaceItem1.AllowHotTrack = false;
148
            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 537);
148
            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 670);
149 149
            this.emptySpaceItem1.Name = "emptySpaceItem1";
150
            this.emptySpaceItem1.Size = new System.Drawing.Size(771, 40);
150
            this.emptySpaceItem1.Size = new System.Drawing.Size(887, 40);
151 151
            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
152 152
            // 
153 153
            // tabbedControlGroup1
......
155 155
            this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 0);
156 156
            this.tabbedControlGroup1.Name = "tabbedControlGroup1";
157 157
            this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup1;
158
            this.tabbedControlGroup1.Size = new System.Drawing.Size(638, 537);
158
            this.tabbedControlGroup1.Size = new System.Drawing.Size(734, 670);
159 159
            this.tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
160 160
            this.layoutControlGroup1,
161 161
            this.layoutControlGroup2});
......
170 170
            this.layoutControlGroup5});
171 171
            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
172 172
            this.layoutControlGroup1.Name = "layoutControlGroup1";
173
            this.layoutControlGroup1.Size = new System.Drawing.Size(614, 489);
173
            this.layoutControlGroup1.Size = new System.Drawing.Size(710, 622);
174 174
            this.layoutControlGroup1.Text = "Symbol";
175 175
            // 
176 176
            // btnSave
177 177
            // 
178 178
            this.btnSave.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnSave.ImageOptions.SvgImage")));
179
            this.btnSave.Location = new System.Drawing.Point(783, 549);
179
            this.btnSave.Location = new System.Drawing.Point(899, 682);
180 180
            this.btnSave.Name = "btnSave";
181
            this.btnSave.Size = new System.Drawing.Size(84, 36);
181
            this.btnSave.Size = new System.Drawing.Size(97, 36);
182 182
            this.btnSave.StyleController = this.layoutControl1;
183 183
            this.btnSave.TabIndex = 5;
184 184
            this.btnSave.Text = "  Save  ";
......
186 186
            // layoutControlItem2
187 187
            // 
188 188
            this.layoutControlItem2.Control = this.btnSave;
189
            this.layoutControlItem2.Location = new System.Drawing.Point(771, 537);
189
            this.layoutControlItem2.Location = new System.Drawing.Point(887, 670);
190 190
            this.layoutControlItem2.Name = "layoutControlItem2";
191
            this.layoutControlItem2.Size = new System.Drawing.Size(88, 40);
191
            this.layoutControlItem2.Size = new System.Drawing.Size(101, 40);
192 192
            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
193 193
            this.layoutControlItem2.TextVisible = false;
194 194
            // 
195 195
            // btnClose
196 196
            // 
197 197
            this.btnClose.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnClose.ImageOptions.SvgImage")));
198
            this.btnClose.Location = new System.Drawing.Point(881, 549);
198
            this.btnClose.Location = new System.Drawing.Point(1011, 682);
199 199
            this.btnClose.Name = "btnClose";
200
            this.btnClose.Size = new System.Drawing.Size(86, 36);
200
            this.btnClose.Size = new System.Drawing.Size(100, 36);
201 201
            this.btnClose.StyleController = this.layoutControl1;
202 202
            this.btnClose.TabIndex = 6;
203 203
            this.btnClose.Text = "  Close  ";
......
205 205
            // layoutControlItem3
206 206
            // 
207 207
            this.layoutControlItem3.Control = this.btnClose;
208
            this.layoutControlItem3.Location = new System.Drawing.Point(869, 537);
208
            this.layoutControlItem3.Location = new System.Drawing.Point(999, 670);
209 209
            this.layoutControlItem3.Name = "layoutControlItem3";
210
            this.layoutControlItem3.Size = new System.Drawing.Size(90, 40);
210
            this.layoutControlItem3.Size = new System.Drawing.Size(104, 40);
211 211
            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
212 212
            this.layoutControlItem3.TextVisible = false;
213 213
            // 
214 214
            // splitterItem1
215 215
            // 
216 216
            this.splitterItem1.AllowHotTrack = true;
217
            this.splitterItem1.Location = new System.Drawing.Point(638, 0);
217
            this.splitterItem1.Location = new System.Drawing.Point(734, 0);
218 218
            this.splitterItem1.Name = "splitterItem1";
219
            this.splitterItem1.Size = new System.Drawing.Size(12, 537);
219
            this.splitterItem1.Size = new System.Drawing.Size(12, 670);
220 220
            // 
221 221
            // gridControlSymbol
222 222
            // 
......
224 224
            this.gridControlSymbol.MainView = this.gridViewSymbol;
225 225
            this.gridControlSymbol.MenuManager = this.ribbonControl;
226 226
            this.gridControlSymbol.Name = "gridControlSymbol";
227
            this.gridControlSymbol.Size = new System.Drawing.Size(610, 239);
227
            this.gridControlSymbol.Size = new System.Drawing.Size(706, 305);
228 228
            this.gridControlSymbol.TabIndex = 7;
229 229
            this.gridControlSymbol.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
230 230
            this.gridViewSymbol});
......
240 240
            this.layoutControlItem4.Control = this.gridControlSymbol;
241 241
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
242 242
            this.layoutControlItem4.Name = "layoutControlItem4";
243
            this.layoutControlItem4.Size = new System.Drawing.Size(614, 243);
243
            this.layoutControlItem4.Size = new System.Drawing.Size(710, 309);
244 244
            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
245 245
            this.layoutControlItem4.TextVisible = false;
246 246
            // 
......
248 248
            // 
249 249
            this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
250 250
            this.layoutControlGroup2.Name = "layoutControlGroup2";
251
            this.layoutControlGroup2.Size = new System.Drawing.Size(614, 489);
251
            this.layoutControlGroup2.Size = new System.Drawing.Size(710, 622);
252 252
            this.layoutControlGroup2.Text = "Line";
253 253
            // 
254 254
            // treeList1
255 255
            // 
256 256
            this.treeList1.Cursor = System.Windows.Forms.Cursors.Default;
257
            this.treeList1.Location = new System.Drawing.Point(674, 43);
257
            this.treeList1.Location = new System.Drawing.Point(770, 43);
258 258
            this.treeList1.Name = "treeList1";
259
            this.treeList1.Size = new System.Drawing.Size(281, 220);
259
            this.treeList1.Size = new System.Drawing.Size(329, 286);
260 260
            this.treeList1.TabIndex = 8;
261 261
            // 
262 262
            // layoutControlItem1
......
264 264
            this.layoutControlItem1.Control = this.treeList1;
265 265
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
266 266
            this.layoutControlItem1.Name = "layoutControlItem1";
267
            this.layoutControlItem1.Size = new System.Drawing.Size(285, 224);
267
            this.layoutControlItem1.Size = new System.Drawing.Size(333, 290);
268 268
            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
269 269
            this.layoutControlItem1.TextVisible = false;
270 270
            // 
......
272 272
            // 
273 273
            this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
274 274
            this.layoutControlItem1});
275
            this.layoutControlGroup3.Location = new System.Drawing.Point(650, 0);
275
            this.layoutControlGroup3.Location = new System.Drawing.Point(746, 0);
276 276
            this.layoutControlGroup3.Name = "layoutControlGroup3";
277
            this.layoutControlGroup3.Size = new System.Drawing.Size(309, 267);
277
            this.layoutControlGroup3.Size = new System.Drawing.Size(357, 333);
278 278
            this.layoutControlGroup3.Text = "Aveva Symbol";
279 279
            // 
280 280
            // emptySpaceItem2
281 281
            // 
282 282
            this.emptySpaceItem2.AllowHotTrack = false;
283
            this.emptySpaceItem2.Location = new System.Drawing.Point(859, 537);
283
            this.emptySpaceItem2.Location = new System.Drawing.Point(988, 670);
284 284
            this.emptySpaceItem2.Name = "emptySpaceItem2";
285
            this.emptySpaceItem2.Size = new System.Drawing.Size(10, 40);
285
            this.emptySpaceItem2.Size = new System.Drawing.Size(11, 40);
286 286
            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
287 287
            // 
288 288
            // pictureEdit1
289 289
            // 
290
            this.pictureEdit1.Location = new System.Drawing.Point(36, 334);
290
            this.pictureEdit1.Location = new System.Drawing.Point(36, 400);
291 291
            this.pictureEdit1.MenuManager = this.ribbonControl;
292 292
            this.pictureEdit1.Name = "pictureEdit1";
293 293
            this.pictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.Auto;
294
            this.pictureEdit1.Size = new System.Drawing.Size(277, 187);
294
            this.pictureEdit1.Size = new System.Drawing.Size(325, 254);
295 295
            this.pictureEdit1.StyleController = this.layoutControl1;
296 296
            this.pictureEdit1.TabIndex = 9;
297 297
            // 
......
300 300
            this.layoutControlItem5.Control = this.pictureEdit1;
301 301
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 0);
302 302
            this.layoutControlItem5.Name = "layoutControlItem5";
303
            this.layoutControlItem5.Size = new System.Drawing.Size(281, 191);
303
            this.layoutControlItem5.Size = new System.Drawing.Size(329, 258);
304 304
            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
305 305
            this.layoutControlItem5.TextVisible = false;
306 306
            // 
307 307
            // splitterItem2
308 308
            // 
309 309
            this.splitterItem2.AllowHotTrack = true;
310
            this.splitterItem2.Location = new System.Drawing.Point(0, 243);
310
            this.splitterItem2.Location = new System.Drawing.Point(0, 309);
311 311
            this.splitterItem2.Name = "splitterItem2";
312
            this.splitterItem2.Size = new System.Drawing.Size(614, 12);
312
            this.splitterItem2.Size = new System.Drawing.Size(710, 12);
313 313
            // 
314 314
            // pictureEdit2
315 315
            // 
316
            this.pictureEdit2.Location = new System.Drawing.Point(353, 334);
316
            this.pictureEdit2.Location = new System.Drawing.Point(401, 400);
317 317
            this.pictureEdit2.MenuManager = this.ribbonControl;
318 318
            this.pictureEdit2.Name = "pictureEdit2";
319 319
            this.pictureEdit2.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.Auto;
320
            this.pictureEdit2.Size = new System.Drawing.Size(269, 187);
320
            this.pictureEdit2.Size = new System.Drawing.Size(317, 254);
321 321
            this.pictureEdit2.StyleController = this.layoutControl1;
322 322
            this.pictureEdit2.TabIndex = 10;
323 323
            // 
......
326 326
            this.layoutControlItem6.Control = this.pictureEdit2;
327 327
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 0);
328 328
            this.layoutControlItem6.Name = "layoutControlItem6";
329
            this.layoutControlItem6.Size = new System.Drawing.Size(273, 191);
329
            this.layoutControlItem6.Size = new System.Drawing.Size(321, 258);
330 330
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
331 331
            this.layoutControlItem6.TextVisible = false;
332 332
            // 
333 333
            // splitterItem3
334 334
            // 
335 335
            this.splitterItem3.AllowHotTrack = true;
336
            this.splitterItem3.Location = new System.Drawing.Point(305, 255);
336
            this.splitterItem3.Location = new System.Drawing.Point(353, 321);
337 337
            this.splitterItem3.Name = "splitterItem3";
338
            this.splitterItem3.Size = new System.Drawing.Size(12, 234);
338
            this.splitterItem3.Size = new System.Drawing.Size(12, 301);
339 339
            // 
340 340
            // layoutControlGroup4
341 341
            // 
342 342
            this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
343 343
            this.layoutControlItem5});
344
            this.layoutControlGroup4.Location = new System.Drawing.Point(0, 255);
344
            this.layoutControlGroup4.Location = new System.Drawing.Point(0, 321);
345 345
            this.layoutControlGroup4.Name = "layoutControlGroup4";
346
            this.layoutControlGroup4.Size = new System.Drawing.Size(305, 234);
346
            this.layoutControlGroup4.Size = new System.Drawing.Size(353, 301);
347 347
            this.layoutControlGroup4.Text = "ID2 Image";
348 348
            // 
349 349
            // layoutControlGroup5
350 350
            // 
351 351
            this.layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
352 352
            this.layoutControlItem6});
353
            this.layoutControlGroup5.Location = new System.Drawing.Point(317, 255);
353
            this.layoutControlGroup5.Location = new System.Drawing.Point(365, 321);
354 354
            this.layoutControlGroup5.Name = "layoutControlGroup5";
355
            this.layoutControlGroup5.Size = new System.Drawing.Size(297, 234);
355
            this.layoutControlGroup5.Size = new System.Drawing.Size(345, 301);
356 356
            this.layoutControlGroup5.Text = "Mapped Image";
357 357
            // 
358 358
            // pictureEdit3
359 359
            // 
360
            this.pictureEdit3.Location = new System.Drawing.Point(674, 322);
360
            this.pictureEdit3.Location = new System.Drawing.Point(770, 388);
361 361
            this.pictureEdit3.MenuManager = this.ribbonControl;
362 362
            this.pictureEdit3.Name = "pictureEdit3";
363 363
            this.pictureEdit3.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.Auto;
364
            this.pictureEdit3.Size = new System.Drawing.Size(281, 211);
364
            this.pictureEdit3.Size = new System.Drawing.Size(329, 278);
365 365
            this.pictureEdit3.StyleController = this.layoutControl1;
366 366
            this.pictureEdit3.TabIndex = 11;
367 367
            // 
......
370 370
            this.layoutControlItem7.Control = this.pictureEdit3;
371 371
            this.layoutControlItem7.Location = new System.Drawing.Point(0, 0);
372 372
            this.layoutControlItem7.Name = "layoutControlItem7";
373
            this.layoutControlItem7.Size = new System.Drawing.Size(285, 215);
373
            this.layoutControlItem7.Size = new System.Drawing.Size(333, 282);
374 374
            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
375 375
            this.layoutControlItem7.TextVisible = false;
376 376
            // 
......
378 378
            // 
379 379
            this.layoutControlGroup6.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
380 380
            this.layoutControlItem7});
381
            this.layoutControlGroup6.Location = new System.Drawing.Point(650, 279);
381
            this.layoutControlGroup6.Location = new System.Drawing.Point(746, 345);
382 382
            this.layoutControlGroup6.Name = "layoutControlGroup6";
383
            this.layoutControlGroup6.Size = new System.Drawing.Size(309, 258);
383
            this.layoutControlGroup6.Size = new System.Drawing.Size(357, 325);
384 384
            this.layoutControlGroup6.Text = "Aveva Symbol";
385 385
            // 
386 386
            // splitterItem4
387 387
            // 
388 388
            this.splitterItem4.AllowHotTrack = true;
389
            this.splitterItem4.Location = new System.Drawing.Point(650, 267);
389
            this.splitterItem4.Location = new System.Drawing.Point(746, 333);
390 390
            this.splitterItem4.Name = "splitterItem4";
391
            this.splitterItem4.Size = new System.Drawing.Size(309, 12);
391
            this.splitterItem4.Size = new System.Drawing.Size(357, 12);
392 392
            // 
393 393
            // MappingForm
394 394
            // 
395 395
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
396 396
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
397
            this.ClientSize = new System.Drawing.Size(979, 629);
397
            this.ClientSize = new System.Drawing.Size(1123, 762);
398 398
            this.Controls.Add(this.layoutControl1);
399 399
            this.Controls.Add(this.ribbonControl);
400 400
            this.Name = "MappingForm";

내보내기 Unified diff

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