toan / Robofork

Download as
Browse Code ยป

Commit fa577fd8d4e73e258ededa6462f80bb5c0358898

Authored by toan
1 parent 6870a03e36
Exists in master

2036: Update follow new map

Showing 3 changed files with 154 additions and 52 deletions Side-by-side Diff

sources/RoboforkApp/DesignerCanvas.cs
Diff comments   View file @ fa577fd
... ... @@ -703,52 +703,55 @@
703 703 /// </summary>
704 704 public void MakeRoot()
705 705 {
706   - LineGeometry lineGeometry;
707   - EllipseGeometry ellipseGeometry;
708   - Point startPoint;
709   - Point endPoint;
  706 + //LineGeometry lineGeometry;
  707 + //EllipseGeometry ellipseGeometry;
  708 + //Point startPoint;
  709 + //Point endPoint;
710 710  
711 711 // If still not route
712 712 if (gGrpLine.Children.Count == 0)
713 713 return;
714 714  
715   - // Setting for path line
716   - pRootLine.Stroke = new SolidColorBrush(Colors.Red);
717   - pRootLine.StrokeThickness = STROKE_ROOT_LINE;
718   - pRootLine.Data = gGrpRootLine;
719   - this.Children.Add(pRootLine);
  715 + pLine.Stroke = new SolidColorBrush(Colors.Red);
  716 + pLine.StrokeThickness = STROKE_ROOT_LINE;
720 717  
  718 + //// Setting for path line
  719 + //pRootLine.Stroke = new SolidColorBrush(Colors.Red);
  720 + //pRootLine.StrokeThickness = STROKE_ROOT_LINE;
  721 + //pRootLine.Data = gGrpRootLine;
  722 + //this.Children.Add(pRootLine);
  723 +
721 724 // Setting for path curver line
722   - pCurverLine.StrokeThickness = STROKE_ROOT_LINE;
  725 + //pCurverLine.StrokeThickness = STROKE_ROOT_LINE;
723 726  
724   - // Get start point
725   - lineGeometry = (LineGeometry)gGrpLine.Children[0];
726   - startPoint = lineGeometry.StartPoint;
  727 + //// Get start point
  728 + //lineGeometry = (LineGeometry)gGrpLine.Children[0];
  729 + //startPoint = lineGeometry.StartPoint;
727 730  
728   - for (int i = 0; i < gGrpYellowNode.Children.Count; i = i + 2)
729   - {
730   - ellipseGeometry = (EllipseGeometry)gGrpYellowNode.Children[i];
731   - endPoint = ellipseGeometry.Center;
  731 + //for (int i = 0; i < gGrpYellowNode.Children.Count; i = i + 2)
  732 + //{
  733 + // ellipseGeometry = (EllipseGeometry)gGrpYellowNode.Children[i];
  734 + // endPoint = ellipseGeometry.Center;
732 735  
733   - DrawLine(startPoint, endPoint, gGrpRootLine);
  736 + // DrawLine(startPoint, endPoint, gGrpRootLine);
734 737  
735   - ellipseGeometry = (EllipseGeometry)gGrpYellowNode.Children[i + 1];
736   - startPoint = ellipseGeometry.Center;
737   - }
  738 + // ellipseGeometry = (EllipseGeometry)gGrpYellowNode.Children[i + 1];
  739 + // startPoint = ellipseGeometry.Center;
  740 + //}
738 741  
739   - lineGeometry = (LineGeometry)gGrpLine.Children[gGrpLine.Children.Count - 1];
740   - endPoint = lineGeometry.EndPoint;
  742 + //lineGeometry = (LineGeometry)gGrpLine.Children[gGrpLine.Children.Count - 1];
  743 + //endPoint = lineGeometry.EndPoint;
741 744  
742   - DrawLine(startPoint, endPoint, gGrpRootLine);
  745 + //DrawLine(startPoint, endPoint, gGrpRootLine);
743 746  
744   - this.Children.Remove(pYellowNode);
745   - this.Children.Remove(pBlueNode);
746   - this.Children.Remove(_startPoint);
747   - this.Children.Remove(_goalPoint);
748   - this.Children.Add(pYellowNode);
749   - this.Children.Add(pBlueNode);
750   - this.Children.Add(_startPoint);
751   - this.Children.Add(_goalPoint);
  747 + //this.Children.Remove(pYellowNode);
  748 + //this.Children.Remove(pBlueNode);
  749 + //this.Children.Remove(_startPoint);
  750 + //this.Children.Remove(_goalPoint);
  751 + //this.Children.Add(pYellowNode);
  752 + //this.Children.Add(pBlueNode);
  753 + //this.Children.Add(_startPoint);
  754 + //this.Children.Add(_goalPoint);
752 755 }
753 756  
754 757 /// <summary>
755 758  
756 759  
... ... @@ -904,20 +907,20 @@
904 907 endPoint = new Point(newLine.StartPoint.X + radius, newLine.StartPoint.Y);
905 908 }
906 909  
907   - // Setting sweep direction
908   - SweepDirection sweepDirection = SweepDirection.Clockwise;
909   - if (IsVerticalLine(oldLine) && ((startPoint.Y - endPoint.Y) * (startPoint.X - endPoint.X)) > 0)
910   - {
911   - sweepDirection = SweepDirection.Counterclockwise;
912   - }
  910 + //// Setting sweep direction
  911 + //SweepDirection sweepDirection = SweepDirection.Clockwise;
  912 + //if (IsVerticalLine(oldLine) && ((startPoint.Y - endPoint.Y) * (startPoint.X - endPoint.X)) > 0)
  913 + //{
  914 + // sweepDirection = SweepDirection.Counterclockwise;
  915 + //}
