개정판 a3557cbc
dev issue #000 : fix bug
Change-Id: Id8c97062781c83372cebe5c4eccbe5fae34bd50b
| DTI_PID/SPPIDConverter/AutoModeling.cs | ||
|---|---|---|
| 1162 | 1162 |
if (item.GetType() == typeof(Line)) |
| 1163 | 1163 |
{
|
| 1164 | 1164 |
Line line = item as Line; |
| 1165 |
|
|
| 1166 |
LMModelItem _LMModelItem = dataSource.GetModelItem(line.SPPID.ModelItemId);//dataSource.GetPipeRun(line.SPPID.ModelItemId); |
|
| 1167 |
foreach (var attribute in lineNumber.ATTRIBUTES) |
|
| 1165 |
LMModelItem _LMModelItem = dataSource.GetModelItem(line.SPPID.ModelItemId); |
|
| 1166 |
if (_LMModelItem.get_ItemStatus() == "Active") |
|
| 1168 | 1167 |
{
|
| 1169 |
LineNumberMapping mapping = document.LineNumberMappings.Find(x => x.UID == attribute.UID); |
|
| 1170 |
if (mapping != null) |
|
| 1168 |
foreach (var attribute in lineNumber.ATTRIBUTES) |
|
| 1171 | 1169 |
{
|
| 1172 |
LMAAttribute _LMAAttribute = _LMModelItem.Attributes[mapping.SPPIDATTRIBUTENAME];
|
|
| 1173 |
if (_LMAAttribute != null)
|
|
| 1170 |
LineNumberMapping mapping = document.LineNumberMappings.Find(x => x.UID == attribute.UID);
|
|
| 1171 |
if (mapping != null)
|
|
| 1174 | 1172 |
{
|
| 1175 |
if (DBNull.Value.Equals(_LMAAttribute.get_Value())) |
|
| 1176 |
_LMAAttribute.set_Value(attribute.VALUE); |
|
| 1177 |
else if (_LMAAttribute.get_Value() != attribute.VALUE) |
|
| 1178 |
_LMAAttribute.set_Value(attribute.VALUE); |
|
| 1173 |
LMAAttribute _LMAAttribute = _LMModelItem.Attributes[mapping.SPPIDATTRIBUTENAME]; |
|
| 1174 |
if (_LMAAttribute != null) |
|
| 1175 |
{
|
|
| 1176 |
if (DBNull.Value.Equals(_LMAAttribute.get_Value())) |
|
| 1177 |
_LMAAttribute.set_Value(attribute.VALUE); |
|
| 1178 |
else if (_LMAAttribute.get_Value() != attribute.VALUE) |
|
| 1179 |
_LMAAttribute.set_Value(attribute.VALUE); |
|
| 1180 |
} |
|
| 1179 | 1181 |
} |
| 1180 | 1182 |
} |
| 1183 |
_LMModelItem.Commit(); |
|
| 1184 |
break; |
|
| 1181 | 1185 |
} |
| 1182 |
|
|
| 1183 |
_LMModelItem.Commit(); |
|
| 1184 | 1186 |
ReleaseCOMObjects(_LMModelItem); |
| 1185 |
break; |
|
| 1186 | 1187 |
} |
| 1187 | 1188 |
} |
| 1188 | 1189 |
} |
| DTI_PID/SPPIDConverter/ConverterForm.cs | ||
|---|---|---|
| 553 | 553 |
#if DEBUG |
| 554 | 554 |
this.Visible = false; |
| 555 | 555 |
|
| 556 |
SPPID_Document document = new SPPID_Document(@"Z:\HanKyouHo\temp\Isocynates\Temp\11111.xml"); |
|
| 557 |
//SPPID_Document document = new SPPID_Document(@"Z:\HanKyouHo\temp\Isocynates\Temp\Isocynates-325_Page50.xml");
|
|
| 556 |
//SPPID_Document document = new SPPID_Document(@"Z:\HanKyouHo\temp\Isocynates\Temp\11111.xml");
|
|
| 557 |
SPPID_Document document = new SPPID_Document(@"Z:\HanKyouHo\temp\Isocynates\Temp\Isocynates-325_Page50.xml"); |
|
| 558 | 558 |
//SPPID_Document document = new SPPID_Document(@"Z:\HanKyouHo\temp\Isocynates\Temp\Isocynates-325_Page49.xml"); |
| 559 | 559 |
document.SymbolMappings = symbolMappings; |
| 560 | 560 |
document.ChildSymbolMappings = childSymbolMappings; |
| DTI_PID/SPPIDConverter/SPPIDConverter.csproj | ||
|---|---|---|
| 5 | 5 |
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 6 | 6 |
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
| 7 | 7 |
<ProjectGuid>{B6757E78-6B59-40A3-A7BB-E73E8F81B6C3}</ProjectGuid>
|
| 8 |
<OutputType>WinExe</OutputType>
|
|
| 8 |
<OutputType>Library</OutputType>
|
|
| 9 | 9 |
<AppDesignerFolder>Properties</AppDesignerFolder> |
| 10 | 10 |
<RootNamespace>Converter.SPPID</RootNamespace> |
| 11 | 11 |
<AssemblyName>SPPIDConverter</AssemblyName> |
| DTI_PID/SPPIDConverter/Util/SPPIDUtil.cs | ||
|---|---|---|
| 124 | 124 |
else |
| 125 | 125 |
{
|
| 126 | 126 |
double angle = Math.Atan(Math.Abs(y2 - y1) / Math.Abs(x2 - x1)) * 180 / Math.PI; |
| 127 |
if (angle <= 1)
|
|
| 127 |
if (angle <= 5)
|
|
| 128 | 128 |
return SlopeType.HORIZONTAL; |
| 129 |
else if (angle >= 89)
|
|
| 129 |
else if (angle >= 85)
|
|
| 130 | 130 |
return SlopeType.VERTICAL; |
| 131 | 131 |
else |
| 132 | 132 |
return SlopeType.Slope; |
내보내기 Unified diff
