RM2101 commit source

toan · toan
1 parent 38023b2669
Showing 2 changed files with 59 additions and 26 deletions Side-by-side Diff
sources/RoboforkApp/Controls/DesignerCanvas.cs
sources/RoboforkApp/RoboforkMenuView.xaml.cs
@@ -3524,11 +3524,51 @@
         /// <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> fork2PCs = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x => x.NodeID);
+            IEnumerable<Robofork15Demo> nodes = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x => x.NodeID);
  
             //Clear Route Info Table
             ((RoboforkMenu)System.Windows.Application.Current.MainWindow).grdRouteInfo.Children.Clear();
  
  
  
@@ -3536,29 +3576,16 @@
             // Process clear canvas
             ClearCanvas();
  
-            int _RowIdx = 0;
-            foreach (var fork2PC in fork2PCs)
+            //int _RowIdx = 0;
+            foreach (var node in nodes)
             {
-                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);
+                //execCreateNode(new Point(ConvertPointActualToDisplay(node.NodePos_x, Scale_X, PointMapStart_X)
+                //                        , ConvertPointActualToDisplay(node.NodePos_y, Scale_X, PointMapStart_Y)));
  
-                //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++;
+                execCreateNode(new Point(node.NodePos_x, node.NodePos_y));
             }
+
+            CreateVehicleNode();
         }
  
         /// <summary>
@@ -41,16 +41,16 @@
             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,7 +220,13 @@
  
         private void DoBeginTask()
         {
-            MyScheduleCanvas.CreateSimulation(MyDesignerCanvas.ucScheduleNode_Lst, MyDesignerCanvas.ProjectModel.ProjectModelList[MyDesignerCanvas.ProjectIndex], MyDesignerCanvas.VehicleIndex);
+            //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();
+            }
         }
  
         private void DoBeginSetAutoNotes()
...	...	@@ -3524,11 +3524,51 @@
3524	3524	/// <summary>
3525	3525	/// Get infor node
3526	3526	/// </summary>
	3527	+ public void UploadData()
	3528	+ {
	3529	+ if (ucNode_Lst.Count < 1)
	3530	+ return;
	3531	+
	3532	+ Robofork15DemoService service = new Robofork15DemoService();
	3533	+ for (int i = 0; i < ucNode_Lst.Count; i++)
	3534	+ {
	3535	+ Robofork15Demo node = new Robofork15Demo();
	3536	+ ucNode _ucScheduleNode = new ucNode();
	3537	+ _ucScheduleNode = ucNode_Lst[i];
	3538	+ node.NodeID = i + 1;
	3539	+ node.ForkNo = 1;
	3540	+ node.NodePos_x = Math.Round(Canvas.GetLeft(_ucScheduleNode) + UCNODE_SETLEFT, 2);
	3541	+ node.NodePos_y = Math.Round(Canvas.GetTop(_ucScheduleNode) + UCNODE_SETTOP, 2);
	3542	+ service.AddRobofork15Demo(node);
	3543	+ }
	3544	+
	3545	+ IEnumerable<Robofork15Demo> nodes = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x=>x.NodeID);
	3546	+
	3547	+ // Delete node
	3548	+ if (ucNode_Lst.Count() == nodes.Count())
	3549	+ {
	3550	+ GetInfoNode();
	3551	+ return;
	3552	+ }
	3553	+
	3554	+ for (int i = ucNode_Lst.Count(); i < nodes.Count(); i++)
	3555	+ {
	3556	+ Robofork15Demo node = new Robofork15Demo();
	3557	+ node = nodes.ElementAt(i);
	3558	+ service.DeleteRobofork15Demo(node);
	3559	+ }
	3560	+ }
	3561	+
	3562	+ /// <summary>
	3563	+ /// Get infor node
	3564	+ /// </summary>
3527	3565	public void GetInfoNode()
3528	3566	{
3529	3567	var service = new Robofork15DemoService();
	3568	+
	3569	+ readMapFan = true;
3530	3570	/Read/
3531		- IEnumerable<Robofork15Demo> fork2PCs = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x => x.NodeID);
	3571	+ IEnumerable<Robofork15Demo> nodes = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x => x.NodeID);
