개정판 6924abc6
dev issue #000 : minor
Change-Id: I8def871a4106d4cef8bd855f0a8e4588dae048dd
DTI_PID/SPPIDConverter/AutoModeling.cs | ||
---|---|---|
273 | 273 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.UpProgress, null); |
274 | 274 |
} |
275 | 275 |
else |
276 |
throw new Exception(); |
|
276 |
throw new Exception("Fail Branch Modeling");
|
|
277 | 277 |
} |
278 | 278 |
catch (Exception ex) |
279 | 279 |
{ |
... | ... | |
1578 | 1578 |
|
1579 | 1579 |
foreach (var groupLine in group) |
1580 | 1580 |
{ |
1581 |
if (group.Find(x => x.UID == "37c4a0c0-1a4d-40d0-a56d-8d69c18ea26b") != null) |
|
1582 |
{ |
|
1583 |
|
|
1584 |
} |
|
1585 | 1581 |
if (!isBranchModeling && SPPIDUtil.IsBranchLine(groupLine)) |
1586 | 1582 |
{ |
1587 | 1583 |
NewBranchLines.Add(groupLine); |
... | ... | |
1648 | 1644 |
if (groupLine.CONNECTORS.IndexOf(connector) == 0) |
1649 | 1645 |
{ |
1650 | 1646 |
if (groupLine.SlopeType == SlopeType.HORIZONTAL) |
1651 |
placeRunInputs.AddPoint(x, -0.1); |
|
1647 |
placeRunInputs.AddPoint(x, -y - 0.1);
|
|
1652 | 1648 |
else if (groupLine.SlopeType == SlopeType.VERTICAL) |
1653 |
placeRunInputs.AddPoint(-0.1, y); |
|
1649 |
placeRunInputs.AddPoint(-x - 0.1, y);
|
|
1654 | 1650 |
else |
1655 | 1651 |
{ |
1656 | 1652 |
if (SPPIDUtil.CalcAngle(groupLine.SPPID.START_X, groupLine.SPPID.START_Y, groupLine.SPPID.END_X, groupLine.SPPID.END_Y) < 45) |
1657 |
placeRunInputs.AddPoint(-0.1, y);
|
|
1653 |
placeRunInputs.AddPoint(x, -y - 0.1);
|
|
1658 | 1654 |
else |
1659 |
placeRunInputs.AddPoint(x, -0.1);
|
|
1655 |
placeRunInputs.AddPoint(-x - 0.1, y);
|
|
1660 | 1656 |
} |
1661 | 1657 |
} |
1662 | 1658 |
|
... | ... | |
1665 | 1661 |
if (groupLine.CONNECTORS.IndexOf(connector) == 1) |
1666 | 1662 |
{ |
1667 | 1663 |
if (groupLine.SlopeType == SlopeType.HORIZONTAL) |
1668 |
placeRunInputs.AddPoint(x, -0.1); |
|
1664 |
placeRunInputs.AddPoint(x, -y - 0.1);
|
|
1669 | 1665 |
else if (groupLine.SlopeType == SlopeType.VERTICAL) |
1670 |
placeRunInputs.AddPoint(-0.1, y); |
|
1666 |
placeRunInputs.AddPoint(-x - 0.1, y);
|
|
1671 | 1667 |
else |
1672 | 1668 |
{ |
1673 | 1669 |
if (SPPIDUtil.CalcAngle(groupLine.SPPID.START_X, groupLine.SPPID.START_Y, groupLine.SPPID.END_X, groupLine.SPPID.END_Y) < 45) |
1674 |
placeRunInputs.AddPoint(-0.1, y);
|
|
1670 |
placeRunInputs.AddPoint(x, -y - 0.1);
|
|
1675 | 1671 |
else |
1676 |
placeRunInputs.AddPoint(x, -0.1);
|
|
1672 |
placeRunInputs.AddPoint(-x - 0.1, y);
|
|
1677 | 1673 |
} |
1678 |
|
|
1679 | 1674 |
} |
1680 | 1675 |
} |
1681 | 1676 |
} |
... | ... | |
1746 | 1741 |
double x = 0; |
1747 | 1742 |
double y = 0; |
1748 | 1743 |
lineStringGeometry.GetVertex(i + 1, ref x, ref y); |
1749 |
if (verticesCount == 2 && x < 0 || y < 0)
|
|
1744 |
if (verticesCount == 2 && (x < 0 || y < 0))
|
|
1750 | 1745 |
_placement.PIDRemovePlacement(rep); |
1751 | 1746 |
} |
1752 | 1747 |
ReleaseCOMObjects(_LMConnector); |
DTI_PID/SPPIDConverter/ConverterForm.cs | ||
---|---|---|
534 | 534 |
return; |
535 | 535 |
} |
536 | 536 |
|
537 |
if (gridViewConverter.GetSelectedRows().Length == 0) |
|
538 |
return; |
|
539 |
|
|
537 | 540 |
_Documents.Clear(); |
538 | 541 |
foreach (int rowHandle in gridViewConverter.GetSelectedRows()) |
539 | 542 |
{ |
내보내기 Unified diff