toan / Robofork

Compare View

switch
from
...
to
 
Commits (4)

Changes

Showing 2 changed files Side-by-side Diff

sources/RoboforkApp/Controls/DesignerCanvas.cs
Diff comments   View file @ e658bdc
... ... @@ -3532,11 +3532,51 @@ namespace RoboforkApp
3532 3532 /// <summary>
3533 3533 /// Get infor node
3534 3534 /// </summary>
  3535 + public void UploadData()
  3536 + {
  3537 + if (ucNode_Lst.Count < 1)
  3538 + return;
  3539 +
  3540 + Robofork15DemoService service = new Robofork15DemoService();
  3541 + for (int i = 0; i < ucNode_Lst.Count; i++)
  3542 + {
  3543 + Robofork15Demo node = new Robofork15Demo();
  3544 + ucNode _ucScheduleNode = new ucNode();
  3545 + _ucScheduleNode = ucNode_Lst[i];
  3546 + node.NodeID = i + 1;
  3547 + node.ForkNo = 1;
  3548 + node.NodePos_x = Math.Round(Canvas.GetLeft(_ucScheduleNode) + UCNODE_SETLEFT, 2);
  3549 + node.NodePos_y = Math.Round(Canvas.GetTop(_ucScheduleNode) + UCNODE_SETTOP, 2);
  3550 + service.AddRobofork15Demo(node);
  3551 + }
  3552 +
  3553 + IEnumerable<Robofork15Demo> nodes = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x => x.NodeID);
  3554 +
  3555 + // Delete node
  3556 + if (ucNode_Lst.Count() == nodes.Count())
  3557 + {
  3558 + GetInfoNode();
  3559 + return;
  3560 + }
  3561 +
  3562 + for (int i = ucNode_Lst.Count(); i < nodes.Count(); i++)
  3563 + {
  3564 + Robofork15Demo node = new Robofork15Demo();
  3565 + node = nodes.ElementAt(i);
  3566 + service.DeleteRobofork15Demo(node);
  3567 + }
  3568 + }
  3569 +
  3570 + /// <summary>
  3571 + /// Get infor node
  3572 + /// </summary>
3535 3573 public void GetInfoNode()
3536 3574 {
3537 3575 var service = new Robofork15DemoService();
  3576 +
  3577 + readMapFan = true;
3538 3578 /*Read*/
3539   - IEnumerable<Robofork15Demo> fork2PCs = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x => x.NodeID);
  3579 + IEnumerable<Robofork15Demo> nodes = service.GetAllRobofork15Demos().Where(x => x.ForkNo == 1).OrderBy(x => x.NodeID);
3540 3580  
3541 3581 //Clear Route Info Table
3542 3582 ((RoboforkMenu)System.Windows.Application.Current.MainWindow).grdRouteInfo.Children.Clear();
... ... @@ -3544,29 +3584,16 @@ namespace RoboforkApp
3544 3584 // Process clear canvas
3545 3585 ClearCanvas();
3546 3586  
3547   - int _RowIdx = 0;
3548   - foreach (var fork2PC in fork2PCs)
  3587 + //int _RowIdx = 0;
  3588 + foreach (var node in nodes)
3549 3589 {
3550   - ucNode _ucNode = new ucNode();
3551   - _ucNode.txtNode = fork2PC.NodeID.ToString();
3552   - _ucNode.IsDragDelta = true;
3553   - _ucNode._dataNode = fork2PC;
3554   - Canvas.SetLeft(_ucNode, fork2PC.NodePos_x - UCNODE_SETLEFT);
3555   - Canvas.SetTop(_ucNode, fork2PC.NodePos_y - UCNODE_SETTOP);
3556   - ucNode_Lst.Add(_ucNode);
3557   - this.Children.Add(_ucNode);
3558   -
3559   - //Column 1 : node index
3560   - AddLabeltoGrid(_RowIdx, 0, fork2PC.NodeID.ToString());
3561   -
3562   - //Column 2 : Pos_X, Pos_Y, Speed
3563   - AddLabeltoGrid(_RowIdx, 1, "LAT: " + fork2PC.NodePos_x.ToString());
3564   - _RowIdx++;
3565   - AddLabeltoGrid(_RowIdx, 1, "LOC: " + fork2PC.NodePos_y.ToString());
3566   - _RowIdx++;
3567   - AddLabeltoGrid(_RowIdx, 1, "SPD: " + fork2PC.NodeVehSpd.ToString() + "Km/h");
3568   - _RowIdx++;
  3590 + //execCreateNode(new Point(ConvertPointActualToDisplay(node.NodePos_x, Scale_X, PointMapStart_X)
  3591 + // , ConvertPointActualToDisplay(node.NodePos_y, Scale_X, PointMapStart_Y)));
  3592 +
  3593 + execCreateNode(new Point(node.NodePos_x, node.NodePos_y));
3569 3594 }
  3595 +
  3596 + CreateVehicleNode();
3570 3597 }
3571 3598  
3572 3599 /// <summary>
sources/RoboforkApp/RoboforkMenuView.xaml.cs
Diff comments   View file @ e658bdc
... ... @@ -51,6 +51,9 @@ namespace RoboforkApp
51 51 GetScaleCanVas();
52 52 GetScheduleCanVas();
53 53 MyDesignerCanvas.ReadFile();
  54 + NewDoBeginSetFreeNotes();
  55 + DesignerCanvas.isDrawingNode = true;
  56 + MyDesignerCanvas.GetInfoNode();
54 57 DisplayMap_1();
55 58 }
56 59  
... ... @@ -220,7 +223,13 @@ namespace RoboforkApp
220 223  
221 224 private void DoBeginTask()
222 225 {
223   - MyScheduleCanvas.CreateSimulation(MyDesignerCanvas.ucScheduleNode_Lst, MyDesignerCanvas.ProjectModel.ProjectModelList[MyDesignerCanvas.ProjectIndex], MyDesignerCanvas.VehicleIndex);
  226 + //MyScheduleCanvas.CreateSimulation(MyDesignerCanvas.ucScheduleNode_Lst, MyDesignerCanvas.ProjectModel.ProjectModelList[MyDesignerCanvas.ProjectIndex], MyDesignerCanvas.VehicleIndex);
  227 + MessageBoxResult result = MessageBox.Show("Do you want upload data?", "Upload data", MessageBoxButton.OKCancel);
  228 + if (result == MessageBoxResult.OK)
  229 + {
  230 + MyDesignerCanvas.UploadData();
  231 + MyDesignerCanvas.GetInfoNode();
  232 + }
224 233 }
225 234  
226 235 private void DoBeginSetAutoNotes()