개정판 0b885fb1
Revert "Fix logic when diagonal starting point is in opposite direction for diagonal pipe drawing and PipeRun join"
Change-Id: Ia07606c8a6ffca8a2d2cbff5c7fefe902b43207e
| DTI_PID/SPPIDConverter/AutoModeling.cs | ||
|---|---|---|
| 4174 | 4174 |
ReleaseCOMObjects(connector2); |
| 4175 | 4175 |
connector2 = null; |
| 4176 | 4176 |
|
| 4177 |
// item2가 item1으로 조인 |
|
| 4178 |
_placement.PIDJoinRuns(ref item1, ref item2); |
|
| 4179 |
item1.Commit(); |
|
| 4180 |
item2.Commit(); |
|
| 4181 |
|
|
| 4177 | 4182 |
string beforeID = string.Empty; |
| 4178 | 4183 |
string afterID = string.Empty; |
| 4179 | 4184 |
|
| 4180 | 4185 |
if (modelItem1.get_ItemStatus() == "Active" && modelItem2.get_ItemStatus() != "Active") |
| 4181 | 4186 |
{
|
| 4182 |
// item2가 item1으로 조인 |
|
| 4183 |
_placement.PIDJoinRuns(ref item1, ref item2); |
|
| 4184 |
item1.Commit(); |
|
| 4185 |
item2.Commit(); |
|
| 4186 |
|
|
| 4187 | 4187 |
beforeID = modelItem2.Id; |
| 4188 | 4188 |
afterID = modelItem1.Id; |
| 4189 | 4189 |
survivorId = afterID; |
| 4190 | 4190 |
} |
| 4191 | 4191 |
else if (modelItem1.get_ItemStatus() != "Active" && modelItem2.get_ItemStatus() == "Active") |
| 4192 | 4192 |
{
|
| 4193 |
// item1이 item2로 조인 |
|
| 4194 |
_placement.PIDJoinRuns(ref item2, ref item1); |
|
| 4195 |
item1.Commit(); |
|
| 4196 |
item2.Commit(); |
|
| 4197 |
|
|
| 4198 | 4193 |
beforeID = modelItem1.Id; |
| 4199 | 4194 |
afterID = modelItem2.Id; |
| 4200 | 4195 |
survivorId = afterID; |
| ... | ... | |
| 4205 | 4200 |
int model2Cnt = GetConnectorCount(modelId2); |
| 4206 | 4201 |
if (model1Cnt == 0) |
| 4207 | 4202 |
{
|
| 4208 |
// item1이 item2로 조인 |
|
| 4209 |
_placement.PIDJoinRuns(ref item2, ref item1); |
|
| 4210 |
item1.Commit(); |
|
| 4211 |
item2.Commit(); |
|
| 4212 |
|
|
| 4213 | 4203 |
beforeID = modelItem1.Id; |
| 4214 | 4204 |
afterID = modelItem2.Id; |
| 4215 | 4205 |
survivorId = afterID; |
| 4216 | 4206 |
} |
| 4217 | 4207 |
else if (model2Cnt == 0) |
| 4218 | 4208 |
{
|
| 4219 |
// item2가 item1으로 조인 |
|
| 4220 |
_placement.PIDJoinRuns(ref item1, ref item2); |
|
| 4221 |
item1.Commit(); |
|
| 4222 |
item2.Commit(); |
|
| 4223 |
|
|
| 4224 | 4209 |
beforeID = modelItem2.Id; |
| 4225 | 4210 |
afterID = modelItem1.Id; |
| 4226 | 4211 |
survivorId = afterID; |
내보내기 Unified diff
