diff --git a/sources/RoboforkApp/DesignerCanvas.cs b/sources/RoboforkApp/DesignerCanvas.cs index 20f8724..ed8924d 100644 --- a/sources/RoboforkApp/DesignerCanvas.cs +++ b/sources/RoboforkApp/DesignerCanvas.cs @@ -79,6 +79,7 @@ namespace RoboforkApp List NewNodeInfo_List = new List(); List NodeNo = new List(); List ucNode_Lst = new List(); + List ucScheduleNode_Lst = new List(); int stt = 1; //2017/03/04 NAM ADD END @@ -2413,6 +2414,8 @@ namespace RoboforkApp DeleteNode(i); + SetScheduleRoute(); + return; } else @@ -2464,6 +2467,8 @@ namespace RoboforkApp FreeNode.X = XXX; FreeNode.Y = YYY; AddNode(FreeNode, gGrpBlueNode); + + SetScheduleRoute(); //ve line if (stt > 1) @@ -2499,12 +2504,26 @@ namespace RoboforkApp Point node_1; Point node_2; Point node_Schedule = new Point(); + double x_1 = 50; + double y_1 = 80; + double Totaldistance = 1270; + + if (ucScheduleNode_Lst.Count > 0) + { + for (int i = 0; i < ucScheduleNode_Lst.Count; i++) + { + ucNode _ucNode = new ucNode(); + _ucNode = ucScheduleNode_Lst[i]; + scheduleCanvas.Children.Remove(_ucNode); + + } + ucScheduleNode_Lst.Clear(); + } gGrpScheduleNode.Children.Clear(); gGrpScheduleLine.Children.Clear(); - double Totaldistance = 1000; List distance = new List(); double addDistance; @@ -2557,15 +2576,15 @@ namespace RoboforkApp } } - node_Schedule.X = 50; - node_Schedule.Y = 100; + node_Schedule.X = x_1; + node_Schedule.Y = y_1; AddNode(node_Schedule, gGrpScheduleNode); addDistance = 0; for (int i = 0; i < distance.Count; i++) { - node_Schedule.Y = 100; + node_Schedule.Y = y_1; addDistance = addDistance + distance[i]; node_Schedule.X = addDistance; AddNode(node_Schedule, gGrpScheduleNode); @@ -2609,6 +2628,7 @@ namespace RoboforkApp Canvas.SetLeft(_ucNode, point.X - 25); Canvas.SetTop(_ucNode, point.Y - 25); scheduleCanvas.Children.Add(_ucNode); + ucScheduleNode_Lst.Add(_ucNode); } #endregion diff --git a/sources/RoboforkApp/RoboforkApp.csproj b/sources/RoboforkApp/RoboforkApp.csproj index 4b27381..eabfe33 100644 --- a/sources/RoboforkApp/RoboforkApp.csproj +++ b/sources/RoboforkApp/RoboforkApp.csproj @@ -124,6 +124,7 @@ RoboforkMenu.xaml + ucDisplayCoordinate.xaml diff --git a/sources/RoboforkApp/RoboforkApp.csproj.user b/sources/RoboforkApp/RoboforkApp.csproj.user index 4a9dac5..6e4c912 100644 --- a/sources/RoboforkApp/RoboforkApp.csproj.user +++ b/sources/RoboforkApp/RoboforkApp.csproj.user @@ -9,5 +9,6 @@ en-US false + ShowAllFiles \ No newline at end of file diff --git a/sources/RoboforkApp/RoboforkMenu.xaml b/sources/RoboforkApp/RoboforkMenu.xaml index 3cfb280..2c1c5cb 100644 --- a/sources/RoboforkApp/RoboforkMenu.xaml +++ b/sources/RoboforkApp/RoboforkMenu.xaml @@ -333,25 +333,7 @@ - - - - - - - - - - 100 - 200 - 300 - 400 - 500 - 600 - 700 - 800 - 900 100