toan / Robofork

Download as
Browse Code »

Commit 6870a03e36b59ea048bd119a6d908c1becc6b9ea

Authored by doan
1 parent 729be9a6d6
Exists in master

仕様 #2035 : 画面構成変更 Update

Showing 16 changed files with 163 additions and 116 deletions Side-by-side Diff

releases/RM2035/20170303_RM2035.rar
Diff comments   View file @ 6870a03
No preview for this file type
sources/RoboforkApp.v12.suo
Diff comments   View file @ 6870a03
No preview for this file type
sources/RoboforkApp/RoboforkMenu.xaml
Diff comments   View file @ 6870a03
... ... @@ -5,11 +5,11 @@
5 5 Title="Robofork App"
6 6 ResizeMode="NoResize"
7 7 WindowStartupLocation="CenterScreen"
8   - Height="900" Width="1300">
  8 + Height="1000" Width="1300">
9 9 <Grid ShowGridLines="False" Margin="20,20,20,20">
10 10  
11 11 <Grid.RowDefinitions>
12   - <RowDefinition Height="1*"/>
  12 + <RowDefinition Height="0.8*"/>
13 13 <RowDefinition Height="10*"/>
14 14 </Grid.RowDefinitions>
15 15 <Border Grid.Row="0" BorderThickness="1" BorderBrush="Gray" Margin="0,0,0,5">
16 16  
... ... @@ -19,14 +19,14 @@
19 19 <RowDefinition Height="*"/>
20 20 </Grid.RowDefinitions>
21 21 <Label Grid.Row="0" Content="Autonomous Planning Tool" Margin="10,0,0,0"
22   - FontSize="17"/>
  22 + FontSize="16"/>
23 23 </Grid>
24 24 </Border>
25 25  
26 26 <Grid ShowGridLines="False" Grid.Row="1">
27 27  
28 28 <Grid.ColumnDefinitions>
29   - <ColumnDefinition Width="1*"/>
  29 + <ColumnDefinition Width="1.2*"/>
30 30 <ColumnDefinition Width="20"/>
31 31 <ColumnDefinition Width="3*"/>
32 32 </Grid.ColumnDefinitions>
33 33  
34 34  
35 35  
36 36  
37 37  
38 38  
... ... @@ -38,35 +38,35 @@
38 38 </Grid.RowDefinitions>
39 39 <Border Grid.Row="0" BorderThickness="1" BorderBrush="White" Margin="0,0,0,5">
40 40 <TreeView >
41   - <TreeViewItem Header="Project [AAA工場]" FontSize="17">
42   - <TreeViewItem Header="MAP" FontSize="17">
  41 + <TreeViewItem Header="Project [AAA工場]" FontSize="17">
  42 + <TreeViewItem Header="MAP" FontSize="17">
43 43 <TreeViewItem Header="Pass plan"
44   - FontSize="17"
  44 + FontSize="17"
45 45 Name="PassplanTree"
46 46 Selected="GetPassplanTree"
47 47 Unselected="SetPassplanTree"
48 48 >
49 49 </TreeViewItem>
50 50 <TreeViewItem Header="Node"
51   - FontSize="17"
  51 + FontSize="17"
52 52 Name="NodeTree"
53 53 Selected="GetNodeTree"
54 54 Unselected="SetNodeTree"
55 55 >
56 56 </TreeViewItem>
57   - <TreeViewItem Header="--------------------" FontSize="17">
  57 + <TreeViewItem Header="--------------------" FontSize="17">
58 58 </TreeViewItem>
59 59 </TreeViewItem>
60 60  
61   - <TreeViewItem Header="Vehicle" FontSize="17">
  61 + <TreeViewItem Header="Vehicle" FontSize="17">
62 62 <TreeViewItem Header="FK15_#1"
63   - FontSize="17"
  63 + FontSize="17"
64 64 Name="FK15Tree"
65 65 Selected="GetFK15Tree"
66 66 Unselected="SetFK15Tree">
67 67 </TreeViewItem>
68 68 <TreeViewItem Header="[+]"
69   - FontSize="17"
  69 + FontSize="17"
