toan / Robofork

Download as
Browse Code »

Commit d178b140a278b6381ef3e4d6bb13d0588fb87b95

Authored by doan
1 parent f90723cf3f
Exists in master

Update Task 2085

Showing 21 changed files with 167 additions and 103 deletions Side-by-side Diff

sources/RoboforkApp.v12.suo
Diff comments   View file @ d178b14
No preview for this file type
sources/RoboforkApp/Mapfan/MapFan.index
Diff comments   View file @ d178b14
1   -523857 138.875 139 35.083333328125 35.166666671875
  1 +523857 127.8584362 128 26.335797499999998 27 null 74 null null null
2 2 523867 238.875 139 35.166666671875 35.25
3 3 523877 338.875 139 35.25 35.333333328125
4 4 523950 439 139.125 35.083333328125 35.166666671875
sources/RoboforkApp/RoboforkMenuView.xaml
Diff comments   View file @ d178b14
... ... @@ -19,7 +19,7 @@
19 19 <RowDefinition Height="0.5*"/>
20 20 </Grid.RowDefinitions>
21 21 <Label Grid.Row="0" Content="Autonomous Planning Tool" Margin="10,0,0,0"
22   - FontSize="14"/>
  22 + FontSize="13"/>
23 23 </Grid>
24 24 </Border>
25 25  
26 26  
27 27  
28 28  
29 29  
30 30  
31 31  
32 32  
33 33  
34 34  
35 35  
36 36  
37 37  
38 38  
... ... @@ -38,67 +38,67 @@
38 38 </Grid.RowDefinitions>
39 39 <Border Grid.Row="0" BorderThickness="1" BorderBrush="White" Margin="0,0,0,5">
40 40 <TreeView Name="ProjectTreeView">
41   - <TreeViewItem Name="ProjectAAA" IsExpanded="True" Header="Project [AAA工場]" FontSize="14" Selected="btnProjectItem_Selected" Tag="ProjectItem">
42   - <TreeViewItem Name="Map" IsExpanded="True" Header="MAP" FontSize="14">
43   - <TreeViewItem Header="Setup Restriction" FontSize="14" Name="SetupRestriction" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetupRestriction">
44   - <!--<TreeViewItem Header="Set Start" FontSize="14" Name="btnSetStart" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetStart"></TreeViewItem>
45   - <TreeViewItem Header="Set Goal" FontSize="14" Name="btnSetGoal" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetGoal"></TreeViewItem>
46   - <TreeViewItem Header="Set Route" FontSize="14" Name="btnSetRoute" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetupRoute"></TreeViewItem>
47   - <TreeViewItem Header="Make Root" FontSize="14" Name="btnMakeRoot" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="MakeRoot"></TreeViewItem>
48   - <TreeViewItem Header="Delete Route" FontSize="14" Name="btnDeleteRoute" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="DeleteRoute"></TreeViewItem>-->
  41 + <TreeViewItem Name="ProjectAAA" IsExpanded="True" Header="Project [AAA工場]" FontSize="13" Selected="btnProjectItem_Selected" Tag="ProjectItem">
  42 + <TreeViewItem Name="Map" IsExpanded="True" Header="MAP" FontSize="13">
  43 + <TreeViewItem Header="Setup Restriction" FontSize="13" Name="SetupRestriction" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetupRestriction">
  44 + <!--<TreeViewItem Header="Set Start" FontSize="13" Name="btnSetStart" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetStart"></TreeViewItem>
  45 + <TreeViewItem Header="Set Goal" FontSize="13" Name="btnSetGoal" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetGoal"></TreeViewItem>
  46 + <TreeViewItem Header="Set Route" FontSize="13" Name="btnSetRoute" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="SetupRoute"></TreeViewItem>
  47 + <TreeViewItem Header="Make Root" FontSize="13" Name="btnMakeRoot" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="MakeRoot"></TreeViewItem>
  48 + <TreeViewItem Header="Delete Route" FontSize="13" Name="btnDeleteRoute" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="DeleteRoute"></TreeViewItem>-->
49 49 </TreeViewItem>
50   - <TreeViewItem IsExpanded="True" Header="Node" FontSize="14" Name="NodeTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="NodeTree">
  50 + <TreeViewItem IsExpanded="True" Header="Node" FontSize="13" Name="NodeTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="NodeTree">
51 51 </TreeViewItem>
52   - <TreeViewItem Header="--------------------" FontSize="14">
  52 + <TreeViewItem Header="--------------------" FontSize="13">
53 53 </TreeViewItem>
54 54 </TreeViewItem>
55 55  
56   - <TreeViewItem Name="LoadDB" Header="Load DB" FontSize="14">
57   - <TreeViewItem Name="FORK_FK15" Header="FORK_FK15" FontSize="14" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="InfoFork" ></TreeViewItem>
58   - <TreeViewItem Name="NODE_FK15" Header="NODE_FK15" FontSize="14" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="InfoNode"></TreeViewItem>
  56 + <TreeViewItem Name="LoadDB" Header="Load DB" FontSize="13">
  57 + <TreeViewItem Name="FORK_FK15" Header="FORK_FK15" FontSize="13" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="InfoFork" ></TreeViewItem>
  58 + <TreeViewItem Name="NODE_FK15" Header="NODE_FK15" FontSize="13" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="InfoNode"></TreeViewItem>
