Push Changes from Techcrafters Repo
This commit is contained in:
@@ -7,17 +7,19 @@
|
||||
xmlns:common="clr-namespace:Common"
|
||||
d:DataContext="{d:DesignInstance Type=uniperHmi:ReceipePageVM, IsDesignTimeCreatable=True}"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="1900" d:DesignWidth="3800">
|
||||
d:DesignHeight="1554" d:DesignWidth="3840">
|
||||
|
||||
<Page.Resources>
|
||||
<CollectionViewSource x:Key="FlowStations" Source="{Binding FlowStationsVm}"></CollectionViewSource>
|
||||
<CollectionViewSource x:Key="FlowStations" Source="{Binding FlowStationsVm}"/>
|
||||
<Style x:Key="Foo" TargetType="DataGridCell">
|
||||
<Setter Property="FontSize" Value="30"/>
|
||||
</Style>
|
||||
</Page.Resources>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="33*"/>
|
||||
<ColumnDefinition Width="33*"/>
|
||||
<ColumnDefinition Width="17*"/>
|
||||
<ColumnDefinition Width="17*"/>
|
||||
<ColumnDefinition Width="0.25*"/>
|
||||
<ColumnDefinition Width="0.25*"/>
|
||||
<ColumnDefinition Width="0.5*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
@@ -40,34 +42,40 @@
|
||||
<RowDefinition/>
|
||||
<RowDefinition/>
|
||||
<RowDefinition/>
|
||||
<RowDefinition/>
|
||||
<RowDefinition/>
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal">
|
||||
<Button Grid.Row="0" x:Name="BtnReadReceipeFile"
|
||||
Content="Rezept aus Datei Laden"
|
||||
Width="120"
|
||||
Width="450" Height="140" FontSize="30"
|
||||
Command="{Binding ReadReceipeFileCommand}"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="10"/>
|
||||
|
||||
<Button Grid.Row="0" x:Name="BtnWriteReceipeFile"
|
||||
Content="Rezept speichern"
|
||||
Width="120"
|
||||
Width="450" Height="140" FontSize="30"
|
||||
Command="{Binding WriteReceipeFileCommand}"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="10"/>
|
||||
<Button Grid.Row="0" x:Name="BtnWriteToPlc"
|
||||
Content="Sende Daten an SPS"
|
||||
Width="120"
|
||||
Command="{Binding WriteToPlcCommand}"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="10"/>
|
||||
<Button Grid.Row="0" x:Name="BtnWriteToPlc"
|
||||
Content="Sende Daten an SPS"
|
||||
Width="450" Height="140" FontSize="30"
|
||||
Command="{Binding WriteToPlcCommand}"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="10"/>
|
||||
<Button Grid.Row="0" x:Name="BtnReadToPlc"
|
||||
Content="Lese Daten von SPS"
|
||||
Width="450" Height="140" FontSize="30"
|
||||
Command="{Binding ReadFromPlcCommand}"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="10"
|
||||
Visibility ="Collapsed"
|
||||
/>
|
||||
</StackPanel>
|
||||
<Label Grid.Column="0" Grid.Row="1" Content="Allgemein: " VerticalAlignment="Center" FontSize="24"></Label>
|
||||
<common:ParamControlFloat Grid.Column="0" Grid.Row="2" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding CameraProgramsVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="0" Grid.Row="3" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding ChucksVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="0" Grid.Row="4" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding GripperVm}"/>
|
||||
<common:ParamControlInt Grid.Column="0" Grid.Row="2" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding CameraProgramsVm}"/>
|
||||
<common:ParamControlInt Grid.Column="0" Grid.Row="3" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding ChucksVm}"/>
|
||||
<common:ParamControlInt Grid.Column="0" Grid.Row="4" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding GripperVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="0" Grid.Row="6" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding DiameterVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="0" Grid.Row="7" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding ThicknessVm}"/>
|
||||
|
||||
@@ -88,8 +96,8 @@
|
||||
<Label Grid.Column="1" Grid.Row="1" Content="Hochvolt Parameter: " VerticalAlignment="Center" FontSize="24"></Label>
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="2" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvmaxTestCurrentVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="3" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding Hvn2PrePurgeTimeVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="4" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvnumRetriesVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="5" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvpolarityVm}"/>
|
||||
<common:ParamControlInt Grid.Column="1" Grid.Row="4" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvnumRetriesVm}"/>
|
||||
<common:ParamControlInt Grid.Column="1" Grid.Row="5" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvpolarityVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="6" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvrampTimeVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="7" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvtestFrequencyVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="8" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvTestOkCurrentVm}"/>
|
||||
@@ -97,22 +105,59 @@
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="10" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvtestTemperatureVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="11" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvtestVoltageVm}"/>
|
||||
<common:ParamControlFloat Grid.Column="1" Grid.Row="12" Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center" DataContext="{Binding HvtestPressureN2Vm}"/>
|
||||
|
||||
<Label Grid.Column="1" Grid.Row="14" Content="Durchlaufrezept Tabelle"></Label>
|
||||
<Grid Grid.Column="1" Grid.Row="15" Grid.RowSpan="6">
|
||||
|
||||
<Label Grid.Column="1" Grid.Row="14" Content="Traypositionen" FontSize="35"></Label>
|
||||
<Grid Grid.Column="1" Grid.Row="15" Grid.RowSpan="5">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="0.8*"/>
|
||||
<ColumnDefinition Width="0.2*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<DataGrid Grid.Column="0" ItemsSource="{Binding TrayPositions}"
|
||||
SelectedItem="{Binding SelectedTrayPosition}"
|
||||
AutoGenerateColumns="False" CanUserAddRows="False" FontSize="30" >
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Pos Nr." Binding="{Binding PosId}"/>
|
||||
<DataGridTextColumn Header="Pos X" Binding="{Binding PosX}" Width="170"/>
|
||||
<DataGridTextColumn Header="Pos Y" Binding="{Binding PosY}" Width="170"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<StackPanel Grid.Column="1" Orientation="Vertical">
|
||||
<Button Content="+" FontSize="24" Width="60" Height="60" HorizontalAlignment="Left" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="10" Command="{Binding AddTrayPositionCommand}" IsEnabled="{Binding CanAddTrayPosition}"/>
|
||||
<Button Content="-" FontSize="24" Width="60" Height="60" HorizontalAlignment="Left" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="10" Command="{Binding RemoveTrayPositionCommand}" IsEnabled="{Binding CanRemoveTrayPosition}"/>
|
||||
<Button Content="↑" FontSize="24" Width="60" Height="60" HorizontalAlignment="Left" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="10" Command="{Binding TrayPositionUpCommand}"/>
|
||||
<Button Content="↓" FontSize="24" Width="60" Height="60" HorizontalAlignment="Left" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="10" Command="{Binding TrayPositionDownCommand}"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
<Label Grid.Column="2" Grid.Row="1" Content="Durchlaufrezept Tabelle" FontSize="30"/>
|
||||
<Grid Grid.Column="2" Grid.Row="2" Grid.RowSpan="6">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="90*"/>
|
||||
<ColumnDefinition Width="10*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<DataGrid Grid.Column="0" ItemsSource="{Binding FlowReceipeEntries}"
|
||||
SelectedItem="{Binding SelectedFlowReceipeEntry, UpdateSourceTrigger=PropertyChanged}"
|
||||
AutoGenerateColumns="False" CanUserAddRows="False">
|
||||
AutoGenerateColumns="False" CanUserAddRows="False" FontSize="30">
|
||||
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="NodeID" Binding="{Binding NodeId}"/>
|
||||
<DataGridTextColumn Header="Priorität" Binding="{Binding Priority}"/>
|
||||
<DataGridComboBoxColumn Header="Station"
|
||||
<DataGridTextColumn Header="Prio" Binding="{Binding Priority}"/>
|
||||
<DataGridComboBoxColumn Header="Station"
|
||||
ItemsSource="{Binding Source={StaticResource FlowStations}}"
|
||||
SelectedValueBinding="{Binding Station, NotifyOnTargetUpdated=True, NotifyOnSourceUpdated=True}"/>
|
||||
SelectedValueBinding="{Binding Station, NotifyOnTargetUpdated=True, NotifyOnSourceUpdated=True}">
|
||||
<DataGridComboBoxColumn.ElementStyle>
|
||||
<Style TargetType="ComboBox">
|
||||
<Setter Property="FontSize" Value="30"/>
|
||||
<Setter Property="IsHitTestVisible" Value="False"/>
|
||||
<Setter Property="Focusable" Value="False"/>
|
||||
</Style>
|
||||
</DataGridComboBoxColumn.ElementStyle>
|
||||
<DataGridComboBoxColumn.EditingElementStyle>
|
||||
<Style TargetType="ComboBox">
|
||||
<Setter Property="FontSize" Value="30"/>
|
||||
</Style>
|
||||
</DataGridComboBoxColumn.EditingElementStyle>
|
||||
</DataGridComboBoxColumn>
|
||||
<DataGridTextColumn Header="Max. Wdh." Binding="{Binding MaxRetries}"/>
|
||||
<DataGridTextColumn Header="Nächste Node" Binding="{Binding NextNodeSuccess}"/>
|
||||
<DataGridTextColumn Header="Nächste Node bei Wdh." Binding="{Binding NextNodeRetry}"/>
|
||||
@@ -129,39 +174,16 @@
|
||||
|
||||
|
||||
|
||||
|
||||
<Label Grid.Column="2" Grid.Row="1" Content="Traypositionen" FontSize="24"></Label>
|
||||
<Grid Grid.Column="2" Grid.Row="1" Grid.RowSpan="6">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="80*"/>
|
||||
<ColumnDefinition Width="20*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<DataGrid Grid.Column="0" ItemsSource="{Binding TrayPositions}"
|
||||
SelectedItem="{Binding SelectedTrayPosition}"
|
||||
AutoGenerateColumns="False" CanUserAddRows="False">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Pos Nr." Binding="{Binding PosId}"/>
|
||||
<DataGridTextColumn Header="Pos X" Binding="{Binding PosX}"/>
|
||||
<DataGridTextColumn Header="Pos Y" Binding="{Binding PosY}"></DataGridTextColumn>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<StackPanel Grid.Column="1" Orientation="Vertical">
|
||||
<Button Content="+" FontSize="24" Width="60" Height="60" HorizontalAlignment="Left" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="10" Command="{Binding AddTrayPositionCommand}" IsEnabled="{Binding CanAddTrayPosition}"></Button>
|
||||
<Button Content="-" FontSize="24" Width="60" Height="60" HorizontalAlignment="Left" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="10" Command="{Binding RemoveTrayPositionCommand}" IsEnabled="{Binding CanRemoveTrayPosition}"></Button>
|
||||
<Button Content="↑" FontSize="24" Width="60" Height="60" HorizontalAlignment="Left" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="10" Command="{Binding TrayPositionUpCommand}"></Button>
|
||||
<Button Content="↓" FontSize="24" Width="60" Height="60" HorizontalAlignment="Left" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="10" Command="{Binding TrayPositionDownCommand}"></Button>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
<Label Grid.Column="2" Grid.Row="9" Content="Ätzschritte Mecademic Roboter"></Label>
|
||||
<Grid Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="10" Grid.RowSpan="7">
|
||||
|
||||
<Label Grid.Column="2" Grid.Row="9" Content="Ätzschritte Mecademic Roboter" FontSize="30"></Label>
|
||||
<Grid Grid.Column="2" Grid.ColumnSpan="1" Grid.Row="10" Grid.RowSpan="7">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="90*"/>
|
||||
<ColumnDefinition Width="10*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<DataGrid Grid.Column="0" ItemsSource="{Binding EtcherRobotSteps}"
|
||||
SelectedItem="{Binding SelectedEtchRobotStep, UpdateSourceTrigger=PropertyChanged}"
|
||||
AutoGenerateColumns="False" CanUserAddRows="False">
|
||||
AutoGenerateColumns="False" CanUserAddRows="False" FontSize="30">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Pos X" Binding="{Binding PosX}"/>
|
||||
<DataGridTextColumn Header="Pos Y" Binding="{Binding PosY}"/>
|
||||
|
||||
Reference in New Issue
Block a user