개정판 be7159c9
dev issue #000 : fix minor bug & 안쓰는 소스 삭제
Change-Id: I6bf9f5dc9cf114a0df27e7fe8b060ebad92dccd3
| DTI_PID/SPPIDConverter/AutoModeling.cs | ||
|---|---|---|
| 2667 | 2667 |
beforeID = modelItem2.Id; |
| 2668 | 2668 |
afterID = modelItem1.Id; |
| 2669 | 2669 |
survivorId = afterID; |
| 2670 |
modelItem1.Attributes["FlowDirection"].set_Value("End 1 is upstream (Inlet)");
|
|
| 2670 |
LMAAttribute attribute = modelItem1.Attributes["FlowDirection"]; |
|
| 2671 |
if (attribute != null) |
|
| 2672 |
attribute.set_Value("End 1 is upstream (Inlet)");
|
|
| 2671 | 2673 |
} |
| 2672 | 2674 |
else if (modelItem1.get_ItemStatus() != "Active" && modelItem2.get_ItemStatus() == "Active") |
| 2673 | 2675 |
{
|
| 2674 | 2676 |
beforeID = modelItem1.Id; |
| 2675 | 2677 |
afterID = modelItem2.Id; |
| 2676 | 2678 |
survivorId = afterID; |
| 2677 |
modelItem2.Attributes["FlowDirection"].set_Value("End 1 is upstream (Inlet)");
|
|
| 2679 |
LMAAttribute attribute = modelItem2.Attributes["FlowDirection"]; |
|
| 2680 |
if (attribute != null) |
|
| 2681 |
attribute.set_Value("End 1 is upstream (Inlet)");
|
|
| 2678 | 2682 |
} |
| 2679 | 2683 |
else if (modelItem1.get_ItemStatus() == "Active" && modelItem2.get_ItemStatus() == "Active") |
| 2680 | 2684 |
survivorId = null; |
| ... | ... | |
| 2684 | 2688 |
survivorId = null; |
| 2685 | 2689 |
} |
| 2686 | 2690 |
|
| 2687 |
|
|
| 2688 | 2691 |
if (!string.IsNullOrEmpty(beforeID) && !string.IsNullOrEmpty(afterID)) |
| 2689 | 2692 |
{
|
| 2690 | 2693 |
List<Line> lines = SPPIDUtil.FindLinesByModelId(document, beforeID); |
| ... | ... | |
| 3748 | 3751 |
if (modelItemIds.Count == 1) |
| 3749 | 3752 |
{
|
| 3750 | 3753 |
string joinModelItemId = modelItemIds[0]; |
| 3751 |
//CheckZeroLengthAndLabel(ref joinModelItemId); |
|
| 3752 | 3754 |
JoinRun(joinModelItemId, modelItemId, ref survivorId); |
| 3753 | 3755 |
if (survivorId != null) |
| 3754 | 3756 |
break; |
| ... | ... | |
| 3761 | 3763 |
if (modelItemIds.Count == 1) |
| 3762 | 3764 |
{
|
| 3763 | 3765 |
string joinModelItemId = modelItemIds[0]; |
| 3764 |
//CheckZeroLengthAndLabel(ref joinModelItemId); |
|
| 3765 | 3766 |
JoinRun(joinModelItemId, modelItemId, ref survivorId); |
| 3766 | 3767 |
if (survivorId != null) |
| 3767 | 3768 |
break; |
| ... | ... | |
| 3770 | 3771 |
} |
| 3771 | 3772 |
} |
| 3772 | 3773 |
} |
| 3773 |
|
|
| 3774 |
void CheckZeroLengthAndLabel(ref string _modelItemId) |
|
| 3775 |
{
|
|
| 3776 |
LMConnector connector = GetLMConnectorOnlyOne(_modelItemId); |
|
| 3777 |
if (connector != null && Convert.ToBoolean(connector.get_IsZeroLength()) && connector.LabelPersists.Count == 0) |
|
| 3778 |
{
|
|
| 3779 |
string symbolPath = GetSPPIDFileName(modelItem); |
|
| 3780 |
LMConnector newConnector = ReModelingLMConnector(connector, symbolPath); |
|
| 3781 |
ReleaseCOMObjects(connector); |
|
| 3782 |
_modelItemId = newConnector.ModelItemID; |
|
| 3783 |
ReleaseCOMObjects(newConnector); |
|
| 3784 |
} |
|
| 3785 |
} |
|
| 3786 | 3774 |
} |
| 3787 | 3775 |
|
| 3788 | 3776 |
/// <summary> |
내보내기 Unified diff