59 59 </TreeViewItem>
60 60  
61   - <TreeViewItem Name="Vehicle" Header="Vehicle" FontSize="14">
62   - <TreeViewItem Name="FK_15" Header="FK15_#1" FontSize="14" Selected="btnVehicleItem_Selected" Tag="VehicleItem" ></TreeViewItem>
63   - <TreeViewItem Name="VehicleAdd" Header="[+]" FontSize="14" Selected="btnVehicleItem_Selected" Tag="VehicleAddTree"></TreeViewItem>
  61 + <TreeViewItem Name="Vehicle" Header="Vehicle" FontSize="13">
  62 + <TreeViewItem Name="FK_15" Header="FK15_#1" FontSize="13" Selected="btnVehicleItem_Selected" Tag="VehicleItem" ></TreeViewItem>
  63 + <TreeViewItem Name="VehicleAdd" Header="[+]" FontSize="13" Selected="btnVehicleItem_Selected" Tag="VehicleAddTree"></TreeViewItem>
64 64 <TreeViewItem Name="UnderLine" Header="--------------------"></TreeViewItem>
65 65 </TreeViewItem>
66 66  
67   - <TreeViewItem Header="Work" FontSize="14">
68   - <TreeViewItem Header="Task patterm [FK15_#1]" FontSize="14" Name="TaskpattermTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="TaskpattermTree">
  67 + <TreeViewItem Header="Work" FontSize="13">
  68 + <TreeViewItem Header="Task patterm [FK15_#1]" FontSize="13" Name="TaskpattermTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="TaskpattermTree">
69 69 </TreeViewItem>
70 70 <TreeViewItem Header="[+]"
71   - FontSize="14"
  71 + FontSize="13"
72 72 Name="WorkAddTree"
73 73 Selected="btnMenu_UnselectedSet"
74 74 Unselected="btnMenu_UnselectedSet">
75 75 </TreeViewItem>
76 76 <TreeViewItem Header="--------------------"
77   - FontSize="14">
  77 + FontSize="13">
78 78 </TreeViewItem>
79 79 </TreeViewItem>
80 80  
81 81 <TreeViewItem Header="Setting"
82   - FontSize="14">
  82 + FontSize="13">
83 83 <TreeViewItem Header="Connect [Wi-Fi]"
84   - FontSize="14"
  84 + FontSize="13"
85 85 Name="ConnectTree"
86 86 Selected="btnMenu_UnselectedSet"
87 87 Unselected="btnMenu_UnselectedSet">
88 88 </TreeViewItem>
89 89 <TreeViewItem Header="Parameter"
90   - FontSize="14"
  90 + FontSize="13"
91 91 Name="ParameterTree"
92 92 Selected="btnMenu_UnselectedSet"
93 93 Unselected="btnMenu_UnselectedSet">
94 94 </TreeViewItem>
95 95 <TreeViewItem Header="--------------------"
96   - FontSize="14">
  96 + FontSize="13">
97 97 </TreeViewItem>
98 98 </TreeViewItem>
99   - <!--<TreeViewItem Header="Schedule" FontSize="14" Name="ScheduleTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="ScheduleRoute"></TreeViewItem>-->
  99 + <!--<TreeViewItem Header="Schedule" FontSize="13" Name="ScheduleTree" Selected="btnMenu_Selected" Unselected="btnMenu_UnselectedSet" Tag="ScheduleRoute"></TreeViewItem>-->
100 100 <TreeViewItem Header="Logging"
101   - FontSize="14"
  101 + FontSize="13"
102 102 Name="LoggingTree"
103 103 Selected="btnMenu_UnselectedSet"
104 104 Unselected="btnMenu_UnselectedSet">
105 105  
106 106  
... ... @@ -107,19 +107,19 @@
107 107 </TreeViewItem>
108 108 </TreeViewItem>
109 109 <TreeViewItem Header="Alert"
110   - FontSize="14"
  110 + FontSize="13"
111 111 Name="AlertTree"
112 112 Selected="btnMenu_UnselectedSet"
113 113 Unselected="btnMenu_UnselectedSet">
114 114 </TreeViewItem>
115 115 <TreeViewItem Header="Help"
116   - FontSize="14"
  116 + FontSize="13"
117 117 Name="HelpTree"
118 118 Selected="btnMenu_UnselectedSet"
119 119 Unselected="btnMenu_UnselectedSet">
120 120 </TreeViewItem>
121 121 <TreeViewItem Header="[+New Project]"
122   - FontSize="14"
  122 + FontSize="13"
123 123 Name="NewProjectTree"
124 124 Selected="btnProjectItem_Selected" Tag="ProjectAddTree"
125 125 Unselected="btnMenu_UnselectedSet">
... ... @@ -134,7 +134,7 @@
134 134 <RowDefinition Height="4*"/>
135 135 </Grid.RowDefinitions>
136 136 <Label Grid.Row="0" Content="Viewer" Margin="10,0,0,0"
137   - FontSize="14"/>
  137 + FontSize="13"/>
138 138 </Grid>
139 139 </Border>
140 140 </Grid>
... ... @@ -144,7 +144,7 @@
144 144 <TabItem x:Name="TabMap" >
145 145 <TabItem.Header>
146 146 <StackPanel Orientation="Horizontal">
147   - <TextBlock Text="MAP " VerticalAlignment="Center" FontSize="14"></TextBlock>
  147 + <TextBlock Text="MAP " VerticalAlignment="Center" FontSize="13"></TextBlock>
