개정판 24515a3a
dev issue #000 : fix bug
Change-Id: Id09252da9740a2bbce99ca844860de130d519ba1
| DTI_PID/SPPIDConverter/AutoModeling.cs | ||
|---|---|---|
| 1540 | 1540 |
|
| 1541 | 1541 |
List<Line> group = new List<Line>(); |
| 1542 | 1542 |
GetConnectedLineGroup(line, group); |
| 1543 |
//SortGroupLine(group); |
|
| 1544 | 1543 |
LineCoordinateCorrection(group); |
| 1545 | 1544 |
|
| 1546 | 1545 |
foreach (var groupLine in group) |
| ... | ... | |
| 1725 | 1724 |
{
|
| 1726 | 1725 |
Line connLine = connector.ConnectedObject as Line; |
| 1727 | 1726 |
if (!SPPIDUtil.IsBranchLine(connLine, line)) |
| 1727 |
{
|
|
| 1728 |
if (line.CONNECTORS.IndexOf(connector) == 0) |
|
| 1729 |
group.Insert(0, connLine); |
|
| 1730 |
else |
|
| 1731 |
group.Add(connLine); |
|
| 1728 | 1732 |
GetConnectedLineGroup(connLine, group); |
| 1733 |
} |
|
| 1729 | 1734 |
} |
| 1730 | 1735 |
} |
| 1731 | 1736 |
} |
| 1732 | 1737 |
|
| 1733 |
private void SortGroupLine(List<Line> group) |
|
| 1734 |
{
|
|
| 1735 |
List<Line> result = new List<Line>(); |
|
| 1736 |
result.Add(group[0]); |
|
| 1737 |
|
|
| 1738 |
group.Clear(); |
|
| 1739 |
result.AddRange(result); |
|
| 1740 |
} |
|
| 1741 |
|
|
| 1742 | 1738 |
private void LineCoordinateCorrection(List<Line> group) |
| 1743 | 1739 |
{
|
| 1744 | 1740 |
// 순서대로 전 Item 기준 정렬 |
| ... | ... | |
| 3643 | 3639 |
} |
| 3644 | 3640 |
else |
| 3645 | 3641 |
{
|
| 3646 |
// ConnectedItem이 없는것
|
|
| 3647 |
int noneConnRetval = CompareNoneConn(a, b);
|
|
| 3648 |
if (noneConnRetval != 0)
|
|
| 3642 |
// 아이템 연결 갯수(심볼, Line이면서 Not Branch)
|
|
| 3643 |
int connItemRetval = CompareConnItem(a, b);
|
|
| 3644 |
if (connItemRetval != 0)
|
|
| 3649 | 3645 |
{
|
| 3650 |
return noneConnRetval;
|
|
| 3646 |
return connItemRetval;
|
|
| 3651 | 3647 |
} |
| 3652 | 3648 |
else |
| 3653 | 3649 |
{
|
| 3654 |
// 아이템 연결 갯수(심볼, Line이면서 Not Branch)
|
|
| 3655 |
int connItemRetval = CompareConnItem(a, b);
|
|
| 3656 |
if (connItemRetval != 0)
|
|
| 3650 |
// ConnectedItem이 없는것
|
|
| 3651 |
int noneConnRetval = CompareNoneConn(a, b);
|
|
| 3652 |
if (noneConnRetval != 0)
|
|
| 3657 | 3653 |
{
|
| 3658 |
return connItemRetval;
|
|
| 3654 |
return noneConnRetval;
|
|
| 3659 | 3655 |
} |
| 3660 | 3656 |
else |
| 3661 | 3657 |
{
|
내보내기 Unified diff