70 70 Name="VehicleAddTree"
71 71 Selected="GetVehicleAddTree"
72 72 Unselected="SetVehicleAddTree">
73 73  
74 74  
75 75  
76 76  
77 77  
78 78  
79 79  
80 80  
81 81  
... ... @@ -76,50 +76,50 @@
76 76 </TreeViewItem>
77 77  
78 78 <TreeViewItem Header="Work"
79   - FontSize="17">
  79 + FontSize="17">
80 80 <TreeViewItem Header="Task patterm [FK15_#1]"
81   - FontSize="17"
  81 + FontSize="17"
82 82 Name="TaskpattermTree"
83 83 Selected="GetTaskpattermTree"
84 84 Unselected="SetTaskpattermTree">
85 85 </TreeViewItem>
86 86 <TreeViewItem Header="[+]"
87   - FontSize="17"
  87 + FontSize="17"
88 88 Name="WorkAddTree"
89 89 Selected="GetWorkAddTree"
90 90 Unselected="SetWorkAddTree">
91 91 </TreeViewItem>
92 92 <TreeViewItem Header="--------------------"
93   - FontSize="17">
  93 + FontSize="17">
94 94 </TreeViewItem>
95 95 </TreeViewItem>
96 96  
97 97 <TreeViewItem Header="Setting"
98   - FontSize="17">
  98 + FontSize="17">
99 99 <TreeViewItem Header="Connect [Wi-Fi]"
100   - FontSize="17"
  100 + FontSize="17"
101 101 Name="ConnectTree"
102 102 Selected="GetConnectTree"
103 103 Unselected="SetConnectTree">
104 104 </TreeViewItem>
105 105 <TreeViewItem Header="Parameter"
106   - FontSize="17"
  106 + FontSize="17"
107 107 Name="ParameterTree"
108 108 Selected="GetParameterTree"
109 109 Unselected="SetParameterTree">
110 110 </TreeViewItem>
111 111 <TreeViewItem Header="--------------------"
112   - FontSize="17">
  112 + FontSize="17">
113 113 </TreeViewItem>
114 114 </TreeViewItem>
115 115 <TreeViewItem Header="Schedule"
116   - FontSize="17"
  116 + FontSize="17"
117 117 Name="ScheduleTree"
118 118 Selected="GetScheduleTree"
119 119 Unselected="SetScheduleTree">
120 120 </TreeViewItem>
121 121 <TreeViewItem Header="Logging"
122   - FontSize="17"
  122 + FontSize="17"
123 123 Name="LoggingTree"
124 124 Selected="GetLoggingTree"
125 125 Unselected="SetLoggingTree">
126 126  
127 127  
... ... @@ -128,19 +128,19 @@
128 128 </TreeViewItem>
129 129 </TreeViewItem>
130 130 <TreeViewItem Header="Alert"
131   - FontSize="17"
  131 + FontSize="17"
132 132 Name="AlertTree"
133 133 Selected="GetAlertTree"
134 134 Unselected="SetAlertTree">
135 135 </TreeViewItem>
136 136 <TreeViewItem Header="Help"
137   - FontSize="17"
  137 + FontSize="17"
138 138 Name="HelpTree"
139 139 Selected="GetHelpTree"
140 140 Unselected="SetHelpTree">
141 141 </TreeViewItem>
142 142 <TreeViewItem Header="[+New Project]"
143   - FontSize="17"
  143 + FontSize="17"
144 144 Name="NewProjectTree"
145 145 Selected="GetNewProjectTree"
146 146 Unselected="SetNewProjectTree">
... ... @@ -155,7 +155,7 @@
155 155 <RowDefinition Height="5*"/>
156 156 </Grid.RowDefinitions>
157 157 <Label Grid.Row="0" Content="Viewer" Margin="10,0,0,0"
158   - FontSize="17"/>
  158 + FontSize="17"/>
