Add Start + Complete Button to PackML_UserControl
This commit is contained in:
@@ -39,6 +39,7 @@
|
|||||||
<RowDefinition Height="15*"/>
|
<RowDefinition Height="15*"/>
|
||||||
<RowDefinition Height="15*"/>
|
<RowDefinition Height="15*"/>
|
||||||
<RowDefinition Height="15*"/>
|
<RowDefinition Height="15*"/>
|
||||||
|
<RowDefinition Height="15*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Border Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" BorderBrush="White" BorderThickness="2"/>
|
<Border Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" BorderBrush="White" BorderThickness="2"/>
|
||||||
<!-- <Label Grid.Column="0" Content="{Binding SName}" VerticalAlignment="Center" HorizontalAlignment="Left"/> -->
|
<!-- <Label Grid.Column="0" Content="{Binding SName}" VerticalAlignment="Center" HorizontalAlignment="Left"/> -->
|
||||||
@@ -55,14 +56,22 @@
|
|||||||
|
|
||||||
<Button Visibility="Visible" Grid.Row="3" Grid.Column="0" Content="Produktion" Margin="5" DataContext="{Binding ProdModeButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
<Button Visibility="Visible" Grid.Row="3" Grid.Column="0" Content="Produktion" Margin="5" DataContext="{Binding ProdModeButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
<Button Visibility="Visible" Grid.Row="3" Grid.Column="1" Content="Manuell" Margin="5" DataContext="{Binding ManualModeButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
<Button Visibility="Visible" Grid.Row="3" Grid.Column="1" Content="Manuell" Margin="5" DataContext="{Binding ManualModeButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
<Button Visibility="Visible" Grid.Row="5" Grid.Column="0" Content="Clear" Margin="5" DataContext="{Binding ClearButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
|
||||||
<Button Visibility="Visible" Grid.Row="5" Grid.Column="1" Content="Reset" Margin="5" DataContext="{Binding ResetButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
|
||||||
<Button Visibility="Visible" Grid.Row="6" Grid.Column="0" Content="Abbruch" Margin="5" DataContext="{Binding AbortButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
<Button Visibility="Visible" Grid.Row="5" Grid.Column="0" Content="Start" Margin="5" DataContext="{Binding StartButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
<Button Visibility="Visible" Grid.Row="6" Grid.Column="1" Content="Hold" Margin="5" DataContext="{Binding HoldButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
<Button Visibility="Visible" Grid.Row="5" Grid.Column="1" Content="Complete" Margin="5" DataContext="{Binding CompleteButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
<Button Visibility="Visible" Grid.Row="7" Grid.Column="0" Content="Stop" Margin="5" DataContext="{Binding StopButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
|
||||||
<Button Visibility="Visible" Grid.Row="7" Grid.Column="1" Content="Suspend" Margin="5" DataContext="{Binding SuspendButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
<Button Visibility="Visible" Grid.Row="6" Grid.Column="0" Content="Hold" Margin="5" DataContext="{Binding HoldButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
<Button Visibility="Visible" Grid.Row="8" Grid.Column="0" Content="Unhold" Margin="5" DataContext="{Binding UnholdButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
<Button Visibility="Visible" Grid.Row="6" Grid.Column="1" Content="Unhold" Margin="5" DataContext="{Binding UnholdButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
<Button Visibility="Visible" Grid.Row="8" Grid.Column="1" Content="Unsuspend" Margin="5" DataContext="{Binding UnsuspendButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
|
||||||
|
<Button Visibility="Visible" Grid.Row="7" Grid.Column="0" Content="Suspend" Margin="5" DataContext="{Binding SuspendButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
|
<Button Visibility="Visible" Grid.Row="7" Grid.Column="1" Content="Unsuspend" Margin="5" DataContext="{Binding UnsuspendButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
|
|
||||||
|
<Button Visibility="Visible" Grid.Row="8" Grid.Column="0" Content="Stop" Margin="5" DataContext="{Binding StopButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
|
<Button Visibility="Visible" Grid.Row="8" Grid.Column="1" Content="Abbruch" Margin="5" DataContext="{Binding AbortButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
|
|
||||||
|
<Button Visibility="Visible" Grid.Row="9" Grid.Column="0" Content="Clear" Margin="5" DataContext="{Binding ClearButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
|
<Button Visibility="Visible" Grid.Row="9" Grid.Column="1" Content="Reset" Margin="5" DataContext="{Binding ResetButtonVm}" Command="{Binding ButtonClickedCommand}" IsEnabled="{Binding XRelease}" Background="{Binding IFeedback, Converter={StaticResource feedbackConverter}}" FontSize="32" />
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ public sealed partial class PackMLControlVM : ObservableValidator, IDisposable
|
|||||||
[ObservableProperty] private HMIControlButtonVM? suspendButtonVm;
|
[ObservableProperty] private HMIControlButtonVM? suspendButtonVm;
|
||||||
[ObservableProperty] private HMIControlButtonVM? unholdButtonVm;
|
[ObservableProperty] private HMIControlButtonVM? unholdButtonVm;
|
||||||
[ObservableProperty] private HMIControlButtonVM? unsuspendButtonVm;
|
[ObservableProperty] private HMIControlButtonVM? unsuspendButtonVm;
|
||||||
|
[ObservableProperty] private HMIControlButtonVM? completeButtonVm;
|
||||||
|
|
||||||
[ObservableProperty] private bool canUserInteract;
|
[ObservableProperty] private bool canUserInteract;
|
||||||
|
|
||||||
@@ -50,6 +51,7 @@ public sealed partial class PackMLControlVM : ObservableValidator, IDisposable
|
|||||||
SuspendButtonVm = new();
|
SuspendButtonVm = new();
|
||||||
UnholdButtonVm = new();
|
UnholdButtonVm = new();
|
||||||
UnsuspendButtonVm = new();
|
UnsuspendButtonVm = new();
|
||||||
|
CompleteButtonVm = new();
|
||||||
|
|
||||||
var currentUser = Users.getCurrentUser();
|
var currentUser = Users.getCurrentUser();
|
||||||
canUserInteract = currentUser.UserLevel > 50;
|
canUserInteract = currentUser.UserLevel > 50;
|
||||||
@@ -76,6 +78,7 @@ public sealed partial class PackMLControlVM : ObservableValidator, IDisposable
|
|||||||
SuspendButtonVm = new(_adsManager, _variableName + ".stBtnSuspend");
|
SuspendButtonVm = new(_adsManager, _variableName + ".stBtnSuspend");
|
||||||
UnholdButtonVm = new(_adsManager, _variableName + ".stBtnUnhold");
|
UnholdButtonVm = new(_adsManager, _variableName + ".stBtnUnhold");
|
||||||
UnsuspendButtonVm = new(_adsManager, _variableName + ".stBtnUnsuspend");
|
UnsuspendButtonVm = new(_adsManager, _variableName + ".stBtnUnsuspend");
|
||||||
|
CompleteButtonVm = new(_adsManager, _variableName + ".stBtnComplete");
|
||||||
|
|
||||||
_adsManager.Register(_variableName + ".eCurrentState", StateChanged);
|
_adsManager.Register(_variableName + ".eCurrentState", StateChanged);
|
||||||
_adsManager.Register(_variableName + ".eCurrentMode", ModeChanged);
|
_adsManager.Register(_variableName + ".eCurrentMode", ModeChanged);
|
||||||
@@ -194,7 +197,18 @@ public sealed partial class PackMLControlVM : ObservableValidator, IDisposable
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
ProdModeButtonVm?.Dispose();
|
||||||
|
ManualModeButtonVm?.Dispose();
|
||||||
|
ClearButtonVm?.Dispose();
|
||||||
|
ResetButtonVm?.Dispose();
|
||||||
|
StartButtonVm?.Dispose();
|
||||||
|
AbortButtonVm?.Dispose();
|
||||||
|
HoldButtonVm?.Dispose();
|
||||||
|
StopButtonVm?.Dispose();
|
||||||
|
SuspendButtonVm?.Dispose();
|
||||||
|
UnholdButtonVm?.Dispose();
|
||||||
|
UnsuspendButtonVm?.Dispose();
|
||||||
|
CompleteButtonVm?.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user