/ - Diff - HYTOS - 일정관리

개정판 5e6ecf05

ID	5e6ecf058b4c479f7ab4aab362867f735ad7b129
상위	f1232880
하위	1bd743fd, 56bc67e1

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

dev issue #000 : branch target 구하는 로직 추가(보안 필요)

Change-Id: Iac4e63f4c2cdbee58c5b7489b7d46e91c5cae942

DTI_PID/BaseModel/Model/SPPID/SPPIDLineInfo.cs
14	14	public double START_Y { get; set; }
15	15	public double END_X { get; set; }
16	16	public double END_Y { get; set; }
17		public string RepresentationId { get; set; }
	17	public string ModelItemId { get; set; }
18	18	public bool IsGroup { get; set; }
19	19	}
20	20	}

     using Converter.SPPID.Properties;
     using Converter.SPPID.Util;
     using Converter.SPPID.DB;
     using Ingr.RAD2D.MacroControls.CmdCtrl;
     using Ingr.RAD2D;
     using System.Windows;
     using System.Threading;
     using System.Drawing;
-...
+        {
             Placement _placement;
             LMADataSource dataSource;
             Ingr.RAD2D.Application radApp;
             SPPID_Document document;
             public AutoModeling(SPPID_Document document)
             public AutoModeling(SPPID_Document document, Ingr.RAD2D.Application radApp)
+            {
                 this.document = document;
                 this.radApp = radApp;
+            }
             public void Run()
-...
                 //Thread.Sleep(100);
                 //application.ActiveWindow.Zoom = 60;
                 //Thread.Sleep(100);
                 foreach (Equipment equipment in document.Equipments)
+                {
                     SymbolModeling(equipment as Symbol, null, null);
+                }
                 foreach (LineNumber lineNumber in document.LINENUMBERS)
                 try
+                {
                     foreach (LineRun run in lineNumber.RUNS)
                     foreach (Equipment equipment in document.Equipments)
+                    {
                         SymbolModelingByRun(run);
                         SymbolModeling(equipment as Symbol, null, null);
+                    }
+                }
                     foreach (LineNumber lineNumber in document.LINENUMBERS)
+                    {
                         foreach (LineRun run in lineNumber.RUNS)
+                        {
                             SymbolModelingByRun(run);
+                        }
+                    }
                 foreach (TrimLine trimLine in document.TRIMLINES)
+                {
                     foreach (LineRun run in trimLine.RUNS)
                     foreach (TrimLine trimLine in document.TRIMLINES)
+                    {
                         SymbolModelingByRun(run);
                         foreach (LineRun run in trimLine.RUNS)
+                        {
                             SymbolModelingByRun(run);
+                        }
+                    }
+                }
                 foreach (LineNumber lineNumber in document.LINENUMBERS)
+                {
                     foreach (LineRun run in lineNumber.RUNS)
                     foreach (LineNumber lineNumber in document.LINENUMBERS)
+                    {
                         LineModelingByRun(run);
                         foreach (LineRun run in lineNumber.RUNS)
+                        {
                             LineModelingByRun(run);
+                        }
+                    }
+                }
                 foreach (TrimLine trimLine in document.TRIMLINES)
+                {
                     foreach (LineRun run in trimLine.RUNS)
                     foreach (TrimLine trimLine in document.TRIMLINES)
+                    {
                         LineModelingByRun(run);
                         foreach (LineRun run in trimLine.RUNS)
+                        {
                             LineModelingByRun(run);
+                        }
+                    }
+                }
                 ReleaseCOMObjects(dataSource);
                 ReleaseCOMObjects(_placement);
                 catch (Exception ex)
+                {
                     System.Windows.Forms.MessageBox.Show(ex.Message + "\r\n" + ex.StackTrace);
+                }
                 finally
+                {
                     ReleaseCOMObjects(dataSource);
                     ReleaseCOMObjects(_placement);
+                }
                 System.Windows.Forms.MessageBox.Show("end");
+            }
-...
                 PlaceRunInputs placeRunInputs = new PlaceRunInputs();
                 LMSymbol _LMSymbol1 = null;
                 LMSymbol _LMSymbol2 = null;
                 Dictionary<LMConnector, List<double[]>> connectorVertices1 = new Dictionary<LMConnector, List<double[]>>();
                 LMConnector targetConnector1 = null;
                 Dictionary<LMConnector, List<double[]>> connectorVertices2 = new Dictionary<LMConnector, List<double[]>>();
                 LMConnector targetConnector2 = null;
                 for (int i = 0; i < lines.Count; i++)