159 159 </Grid>
160 160 </Border>
161 161 </Grid>
162 162  
163 163  
164 164  
165 165  
... ... @@ -165,31 +165,31 @@
165 165 <TabItem x:Name="TabMap" >
166 166 <TabItem.Header>
167 167 <StackPanel Orientation="Horizontal">
168   - <TextBlock Text="MAP " VerticalAlignment="Center" FontSize="17"></TextBlock>
  168 + <TextBlock Text="MAP " VerticalAlignment="Center" FontSize="17"></TextBlock>
169 169 </StackPanel>
170 170 </TabItem.Header>
171 171 <Grid ShowGridLines="False">
172 172 <Grid.RowDefinitions>
173   - <RowDefinition Height="4*"/>
  173 + <RowDefinition Height="5*"/>
174 174 <RowDefinition Height="1*"/>
175 175 <RowDefinition Height="1*"/>
176 176 </Grid.RowDefinitions>
177 177  
178   - <Grid ShowGridLines="False" Grid.Row="0">
179   - <Grid.ColumnDefinitions>
180   - <ColumnDefinition Width="4*"/>
181   - <ColumnDefinition Width="1.5*"/>
182   - </Grid.ColumnDefinitions>
  178 + <Grid ShowGridLines="False" Grid.Row="0" Name="GridMap">
  179 + <Grid >
  180 + <Grid.ColumnDefinitions>
  181 + <ColumnDefinition Width="{Binding ActualHeight, ElementName=GridMap}"/>
  182 + <ColumnDefinition Width="*"/>
  183 + </Grid.ColumnDefinitions>
  184 + <Border Grid.Column="0" BorderThickness="1" BorderBrush="Red" Margin="5,5,5,5">
183 185  
184   - <Border Grid.Column="0" BorderThickness="1" BorderBrush="Red" Margin="5,5,5,5">
185   -
186   - <s:DesignerCanvas x:Name="MyDesignerCanvas"
  186 + <s:DesignerCanvas x:Name="MyDesignerCanvas"
187 187 AllowDrop="True"
188 188 Background="White" HorizontalAlignment="Stretch">
189   - <!--<Canvas.LayoutTransform>
190   - --><!-- Adjust ScaleX and ScaleY in lock-step to zoom --><!--
191   - <ScaleTransform ScaleX=".8" ScaleY=".8" CenterX=".8" CenterY=".8" />
192   - </Canvas.LayoutTransform>-->
  189 + <Canvas.LayoutTransform>
  190 + <!--Adjust ScaleX and ScaleY in lock-step to zoom-->
  191 + <ScaleTransform ScaleX=".8" ScaleY=".8" CenterX=".8" CenterY=".8" />
  192 + </Canvas.LayoutTransform>
193 193 <Grid Name="MCGrid" Background="White" ShowGridLines="True"
194 194 Width="{Binding ActualWidth, ElementName=MyDesignerCanvas}"
195 195 Height="{Binding ActualHeight, ElementName=MyDesignerCanvas}">
196 196  
197 197  
198 198  
... ... @@ -239,14 +239,14 @@
239 239 <TextBlock Grid.Row="9" Grid.Column="0" Foreground="SkyBlue">900</TextBlock>
240 240 </Grid>
241 241  
242   - </s:DesignerCanvas>
  242 + </s:DesignerCanvas>
243 243  
244   - </Border>
  244 + </Border>
245 245  
246   - <Border Grid.Column="1" BorderThickness="1" BorderBrush="Gray" Margin="5,5,5,5">
  246 + <Border Grid.Column="1" BorderThickness="1" BorderBrush="Gray" Margin="5,5,5,5">
247 247  
248   - <DockPanel >
249   - <!--<ScrollViewer>-->
  248 + <DockPanel >
  249 + <!--<ScrollViewer>-->
250 250 <Grid Name="grdRouteInfo">
251 251 <Grid.RowDefinitions>
252 252 <RowDefinition Height="1*"/>
... ... @@ -264,7 +264,7 @@
264 264 <RowDefinition Height="1*"/>
265 265 <RowDefinition Height="1*"/>
266 266 <RowDefinition Height="1*"/>
267   -
  267 +