148 148 </StackPanel>
149 149 </TabItem.Header>
150 150 <Grid ShowGridLines="False">
... ... @@ -278,18 +278,18 @@
278 278  
279 279  
280 280  
281   - <Label Grid.Row="0" Grid.Column="1" Content="Monitor" FontSize="14"/>
282   - <Label Grid.Row="1" Grid.Column="1" Content="AOR 28249 [kg/h]" FontSize="14"/>
283   - <Label Grid.Row="2" Grid.Column="1" Content="ABC 4738 [trq]" FontSize="14"/>
284   - <Label Grid.Row="3" Grid.Column="1" Content="ATR 49593 [%]" FontSize="14"/>
285   - <Label Grid.Row="4" Grid.Column="1" Content="DEK 50403 [G]" FontSize="14"/>
286   - <Label Grid.Row="5" Grid.Column="1" Content="SKG 2739 [kg]" FontSize="14"/>
287   - <Label Grid.Row="6" Grid.Column="1" Content="SOC 86 [%]" FontSize="14"/>
288   - <Label Grid.Row="7" Grid.Column="1" Content=" :" FontSize="14"/>
289   - <Label Grid.Row="8" Grid.Column="1" Content=" :" FontSize="14"/>
290   - <Label Grid.Row="9" Grid.Column="1" Content=" :" FontSize="14"/>
291   - <Label Grid.Row="10" Grid.Column="1" Content=" :" FontSize="14"/>
292   - <Label Grid.Row="11" Grid.Column="1" Content=" :" FontSize="14"/>
  281 + <Label Grid.Row="0" Grid.Column="1" Content="Monitor" FontSize="13"/>
  282 + <Label Grid.Row="1" Grid.Column="1" Content="AOR 28249 [kg/h]" FontSize="13"/>
  283 + <Label Grid.Row="2" Grid.Column="1" Content="ABC 4738 [trq]" FontSize="13"/>
  284 + <Label Grid.Row="3" Grid.Column="1" Content="ATR 49593 [%]" FontSize="13"/>
  285 + <Label Grid.Row="4" Grid.Column="1" Content="DEK 50403 [G]" FontSize="13"/>
  286 + <Label Grid.Row="5" Grid.Column="1" Content="SKG 2739 [kg]" FontSize="13"/>
  287 + <Label Grid.Row="6" Grid.Column="1" Content="SOC 86 [%]" FontSize="13"/>
  288 + <Label Grid.Row="7" Grid.Column="1" Content=" :" FontSize="13"/>
  289 + <Label Grid.Row="8" Grid.Column="1" Content=" :" FontSize="13"/>
  290 + <Label Grid.Row="9" Grid.Column="1" Content=" :" FontSize="13"/>
  291 + <Label Grid.Row="10" Grid.Column="1" Content=" :" FontSize="13"/>
  292 + <Label Grid.Row="11" Grid.Column="1" Content=" :" FontSize="13"/>
293 293 </Grid>
294 294 </ScrollViewer>
295 295 </DockPanel >
... ... @@ -300,7 +300,7 @@
300 300 <Border Grid.Row="1" BorderThickness="1" BorderBrush="Gray" Margin="5,5,5,5">
301 301 <Grid ShowGridLines="False">
302 302 <Grid.ColumnDefinitions>
303   - <ColumnDefinition Width="1*"/>
  303 + <ColumnDefinition Width="1.2*"/>
304 304 <ColumnDefinition Width="8*"/>
305 305 </Grid.ColumnDefinitions>
306 306 <Grid ShowGridLines="False" Grid.Column="0">
... ... @@ -309,8 +309,8 @@
309 309 <RowDefinition Height="1*"/>
310 310 <RowDefinition Height="0.5*"/>
311 311 </Grid.RowDefinitions>
312   - <Label Grid.Row="0" Content="Schedule" Margin="10,0,0,0" FontSize="14"/>
313   - <Label Name="LabelSchedule" Grid.Row="1" Content="FK15_#1" Margin="10,0,0,0" FontSize="14"/>
  312 + <Label Grid.Row="0" Content="Schedule" Margin="5,0,0,0" FontSize="13"/>
  313 + <Label Name="LabelSchedule" Grid.Row="1" Content="FK15_#1" Margin="5,0,0,0" FontSize="13"/>
314 314 </Grid>
315 315 <Border Grid.Column="1" BorderThickness="1" BorderBrush="Red" Margin="5,5,5,5">
316 316  
... ... @@ -348,7 +348,7 @@
348 348 <RowDefinition Height="1*"/>
349 349 <RowDefinition Height="1.5*"/>
350 350 </Grid.RowDefinitions>
351   - <Label Name="WorkVehicle" Grid.Row="0" Content="Work [FK15_#1]" Margin="10,0,0,0" FontSize="14"/>
  351 + <Label Name="WorkVehicle" Grid.Row="0" Content="Work [FK15_#1]" Margin="5,0,0,0" FontSize="13"/>
352 352 </Grid>
353 353 </Border>
354 354 </Grid>
355 355  
... ... @@ -356,14 +356,14 @@
356 356 <TabItem x:Name="TabWork" >
357 357 <TabItem.Header>
358 358 <StackPanel Orientation="Horizontal">
359   - <TextBlock Text=" Work " VerticalAlignment="Center" FontSize="14"></TextBlock>
  359 + <TextBlock Text=" Work " VerticalAlignment="Center" FontSize="13"></TextBlock>
360 360 </StackPanel>
361 361 </TabItem.Header>
362 362 </TabItem>
363 363 <TabItem x:Name="TabSchedule" >
364 364 <TabItem.Header>
365 365 <StackPanel Orientation="Horizontal">
366   - <TextBlock Text=" Schedule " VerticalAlignment="Center" FontSize="14"></TextBlock>
  366 + <TextBlock Text=" Schedule " VerticalAlignment="Center" FontSize="13"></TextBlock>
