From ef52277ed4d5a1e6c13f1d77d5609c62b257db52 Mon Sep 17 00:00:00 2001
From: "SVL-PC005-2\\DOAN" <dangdoan1229@gmail.com>
Date: Mon, 6 Mar 2017 00:23:13 +0700
Subject: [PATCH] =?UTF-8?q?=E9=96=8B=E7=99=BA=20#2045=20:=20node=20?=
 =?UTF-8?q?=E3=81=AE=E8=A8=AD=E7=BD=AE=E3=81=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sources/RoboforkApp/DesignerCanvas.cs       | 28 ++++++++++++++++++++++++----
 sources/RoboforkApp/RoboforkApp.csproj      |  1 +
 sources/RoboforkApp/RoboforkApp.csproj.user |  1 +
 sources/RoboforkApp/RoboforkMenu.xaml       | 18 ------------------
 4 files changed, 26 insertions(+), 22 deletions(-)

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> NewNodeInfo_List = new List<NewNodeInfo>();
         List<TextBlock> NodeNo = new List<TextBlock>();
         List<ucNode> ucNode_Lst = new List<ucNode>();
+        List<ucNode> ucScheduleNode_Lst = new List<ucNode>();
         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<double> distance = new List<double>();
             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 @@
     <Compile Include="RoboforkMenu.xaml.cs">
       <DependentUpon>RoboforkMenu.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ScheduleCanvas.cs" />
     <Compile Include="UserControls\ucDisplayCoordinate.xaml.cs">
       <DependentUpon>ucDisplayCoordinate.xaml</DependentUpon>
     </Compile>
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 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>en-US</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
 </Project>
\ 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 @@
                                             </Grid.RowDefinitions>
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
-                                                <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
-                                            <TextBlock Grid.Row="0" Grid.Column="1" Foreground="SkyBlue">100</TextBlock>
-                                            <TextBlock Grid.Row="0" Grid.Column="2" Foreground="SkyBlue">200</TextBlock>
-                                            <TextBlock Grid.Row="0" Grid.Column="3" Foreground="SkyBlue">300</TextBlock>
-                                            <TextBlock Grid.Row="0" Grid.Column="4" Foreground="SkyBlue">400</TextBlock>
-                                            <TextBlock Grid.Row="0" Grid.Column="5" Foreground="SkyBlue">500</TextBlock>
-                                            <TextBlock Grid.Row="0" Grid.Column="6" Foreground="SkyBlue">600</TextBlock>
-                                            <TextBlock Grid.Row="0" Grid.Column="7" Foreground="SkyBlue">700</TextBlock>
-                                            <TextBlock Grid.Row="0" Grid.Column="8" Foreground="SkyBlue">800</TextBlock>
-                                            <TextBlock Grid.Row="0" Grid.Column="9" Foreground="SkyBlue">900</TextBlock>
 
                                             <TextBlock Grid.Row="1" Grid.Column="0" Foreground="SkyBlue">100</TextBlock>
                                             <!--<TextBlock Grid.Row="2" Grid.Column="0" Foreground="SkyBlue">200</TextBlock>-->
-- 
1.8.5.3