개정판 90662b0b
dev issue #507 : equipment 분리
Change-Id: I505e5ececcb444ebe2111cfbd9647e253617f589
| DTI_PID/SPPIDConverter/AutoModeling.cs | ||
|---|---|---|
| 3338 | 3338 |
/// </summary> |
| 3339 | 3339 |
/// <param name="modelItemID1"></param> |
| 3340 | 3340 |
/// <param name="modelItemID2"></param> |
| 3341 |
private void JoinRun(string modelId1, string modelId2, ref string survivorId) |
|
| 3341 |
private void JoinRun(string modelId1, string modelId2, ref string survivorId, bool IsSameConnector = true)
|
|
| 3342 | 3342 |
{
|
| 3343 | 3343 |
try |
| 3344 | 3344 |
{
|
| DTI_PID/SPPIDConverter/BaseModel/Document.cs | ||
|---|---|---|
| 492 | 492 |
if (element.Name == "SYMBOL") |
| 493 | 493 |
{
|
| 494 | 494 |
Symbol symbol = GetSymbolByUID(element.Element("UID").Value);
|
| 495 |
if (symbol == null) |
|
| 495 |
Equipment equipment = GetEquipmentByUID(element.Element("UID").Value);
|
|
| 496 |
if (symbol == null && equipment == null) |
|
| 496 | 497 |
{
|
| 497 | 498 |
validationStringBuilder.AppendLine("Missing Item!" + "\r\nUID : " + element.Element("UID").Value);
|
| 498 | 499 |
validationStringBuilder.AppendLine(); |
| 499 | 500 |
validationResult = true; |
| 500 | 501 |
} |
| 501 |
run.RUNITEMS.Add(symbol); |
|
| 502 |
if (symbol != null) |
|
| 503 |
run.RUNITEMS.Add(symbol); |
|
| 504 |
else if (equipment != null) |
|
| 505 |
run.RUNITEMS.Add(equipment); |
|
| 502 | 506 |
} |
| 503 | 507 |
else if (element.Name == "LINE") |
| 504 | 508 |
{
|
| ... | ... | |
| 565 | 569 |
return SYMBOLS.Find(x => x.UID == uid); |
| 566 | 570 |
} |
| 567 | 571 |
|
| 572 |
public Equipment GetEquipmentByUID(string uid) |
|
| 573 |
{
|
|
| 574 |
return Equipments.Find(x => x.UID == uid); |
|
| 575 |
} |
|
| 576 |
|
|
| 568 | 577 |
public Line GetLineByUID(string uid) |
| 569 | 578 |
{
|
| 570 | 579 |
return LINES.Find(x => x.UID == uid); |
| DTI_PID/SPPIDConverter/ConverterDocking.cs | ||
|---|---|---|
| 232 | 232 |
|
| 233 | 233 |
private void simpleButton1_Click(object sender, EventArgs e) |
| 234 | 234 |
{
|
| 235 |
int z = application.RunningCommand; |
|
| 236 | 235 |
|
| 237 | 236 |
foreach (RADObject item in application.ActiveDocument.SelectSet) |
| 238 | 237 |
{
|
| 239 | 238 |
DependencyObject dependencyObject = item as DependencyObject; |
| 240 | 239 |
if (dependencyObject != null) |
| 241 | 240 |
{
|
| 241 |
Ingr.RAD2D.LineStringGeometry2d lineStringGeometry = dependencyObject.GetGeometry() as Ingr.RAD2D.LineStringGeometry2d; |
|
| 242 |
int verticesCount = lineStringGeometry.VertexCount; |
|
| 243 |
double[] vertices = null; |
|
| 244 |
lineStringGeometry.GetVertices(ref verticesCount, ref vertices); |
|
| 245 |
for (int i = 0; i < verticesCount; i++) |
|
| 246 |
{
|
|
| 247 |
double x = 0; |
|
| 248 |
double y = 0; |
|
| 249 |
lineStringGeometry.GetVertex(i + 1, ref x, ref y); |
|
| 250 |
} |
|
| 251 |
|
|
| 242 | 252 |
double minX = 0; |
| 243 | 253 |
double minY = 0; |
| 244 | 254 |
double maxX = 0; |
| ... | ... | |
| 255 | 265 |
symbol2D.Range(out minX, out minY, out maxX, out maxY); |
| 256 | 266 |
} |
| 257 | 267 |
} |
| 258 |
int pid = 0; |
|
| 259 |
GetWindowThreadProcessId((IntPtr)application.HWnd, out pid); |
|
| 268 |
|
|
| 260 | 269 |
|
| 261 | 270 |
return; |
| 262 | 271 |
Thread outThread = new Thread(func2 => |
내보내기 Unified diff