+                {
                     Line line = lines[i];
-...
                             else
                                 placeRunInputs.AddPoint(line.SPPID.START_X, line.SPPID.START_Y);
+                        }
                         else if (connItem != null && connItem.GetType() == typeof(Line))
+                        {
                             connectorVertices1 = GetPipeRunVertices(((Line)connItem).SPPID.ModelItemId);
                             targetConnector1 = FindTargetLMConnector(connectorVertices1, line.SPPID.START_X, line.SPPID.START_Y);
                             if (targetConnector1 != null)
                                 placeRunInputs.AddConnectorTarget(targetConnector1, line.SPPID.START_X, line.SPPID.START_Y);
                             else
                                 placeRunInputs.AddPoint(line.SPPID.START_X, line.SPPID.START_Y);
+                        }
                         else
                             placeRunInputs.AddPoint(line.SPPID.START_X, line.SPPID.START_Y);
+                    }
-...
+                    {
                         // 끝점에 연결된 Symbol 찾기
                         object connItem = SPPIDUtil.FindObjectByUID(document, line.CONNECTORS[1].CONNECTEDITEM);
                         if (i != 0)
                             placeRunInputs.AddPoint(line.SPPID.START_X, line.SPPID.START_Y);
                         if (connItem != null && connItem.GetType() == typeof(Symbol))
+                        {
                             _LMSymbol2 = dataSource.GetSymbol(((Symbol)connItem).SPPID.RepresentationId);
                             if (_LMSymbol2 != null)
+                            {
                                 if (i != 0)
                                     placeRunInputs.AddPoint(line.SPPID.START_X, line.SPPID.START_Y);
                                 placeRunInputs.AddSymbolTarget(_LMSymbol2, line.SPPID.END_X, line.SPPID.END_Y);
+                            }
                             else
+                            {
                                 if (i != 0)
                                     placeRunInputs.AddPoint(line.SPPID.START_X, line.SPPID.START_Y);
                                 placeRunInputs.AddPoint(line.SPPID.END_X, line.SPPID.END_Y);
+                            }
+                        }
                         else if (connItem != null && connItem.GetType() == typeof(Line))
+                        {
                             connectorVertices2 = GetPipeRunVertices(((Line)connItem).SPPID.ModelItemId);
                             targetConnector2 = FindTargetLMConnector(connectorVertices2, line.SPPID.END_X, line.SPPID.END_Y);
                             if (targetConnector2 != null)
                                 placeRunInputs.AddConnectorTarget(targetConnector2, line.SPPID.END_X, line.SPPID.END_Y);
                             else
                                 placeRunInputs.AddPoint(line.SPPID.END_X, line.SPPID.END_Y);
+                        }
                         else
+                        {
                             if (i != 0)
                                 placeRunInputs.AddPoint(line.SPPID.START_X, line.SPPID.START_Y);
                             placeRunInputs.AddPoint(line.SPPID.END_X, line.SPPID.END_Y);
+                        }
+                    }
-...
                 if (_lMConnector != null)