268 268 </Grid.RowDefinitions>
269 269 <Grid.ColumnDefinitions>
270 270 <ColumnDefinition Width="0.5*"/>
271 271  
272 272  
... ... @@ -289,28 +289,30 @@
289 289  
290 290  
291 291  
292   - <Label Grid.Row="0" Grid.Column="1" Content="Monitor" FontSize="17"/>
293   - <Label Grid.Row="1" Grid.Column="1" Content="AOR 28249 [kg/h]" FontSize="17"/>
294   - <Label Grid.Row="2" Grid.Column="1" Content="ABC 4738 [trq]" FontSize="17"/>
295   - <Label Grid.Row="3" Grid.Column="1" Content="ATR 49593 [%]" FontSize="17"/>
296   - <Label Grid.Row="4" Grid.Column="1" Content="DEK 50403 [G]" FontSize="17"/>
297   - <Label Grid.Row="5" Grid.Column="1" Content="SKG 2739 [kg]" FontSize="17"/>
298   - <Label Grid.Row="6" Grid.Column="1" Content="SOC 86 [%]" FontSize="17"/>
299   - <Label Grid.Row="7" Grid.Column="1" Content=" :" FontSize="17"/>
300   - <Label Grid.Row="8" Grid.Column="1" Content=" :" FontSize="17"/>
301   - <Label Grid.Row="9" Grid.Column="1" Content=" :" FontSize="17"/>
302   - <Label Grid.Row="10" Grid.Column="1" Content=" :" FontSize="17"/>
303   - <Label Grid.Row="11" Grid.Column="1" Content=" :" FontSize="17"/>
  292 + <Label Grid.Row="0" Grid.Column="1" Content="Monitor" FontSize="17"/>
  293 + <Label Grid.Row="1" Grid.Column="1" Content="AOR 28249 [kg/h]" FontSize="17"/>
  294 + <Label Grid.Row="2" Grid.Column="1" Content="ABC 4738 [trq]" FontSize="17"/>
  295 + <Label Grid.Row="3" Grid.Column="1" Content="ATR 49593 [%]" FontSize="17"/>
  296 + <Label Grid.Row="4" Grid.Column="1" Content="DEK 50403 [G]" FontSize="17"/>
  297 + <Label Grid.Row="5" Grid.Column="1" Content="SKG 2739 [kg]" FontSize="17"/>
  298 + <Label Grid.Row="6" Grid.Column="1" Content="SOC 86 [%]" FontSize="17"/>
  299 + <Label Grid.Row="7" Grid.Column="1" Content=" :" FontSize="17"/>
  300 + <Label Grid.Row="8" Grid.Column="1" Content=" :" FontSize="17"/>
  301 + <Label Grid.Row="9" Grid.Column="1" Content=" :" FontSize="17"/>
  302 + <Label Grid.Row="10" Grid.Column="1" Content=" :" FontSize="17"/>
  303 + <Label Grid.Row="11" Grid.Column="1" Content=" :" FontSize="17"/>
304 304 </Grid>
305   - <!--</ScrollViewer>-->
306   - </DockPanel >
307   - </Border>
  305 + <!--</ScrollViewer>-->
  306 + </DockPanel >
  307 + </Border>
  308 + </Grid>
  309 +
308 310 </Grid>
309 311 <Border Grid.Row="1" BorderThickness="1" BorderBrush="Gray" Margin="5,5,5,5">
310 312 <Grid ShowGridLines="False">
311 313 <Grid.ColumnDefinitions>
312 314 <ColumnDefinition Width="1*"/>
313   - <ColumnDefinition Width="9*"/>
  315 + <ColumnDefinition Width="8*"/>
314 316 </Grid.ColumnDefinitions>
315 317 <Grid ShowGridLines="False" Grid.Column="0">
316 318 <Grid.RowDefinitions>
... ... @@ -318,8 +320,8 @@
318 320 <RowDefinition Height="1*"/>
319 321 <RowDefinition Height="1*"/>
320 322 </Grid.RowDefinitions>
321   - <Label Grid.Row="0" Content="Schedule" Margin="10,0,0,0" FontSize="17"/>
322   - <Label Grid.Row="1" Content="FK15_#1" Margin="10,0,0,0" FontSize="17"/>
  323 + <Label Grid.Row="0" Content="Schedule" Margin="10,0,0,0" FontSize="17"/>
  324 + <Label Grid.Row="1" Content="FK15_#1" Margin="10,0,0,0" FontSize="17"/>
