From 56b242f5703dc8e369a795544f4384ad4a1f1e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toan=20Tr=E1=BA=A7n?= <trantoan.bk53@gmail.com>
Date: Tue, 28 Mar 2017 23:24:49 +0700
Subject: [PATCH] Revert "RM2101 commit source"

This reverts commit 93c4a5599481ec075c375382e2163ca42f1f58ac.
---
 sources/RoboforkApp/Controls/DesignerCanvas.cs | 71 ++++++++------------------
 sources/RoboforkApp/RoboforkMenuView.xaml.cs   | 14 ++---
 2 files changed, 26 insertions(+), 59 deletions(-)

diff --git a/sources/RoboforkApp/Controls/DesignerCanvas.cs b/sources/RoboforkApp/Controls/DesignerCanvas.cs
index 3a6f877..f548d6d 100644
--- a/sources/RoboforkApp/Controls/DesignerCanvas.cs
+++ b/sources/RoboforkApp/Controls/DesignerCanvas.cs
@@ -3524,51 +3524,11 @@ namespace RoboforkApp
         /// <summary>
         /// Get infor node
         /// </summary>
-        public void UploadData()
-        {
-            if (ucNode_Lst.Count < 1)
-                return;
-
-            Robofork15DemoService service = new Robofork15DemoService();
-            for (int i = 0; i < ucNode_Lst.Count; i++)
-            {
-                Robofork15Demo node = new Robofork15Demo();
-                ucNode _ucScheduleNode = new ucNode();
-                _ucScheduleNode = ucNode_Lst[i];
-                node.NodeID = i + 1;
-                node.ForkNo = 1;
-                node.NodePos_x = Math.Round(Canvas.GetLeft(_ucScheduleNode) + UCNODE_SETLEFT, 2);
-                node.NodePos_y = Math.Round(Canvas.GetTop(_ucScheduleNode) + UCNODE_SETTOP, 2);
-                service.AddRobofork15Demo(node);
-            }
-
-            IEnumerable<Robofork15Demo> nodes = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x=>x.NodeID);
-
-            // Delete node
-            if (ucNode_Lst.Count() == nodes.Count())
-            {
-                GetInfoNode();
-                return;
-            }
-
-            for (int i = ucNode_Lst.Count(); i < nodes.Count(); i++)
-            {
-                Robofork15Demo node = new Robofork15Demo();
-                node = nodes.ElementAt(i);
-                service.DeleteRobofork15Demo(node);
-            }
-        }
-
-        /// <summary>
-        /// Get infor node
-        /// </summary>
         public void GetInfoNode()
         {
             var service = new Robofork15DemoService();
-
-            readMapFan = true;
             /*Read*/
-            IEnumerable<Robofork15Demo> nodes = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x => x.NodeID);
+            IEnumerable<Robofork15Demo> fork2PCs = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x => x.NodeID);
 
             //Clear Route Info Table
             ((RoboforkMenu)System.Windows.Application.Current.MainWindow).grdRouteInfo.Children.Clear();
@@ -3576,16 +3536,29 @@ namespace RoboforkApp
             // Process clear canvas
             ClearCanvas();
 
-            //int _RowIdx = 0;
-            foreach (var node in nodes)
+            int _RowIdx = 0;
+            foreach (var fork2PC in fork2PCs)
             {
-                //execCreateNode(new Point(ConvertPointActualToDisplay(node.NodePos_x, Scale_X, PointMapStart_X)
-                //                        , ConvertPointActualToDisplay(node.NodePos_y, Scale_X, PointMapStart_Y)));
-
-                execCreateNode(new Point(node.NodePos_x, node.NodePos_y));
+                ucNode _ucNode = new ucNode();
+                _ucNode.txtNode = fork2PC.NodeID.ToString();
+                _ucNode.IsDragDelta = true;
+                _ucNode._dataNode = fork2PC;
+                Canvas.SetLeft(_ucNode, fork2PC.NodePos_x - UCNODE_SETLEFT);
+                Canvas.SetTop(_ucNode, fork2PC.NodePos_y - UCNODE_SETTOP);
+                ucNode_Lst.Add(_ucNode);
+                this.Children.Add(_ucNode);
+
+                //Column 1 : node index
+                AddLabeltoGrid(_RowIdx, 0, fork2PC.NodeID.ToString());
+
+                //Column 2 : Pos_X, Pos_Y, Speed
+                AddLabeltoGrid(_RowIdx, 1, "LAT: " + fork2PC.NodePos_x.ToString());
+                _RowIdx++;
+                AddLabeltoGrid(_RowIdx, 1, "LOC: " + fork2PC.NodePos_y.ToString());
+                _RowIdx++;
+                AddLabeltoGrid(_RowIdx, 1, "SPD: " + fork2PC.NodeVehSpd.ToString() + "Km/h");
+                _RowIdx++;
             }
-
-            CreateVehicleNode();
         }
 
         /// <summary>
diff --git a/sources/RoboforkApp/RoboforkMenuView.xaml.cs b/sources/RoboforkApp/RoboforkMenuView.xaml.cs
index e82c089..efcbde1 100644
--- a/sources/RoboforkApp/RoboforkMenuView.xaml.cs
+++ b/sources/RoboforkApp/RoboforkMenuView.xaml.cs
@@ -41,16 +41,16 @@ namespace RoboforkApp
             MyDesignerCanvas.InitDrawRoute();
             MyDesignerCanvas.scheduleCanvas = MyScheduleCanvas;
 
+
+
         }
 
+
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             GetScaleCanVas();
             GetScheduleCanVas();
             MyDesignerCanvas.ReadFile();
-            NewDoBeginSetFreeNotes();
-            DesignerCanvas.isDrawingNode = true;
-            MyDesignerCanvas.GetInfoNode();
             DisplayMap_1();
         }
 
@@ -220,13 +220,7 @@ namespace RoboforkApp
 
         private void DoBeginTask()
         {
-            //MyScheduleCanvas.CreateSimulation(MyDesignerCanvas.ucScheduleNode_Lst, MyDesignerCanvas.ProjectModel.ProjectModelList[MyDesignerCanvas.ProjectIndex], MyDesignerCanvas.VehicleIndex);
-            MessageBoxResult result = MessageBox.Show("Do you want upload data?", "Upload data", MessageBoxButton.OKCancel);
-            if (result == MessageBoxResult.OK)
-            {
-                MyDesignerCanvas.UploadData();
-                MyDesignerCanvas.GetInfoNode();
-            }
+            MyScheduleCanvas.CreateSimulation(MyDesignerCanvas.ucScheduleNode_Lst, MyDesignerCanvas.ProjectModel.ProjectModelList[MyDesignerCanvas.ProjectIndex], MyDesignerCanvas.VehicleIndex);
         }
 
         private void DoBeginSetAutoNotes()
-- 
1.8.5.3