367 367 </StackPanel>
368 368 </TabItem.Header>
369 369 </TabItem>
sources/RoboforkApp/RoboforkMenuView.xaml.cs
Diff comments   View file @ d178b14
... ... @@ -323,7 +323,7 @@
323 323 TreeViewItem item = new TreeViewItem();
324 324 item.Header = "FK"+ IndexVehicle.ToString()+"_#1";
325 325 item.Tag = "VehicleItem";
326   - item.FontSize = 14;
  326 + item.FontSize = 13;
327 327 item.Selected += new RoutedEventHandler(btnVehicleItem_Selected);
328 328 //item.IsSelected = true;
329 329 item.IsExpanded = true;
330 330  
... ... @@ -333,14 +333,14 @@
333 333 TreeViewItem item2 = new TreeViewItem();
334 334 item2.Header = "[+]";
335 335 item2.Tag = "VehicleAddTree";
336   - item2.FontSize = 14;
  336 + item2.FontSize = 13;
337 337 item2.Selected += new RoutedEventHandler(btnVehicleItem_Selected);
338 338 item2.Name = "VehicleAdd";
339 339 treeitem.Items.Add(item2);
340 340  
341 341 TreeViewItem item3 = new TreeViewItem();
342 342 item3.Header = "--------------------";
343   - item3.FontSize = 14;
  343 + item3.FontSize = 13;
344 344 item3.Name = "UnderLine";
345 345 treeitem.Items.Add(item3);
346 346  
... ... @@ -394,7 +394,7 @@
394 394 //Root Project
395 395 TreeViewItem itemProject = new TreeViewItem();
396 396 itemProject.Header = "Project[" + IndexProject + "工場]";
397   - itemProject.FontSize = 14;
  397 + itemProject.FontSize = 13;
398 398 itemProject.Selected += new RoutedEventHandler(btnProjectItem_Selected);
399 399 itemProject.Name = "Project";
400 400 itemProject.Tag = "ProjectItem";
401 401  
... ... @@ -404,14 +404,14 @@
404 404 //Tree Map
405 405 TreeViewItem itemMap = new TreeViewItem();
406 406 itemMap.Header = "Map";
407   - itemMap.FontSize = 14;
  407 + itemMap.FontSize = 13;
408 408 itemMap.Name = "Map";
409 409 itemProject.Items.Add(itemMap);
410 410  
411 411  
412 412 TreeViewItem itemRestrict = new TreeViewItem();
413 413 itemRestrict.Header = "Setup Restriction";
414   - itemRestrict.FontSize = 14;
  414 + itemRestrict.FontSize = 13;
415 415 itemRestrict.Selected += new RoutedEventHandler(btnMenu_Selected);
416 416 itemRestrict.Name = "SetupRestriction";
417 417 itemRestrict.Tag = "SetupRestriction";
... ... @@ -420,7 +420,7 @@
420 420  
421 421 TreeViewItem itemNode = new TreeViewItem();
422 422 itemNode.Header = "Node";
423   - itemNode.FontSize = 14;
  423 + itemNode.FontSize = 13;
424 424 itemNode.Selected += new RoutedEventHandler(btnMenu_Selected);
425 425 itemNode.Name = "NodeTree";
426 426 itemNode.Tag = "NodeTree";
427 427  
... ... @@ -428,13 +428,13 @@
428 428  
429 429 TreeViewItem itemDivision = new TreeViewItem();
430 430 itemDivision.Header = "--------------------";
431   - itemDivision.FontSize = 14;
  431 + itemDivision.FontSize = 13;
432 432 itemMap.Items.Add(itemDivision);
433 433  
434 434 //Tree Vehicle
435 435 TreeViewItem itemVehicle = new TreeViewItem();
436 436 itemVehicle.Header = "Vehicle";
437   - itemVehicle.FontSize = 14;
  437 + itemVehicle.FontSize = 13;
438 438 itemVehicle.Name = "Vehicle" + IndexProject.ToString();
439 439 itemProject.Items.Add(itemVehicle);
440 440  
... ... @@ -443,7 +443,7 @@
443 443 TreeViewItem itemVehicleBr = new TreeViewItem();
444 444 itemVehicleBr.Header = "FK"+ IndexVehicle.ToString()+"_#1";
445 445 itemVehicleBr.Tag = "VehicleItem";
446   - itemVehicleBr.FontSize = 14;
  446 + itemVehicleBr.FontSize = 13;
447 447 itemVehicleBr.Selected += new RoutedEventHandler(btnVehicleItem_Selected);
448 448 itemVehicleBr.IsExpanded = true;
449 449 itemVehicleBr.Name = "FK_" + IndexVehicle.ToString();
450 450  
... ... @@ -452,14 +452,14 @@
452 452 itemVehicleBr = new TreeViewItem();
453 453 itemVehicleBr.Header = "[+]";
454 454 itemVehicleBr.Tag = "VehicleAddTree";
455   - itemVehicleBr.FontSize = 14;
  455 + itemVehicleBr.FontSize = 13;
456 456 itemVehicleBr.Selected += new RoutedEventHandler(btnVehicleItem_Selected);
457 457 itemVehicleBr.Name = "VehicleAdd";
458 458 itemVehicle.Items.Add(itemVehicleBr);
459 459  
460 460 itemVehicleBr = new TreeViewItem();
461 461 itemVehicleBr.Header = "--------------------";
462   - itemVehicleBr.FontSize = 14;
  462 + itemVehicleBr.FontSize = 13;