913 916  
914   - if (!IsVerticalLine(oldLine) && ((startPoint.Y - endPoint.Y) * (startPoint.X - endPoint.X)) < 0)
915   - {
916   - sweepDirection = SweepDirection.Counterclockwise;
917   - }
  917 + //if (!IsVerticalLine(oldLine) && ((startPoint.Y - endPoint.Y) * (startPoint.X - endPoint.X)) < 0)
  918 + //{
  919 + // sweepDirection = SweepDirection.Counterclockwise;
  920 + //}
918 921  
919   - // Add curver line
920   - DrawCurverLine(startPoint, endPoint, sweepDirection, gGrpCurverLine);
  922 + //// Add curver line
  923 + //DrawCurverLine(startPoint, endPoint, sweepDirection, gGrpCurverLine);
921 924  
922 925 // Add node to postion distance 1300mm
923 926 AddNode(startPoint, gGrpYellowNode);
sources/RoboforkApp/RoboforkMenu.xaml
Diff comments   View file @ fa577fd
... ... @@ -40,12 +40,12 @@
40 40 <TreeView >
41 41 <TreeViewItem Header="Project [AAAๅทฅๅ ด]" FontSize="17">
42 42 <TreeViewItem Header="MAP" FontSize="17">
43   - <TreeViewItem Header="Pass plan"
44   - FontSize="17"
45   - Name="PassplanTree"
46   - Selected="GetPassplanTree"
47   - Unselected="SetPassplanTree"
48   - >
  43 + <TreeViewItem Header="Pass plan" FontSize="17" Name="PassplanTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="PassplanTree">
  44 + <TreeViewItem Header="Set Start" FontSize="17" Name="btnSetStart" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetStart"></TreeViewItem>
  45 + <TreeViewItem Header="Set Goal" FontSize="17" Name="btnSetGoal" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetGoal"></TreeViewItem>
  46 + <TreeViewItem Header="Set Route" FontSize="17" Name="btnSetRoute" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetupRoute"></TreeViewItem>
  47 + <TreeViewItem Header="Make Root" FontSize="17" Name="btnMakeRoot" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="MakeRoot"></TreeViewItem>
  48 + <TreeViewItem Header="Delete Route" FontSize="17" Name="btnDeleteRoute" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="DeleteRoute"></TreeViewItem>
