/ - Diff - HYTOS - 일정관리

개정판 b66a2996

ID	b66a2996b29cbc6ce67eea79c84ed12a1143fba4
상위	51ae61b9
하위	def4a668

gaqhf 이(가) 5년 이상 전에 추가함

dev issue #497 : Snap Line Grid Fix

Change-Id: Iecca9e6942d9906ba109b43d40acccbb2a981ec6

                         SplashScreenManager.ShowForm(typeof(SPPIDSplashScreen), true, true);
                         SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetAllStep, AllCount);
                         SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetDocumentName, DocumentLabelText);
                         //Thread.Sleep(1000);
                         //SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetParent, (IntPtr)radApp.HWnd);
                         //Thread.Sleep(1000);
                         SplashScreenManager.Default.SendCommand(SPPIDSplashScreen.SplashScreenCommand.SetStep, "Group Symbol Modeling");
                         List<List<Symbol>> symbolGroups = SPPIDUtil.GetThreeConnectedSymbolGroup(document);
-...
+                {
                     application.ActiveWindow.Fit();
                     if (newDrawing != null)
                     if (radApp.ActiveDocument != null)
+                    {
                         radApp.ActiveDocument.SaveOnClose = false;
                         radApp.ActiveDocument.Save();
                         //radApp.ActiveDocument.Save();
                         //radApp.ActiveDocument.SaveOnClose = false;
                         //radApp.ActiveDocument.Close(false);
                         ReleaseCOMObjects(newDrawing);
+                    }
-...
             /// </summary>
             private void CreateDocument()
+            {
                 newDrawing = application.Drawings.Add(document.Unit, document.Template, document.DrawingNumber, document.DrawingName);
                 string drawingName = document.DrawingName;
                 string drawingNumber = document.DrawingNumber;
                 GetDrawingNameAndNumber(ref drawingName, ref drawingNumber);
                 newDrawing = application.Drawings.Add(document.Unit, document.Template, drawingNumber, drawingName);
                 application.ActiveWindow.Fit();
                 Thread.Sleep(1000);
                 application.ActiveWindow.Zoom = 2000;
                 Thread.Sleep(2000);
+            }
             private void GetDrawingNameAndNumber(ref string drawingName, ref string drawingNumber)
+            {
                 LMDrawings drawings = new LMDrawings();
                 drawings.Collect(dataSource);
                 List<string> drawingNameList = new List<string>();
                 List<string> drawingNumberList = new List<string>();
                 foreach (LMDrawing item in drawings)
+                {
                     drawingNameList.Add(item.Attributes["Name"].get_Value().ToString());
                     drawingNumberList.Add(item.Attributes["DrawingNumber"].get_Value().ToString());
+                }
                 int nameLength = drawingName.Length;
                 while (drawingNameList.Contains(drawingName))
+                {
                     if (nameLength == drawingName.Length)
                         drawingName += "-1";
                     else
+                    {
                         int index = Convert.ToInt32(drawingName.Remove(0, nameLength + 1));
                         drawingName = drawingName.Substring(0, nameLength + 1);
                         drawingName += ++index;
+                    }
+                }
                 int numberLength = drawingNumber.Length;
                 while (drawingNameList.Contains(drawingNumber))
+                {
                     if (numberLength == drawingNumber.Length)
                         drawingNumber += "-1";
                     else
+                    {
                         int index = Convert.ToInt32(drawingNumber.Remove(0, numberLength + 1));
                         drawingNumber = drawingNumber.Substring(0, numberLength + 1);
                         drawingNumber += ++index;
+                    }
+                }
                 ReleaseCOMObjects(drawings);
+            }
             /// <summary>
-...
                     SlopeType slopeType = SPPIDUtil.CalcSlope(line.SPPID.START_X, line.SPPID.START_Y, line.SPPID.END_X, line.SPPID.END_Y);
                     // Symbol일 경우 바로 Input Point
                     if (item.Item1 == "SYMBOL")
+                    {
                         placeRunInputs.AddSymbolTarget(item.Item3 as LMSymbol, x, y);
                         prevX = x;
                         prevY = y;
                         prevSlopeType = slopeType;
                         continue;
+                    }
                     SPPIDUtil.ConvertGridPoint(ref x, ref y);
                     // i == 0은 그대로 사용
                     if (i != 0)
                     else
+                    {
                         Tuple<string, Line, object, double, double> prevItem = linePointInfo[i - 1];
                         // y 좌표가 같아야함
                         if (prevSlopeType == SlopeType.HORIZONTAL)
                             y = prevY;
                         else if (prevSlopeType == SlopeType.VERTICAL)
                             x = prevX;
                         if (i + 1 == linePointInfo.Count - 1 && linePointInfo[i + 1].Item1 == "SYMBOL")
                         SPPIDUtil.ConvertGridPoint(ref x, ref y);
                         // i == 0은 그대로 사용
                         if (i != 0)
+                        {
                             Line nextLine = linePointInfo[i + 1].Item2;
                             SlopeType nextSlopeType = SPPIDUtil.CalcSlope(nextLine.SPPID.START_X, nextLine.SPPID.START_Y, nextLine.SPPID.END_X, nextLine.SPPID.END_Y);
                             if (slopeType == SlopeType.HORIZONTAL)
                                 y = linePointInfo[i + 1].Item5;
                             else if (slopeType == SlopeType.VERTICAL)
                                 x = linePointInfo[i + 1].Item4;
                             Tuple<string, Line, object, double, double> prevItem = linePointInfo[i - 1];
                             // y 좌표가 같아야함 및 Symbol 좌표가 정확하지 않으므로 한번더 보정
                             if (prevSlopeType == SlopeType.HORIZONTAL)
+                            {
                                 y = prevY;
                                 SPPIDUtil.ConvertGridPointOnlyOnePoint(ref y);
+                            }
                             else if (prevSlopeType == SlopeType.VERTICAL)
+                            {
                                 x = prevX;
                                 SPPIDUtil.ConvertGridPointOnlyOnePoint(ref x);
+                            }
                             // 마지막이 Symbol일 경우는 Symbol의 좌표를 따라감
                             if (i + 1 == linePointInfo.Count - 1 && linePointInfo[i + 1].Item1 == "SYMBOL")
+                            {
                                 Line nextLine = linePointInfo[i + 1].Item2;
                                 SlopeType nextSlopeType = SPPIDUtil.CalcSlope(nextLine.SPPID.START_X, nextLine.SPPID.START_Y, nextLine.SPPID.END_X, nextLine.SPPID.END_Y);
                                 if (slopeType == SlopeType.HORIZONTAL)
                                     y = linePointInfo[i + 1].Item5;
                                 else if (slopeType == SlopeType.VERTICAL)
                                     x = linePointInfo[i + 1].Item4;
+                            }
+                        }
+                    }
                     if (item.Item1 == "LINE")
                         placeRunInputs.AddConnectorTarget(item.Item3 as LMConnector, x, y);
                     else
                         placeRunInputs.AddPoint(x, y);
                         if (item.Item1 == "LINE")
                             placeRunInputs.AddConnectorTarget(item.Item3 as LMConnector, x, y);
                         else
                             placeRunInputs.AddPoint(x, y);
+                    }
                     prevX = x;
                     prevY = y;