323 325 </Grid>
324 326 <Border Grid.Column="1" BorderThickness="1" BorderBrush="Red" Margin="5,5,5,5">
325 327  
... ... @@ -370,7 +372,7 @@
370 372 <RowDefinition Height="1*"/>
371 373 <RowDefinition Height="2*"/>
372 374 </Grid.RowDefinitions>
373   - <Label Grid.Row="0" Content="Work [FK15_#1]" Margin="10,0,0,0" FontSize="17"/>
  375 + <Label Grid.Row="0" Content="Work [FK15_#1]" Margin="10,0,0,0" FontSize="17"/>
374 376 </Grid>
375 377 </Border>
376 378 </Grid>
377 379  
... ... @@ -378,14 +380,14 @@
378 380 <TabItem x:Name="TabWork" >
379 381 <TabItem.Header>
380 382 <StackPanel Orientation="Horizontal">
381   - <TextBlock Text=" Work " VerticalAlignment="Center" FontSize="17"></TextBlock>
  383 + <TextBlock Text=" Work " VerticalAlignment="Center" FontSize="17"></TextBlock>
382 384 </StackPanel>
383 385 </TabItem.Header>
384 386 </TabItem>
385 387 <TabItem x:Name="TabSchedule" >
386 388 <TabItem.Header>
387 389 <StackPanel Orientation="Horizontal">
388   - <TextBlock Text=" Schedule " VerticalAlignment="Center" FontSize="17"></TextBlock>
  390 + <TextBlock Text=" Schedule " VerticalAlignment="Center" FontSize="17"></TextBlock>
389 391 </StackPanel>
390 392 </TabItem.Header>
391 393 </TabItem>
sources/RoboforkApp/bin/Release/RboforkApp.exe
Diff comments   View file @ 6870a03
No preview for this file type
sources/RoboforkApp/bin/Release/RboforkApp.pdb
Diff comments   View file @ 6870a03
No preview for this file type
sources/RoboforkApp/obj/Release/RboforkApp.exe
Diff comments   View file @ 6870a03
No preview for this file type
sources/RoboforkApp/obj/Release/RboforkApp.g.resources
Diff comments   View file @ 6870a03
No preview for this file type
sources/RoboforkApp/obj/Release/RboforkApp.pdb
Diff comments   View file @ 6870a03
No preview for this file type
sources/RoboforkApp/obj/Release/RboforkApp_MarkupCompile.cache
Diff comments   View file @ 6870a03
... ... @@ -4,12 +4,12 @@
4 4 winexe
5 5 C#
6 6 .cs
7   -E:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\obj\Release\
  7 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\
8 8 RoboforkApp
9 9 none
10 10 false
11 11 TRACE
12   -E:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\App.xaml
  12 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\App.xaml
13 13 2368379346
14 14  
15 15 19-592545476
sources/RoboforkApp/obj/Release/RboforkApp_MarkupCompile.i.cache
Diff comments   View file @ 6870a03
... ... @@ -16,5 +16,5 @@
16 16 12612105591
17 17 EditNodeWindow.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;RoboforkMenu.xaml;UserControls\ucDisplayCoordinate.xaml;UserControls\ucStartEndButton.xaml;Stencils\BasicShapes.xaml;Stencils\FlowChartSymbols.xaml;Stencils\RegelungstechnikSymbole.xaml;Stencils\SymbolStencils.xaml;MainWindow.xaml;
18 18  
19   -True
  19 +False