49 49 </TreeViewItem>
50 50 <TreeViewItem Header="Node"
51 51 FontSize="17"
... ... @@ -188,7 +188,7 @@
188 188 Background="White" HorizontalAlignment="Stretch">
189 189 <Canvas.LayoutTransform>
190 190 <!--Adjust ScaleX and ScaleY in lock-step to zoom-->
191   - <ScaleTransform ScaleX=".8" ScaleY=".8" CenterX=".8" CenterY=".8" />
  191 + <ScaleTransform ScaleX=".67" ScaleY=".59" CenterX=".67" CenterY=".59" />
192 192 </Canvas.LayoutTransform>
193 193 <Grid Name="MCGrid" Background="White" ShowGridLines="True"
194 194 Width="{Binding ActualWidth, ElementName=MyDesignerCanvas}"
sources/RoboforkApp/RoboforkMenu.xaml.cs
Diff comments   View file @ fa577fd
... ... @@ -32,6 +32,105 @@
32 32  
33 33 }
34 34  
  35 + private void btnMenu_Selected(object sender, RoutedEventArgs e)
  36 + {
  37 + if (((TreeViewItem)sender) == null)
  38 + {
  39 + return;
  40 + }
  41 +
  42 + string tag = ((TreeViewItem)sender).Tag.ToString();
  43 + switch (tag)
  44 + {
  45 + case "SetStart":
  46 + DoBeginSetStart();
  47 + break;
  48 +
  49 + case "SetGoal":
  50 + DoBeginSetGoal();
  51 + break;
  52 +
  53 + case "SetupRoute":
  54 + DoBeginSetupRoute();
  55 + break;
  56 +
  57 + case "MakeRoot":
  58 + DoBeginMakeRoot();
  59 + break;
  60 +
  61 + case "DeleteRoute":
  62 + DoBeginDeleteRoute();
  63 + break;
  64 + default:
  65 + break;
  66 + }
  67 + }
  68 +
  69 + private void btnMenu_UnselectedSet(object sender, RoutedEventArgs e)
  70 + {
  71 + if (((TreeViewItem)sender) == null)
  72 + {
  73 + return;
  74 + }
  75 +
  76 + string tag = ((TreeViewItem)sender).Tag.ToString();
  77 + switch (tag)
  78 + {
  79 + case "SetStart":
  80 + //DoBeginSetStart();
  81 + break;
  82 +
  83 + case "SetGoal":
  84 + //DoBeginSetGoal();
  85 + break;
  86 +
  87 + case "DeleteRoute":
  88 + //DoBeginDeleteRoute();
  89 + break;
  90 +
  91 + case "SetupRoute":
  92 + //DoBeginSetupRoute();
  93 + break;
  94 +
  95 + case "MakeRoot":
  96 + //DoBeginMakeRoot();
  97 + break;
  98 +
  99 + default:
  100 + break;
  101 + }
  102 + }
  103 +
  104 + private void DoBeginSetStart()
  105 + {
  106 + MyDesignerCanvas.CreateStartPoint();
  107 + }
  108 +
  109 + private void DoBeginSetGoal()
  110 + {
  111 + MyDesignerCanvas.CreateGoalPoint();
  112 + }
  113 +
  114 + private void DoBeginSetupRoute()
  115 + {
  116 + MyDesignerCanvas.Operation = DesignerCanvas.OperationState.DrawRoute;
  117 + }
  118 +
  119 + private void DoBeginMakeRoot()
  120 + {
  121 + MyDesignerCanvas.Children.Remove(MyDesignerCanvas.pRootLine);
  122 + MyDesignerCanvas.MakeRoot();
  123 + }
  124 +
  125 + private void DoBeginDeleteRoute()
  126 + {
  127 + MessageBoxResult result = MessageBox.Show("Do you want delete route?", "Delete route", MessageBoxButton.OKCancel);
  128 + if (result == MessageBoxResult.OK)
  129 + {
  130 + MyDesignerCanvas.ClearRoute();
  131 + }
  132 + }
  133 +
35 134 private void GetPassplanTree(object sender, RoutedEventArgs e)
36 135 {
37 136 MessageBoxResult result = MessageBox.Show("Selected PassplanTree", "", MessageBoxButton.OKCancel);