463 463 itemVehicleBr.Name = "UnderLine";
464 464 itemVehicle.Items.Add(itemVehicleBr);
465 465  
466 466  
... ... @@ -467,12 +467,12 @@
467 467 //Tree Work
468 468 TreeViewItem itemWork = new TreeViewItem();
469 469 itemWork.Header = "Work";
470   - itemWork.FontSize = 14;
  470 + itemWork.FontSize = 13;
471 471 itemProject.Items.Add(itemWork);
472 472  
473 473 TreeViewItem itemWorkChild = new TreeViewItem();
474 474 itemWorkChild.Header = "Task patterm [FK15_#1]";
475   - itemWorkChild.FontSize = 14;
  475 + itemWorkChild.FontSize = 13;
476 476 itemWorkChild.Name = "TaskpattermTree";
477 477 itemWorkChild.Tag = "TaskpattermTree";
478 478 itemWorkChild.Selected += new RoutedEventHandler(btnMenu_Selected);
479 479  
480 480  
481 481  
... ... @@ -481,26 +481,26 @@
481 481  
482 482 itemWorkChild = new TreeViewItem();
483 483 itemWorkChild.Header = "[+]";
484   - itemWorkChild.FontSize = 14;
  484 + itemWorkChild.FontSize = 13;
485 485 itemWorkChild.Selected += new RoutedEventHandler(btnMenu_UnselectedSet);
486 486 itemWorkChild.Name = "WorkAddTree";
487 487 itemWork.Items.Add(itemWorkChild);
488 488  
489 489 itemWorkChild = new TreeViewItem();
490 490 itemWorkChild.Header = "--------------------";
491   - itemWorkChild.FontSize = 14;
  491 + itemWorkChild.FontSize = 13;
492 492 itemWork.Items.Add(itemWorkChild);
493 493  
494 494  
495 495 //Tree Setting
496 496 TreeViewItem itemSetting = new TreeViewItem();
497 497 itemSetting.Header = "Setting";
498   - itemSetting.FontSize = 14;
  498 + itemSetting.FontSize = 13;
499 499 itemProject.Items.Add(itemSetting);
500 500  
501 501 TreeViewItem itemSettingChild = new TreeViewItem();
502 502 itemSettingChild.Header = "Connect [Wi-Fi]";
503   - itemSettingChild.FontSize = 14;
  503 + itemSettingChild.FontSize = 13;
504 504 itemSettingChild.Name = "ConnectTree";
505 505 itemSettingChild.Selected += new RoutedEventHandler(btnMenu_UnselectedSet);
506 506 itemSettingChild.IsExpanded = true;
507 507  
... ... @@ -508,14 +508,14 @@
508 508  
509 509 itemSettingChild = new TreeViewItem();
510 510 itemSettingChild.Header = "Parameter";
511   - itemSettingChild.FontSize = 14;
  511 + itemSettingChild.FontSize = 13;
512 512 itemSettingChild.Selected += new RoutedEventHandler(btnMenu_UnselectedSet);
513 513 itemSettingChild.Name = "ParameterTree";
514 514 itemSetting.Items.Add(itemSettingChild);
515 515  
516 516 itemSettingChild = new TreeViewItem();
517 517 itemSettingChild.Header = "--------------------";
518   - itemSettingChild.FontSize = 14;
  518 + itemSettingChild.FontSize = 13;
519 519 itemSetting.Items.Add(itemSettingChild);
520 520  
521 521  
522 522  
523 523  
... ... @@ -524,21 +524,21 @@
524 524 itemLog.Header = "Logging";
525 525 itemLog.Name = "LoggingTree";
526 526 itemLog.Selected += new RoutedEventHandler(btnMenu_UnselectedSet);
527   - itemLog.FontSize = 14;
  527 + itemLog.FontSize = 13;
528 528 itemProject.Items.Add(itemLog);
529 529  
530 530 //Tree --------------------
531 531 //Tree Logging
532 532 TreeViewItem itemDash = new TreeViewItem();
533 533 itemDash.Header = "--------------------";
534   - itemDash.FontSize = 14;
  534 + itemDash.FontSize = 13;
535 535 itemProject.Items.Add(itemDash);
536 536  
537 537  
538 538 ////Root Alert
539 539 //TreeViewItem itemAlert = new TreeViewItem();
540 540 //itemAlert.Header = "Alert";
541   - //itemAlert.FontSize = 14;
  541 + //itemAlert.FontSize = 13;
542 542 //itemAlert.Selected += new RoutedEventHandler(GetAlertTree);
543 543 //itemAlert.Name = "AlertTree";
544 544 //ProjectTreeView.Items.Add(itemAlert);
... ... @@ -546,7 +546,7 @@
546 546 ////Root Help
547 547 //TreeViewItem itemHelp = new TreeViewItem();
548 548 //itemHelp.Header = "Help";
549   - //itemHelp.FontSize = 14;
  549 + //itemHelp.FontSize = 13;
550 550 //itemHelp.Selected += new RoutedEventHandler(GetHelpTree);
551 551 //itemHelp.Name = "HelpTree";
552 552 //ProjectTreeView.Items.Add(itemHelp);
... ... @@ -555,7 +555,7 @@
555 555 //Root New Project
556 556 TreeViewItem itemNewProject = new TreeViewItem();
557 557 itemNewProject.Header = "[+New Project]";
558   - itemNewProject.FontSize = 14;
  558 + itemNewProject.FontSize = 13;
