개정판 20f3fb3a
dev issue #000 : 각도 확인 로직 추가
Change-Id: I0de95245de22a263074328b73c079fe88b1fbd19
DTI_PID/BaseModel/Model/Document.cs | ||
---|---|---|
173 | 173 |
FLIP = Convert.ToInt32(item.Element("FLIP").Value), |
174 | 174 |
CURRENTPOINTMODEINDEX = Convert.ToInt32(item.Element("CURRENTPOINTMODEINDEX").Value) |
175 | 175 |
}; |
176 |
if (symbol.ANGLE == 1.57) |
|
177 |
//ANGLE = 270 * Math.PI / 180; |
|
178 |
symbol.ANGLE = 90 * Math.PI / 180; |
|
179 |
else if (symbol.ANGLE == 3.14) |
|
180 |
symbol.ANGLE = Math.PI; |
|
181 |
else if (symbol.ANGLE == 4.71) |
|
182 |
//ANGLE = 90 * Math.PI / 180; |
|
183 |
symbol.ANGLE = 270 * Math.PI / 180; |
|
184 | 176 |
|
185 | 177 |
SetAssociations(item.Element("ASSOCIATIONS"), symbol.ASSOCIATIONS); |
186 | 178 |
SetSymbolConnectors(item.Element("CONNECTORS"), symbol.CONNECTORS, symbol.CONNECTIONPOINT); |
DTI_PID/BaseModel/Model/LineNumber.cs | ||
---|---|---|
24 | 24 |
public string LOCATION { get => _LOCATION; set => _LOCATION = value; } |
25 | 25 |
public string WIDTH { get => _WIDTH; set => _WIDTH = value; } |
26 | 26 |
public string HEIGHT { get => _HEIGHT; set => _HEIGHT = value; } |
27 |
public double ANGLE { get => _ANGLE; set => _ANGLE = value; } |
|
27 |
public double ANGLE |
|
28 |
{ |
|
29 |
get |
|
30 |
{ |
|
31 |
return _ANGLE; |
|
32 |
} |
|
33 |
set |
|
34 |
{ |
|
35 |
if (value == 1.57) |
|
36 |
value = 90 * Math.PI / 180; |
|
37 |
else if (value == 3.14) |
|
38 |
value = Math.PI; |
|
39 |
else if (value == 4.71) |
|
40 |
value = 270 * Math.PI / 180; |
|
41 |
|
|
42 |
_ANGLE = value; |
|
43 |
} |
|
44 |
} |
|
28 | 45 |
public string AREA { get => _AREA; set => _AREA = value; } |
29 | 46 |
public List<LineRun> RUNS { get => _RUNS; set => _RUNS = value; } |
30 | 47 |
public List<Property> PROPERTIES { get => _PROPERTIES; set => _PROPERTIES = value; } |
DTI_PID/BaseModel/Model/Symbol.cs | ||
---|---|---|
41 | 41 |
public string CONNECTIONPOINT { get => _CONNECTIONPOINT; set => _CONNECTIONPOINT = value; } |
42 | 42 |
public string LOCATION { get => _LOCATION; set => _LOCATION = value; } |
43 | 43 |
public string SIZE { get => _SIZE; set => _SIZE = value; } |
44 |
public double ANGLE { get => _ANGLE; set => _ANGLE = value; } |
|
44 |
public double ANGLE |
|
45 |
{ |
|
46 |
get |
|
47 |
{ |
|
48 |
return _ANGLE; |
|
49 |
} |
|
50 |
set |
|
51 |
{ |
|
52 |
if (value == 1.57) |
|
53 |
value = 90 * Math.PI / 180; |
|
54 |
else if (value == 3.14) |
|
55 |
value = Math.PI; |
|
56 |
else if (value == 4.71) |
|
57 |
value = 270 * Math.PI / 180; |
|
58 |
|
|
59 |
_ANGLE = value; |
|
60 |
} |
|
61 |
} |
|
45 | 62 |
public string PARENT { get => _PARENT; set => _PARENT = value; } |
46 | 63 |
public string CHILD { get => _CHILD; set => _CHILD = value; } |
47 | 64 |
public string HASINSTRUMENTLABEL { get => _HASINSTRUMENTLABEL; set => _HASINSTRUMENTLABEL = value; } |
DTI_PID/SPPIDConverter/AutoModeling.cs | ||
---|---|---|
782 | 782 |
ReleaseCOMObjects(_EndConnector); |
783 | 783 |
foreach (var item in connectorVertices) |
784 | 784 |
ReleaseCOMObjects(item.Key); |
785 |
|
|
786 |
|
|
787 |
|
|
788 |
//if (!string.IsNullOrEmpty(line.SPPID.ModelItemId) && !string.IsNullOrEmpty(targetLine.SPPID.ModelItemId)) |
|
789 |
//{ |
|
790 |
|
|
791 |
|
|
792 |
|
|
793 |
//} |
|
794 | 785 |
} |
795 | 786 |
|
796 | 787 |
private void EndBreakModeling(EndBreak endBreak) |
내보내기 Unified diff