개정판 68e9394a
dev issue #000 : mapping validation 추가
Change-Id: I52f3a3284a77703bede74fd5b0a19fcbd79bd694
DTI_PID/SPPIDConverter/ConverterForm.cs | ||
---|---|---|
473 | 473 |
{ |
474 | 474 |
SPPID_Document document = new SPPID_Document(fileName); |
475 | 475 |
|
476 |
document.SymbolTable = _ID2SymbolTable; |
|
477 |
document.SymbolMappings = symbolMappings; |
|
478 |
document.ChildSymbolMappings = childSymbolMappings; |
|
479 |
document.LineMappings = lineMappings; |
|
480 |
document.LineNumberMappings = lineNumberMappings; |
|
481 |
document.AttributeMappings = attributeMappings; |
|
482 |
document.ETCSetting = ETCSetting.GetInstance(); |
|
483 |
document.SetSPPIDInfo(); |
|
484 |
|
|
485 |
|
|
486 |
if (!document.SetSPPIDMapping()) |
|
487 |
{ |
|
488 |
document.Enable = false; |
|
489 |
document.MappingValidation = false; |
|
490 |
} |
|
491 |
|
|
476 | 492 |
DataRow[] rows = _ConverterDT.Select(string.Format("colDrawingFilePath = '{0}'", fileName)); |
477 | 493 |
if (rows.Length == 0) |
478 | 494 |
{ |
... | ... | |
511 | 527 |
if (!_DicDocuments.ContainsKey(fileName)) |
512 | 528 |
_DicDocuments.Add(fileName, null); |
513 | 529 |
|
514 |
if (!document.Validation) |
|
530 |
if (!document.Validation || !document.MappingValidation)
|
|
515 | 531 |
validationFailDocs.Add(document); |
516 | 532 |
|
517 | 533 |
_DicDocuments[fileName] = document; |
... | ... | |
653 | 669 |
{ |
654 | 670 |
string fileName = row["colDrawingFilePath"].ToString(); |
655 | 671 |
SPPID_Document document = new SPPID_Document(fileName); |
672 |
document.SymbolTable = _ID2SymbolTable; |
|
673 |
document.SymbolMappings = symbolMappings; |
|
674 |
document.ChildSymbolMappings = childSymbolMappings; |
|
675 |
document.LineMappings = lineMappings; |
|
676 |
document.LineNumberMappings = lineNumberMappings; |
|
677 |
document.AttributeMappings = attributeMappings; |
|
678 |
document.ETCSetting = ETCSetting.GetInstance(); |
|
679 |
document.SetSPPIDInfo(); |
|
680 |
|
|
681 |
|
|
682 |
if (!document.SetSPPIDMapping()) |
|
683 |
{ |
|
684 |
document.Enable = false; |
|
685 |
document.MappingValidation = false; |
|
686 |
} |
|
687 |
|
|
656 | 688 |
row["colDrawingNumber"] = document.DWGNAME; |
657 | 689 |
row["colDrawingName"] = document.DWGNAME; |
658 | 690 |
if (document.Enable) |
... | ... | |
663 | 695 |
if (!_DicDocuments.ContainsKey(fileName)) |
664 | 696 |
_DicDocuments.Add(fileName, null); |
665 | 697 |
|
666 |
if (!document.Validation) |
|
698 |
if (!document.Validation || !document.MappingValidation)
|
|
667 | 699 |
validationFailDocs.Add(document); |
668 | 700 |
|
669 | 701 |
_DicDocuments[fileName] = document; |
내보내기 Unified diff