559 559 itemNewProject.Selected += new RoutedEventHandler(btnProjectItem_Selected);
560 560 itemNewProject.Name = "NewProjectTree";
561 561 itemNewProject.Tag = "ProjectAddTree";
sources/RoboforkApp/View/EditNodeView.xaml
Diff comments   View file @ d178b14
... ... @@ -29,25 +29,25 @@
29 29 <ColumnDefinition Width="1.7*"/>
30 30 </Grid.ColumnDefinitions>
31 31  
32   - <Label Content="Mode" Grid.Row="0" Grid.Column="0" FontSize="14" Margin="20,2,5,2" VerticalContentAlignment="Center"/>
33   - <ComboBox x:Name="cbMode" Grid.Row="0" Grid.Column="1" FontSize="14" Margin="5,2,5,2" VerticalContentAlignment="Center" TabIndex="0">
  32 + <Label Content="Mode" Grid.Row="0" Grid.Column="0" FontSize="13" Margin="20,2,5,2" VerticalContentAlignment="Center"/>
  33 + <ComboBox x:Name="cbMode" Grid.Row="0" Grid.Column="1" FontSize="13" Margin="5,2,5,2" VerticalContentAlignment="Center" TabIndex="0">
34 34 <ComboBoxItem Content="移動"/>
35 35 <ComboBoxItem Content="回転"/>
36 36 <ComboBoxItem Content="パレットの高さ"/>
37 37 </ComboBox>
38 38  
39   - <Label Content="Speed" Grid.Row="1" Grid.Column="0" FontSize="14" Margin="20,2,5,2" VerticalContentAlignment="Center"/>
40   - <TextBox x:Name="txtSpeed" Grid.Row="1" Grid.Column="1" FontSize="14" MaxLength="16" TextWrapping="NoWrap" TabIndex="1" Margin="5,2,5,2" VerticalContentAlignment="Center" LostFocus="txtSpeed_LostFocus"/>
41   - <Label Content="Km/h" Grid.Row="1" Grid.Column="2" FontSize="14" Margin="5,2,5,2" VerticalContentAlignment="Center"/>
  39 + <Label Content="Speed" Grid.Row="1" Grid.Column="0" FontSize="13" Margin="20,2,5,2" VerticalContentAlignment="Center"/>
  40 + <TextBox x:Name="txtSpeed" Grid.Row="1" Grid.Column="1" FontSize="13" MaxLength="16" TextWrapping="NoWrap" TabIndex="1" Margin="5,2,5,2" VerticalContentAlignment="Center" LostFocus="txtSpeed_LostFocus"/>
  41 + <Label Content="Km/h" Grid.Row="1" Grid.Column="2" FontSize="13" Margin="5,2,5,2" VerticalContentAlignment="Center"/>
42 42  
43   - <Label Content="Angle" Grid.Row="2" Grid.Column="0" FontSize="14" Margin="20,2,5,2" VerticalContentAlignment="Center"/>
44   - <TextBox x:Name="txtAngle" Grid.Row="2" Grid.Column="1" FontSize="14" MaxLength="16" TextWrapping="NoWrap" TabIndex="2" Margin="5,2,5,2" VerticalContentAlignment="Center" LostFocus="txtAngle_LostFocus"/>
45   - <Label Content="°" Grid.Row="2" Grid.Column="2" FontSize="14" Margin="5,2,5,2" VerticalContentAlignment="Center"/>
  43 + <Label Content="Angle" Grid.Row="2" Grid.Column="0" FontSize="13" Margin="20,2,5,2" VerticalContentAlignment="Center"/>
  44 + <TextBox x:Name="txtAngle" Grid.Row="2" Grid.Column="1" FontSize="13" MaxLength="16" TextWrapping="NoWrap" TabIndex="2" Margin="5,2,5,2" VerticalContentAlignment="Center" LostFocus="txtAngle_LostFocus"/>
  45 + <Label Content="°" Grid.Row="2" Grid.Column="2" FontSize="13" Margin="5,2,5,2" VerticalContentAlignment="Center"/>
46 46  
47 47  
48   - <Label Content="Hight" Grid.Row="3" Grid.Column="0" FontSize="14" Margin="20,2,5,2" VerticalContentAlignment="Center"/>
49   - <TextBox x:Name="txtHight" Grid.Row="3" Grid.Column="1" FontSize="14" MaxLength="16" TextWrapping="NoWrap" TabIndex="3" Margin="5,2,5,2" VerticalContentAlignment="Center" LostFocus="txtHight_LostFocus"/>
50   - <Label Content="mm" Grid.Row="3" Grid.Column="2" FontSize="14" Margin="5,2,5,2" VerticalContentAlignment="Center"/>
  48 + <Label Content="Hight" Grid.Row="3" Grid.Column="0" FontSize="13" Margin="20,2,5,2" VerticalContentAlignment="Center"/>
  49 + <TextBox x:Name="txtHight" Grid.Row="3" Grid.Column="1" FontSize="13" MaxLength="16" TextWrapping="NoWrap" TabIndex="3" Margin="5,2,5,2" VerticalContentAlignment="Center" LostFocus="txtHight_LostFocus"/>
  50 + <Label Content="mm" Grid.Row="3" Grid.Column="2" FontSize="13" Margin="5,2,5,2" VerticalContentAlignment="Center"/>