sources/RoboforkApp/obj/Release/RboforkApp_MarkupCompile.i.lref
View file @ 6870a03
1   -E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\GeneratedInternalTypeHelper.g.i.cs
2   -
3   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Resources\DesignerItem.xaml;;
4   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Resources\ResizeChrome.xaml;;
5   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Resources\Toolbox.xaml;;
6   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Resources\ZoomBox.xaml;;
7   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\RoboforkMenu.xaml;;
8   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Stencils\BasicShapes.xaml;;
9   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Stencils\FlowChartSymbols.xaml;;
10   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Stencils\RegelungstechnikSymbole.xaml;;
11   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Stencils\SymbolStencils.xaml;;
12   -FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\MainWindow.xaml;;
sources/RoboforkApp/obj/Release/RboforkApp_MarkupCompile.lref
Diff comments   View file @ 6870a03
1   -E:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\obj\Release\GeneratedInternalTypeHelper.g.cs
  1 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\GeneratedInternalTypeHelper.g.cs
2 2  
3   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\Resources\DesignerItem.xaml;;
4   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\Resources\ResizeChrome.xaml;;
5   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\Resources\Toolbox.xaml;;
6   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\Resources\ZoomBox.xaml;;
7   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\RoboforkMenu.xaml;;
8   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\Stencils\BasicShapes.xaml;;
9   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\Stencils\FlowChartSymbols.xaml;;
10   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\Stencils\RegelungstechnikSymbole.xaml;;
11   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\Stencils\SymbolStencils.xaml;;
12   -FE:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\MainWindow.xaml;;
  3 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Resources\DesignerItem.xaml;;
  4 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Resources\ResizeChrome.xaml;;
  5 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Resources\Toolbox.xaml;;
  6 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Resources\ZoomBox.xaml;;
  7 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\RoboforkMenu.xaml;;
  8 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Stencils\BasicShapes.xaml;;
  9 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Stencils\FlowChartSymbols.xaml;;
  10 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Stencils\RegelungstechnikSymbole.xaml;;
  11 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\Stencils\SymbolStencils.xaml;;
  12 +FE:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\MainWindow.xaml;;
sources/RoboforkApp/obj/Release/RoboforkApp.csproj.FileListAbsolute.txt
Diff comments   View file @ 6870a03
... ... @@ -38,6 +38,42 @@
38 38 E:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\obj\Release\RboforkApp.exe
39 39 E:\02_Project\Du an Anh Dai\Robofox\sources\RoboforkApp\obj\Release\RboforkApp.pdb
40 40 E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\bin\Release\RboforkApp.exe.config
  41 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\bin\Release\RboforkApp.exe
  42 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\bin\Release\RboforkApp.pdb
  43 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\EditNodeWindow.baml
  44 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\Brushes.baml
  45 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\Expander.baml
  46 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\LangResources.baml
  47 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\ScrollBar.baml
  48 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\ScrollViewer.baml
  49 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\Slider.baml
  50 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\StatusBar.baml
  51 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\Styles.baml
  52 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\ToolBar.baml
  53 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\Tooltip.baml
  54 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\UserControls\ucDisplayCoordinate.baml
  55 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\UserControls\ucStartEndButton.baml
  56 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\App.baml
  57 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\EditNodeWindow.g.cs
  58 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\RoboforkMenu.g.cs
  59 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\UserControls\ucDisplayCoordinate.g.cs
  60 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\UserControls\ucStartEndButton.g.cs
  61 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\MainWindow.g.cs
  62 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\App.g.cs
  63 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\GeneratedInternalTypeHelper.g.cs
  64 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\RboforkApp_MarkupCompile.cache
  65 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\RboforkApp_MarkupCompile.lref
  66 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\DesignerItem.baml
  67 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\ResizeChrome.baml
  68 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\Toolbox.baml
  69 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Resources\ZoomBox.baml
  70 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\RoboforkMenu.baml
  71 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Stencils\BasicShapes.baml
  72 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Stencils\FlowChartSymbols.baml
  73 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Stencils\RegelungstechnikSymbole.baml
  74 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\Stencils\SymbolStencils.baml
  75 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\MainWindow.baml
  76 +E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\RboforkApp.g.resources
41 77 E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\RboforkApp.exe
42 78 E:\02_Project\Du an Anh Dai\Robofork-toan\sources\RoboforkApp\obj\Release\RboforkApp.pdb
sources/RoboforkApp/obj/Release/RoboforkMenu.baml
Diff comments   View file @ 6870a03
No preview for this file type
sources/RoboforkApp/obj/Release/RoboforkMenu.g.cs
Diff comments   View file @ 6870a03
1   -#pragma checksum "..\..\RoboforkMenu.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F78B0A153F96E7BFD712AB642D563B04"
  1 +#pragma checksum "..\..\RoboforkMenu.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C9703D3DF624983A80ECCEEE6ED3548E"