+                {
                     foreach (var line in lines)
                         line.SPPID.RepresentationId = _lMConnector.AsLMRepresentation().Id;
                         line.SPPID.ModelItemId = _lMConnector.ModelItemID;
                     _lMConnector.Commit();
+                }
                 if (_LMSymbol1 != null)
                     ReleaseCOMObjects(_LMSymbol1);
                 if (_LMSymbol2 != null)
                     ReleaseCOMObjects(_LMSymbol2);
                 if (targetConnector1 != null)
                     ReleaseCOMObjects(targetConnector1);
                 if (targetConnector2 != null)
                     ReleaseCOMObjects(targetConnector2);
                 foreach (var item in connectorVertices1)
                     ReleaseCOMObjects(item.Key);
                 foreach (var item in connectorVertices2)
                     ReleaseCOMObjects(item.Key);
                 ReleaseCOMObjects(_lMConnector);
                 ReleaseCOMObjects(placeRunInputs);
                 ReleaseCOMObjects(_LMAItem);
+            }
             private Dictionary<LMConnector, List<double[]>> GetPipeRunVertices(string modelId)
+            {
                 Dictionary<LMConnector, List<double[]>> connectorVertices = new Dictionary<LMConnector, List<double[]>>();
                 LMPipeRun _LMPipeRun = dataSource.GetPipeRun(modelId);
                 if (_LMPipeRun != null)
+                {
                     foreach (LMRepresentation rep in _LMPipeRun.Representations)
+                    {
                         if (rep.Attributes["RepresentationType"].get_Value() == "Connector" && rep.Attributes["ItemStatus"].get_Value() == "Active")
+                        {
                             LMConnector _LMConnector = dataSource.GetConnector(rep.Id);
                             connectorVertices.Add(_LMConnector, new List<double[]>());
                             dynamic OID = rep.get_GraphicOID();
                             Ingr.RAD2D.DependencyObject drawingObject = radApp.ActiveDocument.ActiveSheet.DrawingObjects[OID];
                             Ingr.RAD2D.LineStringGeometry2d lineStringGeometry = drawingObject.GetGeometry() as Ingr.RAD2D.LineStringGeometry2d;
                             int verticesCount = lineStringGeometry.VertexCount;
                             double[] vertices = null;
                             lineStringGeometry.GetVertices(ref verticesCount, ref vertices);
                             for (int i = 0; i < verticesCount; i++)
+                            {
                                 double x = 0;
                                 double y = 0;
                                 lineStringGeometry.GetVertex(i + 1, ref x, ref y);
                                 connectorVertices[_LMConnector].Add(new double[] { x, y });
+                            }
+                        }
+                    }
                     ReleaseCOMObjects(_LMPipeRun);
+                }
                 return connectorVertices;
+            }
             private LMConnector FindTargetLMConnector(Dictionary<LMConnector, List<double[]>> connectorVertices, double x, double y)
+            {
                 double length = double.MaxValue;
                 LMConnector targetConnector = null;
                 foreach (var item in connectorVertices)
+                {
                     List<double[]> points = item.Value;
                     for (int i = 0; i < points.Count - 1; i++)
+                    {
                         double[] point1 = points[i];
                         double[] point2 = points[i + 1];
                         double maxLineX = Math.Max(point1[0], point2[0]);
                         double minLineX = Math.Min(point1[0], point2[0]);
                         double maxLineY = Math.Max(point1[1], point2[1]);
                         double minLineY = Math.Min(point1[1], point2[1]);
                         // 두직선의 교차점으로 구하면 될듯 그리고 교차점이 x y랑 제일 가까운것
                         if ((minLineX <= x && maxLineX >= x) ||
                             (minLineY <= y && maxLineY >= y))
+                        {
                             double result = SPPIDUtil.CalcLineToPointDistance(point1[0], point1[1], point2[0], point2[1], x, y);
                             if (length > result)
+                            {
                                 targetConnector = item.Key;
                                 length = result;
+                            }
+                        }
+                    }
+                }
                 return targetConnector;
+            }
             private void LineNumberModeling(LineNumber lineNumber)