51 51  
52 52 <Button x:Name="btnAddMode" Grid.Row="2" Grid.Column="3" Tag="ADDMODE" Click="btnEditNode_Click" Margin="10,2,30,4" TabIndex="4">
53 53 <TextBlock Text="ADD MODE" />
54 54  
55 55  
56 56  
57 57  
58 58  
... ... @@ -57,19 +57,19 @@
57 57 </Button>
58 58 </Grid>
59 59  
60   - <DataGrid Grid.Row="2" x:Name="ListEditNodeData" ItemsSource="{Binding}" Margin="10,10,10,10" EnableRowVirtualization="False" SelectionMode="Single" FontSize="14"
  60 + <DataGrid Grid.Row="2" x:Name="ListEditNodeData" ItemsSource="{Binding}" Margin="10,10,10,10" EnableRowVirtualization="False" SelectionMode="Single" FontSize="13"
61 61 CanUserAddRows="False" CanUserResizeRows="False" CanUserSortColumns="False" CanUserResizeColumns="False" ScrollViewer.CanContentScroll="False"
62 62 CanUserReorderColumns="False" AutoGenerateColumns="False">
63 63 <DataGrid.Columns>
64   - <DataGridTextColumn Width="45" x:Name="colIndex" Header="No" Binding="{Binding NO}" FontSize="14" IsReadOnly="True"
  64 + <DataGridTextColumn Width="45" x:Name="colIndex" Header="No" Binding="{Binding NO}" FontSize="13" IsReadOnly="True"
65 65 ClipboardContentBinding="{x:Null}" CanUserResize="False"/>
66   - <DataGridTextColumn Width="120" x:Name="colMode" Header="Mode" Binding="{Binding MODE}" FontSize="14" IsReadOnly="True"
  66 + <DataGridTextColumn Width="120" x:Name="colMode" Header="Mode" Binding="{Binding MODE}" FontSize="13" IsReadOnly="True"
67 67 ClipboardContentBinding="{x:Null}" CanUserResize="False"/>
68   - <DataGridTextColumn Width="115" x:Name="colSpeed" Header="Speed" Binding="{Binding SPEED}" FontSize="14" IsReadOnly="True"
  68 + <DataGridTextColumn Width="115" x:Name="colSpeed" Header="Speed" Binding="{Binding SPEED}" FontSize="13" IsReadOnly="True"
69 69 ClipboardContentBinding="{x:Null}" CanUserResize="False"/>
70   - <DataGridTextColumn Width="115" x:Name="colAngle" Header="Angle" Binding="{Binding ANGLE}" FontSize="14" IsReadOnly="True"
  70 + <DataGridTextColumn Width="115" x:Name="colAngle" Header="Angle" Binding="{Binding ANGLE}" FontSize="13" IsReadOnly="True"
71 71 ClipboardContentBinding="{x:Null}" CanUserResize="False"/>
72   - <DataGridTextColumn Width="110" x:Name="colHight" Header="Hight" Binding="{Binding HIGHT}" FontSize="14" IsReadOnly="True"
  72 + <DataGridTextColumn Width="110" x:Name="colHight" Header="Hight" Binding="{Binding HIGHT}" FontSize="13" IsReadOnly="True"
73 73 ClipboardContentBinding="{x:Null}" CanUserResize="False"/>
74 74 </DataGrid.Columns>
75 75  
76 76  
... ... @@ -98,10 +98,10 @@
98 98 </Grid.ColumnDefinitions>
99 99  
100 100 <Button x:Name="btnNo" Tag="No" Grid.Column="3" Click="btnEditNode_Click" Margin="5,0,5,0" TabIndex="7">
101   - <TextBlock Text="NO" FontSize="14"/>
  101 + <TextBlock Text="NO" FontSize="13"/>
102 102 </Button>
103 103 <Button x:Name="btnSave" Tag="Save" Grid.Column="1" Click="btnEditNode_Click" Margin="5,0,5,0" TabIndex="6">
104   - <TextBlock Text="SAVE" FontSize="14"/>
  104 + <TextBlock Text="SAVE" FontSize="13"/>
105 105 </Button>
106 106 </Grid>
107 107  
sources/RoboforkApp/bin/Release/Mapfan/MapFan.index
Diff comments   View file @ d178b14
1   -523857 138.875 139 35.083333328125 35.166666671875
  1 +523857 127.8584362 128 26.335797499999998 27 null 74 null null null
2 2 523867 238.875 139 35.166666671875 35.25
3 3 523877 338.875 139 35.25 35.333333328125
4 4 523950 439 139.125 35.083333328125 35.166666671875
sources/RoboforkApp/bin/Release/RboforkApp.exe
Diff comments   View file @ d178b14
No preview for this file type
sources/RoboforkApp/bin/Release/RboforkApp.pdb
Diff comments   View file @ d178b14
No preview for this file type
sources/RoboforkApp/obj/Release/GeneratedInternalTypeHelper.g.cs
Diff comments   View file @ d178b14
1   -
  1 +//------------------------------------------------------------------------------
  2 +// <auto-generated>
  3 +// This code was generated by a tool.
  4 +// Runtime Version:4.0.30319.42000
  5 +//
  6 +// Changes to this file may cause incorrect behavior and will be lost if
  7 +// the code is regenerated.
  8 +// </auto-generated>
  9 +//------------------------------------------------------------------------------
  10 +
  11 +namespace XamlGeneratedNamespace {
  12 +
  13 +
  14 + /// <summary>
  15 + /// GeneratedInternalTypeHelper
  16 + /// </summary>
  17 + [System.Diagnostics.DebuggerNonUserCodeAttribute()]
  18 + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
  19 + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
  20 + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
  21 +
  22 + /// <summary>
  23 + /// CreateInstance
  24 + /// </summary>
  25 + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
  26 + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
  27 + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
  28 + }
  29 +
  30 + /// <summary>
  31 + /// GetPropertyValue
  32 + /// </summary>
  33 + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
  34 + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
  35 + }
  36 +
  37 + /// <summary>
  38 + /// SetPropertyValue
  39 + /// </summary>
  40 + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
  41 + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
  42 + }
  43 +
  44 + /// <summary>
  45 + /// CreateDelegate
  46 + /// </summary>
  47 + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
  48 + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
  49 + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
  50 + delegateType,
  51 + handler}, null)));
  52 + }
  53 +
  54 + /// <summary>
  55 + /// AddEventHandler
  56 + /// </summary>
  57 + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
  58 + eventInfo.AddEventHandler(target, handler);
  59 + }
  60 + }
  61 +}