2 2 //------------------------------------------------------------------------------
3 3 // <auto-generated>
4 4 // This code was generated by a tool.
... ... @@ -161,6 +161,14 @@
161 161 #line hidden
162 162  
163 163  
  164 + #line 178 "..\..\RoboforkMenu.xaml"
  165 + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
  166 + internal System.Windows.Controls.Grid GridMap;
  167 +
  168 + #line default
  169 + #line hidden
  170 +
  171 +
164 172 #line 186 "..\..\RoboforkMenu.xaml"
165 173 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
166 174 internal RoboforkApp.DesignerCanvas MyDesignerCanvas;
... ... @@ -185,7 +193,7 @@
185 193 #line hidden
186 194  
187 195  
188   - #line 326 "..\..\RoboforkMenu.xaml"
  196 + #line 328 "..\..\RoboforkMenu.xaml"
189 197 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
190 198 internal RoboforkApp.DesignerCanvas MyDesignerCanvasSchedule;
191 199  
... ... @@ -193,7 +201,7 @@
193 201 #line hidden
194 202  
195 203  
196   - #line 329 "..\..\RoboforkMenu.xaml"
  204 + #line 331 "..\..\RoboforkMenu.xaml"
197 205 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
198 206 internal System.Windows.Controls.Grid MCGridShedule;
199 207  
... ... @@ -201,7 +209,7 @@
201 209 #line hidden
202 210  
203 211  
204   - #line 378 "..\..\RoboforkMenu.xaml"
  212 + #line 380 "..\..\RoboforkMenu.xaml"
205 213 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
206 214 internal System.Windows.Controls.TabItem TabWork;
207 215  
... ... @@ -209,7 +217,7 @@
209 217 #line hidden
210 218  
211 219  
212   - #line 385 "..\..\RoboforkMenu.xaml"
  220 + #line 387 "..\..\RoboforkMenu.xaml"
213 221 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
214 222 internal System.Windows.Controls.TabItem TabSchedule;
215 223  
216 224  
217 225  
218 226  
219 227  
220 228  
221 229  
... ... @@ -455,24 +463,27 @@
455 463 this.TabMap = ((System.Windows.Controls.TabItem)(target));
456 464 return;
457 465 case 16:
458   - this.MyDesignerCanvas = ((RoboforkApp.DesignerCanvas)(target));
  466 + this.GridMap = ((System.Windows.Controls.Grid)(target));
459 467 return;
460 468 case 17:
461   - this.MCGrid = ((System.Windows.Controls.Grid)(target));
  469 + this.MyDesignerCanvas = ((RoboforkApp.DesignerCanvas)(target));
462 470 return;
463 471 case 18:
464   - this.grdRouteInfo = ((System.Windows.Controls.Grid)(target));
  472 + this.MCGrid = ((System.Windows.Controls.Grid)(target));
465 473 return;
466 474 case 19:
467   - this.MyDesignerCanvasSchedule = ((RoboforkApp.DesignerCanvas)(target));
  475 + this.grdRouteInfo = ((System.Windows.Controls.Grid)(target));
468 476 return;
469 477 case 20:
470   - this.MCGridShedule = ((System.Windows.Controls.Grid)(target));
  478 + this.MyDesignerCanvasSchedule = ((RoboforkApp.DesignerCanvas)(target));
471 479 return;
472 480 case 21:
473   - this.TabWork = ((System.Windows.Controls.TabItem)(target));
  481 + this.MCGridShedule = ((System.Windows.Controls.Grid)(target));
474 482 return;
475 483 case 22:
  484 + this.TabWork = ((System.Windows.Controls.TabItem)(target));
  485 + return;
  486 + case 23:
476 487 this.TabSchedule = ((System.Windows.Controls.TabItem)(target));
477 488 return;
478 489 }
sources/RoboforkApp/obj/Release/RoboforkMenu.g.i.cs
Diff comments   View file @ 6870a03
1   -#pragma checksum "..\..\RoboforkMenu.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F78B0A153F96E7BFD712AB642D563B04"
  1 +#pragma checksum "..\..\RoboforkMenu.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "C9703D3DF624983A80ECCEEE6ED3548E"
2 2 //------------------------------------------------------------------------------
3 3 // <auto-generated>
4 4 // This code was generated by a tool.
... ... @@ -161,6 +161,14 @@
161 161 #line hidden
162 162  
163 163  
  164 + #line 178 "..\..\RoboforkMenu.xaml"
  165 + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
  166 + internal System.Windows.Controls.Grid GridMap;
  167 +
  168 + #line default
  169 + #line hidden
  170 +
  171 +
164 172 #line 186 "..\..\RoboforkMenu.xaml"
165 173 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
166 174 internal RoboforkApp.DesignerCanvas MyDesignerCanvas;
... ... @@ -185,7 +193,7 @@
185 193 #line hidden
186 194  
187 195  
188   - #line 326 "..\..\RoboforkMenu.xaml"
  196 + #line 328 "..\..\RoboforkMenu.xaml"
189 197 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
190 198 internal RoboforkApp.DesignerCanvas MyDesignerCanvasSchedule;
191 199  
... ... @@ -193,7 +201,7 @@
193 201 #line hidden
194 202  
195 203  
196   - #line 329 "..\..\RoboforkMenu.xaml"
  204 + #line 331 "..\..\RoboforkMenu.xaml"
197 205 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
198 206 internal System.Windows.Controls.Grid MCGridShedule;
199 207  
... ... @@ -201,7 +209,7 @@
201 209 #line hidden
202 210  
203 211  
204   - #line 378 "..\..\RoboforkMenu.xaml"
  212 + #line 380 "..\..\RoboforkMenu.xaml"
205 213 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
206 214 internal System.Windows.Controls.TabItem TabWork;
207 215  
... ... @@ -209,7 +217,7 @@
209 217 #line hidden
210 218  
211 219  
212   - #line 385 "..\..\RoboforkMenu.xaml"
  220 + #line 387 "..\..\RoboforkMenu.xaml"
213 221 [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
214 222 internal System.Windows.Controls.TabItem TabSchedule;
215 223  
216 224  
217 225  
218 226  
219 227  
220 228  
221 229  
... ... @@ -455,24 +463,27 @@
455 463 this.TabMap = ((System.Windows.Controls.TabItem)(target));
456 464 return;
457 465 case 16:
458   - this.MyDesignerCanvas = ((RoboforkApp.DesignerCanvas)(target));
  466 + this.GridMap = ((System.Windows.Controls.Grid)(target));
459 467 return;
460 468 case 17:
461   - this.MCGrid = ((System.Windows.Controls.Grid)(target));
  469 + this.MyDesignerCanvas = ((RoboforkApp.DesignerCanvas)(target));
462 470 return;
463 471 case 18:
464   - this.grdRouteInfo = ((System.Windows.Controls.Grid)(target));
  472 + this.MCGrid = ((System.Windows.Controls.Grid)(target));
465 473 return;
466 474 case 19:
467   - this.MyDesignerCanvasSchedule = ((RoboforkApp.DesignerCanvas)(target));
  475 + this.grdRouteInfo = ((System.Windows.Controls.Grid)(target));
468 476 return;
469 477 case 20:
470   - this.MCGridShedule = ((System.Windows.Controls.Grid)(target));
  478 + this.MyDesignerCanvasSchedule = ((RoboforkApp.DesignerCanvas)(target));
471 479 return;
472 480 case 21:
473   - this.TabWork = ((System.Windows.Controls.TabItem)(target));
  481 + this.MCGridShedule = ((System.Windows.Controls.Grid)(target));
474 482 return;
475 483 case 22:
  484 + this.TabWork = ((System.Windows.Controls.TabItem)(target));
  485 + return;
  486 + case 23:
476 487 this.TabSchedule = ((System.Windows.Controls.TabItem)(target));
477 488 return;
478 489 }