Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG]Inspectors HideOverride() not working (#762) #1

Merged
merged 1 commit into from
Dec 7, 2024
Merged

[BUG]Inspectors HideOverride() not working (#762) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions ...Inxton.TcoInspectors.Wpf/Abstractions/InspectorDialogue/TcoInspectorDialogDialogView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,21 +120,15 @@
</ScrollViewer>
<WrapPanel Grid.Row="3" HorizontalAlignment="Center">


<WrapPanel.Resources>
<Style BasedOn="{StaticResource MaterialDesignRaisedSecondaryDarkButton}" TargetType="Button">
<Setter Property="Width" Value="150" />
<Setter Property="Margin" Value="10" />
</Style>
</WrapPanel.Resources>

<Button Visibility="{Binding Dialog._hideRetryButton.Cyclic,Converter={vortex:BooleanToVisibilityConverter},ConverterParameter=true}" Command="{Binding RetryCommand, Mode=OneWay}" Content="{x:Static s:strings.Retry}" />
<Button Margin="10" MinWidth="150" Visibility="{Binding Dialog._hideRetryButton.Cyclic,Converter={vortex:BooleanToVisibilityConverter},ConverterParameter=true}" Command="{Binding RetryCommand, Mode=OneWay}" Content="{x:Static s:strings.Retry}" />
<WrapPanel Visibility="{Binding Dialog._hideTerminateButton.Cyclic,Converter={vortex:BooleanToVisibilityConverter},ConverterParameter=true}">
<vortexs:PermissionBox Name="PermissionBoxTerminateCommand" Permissions="can_terminate_inspection">
<Button Visibility="{Binding Dialog._hideTerminateButton.Cyclic,Converter={vortex:BooleanToVisibilityConverter},ConverterParameter=true}" Command="{Binding TerminateCommand, Mode=OneWay}" Content="{x:Static s:strings.Terminate}" />
<Button Margin="10" MinWidth="150" Command="{Binding TerminateCommand, Mode=OneWay}" Content="{x:Static s:strings.Terminate}" />
</vortexs:PermissionBox>
</WrapPanel>
<WrapPanel Visibility="{Binding Dialog._hideOverideButton.Cyclic,Converter={vortex:BooleanToVisibilityConverter},ConverterParameter=true}">
<vortexs:PermissionBox Name="PermissionBoxOverrideCommand" Permissions="can_override_inspection">
<Button Command="{Binding OverrideCommand, Mode=OneWay}" Content="{x:Static s:strings.Override}" />
<Button Margin="10" MinWidth="150" Command="{Binding OverrideCommand, Mode=OneWay}" Content="{x:Static s:strings.Override}" />
</vortexs:PermissionBox>
</WrapPanel>
</WrapPanel>
Expand Down
7 changes: 3 additions & 4 deletions src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,9 @@ METHOD HideOverride : IInspector

]]></Declaration>
<Implementation>
<ST><![CDATA[
HideOverride := THIS^;
<ST><![CDATA[HideOverride := THIS^;

_tcoInspectorDialogue.HideTetminate:=TRUE;]]></ST>
_tcoInspectorDialogue.HideOverride:=TRUE;]]></ST>
</Implementation>
</Method>
<Method Name="HideRetry" Id="{9317c727-1713-06bd-08c8-699129870d8a}">
Expand Down Expand Up @@ -337,7 +336,7 @@ METHOD HideTerminate : IInspector
<ST><![CDATA[
HideTerminate := THIS^;

_tcoInspectorDialogue.HideTetminate:=TRUE;]]></ST>
_tcoInspectorDialogue.HideTerminate:=TRUE;]]></ST>
</Implementation>
</Method>
<Method Name="Instruct" Id="{3cb26e75-7a50-092d-1479-a384f5c28729}">
Expand Down
6 changes: 3 additions & 3 deletions src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspectorDialog.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ END_VAR
</Implementation>
</Get>
</Property>
<Property Name="HideTetminate" Id="{28b62800-6c31-0d8a-222a-9e251ae995de}" FolderPath="HideButtons\">
<Declaration><![CDATA[PROPERTY HideTetminate: REFERENCE TO BOOL
<Property Name="HideTerminate" Id="{28b62800-6c31-0d8a-222a-9e251ae995de}" FolderPath="HideButtons\">
<Declaration><![CDATA[PROPERTY HideTerminate: REFERENCE TO BOOL
]]></Declaration>
<Get Name="Get" Id="{eeefe351-e74d-0f82-16d2-250018ec86f3}">
<Declaration><![CDATA[VAR
END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[HideTetminate ref=_hideTerminateButton;]]></ST>
<ST><![CDATA[HideTerminate ref=_hideTerminateButton;]]></ST>
</Implementation>
</Get>
</Property>
Expand Down