sources/RoboforkApp/obj/Release/RboforkApp.exe
Diff comments   View file @ d178b14
No preview for this file type
sources/RoboforkApp/obj/Release/RboforkApp.g.resources
Diff comments   View file @ d178b14
No preview for this file type
sources/RoboforkApp/obj/Release/RboforkApp.pdb
Diff comments   View file @ d178b14
No preview for this file type
sources/RoboforkApp/obj/Release/RboforkApp_MarkupCompile.i.cache
Diff comments   View file @ d178b14
... ... @@ -16,5 +16,5 @@
16 16 151067470280
17 17 Stencils\BasicShapes.xaml;Stencils\FlowChartSymbols.xaml;Stencils\RegelungstechnikSymbole.xaml;Stencils\SymbolStencils.xaml;UserControls\simulationRobo.xaml;View\AddNodeView.xaml;View\EditNodeView.xaml;Resources\Brushes.xaml;Resources\DesignerItem.xaml;Resources\Expander.xaml;Resources\LangResources.xaml;Resources\ResizeChrome.xaml;Resources\ScrollBar.xaml;Resources\ScrollViewer.xaml;Resources\Slider.xaml;Resources\StatusBar.xaml;Resources\Styles.xaml;Resources\ToolBar.xaml;Resources\Toolbox.xaml;Resources\Tooltip.xaml;Resources\ZoomBox.xaml;RoboforkMenuView.xaml;UserControls\ucDisplayCoordinate.xaml;UserControls\ucNode.xaml;UserControls\ucStartEndButton.xaml;View\UpdateNodeView.xaml;
18 18  
19   -False
  19 +True
sources/RoboforkApp/obj/Release/RboforkApp_MarkupCompile.i.lref
Diff comments   View file @ d178b14
  1 +
  2 +
  3 +FE:\02_Project\Du an Anh Dai\Robofork4\sources\RoboforkApp\RoboforkMenuView.xaml;;
sources/RoboforkApp/obj/Release/RboforkApp_MarkupCompile.lref
Diff comments   View file @ d178b14
1   -E:\02_Project\Du an Anh Dai\Robofork4\sources\RoboforkApp\obj\Release\GeneratedInternalTypeHelper.g.cs
  1 +
2 2  
3 3 FE:\02_Project\Du an Anh Dai\Robofork4\sources\RoboforkApp\Stencils\BasicShapes.xaml;;
4 4 FE:\02_Project\Du an Anh Dai\Robofork4\sources\RoboforkApp\Stencils\FlowChartSymbols.xaml;;
sources/RoboforkApp/obj/Release/RoboforkMenuView.baml
Diff comments   View file @ d178b14
No preview for this file type
sources/RoboforkApp/obj/Release/RoboforkMenuView.g.cs
Diff comments   View file @ d178b14
1   -#pragma checksum "..\..\RoboforkMenuView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D6FF04A8619835C4D51BA22544A09D92"
  1 +#pragma checksum "..\..\RoboforkMenuView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D12DB97184A8A2D6E6020001520512D6"
2 2 //------------------------------------------------------------------------------
3 3 // <auto-generated>
4 4 // This code was generated by a tool.
sources/RoboforkApp/obj/Release/RoboforkMenuView.g.i.cs
Diff comments   View file @ d178b14
1   -#pragma checksum "..\..\RoboforkMenuView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D6FF04A8619835C4D51BA22544A09D92"
  1 +#pragma checksum "..\..\RoboforkMenuView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "D12DB97184A8A2D6E6020001520512D6"
2 2 //------------------------------------------------------------------------------
3 3 // <auto-generated>
4 4 // This code was generated by a tool.
sources/RoboforkApp/obj/Release/View/EditNodeView.baml
Diff comments   View file @ d178b14
No preview for this file type
sources/RoboforkApp/obj/Release/View/EditNodeView.g.cs
Diff comments   View file @ d178b14
1   -#pragma checksum "..\..\..\View\EditNodeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "433DF212F6E243FAAE1AAA7463F1AFDB"
  1 +#pragma checksum "..\..\..\View\EditNodeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FE8C0128F2983A50622A719C836BD6B2"
2 2 //------------------------------------------------------------------------------
3 3 // <auto-generated>
4 4 // This code was generated by a tool.
sources/RoboforkApp/obj/Release/View/EditNodeView.g.i.cs
Diff comments   View file @ d178b14
1   -#pragma checksum "..\..\..\View\EditNodeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "433DF212F6E243FAAE1AAA7463F1AFDB"
  1 +#pragma checksum "..\..\..\View\EditNodeView.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "FE8C0128F2983A50622A719C836BD6B2"
2 2 //------------------------------------------------------------------------------
3 3 // <auto-generated>
4 4 // This code was generated by a tool.