EgtCAM5 :

- Migliorie SetUp.
- Migliorie simulazione.
This commit is contained in:
Emmanuele Sassi
2017-01-27 18:33:56 +00:00
parent 7747916f24
commit dffe9de64e
15 changed files with 493 additions and 327 deletions
@@ -1,11 +1,50 @@
<UserControl x:Class="SimulationExpanderView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
<UserControl.Resources>
<sys:String x:Key="A1">A1</sys:String>
<sys:String x:Key="A2">A2</sys:String>
<sys:String x:Key="A3">A3</sys:String>
<sys:String x:Key="A4">A4</sys:String>
<sys:String x:Key="A5">A5</sys:String>
<sys:String x:Key="A6">A6</sys:String>
<sys:String x:Key="A7">A7</sys:String>
<sys:String x:Key="A8">A8</sys:String>
</UserControl.Resources>
<StackPanel>
<Expander Header="{Binding SimulationMsg}" IsExpanded="{Binding IsExpanded}" Style="{StaticResource ExpanderStyle}">
<StackPanel >
<StackPanel>
<ItemsControl Grid.Row="10" ItemsSource="{Binding MachineAxisList}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid Margin="5,1,10,1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding Name}" FontSize="15"
HorizontalAlignment="Center" VerticalAlignment="Center"
TextWrapping="Wrap" TextAlignment="Center"/>
<TextBox Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Grid.Column="1"
IsReadOnly="{Binding IsReadOnlyAxesValue}"
IsEnabled="{Binding IsEnabledAxesValue}"
TextAlignment="Right">
<TextBox.InputBindings>
<KeyBinding Key="Enter" Command="{Binding ManualAxisModifyCommand}"/>
</TextBox.InputBindings>
</TextBox>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*"/>
@@ -15,55 +54,15 @@
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<TextBlock Text="{Binding A1Name}" Grid.Column="0" Grid.Row="0" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
<EgtWPFLib5:EgtTextBox Text="{Binding A1Value}" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2"
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
<TextBlock Text="{Binding A2Name}" Grid.Column="0" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
<EgtWPFLib5:EgtTextBox Text="{Binding A2Value}" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
<TextBlock Text="{Binding A3Name}" Grid.Column="0" Grid.Row="2" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
<EgtWPFLib5:EgtTextBox Text="{Binding A3Value}" Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2"
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
<TextBlock Text="{Binding A4Name}" Grid.Column="0" Grid.Row="3" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
<EgtWPFLib5:EgtTextBox Text="{Binding A4Value}" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2"
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
<TextBlock Text="{Binding A5Name}" Grid.Column="0" Grid.Row="4" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" />
<EgtWPFLib5:EgtTextBox Text="{Binding A5Value}" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2"
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
<TextBlock Text="{Binding A6Name}" Grid.Column="0" Grid.Row="5" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" />
<EgtWPFLib5:EgtTextBox Text="{Binding A6Value}" Grid.Column="1" Grid.Row="5" Grid.ColumnSpan="2"
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
<TextBlock Text="{Binding A7Name}" Grid.Column="0" Grid.Row="6" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" />
<EgtWPFLib5:EgtTextBox Text="{Binding A7Value}" Grid.Column="1" Grid.Row="6" Grid.ColumnSpan="2"
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
<TextBlock Text="{Binding A8Name}" Grid.Column="0" Grid.Row="7" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" />
<EgtWPFLib5:EgtTextBox Text="{Binding A8Value}" Grid.Column="1" Grid.Row="7" Grid.ColumnSpan="2"
Width="120" TextAlignment="Right" Style="{StaticResource EgtCAM5_SimulationTextBox}"/>
<TextBlock Text="{Binding GCode}" Grid.Column="0" Grid.Row="8" FontSize="15" HorizontalAlignment="Center"
<TextBlock Text="{Binding GCode}" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
<TextBlock Text="{Binding FValue}" Grid.Column="2" Grid.Row="8" FontSize="15" HorizontalAlignment="Center"
<TextBlock Text="{Binding FValue}" Grid.Column="2" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" />
<TextBlock Text="{Binding TName}" Grid.Column="0" Grid.Row="9" FontSize="15" HorizontalAlignment="Center"
<TextBlock Text="{Binding TName}" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Center" Margin="5,5,5,0" Grid.ColumnSpan="2" />
<TextBlock Text="{Binding SValue}" Grid.Column="2" Grid.Row="9" FontSize="15" HorizontalAlignment="Center"
<TextBlock Text="{Binding SValue}" Grid.Column="2" Grid.Row="1" FontSize="15" HorizontalAlignment="Center"
VerticalAlignment="Center" TextAlignment="Right" Margin="0,5,5,5" />
</Grid>