-...
             private void BranchLineModeling(Tuple<string, Line, Line> branch)
+            {
                 List<Line> lines = SPPIDUtil.FindLinesByModelId(document, branch.Item1);
                 Dictionary<LMConnector, List<double[]>> connectorVertices = GetPipeRunVertices(branch.Item1);
                 LMConnector _StartConnector = null;

             private void simpleButton1_Click(object sender, EventArgs e)
+            {
                 Placement placement = new Placement();
                 LMADataSource dataSource = placement.PIDDataSource;
                 StringBuilder sb = new StringBuilder();
                 sb.AppendLine(dataSource.ProjectNumber);
                 sb.AppendLine(radApp.DisplayAlerts.ToString());
                 MessageBox.Show(sb.ToString());
                 return;
                 LMADataSource dataSource = new LMADataSource();//placement.PIDDataSource;
                 Ingr.RAD2D.Symbol2d symbol2d = radApp.ActiveSelectSet[0] as Ingr.RAD2D.Symbol2d;
                 if (symbol2d != null)
+                {
                     double minX;
                     double minY;
                     double maxX;
-...
+                                    {
                                         LMSymbol symbol = dataSource.GetSymbol(rep.Id);
                                         List<double[]> points = new List<double[]>();
                                         StringBuilder sb = new StringBuilder();
                                         for (int i = 1; i < int.MaxValue; i++)
+                                        {
                                             double connX = 0;
                                             double connY = 0;
                                             if (placement.PIDConnectPointLocation(symbol, i, ref connX, ref connY))
+                                            {
                                                 points.Add(new double[] { connX, connY });
                                                 sb.AppendLine(i + " / " + connX + " / " + connY);
+                                            }
                                             else
                                                 break;
+                                        }
                                         double prevX = symbol.get_XCoordinate();
                                         double prevY = symbol.get_YCoordinate();
                                         MessageBox.Show(sb.ToString());
+                                    }
+                                }
+                            }

DTI_PID/SPPIDConverter/Form/SPPIDSplashScreen.cs
20	20	}
21	21	private void SPPIDSplashScreen_Load(object sender, EventArgs e)
22	22	{
23		TopMost = true;
24		//StartPosition = FormStartPosition.Manual;
25		//Location = new Point(0, 0);
	23
26	24	}
27	25
28	26	#region Overrides
...	...
75	73	SetParent,
76	74	ClearParent
77	75	}
78
79
80	76	}
81	77	}

DTI_PID/SPPIDConverter/Util/SPPIDUtil.cs
154	154	}
155	155	}
156	156	}
	157	public static void ConvertGridPointOnlyOnePoint(ref double value)
	158	{
	159	GridSetting _GridSetting = GridSetting.GetInstance();
	160	if (_GridSetting.UseSnapGrid)
	161	{
	162	if (_GridSetting.Unit == GridUnit.Inch)
	163	{
	164	double length = _GridSetting.Density * 0.0254;
	165	double temp = value;
	166	value = Math.Round(value / length) * length;
	167	}
	168	}
	169	}
157	170
158	171	public static SlopeType CalcSlope(double x1, double y1, double x2, double y2)
159	172	{

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 b66a2996