개정판 e88aae98
dev issue #1134 : SPPID Attribute 목록들을 사용자에게 보여주고 선택가능하게 수정.
Change-Id: Ic7d15ede6c81932abb6575f85668ab134225e610
| DTI_PID/SPPIDConverter/ConverterForm.cs | ||
|---|---|---|
| 32 | 32 |
private DataTable _ConverterDT = new DataTable(); |
| 33 | 33 |
private DataTable _SPPIDSymbolPathDT = new DataTable(); |
| 34 | 34 |
private DataTable _SPPIDUnitDT = new DataTable(); |
| 35 |
private DataTable _SPPIDAttributeDT = new DataTable(); |
|
| 35 | 36 |
private RepositoryItemComboBox templateComboBox; |
| 36 | 37 |
|
| 37 | 38 |
|
| ... | ... | |
| 371 | 372 |
if (!string.IsNullOrEmpty(TemplatePath)) |
| 372 | 373 |
templateComboBox.Items.AddRange(Directory.GetFiles(TemplatePath, "*.pid").ToList().Select(filePath => Path.GetFileName(filePath)).ToList()); |
| 373 | 374 |
|
| 375 |
if (_SPPIDUnitDT != null) |
|
| 376 |
{
|
|
| 377 |
_SPPIDUnitDT.Dispose(); |
|
| 378 |
_SPPIDUnitDT = null; |
|
| 379 |
} |
|
| 380 |
if (_SPPIDAttributeDT != null) |
|
| 381 |
{
|
|
| 382 |
_SPPIDAttributeDT.Dispose(); |
|
| 383 |
_SPPIDAttributeDT = null; |
|
| 384 |
} |
|
| 385 |
|
|
| 374 | 386 |
_SPPIDUnitDT = SPPID_DB.GetUnitTree(); |
| 387 |
_SPPIDAttributeDT = SPPID_DB.GetSPPIDAttribute(); |
|
| 388 |
if (_SPPIDAttributeDT != null) |
|
| 389 |
{
|
|
| 390 |
_SPPIDAttributeDT.Columns["DISPLAYNAME"].ColumnName = "DISPLAY NAME"; |
|
| 391 |
} |
|
| 375 | 392 |
|
| 376 | 393 |
layoutControlGroupAutoConverter.Enabled = true; |
| 377 | 394 |
} |
| ... | ... | |
| 521 | 538 |
return; |
| 522 | 539 |
} |
| 523 | 540 |
|
| 524 |
MappingForm form = new MappingForm(_ID2SymbolDT,_SPPIDSymbolPathDT, _ID2LineDT, _ID2LinePropertyDT, _ID2AttributeDT); |
|
| 541 |
MappingForm form = new MappingForm(_ID2SymbolDT,_SPPIDSymbolPathDT, _ID2LineDT, _ID2LinePropertyDT, _ID2AttributeDT, _SPPIDAttributeDT);
|
|
| 525 | 542 |
form.ShowDialog(); |
| 526 | 543 |
InitMapping(); |
| 527 | 544 |
} |
내보내기 Unified diff
