Commit 23c508ed236b55f88c3916733f3d98649fb56763
1 parent
ef52277ed4
Exists in
master
2045: Merge Setup Restriction + Commit demo
Showing 3 changed files with 4 additions and 71 deletions Side-by-side Diff
releases/RM2045/20170306_RM2045.rar
No preview for this file type
sources/RoboforkApp/DesignerCanvas.cs
| ... | ... | @@ -248,46 +248,6 @@ |
| 248 | 248 | }*/ |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | - //test | |
| 252 | - public void AddNewNode(Point FreeNode, bool RightClick) | |
| 253 | - { | |
| 254 | - pBlueNode.Stroke = new SolidColorBrush(Colors.Blue); | |
| 255 | - pBlueNode.Fill = new SolidColorBrush(Colors.LightBlue); | |
| 256 | - pBlueNode.StrokeThickness = STROKE_NODE; | |
| 257 | - pBlueNode.Data = gGrpBlueNode; | |
| 258 | - | |
| 259 | - TextBlock textBlock = new TextBlock(); | |
| 260 | - textBlock.Text = "1"; | |
| 261 | - textBlock.FontSize = 15; | |
| 262 | - textBlock.Foreground = new SolidColorBrush(Colors.White); | |
| 263 | - Canvas.SetLeft(textBlock, FreeNode.X-5 ); | |
| 264 | - Canvas.SetTop(textBlock, FreeNode.Y-8); | |
| 265 | - | |
| 266 | - AddNode(FreeNode, gGrpBlueNode); | |
| 267 | - | |
| 268 | - | |
| 269 | - //Ellipse myEllipse = new Ellipse(); | |
| 270 | - //SolidColorBrush mySolidColorBrush = new SolidColorBrush(); | |
| 271 | - //mySolidColorBrush.Color = Colors.Blue; | |
| 272 | - //myEllipse.Fill = mySolidColorBrush; | |
| 273 | - //myEllipse.StrokeThickness = 2; | |
| 274 | - //myEllipse.Stroke = Brushes.White; | |
| 275 | - //myEllipse.Width = 16d; | |
| 276 | - //myEllipse.Height = 16d; | |
| 277 | - //Canvas.SetLeft(myEllipse, FreeNode.X); | |
| 278 | - //Canvas.SetTop(myEllipse, FreeNode.Y); | |
| 279 | - | |
| 280 | - //this.Children.Add(myEllipse); | |
| 281 | - //this.Children.Add(pBlueNode); | |
| 282 | - this.Children.Add(textBlock); | |
| 283 | - | |
| 284 | - | |
| 285 | - | |
| 286 | - | |
| 287 | - | |
| 288 | - } | |
| 289 | - //test | |
| 290 | - | |
| 291 | 251 | protected override void OnMouseDown(MouseButtonEventArgs e) |
| 292 | 252 | { |
| 293 | 253 | base.OnMouseDown(e); |
| 294 | 254 | |
| ... | ... | @@ -335,25 +295,11 @@ |
| 335 | 295 | ProcessEndRoute(); |
| 336 | 296 | return; |
| 337 | 297 | } |
| 338 | - | |
| 339 | - // Draw curver line | |
| 340 | - //DrawCurver((LineGeometry)gGrpLine.Children[currentLine - 1], (LineGeometry)gGrpLine.Children[currentLine]); | |
| 341 | 298 | } |
| 342 | 299 | else |
| 343 | 300 | { |
| 344 | 301 | // Remove current line |
| 345 | 302 | gGrpLine.Children.RemoveAt(currentLine); |
| 346 | - // Remove yellow node | |
| 347 | - //if (gGrpYellowNode.Children.Count > 0) | |
| 348 | - //{ | |
| 349 | - // gGrpYellowNode.Children.RemoveAt(gGrpYellowNode.Children.Count - 1); | |
| 350 | - // gGrpYellowNode.Children.RemoveAt(gGrpYellowNode.Children.Count - 1); | |
| 351 | - //} | |
| 352 | - //// Remove curver line | |
| 353 | - //if (gGrpCurverLine.Children.Count > 0) | |
| 354 | - //{ | |
| 355 | - // gGrpCurverLine.Children.RemoveAt(gGrpCurverLine.Children.Count - 1); | |
| 356 | - //} | |
| 357 | 303 | |
| 358 | 304 | // Set end point to finish draw line |
| 359 | 305 | LineGeometry lineGeometry = (LineGeometry)gGrpLine.Children[currentLine - 1]; |
| ... | ... | @@ -366,14 +312,6 @@ |
| 366 | 312 | ProcessEndRoute(); |
| 367 | 313 | return; |
| 368 | 314 | } |
| 369 | - | |
| 370 | - //// Re-draw cuver line | |
| 371 | - //if (currentLine > 1) | |
| 372 | - //{ | |
| 373 | - // if (IsCurverNode((LineGeometry)gGrpLine.Children[currentLine - 2] | |
| 374 | - // , (LineGeometry)gGrpLine.Children[currentLine - 1])) | |
| 375 | - // DrawCurver((LineGeometry)gGrpLine.Children[currentLine - 2], (LineGeometry)gGrpLine.Children[currentLine - 1]); | |
| 376 | - //} | |
| 377 | 315 | } |
| 378 | 316 | |
| 379 | 317 | // Draw new line |
| ... | ... | @@ -2021,11 +1959,6 @@ |
| 2021 | 1959 | this.Children.Add(_startPoint); |
| 2022 | 1960 | } |
| 2023 | 1961 | } |
| 2024 | - | |
| 2025 | - | |
| 2026 | - | |
| 2027 | - | |
| 2028 | - | |
| 2029 | 1962 | |
| 2030 | 1963 | |
| 2031 | 1964 | #region Draw New FreeNode |
sources/RoboforkApp/RoboforkMenu.xaml
| ... | ... | @@ -40,12 +40,12 @@ |
| 40 | 40 | <TreeView > |
| 41 | 41 | <TreeViewItem IsExpanded="True" Header="Project [AAA工場]" FontSize="17" > |
| 42 | 42 | <TreeViewItem IsExpanded="True" Header="MAP" FontSize="17"> |
| 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> | |
| 43 | + <TreeViewItem Header="Setup Restriction" FontSize="17" Name="SetupRestriction" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetupRestriction"> | |
| 44 | + <!--<TreeViewItem Header="Set Start" FontSize="17" Name="btnSetStart" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetStart"></TreeViewItem> | |
| 45 | 45 | <TreeViewItem Header="Set Goal" FontSize="17" Name="btnSetGoal" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetGoal"></TreeViewItem> |
| 46 | 46 | <TreeViewItem Header="Set Route" FontSize="17" Name="btnSetRoute" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetupRoute"></TreeViewItem> |
| 47 | 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> | |
| 48 | + <TreeViewItem Header="Delete Route" FontSize="17" Name="btnDeleteRoute" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="DeleteRoute"></TreeViewItem>--> | |
| 49 | 49 | </TreeViewItem> |
| 50 | 50 | <TreeViewItem IsExpanded="True" Header="Node" FontSize="17" Name="NodeTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="NodeTree"> |
| 51 | 51 | </TreeViewItem> |
| ... | ... | @@ -107,7 +107,7 @@ |
| 107 | 107 | FontSize="17"> |
| 108 | 108 | </TreeViewItem> |
| 109 | 109 | </TreeViewItem> |
| 110 | - <TreeViewItem Header="Schedule" FontSize="17" Name="ScheduleTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="ScheduleRoute"></TreeViewItem> | |
| 110 | + <!--<TreeViewItem Header="Schedule" FontSize="17" Name="ScheduleTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="ScheduleRoute"></TreeViewItem>--> | |
| 111 | 111 | <TreeViewItem Header="Logging" |
| 112 | 112 | FontSize="17" |
| 113 | 113 | Name="LoggingTree" |