+            {

             /// <param name="e">Arguments passed during event</param>
             private void commandControl_Activate(object sender, EventArgs e)
+            {
                 if (ShowDialog() == DialogResult.OK)
+                {
+                }
                 Show();
                 //if (ShowDialog() == DialogResult.OK)
                 //{
                 foreach (var item in commandControl.Application.RADApplication.ActiveSelectSet)
+                {
                     //MessageBox.Show(item.GetType());
                     int count = ((Ingr.RAD2D.LineStringGeometry2d)((Ingr.RAD2D.DependencyObject)item).GetGeometry()).VertexCount;
                     double[] iii = null;
                     ((Ingr.RAD2D.LineStringGeometry2d)((Ingr.RAD2D.DependencyObject)item).GetGeometry()).GetVertices(ref count, ref iii);
                     for (int i = 0; i < count; i++)
+                    {
                         double x = 0;
                         double y = 0;
                         ((Ingr.RAD2D.LineStringGeometry2d)((Ingr.RAD2D.DependencyObject)item).GetGeometry()).GetVertex(i + 1, ref x, ref y);
                 //}
+                    }
                     Ingr.RAD2D.Symbol2d symbol2D;
                     //symbol2D.Move
+                }
                 //foreach (var item in commandControl.Application.RADApplication.ActiveSelectSet)
                 //{
                 //    //MessageBox.Show(item.GetType());
                 //    int count = ((Ingr.RAD2D.LineStringGeometry2d)((Ingr.RAD2D.DependencyObject)item).GetGeometry()).VertexCount;
                 //    double[] iii = null;
                 //    ((Ingr.RAD2D.LineStringGeometry2d)((Ingr.RAD2D.DependencyObject)item).GetGeometry()).GetVertices(ref count, ref iii);
                 //    for (int i = 0; i < count; i++)
                 //    {
                 //        double x = 0;
                 //        double y = 0;
                 //        ((Ingr.RAD2D.LineStringGeometry2d)((Ingr.RAD2D.DependencyObject)item).GetGeometry()).GetVertex(i + 1, ref x, ref y);
                 //    }
                 //    Ingr.RAD2D.Symbol2d symbol2D;
                 //    //symbol2D.Move
                 //}
                 //commandControl.Application.RADApplication.Interactive = true;
                 //Hide();
-...
                 if (document.SetSPPIDMapping() && document.Enable)
+                {
                     AutoModeling modeling = new AutoModeling(document);
                     AutoModeling modeling = new AutoModeling(document, commandControl.Application.RADApplication);
                     modeling.Run();
+                }

DTI_PID/SPPIDConverter/SPPIDConverter.csproj
147	147	<Compile Include="Model\LineMapping.cs" />
148	148	<Compile Include="Model\AssociationMapping.cs" />
149	149	<Compile Include="Model\SymbolMapping.cs" />
	150	<Compile Include="Program.cs" />
150	151	<Compile Include="Properties\AssemblyInfo.cs" />
151	152	<Compile Include="Properties\Msg.Designer.cs">
152	153	<AutoGen>True</AutoGen>

+                }
+            }
             public static double CalcLineToPointDistance(double lineX1, double lineY1, double lineX2, double lineY2, double x, double y)
+            {
                 double distance = 0;
                 if (lineX1 == lineX2)
                     distance = Math.Abs(x - lineX1);
                 else
+                {
                     double a;
                     double b;
                     double c;
                     a = (lineY2 - lineY1) / (lineX2 - lineX1);
                     b = -1;
                     c = -a * lineX1 + lineY1;
                     distance = Math.Abs(a * x + b * y + c) / Math.Pow(a * a + b * b, 0.5);
+                }
                 return distance;
+            }
             #region
             public static bool IsBranchLine(string UID, Line connectedLine)
+            {

내보내기 Unified diff

프로젝트

일반

사용자정보

HYTOS

개정판 5e6ecf05