3532	3572
3533	3573	//Clear Route Info Table
3534	3574	((RoboforkMenu)System.Windows.Application.Current.MainWindow).grdRouteInfo.Children.Clear();
3535	3575
3536	3576
3537	3577
...	...	@@ -3536,29 +3576,16 @@
3536	3576	// Process clear canvas
3537	3577	ClearCanvas();
3538	3578
3539		- int _RowIdx = 0;
3540		- foreach (var fork2PC in fork2PCs)
	3579	+ //int _RowIdx = 0;
	3580	+ foreach (var node in nodes)
3541	3581	{
3542		- ucNode _ucNode = new ucNode();
3543		- _ucNode.txtNode = fork2PC.NodeID.ToString();
3544		- _ucNode.IsDragDelta = true;
3545		- _ucNode._dataNode = fork2PC;
3546		- Canvas.SetLeft(_ucNode, fork2PC.NodePos_x - UCNODE_SETLEFT);
3547		- Canvas.SetTop(_ucNode, fork2PC.NodePos_y - UCNODE_SETTOP);
3548		- ucNode_Lst.Add(_ucNode);
3549		- this.Children.Add(_ucNode);
	3582	+ //execCreateNode(new Point(ConvertPointActualToDisplay(node.NodePos_x, Scale_X, PointMapStart_X)
	3583	+ // , ConvertPointActualToDisplay(node.NodePos_y, Scale_X, PointMapStart_Y)));
3550	3584
3551		- //Column 1 : node index
3552		- AddLabeltoGrid(_RowIdx, 0, fork2PC.NodeID.ToString());
3553		-
3554		- //Column 2 : Pos_X, Pos_Y, Speed
3555		- AddLabeltoGrid(_RowIdx, 1, "LAT: " + fork2PC.NodePos_x.ToString());
3556		- _RowIdx++;
3557		- AddLabeltoGrid(_RowIdx, 1, "LOC: " + fork2PC.NodePos_y.ToString());
3558		- _RowIdx++;
3559		- AddLabeltoGrid(_RowIdx, 1, "SPD: " + fork2PC.NodeVehSpd.ToString() + "Km/h");
3560		- _RowIdx++;
	3585	+ execCreateNode(new Point(node.NodePos_x, node.NodePos_y));
3561	3586	}
	3587	+
	3588	+ CreateVehicleNode();
3562	3589	}
3563	3590
3564	3591	/// <summary>
...	...	@@ -41,16 +41,16 @@
41	41	MyDesignerCanvas.InitDrawRoute();
42	42	MyDesignerCanvas.scheduleCanvas = MyScheduleCanvas;
43	43
44		-
45		-
46	44	}
47	45
48		-
49	46	private void Window_Loaded(object sender, RoutedEventArgs e)
50	47	{
51	48	GetScaleCanVas();
52	49	GetScheduleCanVas();
53	50	MyDesignerCanvas.ReadFile();
	51	+ NewDoBeginSetFreeNotes();
	52	+ DesignerCanvas.isDrawingNode = true;
	53	+ MyDesignerCanvas.GetInfoNode();
54	54	DisplayMap_1();
55	55	}
56	56
...	...	@@ -220,7 +220,13 @@
220	220
221	221	private void DoBeginTask()
222	222	{
223		- MyScheduleCanvas.CreateSimulation(MyDesignerCanvas.ucScheduleNode_Lst, MyDesignerCanvas.ProjectModel.ProjectModelList[MyDesignerCanvas.ProjectIndex], MyDesignerCanvas.VehicleIndex);
	223	+ //MyScheduleCanvas.CreateSimulation(MyDesignerCanvas.ucScheduleNode_Lst, MyDesignerCanvas.ProjectModel.ProjectModelList[MyDesignerCanvas.ProjectIndex], MyDesignerCanvas.VehicleIndex);
	224	+ MessageBoxResult result = MessageBox.Show("Do you want upload data?", "Upload data", MessageBoxButton.OKCancel);
	225	+ if (result == MessageBoxResult.OK)
	226	+ {
	227	+ MyDesignerCanvas.UploadData();
	228	+ MyDesignerCanvas.GetInfoNode();
	229	+ }
224	230	}
225	231
226	232	private void DoBeginSetAutoNotes()