개정판 b2d1c1aa
dev issue #589 : Flow Mark Modeling(임시) 기능 추가
Change-Id: If82ce9247e6bd25f7eb5043784f54ec8f3f9d2be
DTI_PID/SPPIDConverter/AutoModeling.cs | ||
---|---|---|
101 | 101 |
SplashScreenManager.ShowForm(typeof(SPPIDSplashScreen), true, true); |
102 | 102 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetAllStep, AllCount); |
103 | 103 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetDocumentName, DocumentLabelText); |
104 |
Thread.Sleep(1000); |
|
105 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetParent, (IntPtr)radApp.HWnd); |
|
106 |
Thread.Sleep(1000); |
|
104 |
//Thread.Sleep(1000);
|
|
105 |
//SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetParent, (IntPtr)radApp.HWnd);
|
|
106 |
//Thread.Sleep(1000);
|
|
107 | 107 |
|
108 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetStep, "Group Symbol Modeling"); |
|
108 | 109 |
List<List<Symbol>> symbolGroups = SPPIDUtil.GetThreeConnectedSymbolGroup(document); |
109 | 110 |
foreach (List<Symbol> symbolGroup in symbolGroups) |
110 | 111 |
SymbolModelingByThreeSymbolGroup(symbolGroup); |
... | ... | |
149 | 150 |
foreach (var item in document.LINENUMBERS) |
150 | 151 |
LineNumberModeling(item); |
151 | 152 |
|
153 |
// LineNumber Modeling |
|
154 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetStep, "Flow Mark Modeling"); |
|
155 |
foreach (var item in document.LINES) |
|
156 |
FlowMarkModeling(item); |
|
157 |
|
|
152 | 158 |
// Note Modeling |
153 | 159 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetStep, "Notes Modeling"); |
154 | 160 |
foreach (var item in document.NOTES) |
... | ... | |
193 | 199 |
finally |
194 | 200 |
{ |
195 | 201 |
application.ActiveWindow.Fit(); |
196 |
|
|
202 |
|
|
197 | 203 |
if (newDrawing != null) |
198 | 204 |
{ |
199 | 205 |
radApp.ActiveDocument.SaveOnClose = false; |
... | ... | |
204 | 210 |
ReleaseCOMObjects(dataSource); |
205 | 211 |
ReleaseCOMObjects(_placement); |
206 | 212 |
|
207 |
SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.ClearParent, null); |
|
213 |
//SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.ClearParent, null);
|
|
208 | 214 |
SplashScreenManager.CloseForm(false); |
209 | 215 |
} |
210 | 216 |
} |
... | ... | |
318 | 324 |
SymbolModelingByRunEnd(run.RUNITEMS[run.RUNITEMS.Count - 1] as Symbol, run); |
319 | 325 |
} |
320 | 326 |
|
321 |
Symbol prevSymbol = null; |
|
322 | 327 |
Symbol targetSymbol = null; |
323 | 328 |
foreach (var item in run.RUNITEMS) |
324 | 329 |
{ |
325 | 330 |
if (item.GetType() == typeof(Symbol)) |
326 | 331 |
{ |
327 | 332 |
Symbol symbol = item as Symbol; |
328 |
SymbolModeling(symbol, targetSymbol, prevSymbol); |
|
329 |
prevSymbol = symbol; |
|
333 |
SymbolModeling(symbol, targetSymbol); |
|
330 | 334 |
targetSymbol = symbol; |
331 | 335 |
} |
332 | 336 |
else |
... | ... | |
350 | 354 |
(targetItem.GetType() == typeof(Symbol) || targetItem.GetType() == typeof(Equipment)) && |
351 | 355 |
!IsSameLineRun(symbol, targetItem)) |
352 | 356 |
{ |
353 |
SymbolModeling(symbol, targetItem as Symbol, null);
|
|
357 |
SymbolModeling(symbol, targetItem as Symbol); |
|
354 | 358 |
for (int i = 1; i < run.RUNITEMS.Count; i++) |
355 | 359 |
{ |
356 | 360 |
object item = run.RUNITEMS[i]; |
357 | 361 |
if (item.GetType() == typeof(Symbol)) |
358 |
SymbolModeling(item as Symbol, run.RUNITEMS[i - 1] as Symbol, null);
|
|
362 |
SymbolModeling(item as Symbol, run.RUNITEMS[i - 1] as Symbol); |
|
359 | 363 |
else |
360 | 364 |
break; |
361 | 365 |
} |
... | ... | |
380 | 384 |
(targetItem.GetType() == typeof(Symbol) || targetItem.GetType() == typeof(Equipment)) && |
381 | 385 |
!IsSameLineRun(symbol, targetItem)) |
382 | 386 |
{ |
383 |
SymbolModeling(symbol, targetItem as Symbol, null);
|
|
387 |
SymbolModeling(symbol, targetItem as Symbol); |
|
384 | 388 |
for (int i = run.RUNITEMS.Count - 2; i >= 0; i--) |
385 | 389 |
{ |
386 | 390 |
object item = run.RUNITEMS[i]; |
387 | 391 |
if (item.GetType() == typeof(Symbol)) |
388 |
SymbolModeling(item as Symbol, run.RUNITEMS[i + 1] as Symbol, null);
|
|
392 |
SymbolModeling(item as Symbol, run.RUNITEMS[i + 1] as Symbol); |
|
389 | 393 |
else |
390 | 394 |
break; |
391 | 395 |
} |
... | ... | |
400 | 404 |
/// <param name="symbol"></param> |
401 | 405 |
/// <param name="targetSymbol"></param> |
402 | 406 |
/// <param name="prevSymbol"></param> |
403 |
private void SymbolModeling(Symbol symbol, Symbol targetSymbol, Symbol prevSymbol)
|
|
407 |
private void SymbolModeling(Symbol symbol, Symbol targetSymbol) |
|
404 | 408 |
{ |
405 | 409 |
// OWNERSYMBOL Attribute, 값을 가지고 있을 경우 |
406 | 410 |
BaseModel.Attribute itemAttribute = symbol.ATTRIBUTES.Find(attr => attr.ATTRIBUTE == "OWNERSYMBOL"); |
... | ... | |
434 | 438 |
_LMSymbol = _placement.PIDPlaceSymbol(mappingPath, x, y, Mirror: mirror, Rotation: angle, TargetItem: _TargetItem); |
435 | 439 |
ReleaseCOMObjects(_TargetItem); |
436 | 440 |
} |
437 |
else if (prevSymbol != null) |
|
438 |
{ |
|
439 |
LMSymbol _PrevSymbol = dataSource.GetSymbol(prevSymbol.SPPID.RepresentationId); |
|
440 |
SlopeType slopeType = SPPIDUtil.CalcSlope(x, y, prevSymbol.SPPID.ORIGINAL_X, prevSymbol.SPPID.ORIGINAL_Y); |
|
441 |
double prevX = _PrevSymbol.get_XCoordinate(); |
|
442 |
double prevY = _PrevSymbol.get_YCoordinate(); |
|
443 |
//if (slopeType == SlopeType.HORIZONTAL) |
|
444 |
// y = prevY; |
|
445 |
//else if (slopeType == SlopeType.VERTICAL) |
|
446 |
// x = prevX; |
|
447 |
ReleaseCOMObjects(_PrevSymbol); |
|
448 |
_LMSymbol = _placement.PIDPlaceSymbol(mappingPath, x, y, Mirror: mirror, Rotation: angle); |
|
449 |
} |
|
450 | 441 |
else |
451 | 442 |
_LMSymbol = _placement.PIDPlaceSymbol(mappingPath, x, y, Mirror: mirror, Rotation: angle); |
452 | 443 |
|
... | ... | |
624 | 615 |
LMSymbol _TargetItem = dataSource.GetSymbol(sRep); |
625 | 616 |
LMLabelPersist _LMLabelPresist = _placement.PIDPlaceLabel(symbol.SPPID.MAPPINGNAME, ref points, Rotation: 0, LabeledItem: _TargetItem.AsLMRepresentation(), IsLeaderVisible: leaderLine); |
626 | 617 |
|
627 |
// Target Item에 Label의 Attribute Input |
|
628 |
InputSymbolAttribute(targetItem, symbol.ATTRIBUTES); |
|
629 |
|
|
630 | 618 |
//Leader 선 센터로 |
631 |
string OID = _LMLabelPresist.get_GraphicOID(); |
|
632 |
DependencyObject dependency = radApp.ActiveDocument.ActiveSheet.DrawingObjects[OID] as DependencyObject; |
|
633 |
if (dependency != null) |
|
619 |
if (_LMLabelPresist != null) |
|
634 | 620 |
{ |
635 |
bool result = false; |
|
636 |
foreach (var attributes in dependency.AttributeSets) |
|
621 |
// Target Item에 Label의 Attribute Input |
|
622 |
InputSymbolAttribute(targetItem, symbol.ATTRIBUTES); |
|
623 |
|
|
624 |
string OID = _LMLabelPresist.get_GraphicOID(); |
|
625 |
DependencyObject dependency = radApp.ActiveDocument.ActiveSheet.DrawingObjects[OID] as DependencyObject; |
|
626 |
if (dependency != null) |
|
637 | 627 |
{ |
638 |
foreach (var attribute in attributes) |
|
628 |
bool result = false; |
|
629 |
foreach (var attributes in dependency.AttributeSets) |
|
639 | 630 |
{ |
640 |
string name = attribute.Name; |
|
641 |
string value = attribute.GetValue().ToString(); |
|
642 |
if (name == "DrawingItemType" && value == "LabelPersist") |
|
631 |
foreach (var attribute in attributes) |
|
643 | 632 |
{ |
644 |
foreach (DrawingObjectBase drawingObject in dependency.DrawingObjects) |
|
633 |
string name = attribute.Name; |
|
634 |
string value = attribute.GetValue().ToString(); |
|
635 |
if (name == "DrawingItemType" && value == "LabelPersist") |
|
645 | 636 |
{ |
646 |
if (drawingObject.Type == Ingr.RAD2D.ObjectType.igLineString2d)
|
|
637 |
foreach (DrawingObjectBase drawingObject in dependency.DrawingObjects)
|
|
647 | 638 |
{ |
648 |
Ingr.RAD2D.LineString2d lineString2D = drawingObject as Ingr.RAD2D.LineString2d; |
|
649 |
double prevX = _TargetItem.get_XCoordinate(); |
|
650 |
double prevY = _TargetItem.get_YCoordinate(); |
|
651 |
lineString2D.InsertVertex(lineString2D.VertexCount, prevX, prevY); |
|
652 |
lineString2D.RemoveVertex(lineString2D.VertexCount); |
|
653 |
result = true; |
|
654 |
break; |
|
639 |
if (drawingObject.Type == Ingr.RAD2D.ObjectType.igLineString2d) |
|
640 |
{ |
|
641 |
Ingr.RAD2D.LineString2d lineString2D = drawingObject as Ingr.RAD2D.LineString2d; |
|
642 |
double prevX = _TargetItem.get_XCoordinate(); |
|
643 |
double prevY = _TargetItem.get_YCoordinate(); |
|
644 |
lineString2D.InsertVertex(lineString2D.VertexCount, prevX, prevY); |
|
645 |
lineString2D.RemoveVertex(lineString2D.VertexCount); |
|
646 |
result = true; |
|
647 |
break; |
|
648 |
} |
|
655 | 649 |
} |
656 | 650 |
} |
651 |
|
|
652 |
if (result) |
|
653 |
break; |
|
657 | 654 |
} |
658 | 655 |
|
659 | 656 |
if (result) |
660 | 657 |
break; |
661 | 658 |
} |
662 |
|
|
663 |
if (result) |
|
664 |
break; |
|
665 | 659 |
} |
666 |
} |
|
667 | 660 |
|
668 |
_LMLabelPresist.Commit(); |
|
661 |
_LMLabelPresist.Commit(); |
|
662 |
} |
|
663 |
|
|
669 | 664 |
ReleaseCOMObjects(_TargetItem); |
670 | 665 |
ReleaseCOMObjects(_LMLabelPresist); |
671 | 666 |
} |
... | ... | |
770 | 765 |
// Center Symbol |
771 | 766 |
if (count == 2) |
772 | 767 |
{ |
773 |
SymbolModeling(symbol, null, null);
|
|
768 |
SymbolModeling(symbol, null); |
|
774 | 769 |
centerSymbol = symbol; |
775 | 770 |
} |
776 | 771 |
else if (symbol1 == null) |
... | ... | |
779 | 774 |
symbol2 = symbol; |
780 | 775 |
} |
781 | 776 |
|
782 |
SymbolModeling(symbol1, centerSymbol, null);
|
|
783 |
SymbolModeling(symbol2, centerSymbol, null);
|
|
777 |
SymbolModeling(symbol1, centerSymbol); |
|
778 |
SymbolModeling(symbol2, centerSymbol); |
|
784 | 779 |
} |
785 | 780 |
|
786 | 781 |
/// <summary> |
... | ... | |
1296 | 1291 |
{ |
1297 | 1292 |
if (IsStart) |
1298 | 1293 |
{ |
1299 |
placeRunInputs.AddConnectorTarget(_BranchTargetConnector, point[0], point[1]); |
|
1294 |
if (_BranchTargetConnector != null) |
|
1295 |
{ |
|
1296 |
placeRunInputs.AddConnectorTarget(_BranchTargetConnector, point[0], point[1]); |
|
1297 |
} |
|
1298 |
else |
|
1299 |
{ |
|
1300 |
placeRunInputs.AddPoint(point[0], point[1]); |
|
1301 |
} |
|
1302 |
|
|
1300 | 1303 |
} |
1301 | 1304 |
else |
1302 | 1305 |
{ |
... | ... | |
1325 | 1328 |
{ |
1326 | 1329 |
placeRunInputs.AddConnectorTarget(_BranchTargetConnector, point[0], point[1]); |
1327 | 1330 |
} |
1331 |
else |
|
1332 |
{ |
|
1333 |
placeRunInputs.AddPoint(point[0], point[1]); |
|
1334 |
} |
|
1328 | 1335 |
} |
1329 | 1336 |
} |
1330 | 1337 |
else |
... | ... | |
1917 | 1924 |
} |
1918 | 1925 |
|
1919 | 1926 |
/// <summary> |
1927 |
/// Flow Mark Modeling |
|
1928 |
/// </summary> |
|
1929 |
/// <param name="line"></param> |
|
1930 |
private void FlowMarkModeling(Line line) |
|
1931 |
{ |
|
1932 |
// 임시 |
|
1933 |
if (line.FLOWMARK && !string.IsNullOrEmpty(line.SPPID.ModelItemId)) |
|
1934 |
{ |
|
1935 |
string mappingPath = _ETCSetting.FlowMarkSymbolPath; |
|
1936 |
double tempX = 0; |
|
1937 |
double tempY = 0; |
|
1938 |
tempX = line.SPPID.END_X; |
|
1939 |
tempY = line.SPPID.END_Y; |
|
1940 |
|
|
1941 |
double x = 0; |
|
1942 |
double y = 0; |
|
1943 |
|
|
1944 |
//if (line.FLOWMARK_PERCENT <= 10) |
|
1945 |
//{ |
|
1946 |
// x = line.SPPID.START_X; |
|
1947 |
// y = line.SPPID.START_Y; |
|
1948 |
//} |
|
1949 |
//else if (line.FLOWMARK_PERCENT >= 90) |
|
1950 |
//{ |
|
1951 |
// x = line.SPPID.END_X; |
|
1952 |
// y = line.SPPID.END_Y; |
|
1953 |
//} |
|
1954 |
//else |
|
1955 |
//{ |
|
1956 |
|
|
1957 |
//} |
|
1958 |
|
|
1959 |
double angle = 0; |
|
1960 |
//SlopeType slopeType = SPPIDUtil.CalcSlope(line.SPPID.START_X, line.SPPID.START_Y, line.SPPID.END_X, line.SPPID.END_Y); |
|
1961 |
//// 0 180 |
|
1962 |
//if (slopeType == SlopeType.HORIZONTAL) |
|
1963 |
//{ |
|
1964 |
// if (line.SPPID.START_X < line.SPPID.END_X) |
|
1965 |
// angle = 0; |
|
1966 |
// else |
|
1967 |
// angle = Math.PI; |
|
1968 |
//} |
|
1969 |
//// 90 270 |
|
1970 |
//else if (slopeType == SlopeType.VERTICAL) |
|
1971 |
//{ |
|
1972 |
// if (line.SPPID.START_Y < line.SPPID.END_Y) |
|
1973 |
// angle = 90 * Math.PI / 180; |
|
1974 |
// else |
|
1975 |
// angle = 270 * Math.PI / 180; |
|
1976 |
//} |
|
1977 |
|
|
1978 |
|
|
1979 |
Dictionary<LMConnector, List<double[]>> connectorVertices = GetPipeRunVertices(line.SPPID.ModelItemId); |
|
1980 |
LMConnector _TargetItem = null; |
|
1981 |
double distance = double.MaxValue; |
|
1982 |
foreach (var item in connectorVertices) |
|
1983 |
{ |
|
1984 |
for (int i = 0; i < item.Value.Count - 1; i++) |
|
1985 |
{ |
|
1986 |
List<double[]> points = item.Value; |
|
1987 |
double[] point1 = points[i]; |
|
1988 |
double[] point2 = points[i + 1]; |
|
1989 |
|
|
1990 |
SlopeType slopeType = SPPIDUtil.CalcSlope(point1[0], point1[1], point2[0], point2[1]); |
|
1991 |
|
|
1992 |
//double result = SPPIDUtil.CalcPointToPointdDistance(point1[0], point1[1], tempX, tempY); |
|
1993 |
//if (result < distance) |
|
1994 |
//{ |
|
1995 |
// distance = result; |
|
1996 |
// _TargetItem = item.Key; |
|
1997 |
|
|
1998 |
// if (slopeType == SlopeType.HORIZONTAL) |
|
1999 |
// { |
|
2000 |
// if (point1[0] < point2[0]) |
|
2001 |
// angle = 0; |
|
2002 |
// else |
|
2003 |
// angle = Math.PI; |
|
2004 |
// } |
|
2005 |
// // 90 270 |
|
2006 |
// else if (slopeType == SlopeType.VERTICAL) |
|
2007 |
// { |
|
2008 |
// if (point1[1] < point2[1]) |
|
2009 |
// angle = 90 * Math.PI / 180; |
|
2010 |
// else |
|
2011 |
// angle = 270 * Math.PI / 180; |
|
2012 |
// } |
|
2013 |
|
|
2014 |
// x = point1[0]; |
|
2015 |
// y = point2[0]; |
|
2016 |
//} |
|
2017 |
|
|
2018 |
double result = SPPIDUtil.CalcPointToPointdDistance(point2[0], point2[1], tempX, tempY); |
|
2019 |
if (result < distance) |
|
2020 |
{ |
|
2021 |
distance = result; |
|
2022 |
_TargetItem = item.Key; |
|
2023 |
|
|
2024 |
if (slopeType == SlopeType.HORIZONTAL) |
|
2025 |
{ |
|
2026 |
if (point1[0] < point2[0]) |
|
2027 |
angle = 0; |
|
2028 |
else |
|
2029 |
angle = Math.PI; |
|
2030 |
} |
|
2031 |
// 90 270 |
|
2032 |
else if (slopeType == SlopeType.VERTICAL) |
|
2033 |
{ |
|
2034 |
if (point1[1] < point2[1]) |
|
2035 |
angle = 90 * Math.PI / 180; |
|
2036 |
else |
|
2037 |
angle = 270 * Math.PI / 180; |
|
2038 |
} |
|
2039 |
|
|
2040 |
x = point2[0]; |
|
2041 |
y = point2[1]; |
|
2042 |
} |
|
2043 |
} |
|
2044 |
} |
|
2045 |
|
|
2046 |
if (_TargetItem != null) |
|
2047 |
{ |
|
2048 |
LMSymbol _LMSymbol = _placement.PIDPlaceSymbol(mappingPath, x, y, Mirror: 0, Rotation: angle, TargetItem: _TargetItem); |
|
2049 |
|
|
2050 |
if (_LMSymbol != null) |
|
2051 |
{ |
|
2052 |
ReleaseCOMObjects(_LMSymbol); |
|
2053 |
} |
|
2054 |
|
|
2055 |
} |
|
2056 |
|
|
2057 |
foreach (var item in connectorVertices) |
|
2058 |
ReleaseCOMObjects(item.Key); |
|
2059 |
} |
|
2060 |
} |
|
2061 |
|
|
2062 |
/// <summary> |
|
1920 | 2063 |
/// Line Number 기준으로 모든 Item에 Line Number의 Attribute Input |
1921 | 2064 |
/// </summary> |
1922 | 2065 |
/// <param name="lineNumber"></param> |
... | ... | |
1937 | 2080 |
foreach (var attribute in lineNumber.ATTRIBUTES) |
1938 | 2081 |
{ |
1939 | 2082 |
LineNumberMapping mapping = document.LineNumberMappings.Find(x => x.UID == attribute.UID); |
1940 |
if (mapping != null) |
|
2083 |
if (mapping != null && !string.IsNullOrEmpty(attribute.VALUE) && attribute.VALUE != "None")
|
|
1941 | 2084 |
{ |
1942 | 2085 |
LMAAttribute _LMAAttribute = _LMModelItem.Attributes[mapping.SPPIDATTRIBUTENAME]; |
1943 | 2086 |
if (_LMAAttribute != null) |
... | ... | |
1967 | 2110 |
foreach (var attribute in lineNumber.ATTRIBUTES) |
1968 | 2111 |
{ |
1969 | 2112 |
LineNumberMapping mapping = document.LineNumberMappings.Find(x => x.UID == attribute.UID); |
1970 |
if (mapping != null) |
|
2113 |
if (mapping != null && !string.IsNullOrEmpty(attribute.VALUE) && attribute.VALUE != "None")
|
|
1971 | 2114 |
{ |
1972 | 2115 |
LMAAttribute _LMAAttribute = _LMModelItem.Attributes[mapping.SPPIDATTRIBUTENAME]; |
1973 | 2116 |
if (_LMAAttribute != null) |
... | ... | |
2208 | 2351 |
} |
2209 | 2352 |
|
2210 | 2353 |
/// <summary> |
2354 |
/// Graphic OID로 해당 Symbol의 크기를 구하여 Zoom |
|
2355 |
/// </summary> |
|
2356 |
/// <param name="graphicOID"></param> |
|
2357 |
/// <param name="milliseconds"></param> |
|
2358 |
private void ZoomObjectByGraphicOID(string graphicOID, int milliseconds = 150) |
|
2359 |
{ |
|
2360 |
if (radApp.ActiveDocument.ActiveSheet.DrawingObjects[graphicOID] != null) |
|
2361 |
{ |
|
2362 |
double minX = 0; |
|
2363 |
double minY = 0; |
|
2364 |
double maxX = 0; |
|
2365 |
double maxY = 0; |
|
2366 |
radApp.ActiveDocument.ActiveSheet.DrawingObjects[graphicOID].Range(out minX, out minY, out maxX, out maxY); |
|
2367 |
radApp.ActiveWindow.ZoomArea2(minX - 0.007, minY - 0.007, maxX + 0.007, maxY + 0.007, null); |
|
2368 |
|
|
2369 |
Thread.Sleep(milliseconds); |
|
2370 |
} |
|
2371 |
} |
|
2372 |
|
|
2373 |
/// <summary> |
|
2211 | 2374 |
/// ComObject를 Release |
2212 | 2375 |
/// </summary> |
2213 | 2376 |
/// <param name="objVars"></param> |
DTI_PID/SPPIDConverter/BaseModel/Document.cs | ||
---|---|---|
199 | 199 |
AREA = item.Element("AREA").Value, |
200 | 200 |
THICKNESS = item.Element("THICKNESS").Value, |
201 | 201 |
}; |
202 |
int flowMarkPercent = 0; |
|
203 |
if (int.TryParse(item.Element("FLOWMARK").Value, out flowMarkPercent)) |
|
204 |
{ |
|
205 |
line.FLOWMARK = true; |
|
206 |
line.FLOWMARK_PERCENT = flowMarkPercent; |
|
207 |
} |
|
208 |
else |
|
209 |
line.FLOWMARK = false; |
|
210 |
|
|
202 | 211 |
SetConnectors(item.Element("CONNECTORS"), line.CONNECTORS); |
203 | 212 |
LINES.Add(line); |
204 | 213 |
} |
DTI_PID/SPPIDConverter/BaseModel/Line.cs | ||
---|---|---|
16 | 16 |
private string _TYPE; |
17 | 17 |
private string _AREA; |
18 | 18 |
private string _THICKNESS; |
19 |
private bool _FLOWMARK; |
|
20 |
private int _FLOWMARK_PERCENT; |
|
19 | 21 |
private List<Connector> _CONNECTORS = new List<Connector>(); |
20 | 22 |
private SPPIDLineInfo _SPPID; |
21 | 23 |
|
... | ... | |
29 | 31 |
public List<Connector> CONNECTORS { get => _CONNECTORS; set => _CONNECTORS = value; } |
30 | 32 |
public string TYPEUID { get => _TYPEUID; set => _TYPEUID = value; } |
31 | 33 |
public SPPIDLineInfo SPPID { get => _SPPID; set => _SPPID = value; } |
34 |
public bool FLOWMARK { get => _FLOWMARK; set => _FLOWMARK = value; } |
|
35 |
public int FLOWMARK_PERCENT { get => _FLOWMARK_PERCENT; set => _FLOWMARK_PERCENT = value; } |
|
32 | 36 |
} |
33 | 37 |
} |
DTI_PID/SPPIDConverter/Form/MappingForm.Designer.cs | ||
---|---|---|
58 | 58 |
this.pictureEditID2Symbol = new DevExpress.XtraEditors.PictureEdit(); |
59 | 59 |
this.pictureEditMapped = new DevExpress.XtraEditors.PictureEdit(); |
60 | 60 |
this.checkEditSnapGrid = new DevExpress.XtraEditors.CheckEdit(); |
61 |
this.textBoxFlowMarkSymbolPath = new DevExpress.XtraEditors.ButtonEdit(); |
|
61 | 62 |
this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); |
62 | 63 |
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); |
63 | 64 |
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); |
... | ... | |
68 | 69 |
this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); |
69 | 70 |
this.splitterItem3 = new DevExpress.XtraLayout.SplitterItem(); |
70 | 71 |
this.tabbedControlGroup = new DevExpress.XtraLayout.TabbedControlGroup(); |
72 |
this.GroupETCSetting = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
73 |
this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); |
|
74 |
this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
75 |
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
76 |
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
77 |
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
78 |
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
79 |
this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
80 |
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
81 |
this.layoutControlGroup12 = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
82 |
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
71 | 83 |
this.GroupSymbol = new DevExpress.XtraLayout.LayoutControlGroup(); |
72 | 84 |
this.splitterItem1 = new DevExpress.XtraLayout.SplitterItem(); |
73 | 85 |
this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup(); |
... | ... | |
88 | 100 |
this.GroupAttribute = new DevExpress.XtraLayout.LayoutControlGroup(); |
89 | 101 |
this.layoutControlGroup7 = new DevExpress.XtraLayout.LayoutControlGroup(); |
90 | 102 |
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); |
91 |
this.GroupETCSetting = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
92 |
this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); |
|
93 |
this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
94 |
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
95 |
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
96 |
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
97 |
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
98 |
this.layoutControlGroup10 = new DevExpress.XtraLayout.LayoutControlGroup(); |
|
99 |
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); |
|
100 | 103 |
this.GroupGridSetting = new DevExpress.XtraLayout.LayoutControlGroup(); |
101 | 104 |
this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem(); |
102 | 105 |
this.layoutControlGroupSnapGrid = new DevExpress.XtraLayout.LayoutControlGroup(); |
... | ... | |
136 | 139 |
((System.ComponentModel.ISupportInitialize)(this.pictureEditID2Symbol.Properties)).BeginInit(); |
137 | 140 |
((System.ComponentModel.ISupportInitialize)(this.pictureEditMapped.Properties)).BeginInit(); |
138 | 141 |
((System.ComponentModel.ISupportInitialize)(this.checkEditSnapGrid.Properties)).BeginInit(); |
142 |
((System.ComponentModel.ISupportInitialize)(this.textBoxFlowMarkSymbolPath.Properties)).BeginInit(); |
|
139 | 143 |
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); |
140 | 144 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); |
141 | 145 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); |
... | ... | |
146 | 150 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit(); |
147 | 151 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem3)).BeginInit(); |
148 | 152 |
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup)).BeginInit(); |
153 |
((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).BeginInit(); |
|
154 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit(); |
|
155 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit(); |
|
156 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); |
|
157 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); |
|
158 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); |
|
159 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); |
|
160 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit(); |
|
161 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); |
|
162 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).BeginInit(); |
|
163 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); |
|
149 | 164 |
((System.ComponentModel.ISupportInitialize)(this.GroupSymbol)).BeginInit(); |
150 | 165 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit(); |
151 | 166 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit(); |
... | ... | |
166 | 181 |
((System.ComponentModel.ISupportInitialize)(this.GroupAttribute)).BeginInit(); |
167 | 182 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).BeginInit(); |
168 | 183 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); |
169 |
((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).BeginInit(); |
|
170 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit(); |
|
171 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit(); |
|
172 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); |
|
173 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); |
|
174 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); |
|
175 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); |
|
176 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).BeginInit(); |
|
177 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); |
|
178 | 184 |
((System.ComponentModel.ISupportInitialize)(this.GroupGridSetting)).BeginInit(); |
179 | 185 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit(); |
180 | 186 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupSnapGrid)).BeginInit(); |
... | ... | |
229 | 235 |
this.layoutControl1.Controls.Add(this.pictureEditID2Symbol); |
230 | 236 |
this.layoutControl1.Controls.Add(this.pictureEditMapped); |
231 | 237 |
this.layoutControl1.Controls.Add(this.checkEditSnapGrid); |
238 |
this.layoutControl1.Controls.Add(this.textBoxFlowMarkSymbolPath); |
|
232 | 239 |
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; |
233 | 240 |
this.layoutControl1.Location = new System.Drawing.Point(0, 27); |
234 | 241 |
this.layoutControl1.Name = "layoutControl1"; |
... | ... | |
354 | 361 |
// |
355 | 362 |
// textBoxDrainValveSize |
356 | 363 |
// |
357 |
this.textBoxDrainValveSize.Location = new System.Drawing.Point(184, 169);
|
|
364 |
this.textBoxDrainValveSize.Location = new System.Drawing.Point(184, 236);
|
|
358 | 365 |
this.textBoxDrainValveSize.MenuManager = this.ribbonControl; |
359 | 366 |
this.textBoxDrainValveSize.Name = "textBoxDrainValveSize"; |
360 | 367 |
this.textBoxDrainValveSize.Size = new System.Drawing.Size(567, 20); |
... | ... | |
549 | 556 |
this.checkEditSnapGrid.TabIndex = 31; |
550 | 557 |
this.checkEditSnapGrid.CheckedChanged += new System.EventHandler(this.checkEditSnapGrid_CheckedChanged); |
551 | 558 |
// |
559 |
// textBoxFlowMarkSymbolPath |
|
560 |
// |
|
561 |
this.textBoxFlowMarkSymbolPath.Location = new System.Drawing.Point(184, 169); |
|
562 |
this.textBoxFlowMarkSymbolPath.MenuManager = this.ribbonControl; |
|
563 |
this.textBoxFlowMarkSymbolPath.Name = "textBoxFlowMarkSymbolPath"; |
|
564 |
this.textBoxFlowMarkSymbolPath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { |
|
565 |
new DevExpress.XtraEditors.Controls.EditorButton()}); |
|
566 |
this.textBoxFlowMarkSymbolPath.Size = new System.Drawing.Size(567, 20); |
|
567 |
this.textBoxFlowMarkSymbolPath.StyleController = this.layoutControl1; |
|
568 |
this.textBoxFlowMarkSymbolPath.TabIndex = 36; |
|
569 |
this.textBoxFlowMarkSymbolPath.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.textBoxETC_ButtonClick); |
|
570 |
// |
|
552 | 571 |
// Root |
553 | 572 |
// |
554 | 573 |
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; |
... | ... | |
649 | 668 |
this.GroupETCSetting, |
650 | 669 |
this.GroupGridSetting}); |
651 | 670 |
// |
671 |
// GroupETCSetting |
|
672 |
// |
|
673 |
this.GroupETCSetting.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
|
674 |
this.emptySpaceItem3, |
|
675 |
this.layoutControlGroup9, |
|
676 |
this.layoutControlGroup10, |
|
677 |
this.layoutControlGroup12}); |
|
678 |
this.GroupETCSetting.Location = new System.Drawing.Point(0, 0); |
|
679 |
this.GroupETCSetting.Name = "GroupETCSetting"; |
|
680 |
this.GroupETCSetting.Size = new System.Drawing.Size(743, 636); |
|
681 |
this.GroupETCSetting.Text = "ETC Setting"; |
|
682 |
// |
|
683 |
// emptySpaceItem3 |
|
684 |
// |
|
685 |
this.emptySpaceItem3.AllowHotTrack = false; |
|
686 |
this.emptySpaceItem3.Location = new System.Drawing.Point(0, 225); |
|
687 |
this.emptySpaceItem3.Name = "emptySpaceItem3"; |
|
688 |
this.emptySpaceItem3.Size = new System.Drawing.Size(743, 411); |
|
689 |
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0); |
|
690 |
// |
|
691 |
// layoutControlGroup9 |
|
692 |
// |
|
693 |
this.layoutControlGroup9.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
|
694 |
this.layoutControlItem5, |
|
695 |
this.layoutControlItem7, |
|
696 |
this.layoutControlItem16, |
|
697 |
this.layoutControlItem17}); |
|
698 |
this.layoutControlGroup9.Location = new System.Drawing.Point(0, 0); |
|
699 |
this.layoutControlGroup9.Name = "layoutControlGroup9"; |
|
700 |
this.layoutControlGroup9.Size = new System.Drawing.Size(743, 91); |
|
701 |
this.layoutControlGroup9.Text = "Text && Note Setting"; |
|
702 |
// |
|
703 |
// layoutControlItem5 |
|
704 |
// |
|
705 |
this.layoutControlItem5.Control = this.textBoxTextSymbolPath; |
|
706 |
this.layoutControlItem5.Location = new System.Drawing.Point(0, 0); |
|
707 |
this.layoutControlItem5.Name = "layoutControlItem5"; |
|
708 |
this.layoutControlItem5.Size = new System.Drawing.Size(403, 24); |
|
709 |
this.layoutControlItem5.Text = "SPPID Text Symbol Path"; |
|
710 |
this.layoutControlItem5.TextSize = new System.Drawing.Size(145, 14); |
|
711 |
// |
|
712 |
// layoutControlItem7 |
|
713 |
// |
|
714 |
this.layoutControlItem7.Control = this.textBoxNoteSymbolPath; |
|
715 |
this.layoutControlItem7.Location = new System.Drawing.Point(0, 24); |
|
716 |
this.layoutControlItem7.Name = "layoutControlItem7"; |
|
717 |
this.layoutControlItem7.Size = new System.Drawing.Size(403, 24); |
|
718 |
this.layoutControlItem7.Text = "SPPID Note Symbol Path"; |
|
719 |
this.layoutControlItem7.TextSize = new System.Drawing.Size(145, 14); |
|
720 |
// |
|
721 |
// layoutControlItem16 |
|
722 |
// |
|
723 |
this.layoutControlItem16.Control = this.checkComboBoxTextLocation; |
|
724 |
this.layoutControlItem16.Location = new System.Drawing.Point(403, 0); |
|
725 |
this.layoutControlItem16.Name = "layoutControlItem16"; |
|
726 |
this.layoutControlItem16.Size = new System.Drawing.Size(316, 24); |
|
727 |
this.layoutControlItem16.Text = "Label Location"; |
|
728 |
this.layoutControlItem16.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; |
|
729 |
this.layoutControlItem16.TextSize = new System.Drawing.Size(78, 14); |
|
730 |
this.layoutControlItem16.TextToControlDistance = 5; |
|
731 |
// |
|
732 |
// layoutControlItem17 |
|
733 |
// |
|
734 |
this.layoutControlItem17.Control = this.checkComboBoxNoteLocation; |
|
735 |
this.layoutControlItem17.Location = new System.Drawing.Point(403, 24); |
|
736 |
this.layoutControlItem17.Name = "layoutControlItem17"; |
|
737 |
this.layoutControlItem17.Size = new System.Drawing.Size(316, 24); |
|
738 |
this.layoutControlItem17.Text = "Label Location"; |
|
739 |
this.layoutControlItem17.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; |
|
740 |
this.layoutControlItem17.TextSize = new System.Drawing.Size(78, 14); |
|
741 |
this.layoutControlItem17.TextToControlDistance = 5; |
|
742 |
// |
|
743 |
// layoutControlGroup10 |
|
744 |
// |
|
745 |
this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
|
746 |
this.layoutControlItem14}); |
|
747 |
this.layoutControlGroup10.Location = new System.Drawing.Point(0, 158); |
|
748 |
this.layoutControlGroup10.Name = "layoutControlGroup10"; |
|
749 |
this.layoutControlGroup10.Size = new System.Drawing.Size(743, 67); |
|
750 |
this.layoutControlGroup10.Text = "Drain Valve Setting"; |
|
751 |
// |
|
752 |
// layoutControlItem14 |
|
753 |
// |
|
754 |
this.layoutControlItem14.Control = this.textBoxDrainValveSize; |
|
755 |
this.layoutControlItem14.Location = new System.Drawing.Point(0, 0); |
|
756 |
this.layoutControlItem14.Name = "layoutControlItem14"; |
|
757 |
this.layoutControlItem14.Size = new System.Drawing.Size(719, 24); |
|
758 |
this.layoutControlItem14.Text = "Drain Valve Size"; |
|
759 |
this.layoutControlItem14.TextSize = new System.Drawing.Size(145, 14); |
|
760 |
// |
|
761 |
// layoutControlGroup12 |
|
762 |
// |
|
763 |
this.layoutControlGroup12.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
|
764 |
this.layoutControlItem24}); |
|
765 |
this.layoutControlGroup12.Location = new System.Drawing.Point(0, 91); |
|
766 |
this.layoutControlGroup12.Name = "layoutControlGroup12"; |
|
767 |
this.layoutControlGroup12.Size = new System.Drawing.Size(743, 67); |
|
768 |
this.layoutControlGroup12.Text = "Flow Mark"; |
|
769 |
// |
|
770 |
// layoutControlItem24 |
|
771 |
// |
|
772 |
this.layoutControlItem24.Control = this.textBoxFlowMarkSymbolPath; |
|
773 |
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0); |
|
774 |
this.layoutControlItem24.Name = "layoutControlItem24"; |
|
775 |
this.layoutControlItem24.Size = new System.Drawing.Size(719, 24); |
|
776 |
this.layoutControlItem24.Text = "Flow Mark Symbol Path"; |
|
777 |
this.layoutControlItem24.TextSize = new System.Drawing.Size(145, 14); |
|
778 |
// |
|
652 | 779 |
// GroupSymbol |
653 | 780 |
// |
654 | 781 |
this.GroupSymbol.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
... | ... | |
835 | 962 |
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); |
836 | 963 |
this.layoutControlItem11.TextVisible = false; |
837 | 964 |
// |
838 |
// GroupETCSetting |
|
839 |
// |
|
840 |
this.GroupETCSetting.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
|
841 |
this.emptySpaceItem3, |
|
842 |
this.layoutControlGroup9, |
|
843 |
this.layoutControlGroup10}); |
|
844 |
this.GroupETCSetting.Location = new System.Drawing.Point(0, 0); |
|
845 |
this.GroupETCSetting.Name = "GroupETCSetting"; |
|
846 |
this.GroupETCSetting.Size = new System.Drawing.Size(743, 636); |
|
847 |
this.GroupETCSetting.Text = "ETC Setting"; |
|
848 |
// |
|
849 |
// emptySpaceItem3 |
|
850 |
// |
|
851 |
this.emptySpaceItem3.AllowHotTrack = false; |
|
852 |
this.emptySpaceItem3.Location = new System.Drawing.Point(0, 158); |
|
853 |
this.emptySpaceItem3.Name = "emptySpaceItem3"; |
|
854 |
this.emptySpaceItem3.Size = new System.Drawing.Size(743, 478); |
|
855 |
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0); |
|
856 |
// |
|
857 |
// layoutControlGroup9 |
|
858 |
// |
|
859 |
this.layoutControlGroup9.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
|
860 |
this.layoutControlItem5, |
|
861 |
this.layoutControlItem7, |
|
862 |
this.layoutControlItem16, |
|
863 |
this.layoutControlItem17}); |
|
864 |
this.layoutControlGroup9.Location = new System.Drawing.Point(0, 0); |
|
865 |
this.layoutControlGroup9.Name = "layoutControlGroup9"; |
|
866 |
this.layoutControlGroup9.Size = new System.Drawing.Size(743, 91); |
|
867 |
this.layoutControlGroup9.Text = "Text && Note Setting"; |
|
868 |
// |
|
869 |
// layoutControlItem5 |
|
870 |
// |
|
871 |
this.layoutControlItem5.Control = this.textBoxTextSymbolPath; |
|
872 |
this.layoutControlItem5.Location = new System.Drawing.Point(0, 0); |
|
873 |
this.layoutControlItem5.Name = "layoutControlItem5"; |
|
874 |
this.layoutControlItem5.Size = new System.Drawing.Size(403, 24); |
|
875 |
this.layoutControlItem5.Text = "SPPID Text Symbol Path"; |
|
876 |
this.layoutControlItem5.TextSize = new System.Drawing.Size(145, 14); |
|
877 |
// |
|
878 |
// layoutControlItem7 |
|
879 |
// |
|
880 |
this.layoutControlItem7.Control = this.textBoxNoteSymbolPath; |
|
881 |
this.layoutControlItem7.Location = new System.Drawing.Point(0, 24); |
|
882 |
this.layoutControlItem7.Name = "layoutControlItem7"; |
|
883 |
this.layoutControlItem7.Size = new System.Drawing.Size(403, 24); |
|
884 |
this.layoutControlItem7.Text = "SPPID Note Symbol Path"; |
|
885 |
this.layoutControlItem7.TextSize = new System.Drawing.Size(145, 14); |
|
886 |
// |
|
887 |
// layoutControlItem16 |
|
888 |
// |
|
889 |
this.layoutControlItem16.Control = this.checkComboBoxTextLocation; |
|
890 |
this.layoutControlItem16.Location = new System.Drawing.Point(403, 0); |
|
891 |
this.layoutControlItem16.Name = "layoutControlItem16"; |
|
892 |
this.layoutControlItem16.Size = new System.Drawing.Size(316, 24); |
|
893 |
this.layoutControlItem16.Text = "Label Location"; |
|
894 |
this.layoutControlItem16.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; |
|
895 |
this.layoutControlItem16.TextSize = new System.Drawing.Size(78, 14); |
|
896 |
this.layoutControlItem16.TextToControlDistance = 5; |
|
897 |
// |
|
898 |
// layoutControlItem17 |
|
899 |
// |
|
900 |
this.layoutControlItem17.Control = this.checkComboBoxNoteLocation; |
|
901 |
this.layoutControlItem17.Location = new System.Drawing.Point(403, 24); |
|
902 |
this.layoutControlItem17.Name = "layoutControlItem17"; |
|
903 |
this.layoutControlItem17.Size = new System.Drawing.Size(316, 24); |
|
904 |
this.layoutControlItem17.Text = "Label Location"; |
|
905 |
this.layoutControlItem17.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize; |
|
906 |
this.layoutControlItem17.TextSize = new System.Drawing.Size(78, 14); |
|
907 |
this.layoutControlItem17.TextToControlDistance = 5; |
|
908 |
// |
|
909 |
// layoutControlGroup10 |
|
910 |
// |
|
911 |
this.layoutControlGroup10.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
|
912 |
this.layoutControlItem14}); |
|
913 |
this.layoutControlGroup10.Location = new System.Drawing.Point(0, 91); |
|
914 |
this.layoutControlGroup10.Name = "layoutControlGroup10"; |
|
915 |
this.layoutControlGroup10.Size = new System.Drawing.Size(743, 67); |
|
916 |
this.layoutControlGroup10.Text = "Drain Valve Setting"; |
|
917 |
// |
|
918 |
// layoutControlItem14 |
|
919 |
// |
|
920 |
this.layoutControlItem14.Control = this.textBoxDrainValveSize; |
|
921 |
this.layoutControlItem14.Location = new System.Drawing.Point(0, 0); |
|
922 |
this.layoutControlItem14.Name = "layoutControlItem14"; |
|
923 |
this.layoutControlItem14.Size = new System.Drawing.Size(719, 24); |
|
924 |
this.layoutControlItem14.Text = "Drain Valve Size"; |
|
925 |
this.layoutControlItem14.TextSize = new System.Drawing.Size(145, 14); |
|
926 |
// |
|
927 | 965 |
// GroupGridSetting |
928 | 966 |
// |
929 | 967 |
this.GroupGridSetting.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { |
... | ... | |
1084 | 1122 |
((System.ComponentModel.ISupportInitialize)(this.pictureEditID2Symbol.Properties)).EndInit(); |
1085 | 1123 |
((System.ComponentModel.ISupportInitialize)(this.pictureEditMapped.Properties)).EndInit(); |
1086 | 1124 |
((System.ComponentModel.ISupportInitialize)(this.checkEditSnapGrid.Properties)).EndInit(); |
1125 |
((System.ComponentModel.ISupportInitialize)(this.textBoxFlowMarkSymbolPath.Properties)).EndInit(); |
|
1087 | 1126 |
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); |
1088 | 1127 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); |
1089 | 1128 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); |
... | ... | |
1094 | 1133 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit(); |
1095 | 1134 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem3)).EndInit(); |
1096 | 1135 |
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup)).EndInit(); |
1136 |
((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).EndInit(); |
|
1137 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit(); |
|
1138 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit(); |
|
1139 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); |
|
1140 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); |
|
1141 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); |
|
1142 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); |
|
1143 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit(); |
|
1144 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); |
|
1145 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup12)).EndInit(); |
|
1146 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); |
|
1097 | 1147 |
((System.ComponentModel.ISupportInitialize)(this.GroupSymbol)).EndInit(); |
1098 | 1148 |
((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit(); |
1099 | 1149 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit(); |
... | ... | |
1114 | 1164 |
((System.ComponentModel.ISupportInitialize)(this.GroupAttribute)).EndInit(); |
1115 | 1165 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup7)).EndInit(); |
1116 | 1166 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); |
1117 |
((System.ComponentModel.ISupportInitialize)(this.GroupETCSetting)).EndInit(); |
|
1118 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit(); |
|
1119 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit(); |
|
1120 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); |
|
1121 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); |
|
1122 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); |
|
1123 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); |
|
1124 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup10)).EndInit(); |
|
1125 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); |
|
1126 | 1167 |
((System.ComponentModel.ISupportInitialize)(this.GroupGridSetting)).EndInit(); |
1127 | 1168 |
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit(); |
1128 | 1169 |
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupSnapGrid)).EndInit(); |
... | ... | |
1222 | 1263 |
private DevExpress.XtraEditors.SpinEdit spinEditDrainValveCellCount; |
1223 | 1264 |
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; |
1224 | 1265 |
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup11; |
1266 |
private DevExpress.XtraEditors.ButtonEdit textBoxFlowMarkSymbolPath; |
|
1267 |
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup12; |
|
1268 |
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; |
|
1225 | 1269 |
} |
1226 | 1270 |
} |
DTI_PID/SPPIDConverter/Form/MappingForm.cs | ||
---|---|---|
257 | 257 |
textBoxNoteSymbolPath.Properties.TextEditStyle = TextEditStyles.DisableTextEditor; |
258 | 258 |
textBoxNoteSymbolPath.Properties.Buttons[0].Kind = ButtonPredefines.Glyph; |
259 | 259 |
textBoxNoteSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16; |
260 |
textBoxFlowMarkSymbolPath.Properties.TextEditStyle = TextEditStyles.DisableTextEditor; |
|
261 |
textBoxFlowMarkSymbolPath.Properties.Buttons[0].Kind = ButtonPredefines.Glyph; |
|
262 |
textBoxFlowMarkSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16; |
|
260 | 263 |
|
261 | 264 |
ETCSetting _ETCSetting = ETCSetting.GetInstance(); |
262 | 265 |
textBoxTextSymbolPath.Text = _ETCSetting.TextSymbolPath; |
263 | 266 |
textBoxNoteSymbolPath.Text = _ETCSetting.NoteSymbolPath; |
264 | 267 |
textBoxDrainValveSize.Text = _ETCSetting.DrainValveSize; |
268 |
textBoxFlowMarkSymbolPath.Text = _ETCSetting.FlowMarkSymbolPath; |
|
265 | 269 |
|
266 | 270 |
checkComboBoxTextLocation.EditValue = _ETCSetting.TextLocation; |
267 | 271 |
checkComboBoxNoteLocation.EditValue = _ETCSetting.NoteLocation; |
... | ... | |
282 | 286 |
{ |
283 | 287 |
textBoxTextSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16; |
284 | 288 |
textBoxNoteSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16; |
289 |
textBoxFlowMarkSymbolPath.Properties.Buttons[0].Image = Resources.pencolor_16x16; |
|
285 | 290 |
|
286 | 291 |
ButtonEdit buttonEdit = sender as ButtonEdit; |
287 | 292 |
if (currentButtonEdit != buttonEdit) |
... | ... | |
380 | 385 |
ETCSetting _ETCSetting = new ETCSetting(); |
381 | 386 |
_ETCSetting.TextSymbolPath = textBoxTextSymbolPath.Text; |
382 | 387 |
_ETCSetting.NoteSymbolPath = textBoxNoteSymbolPath.Text; |
388 |
_ETCSetting.FlowMarkSymbolPath = textBoxFlowMarkSymbolPath.Text; |
|
383 | 389 |
_ETCSetting.DrainValveSize = textBoxDrainValveSize.Text; |
384 | 390 |
_ETCSetting.TextLocation = (Model.Location)checkComboBoxTextLocation.EditValue; |
385 | 391 |
_ETCSetting.NoteLocation = (Model.Location)checkComboBoxNoteLocation.EditValue; |
DTI_PID/SPPIDConverter/Form/SPPIDSplashScreen.Designer.cs | ||
---|---|---|
122 | 122 |
this.Controls.Add(this.labelStep); |
123 | 123 |
this.Controls.Add(this.labelControl1); |
124 | 124 |
this.Name = "SPPIDSplashScreen"; |
125 |
this.Text = "Form1"; |
|
125 |
this.Text = "Converting..."; |
|
126 |
this.Load += new System.EventHandler(this.SPPIDSplashScreen_Load); |
|
126 | 127 |
((System.ComponentModel.ISupportInitialize)(this.pictureEdit2.Properties)).EndInit(); |
127 | 128 |
((System.ComponentModel.ISupportInitialize)(this.pictureEditLogo.Properties)).EndInit(); |
128 | 129 |
((System.ComponentModel.ISupportInitialize)(this.progressBarControl.Properties)).EndInit(); |
DTI_PID/SPPIDConverter/Form/SPPIDSplashScreen.cs | ||
---|---|---|
16 | 16 |
public SPPIDSplashScreen() |
17 | 17 |
{ |
18 | 18 |
InitializeComponent(); |
19 |
this.labelControl1.Text = "Copyright © 2000-" + DateTime.Now.Year.ToString(); |
|
19 |
this.labelControl1.Text = "Copyright © 2018-" + DateTime.Now.Year.ToString(); |
|
20 |
TopMost = true; |
|
21 |
} |
|
22 |
private void SPPIDSplashScreen_Load(object sender, EventArgs e) |
|
23 |
{ |
|
24 |
//StartPosition = FormStartPosition.Manual; |
|
25 |
//Location = new Point(0, 0); |
|
20 | 26 |
} |
21 | 27 |
|
22 | 28 |
#region Overrides |
... | ... | |
69 | 75 |
SetParent, |
70 | 76 |
ClearParent |
71 | 77 |
} |
78 |
|
|
79 |
|
|
72 | 80 |
} |
73 | 81 |
} |
DTI_PID/SPPIDConverter/SPPIDModel/ETCSetting.cs | ||
---|---|---|
16 | 16 |
public string TextSymbolPath { get => _TextSymbolPath; set => _TextSymbolPath = value; } |
17 | 17 |
public string NoteSymbolPath { get => _NoteSymbolPath; set => _NoteSymbolPath = value; } |
18 | 18 |
public string DrainValveSize { get => _DrainValveSize; set => _DrainValveSize = value; } |
19 |
public string FlowMarkSymbolPath { get; set; } |
|
19 | 20 |
|
20 | 21 |
public Model.Location TextLocation { get; set; } |
21 | 22 |
public Model.Location NoteLocation { get; set; } |
DTI_PID/SPPIDConverter/Util/SPPIDUtil.cs | ||
---|---|---|
67 | 67 |
_ETCSetting.TextLocation = jsonETCSetting.TextLocation; |
68 | 68 |
_ETCSetting.NoteLocation = jsonETCSetting.NoteLocation; |
69 | 69 |
_ETCSetting.LineNumberLocation = jsonETCSetting.LineNumberLocation; |
70 |
|
|
70 |
_ETCSetting.FlowMarkSymbolPath = jsonETCSetting.FlowMarkSymbolPath; |
|
71 | 71 |
} |
72 | 72 |
catch (Exception ex) |
73 | 73 |
{ |
내보내기 Unified diff