feat: add Ford VP44 unlock progress dialog, K-Line fast unlock, localization, safety dialogs, and settings
Unlock progress UI:
- UnlockProgressDialog with dark-themed progress ring, phase indicator, elapsed
time, and cancel/close buttons (non-modal, draggable borderless window)
- UnlockProgressViewModel with event-driven progress tracking via IUnlockService
- Triggers on pump selection (manual or K-Line auto-detect), not test start
UnlockService rewrite:
- Persistent CAN senders that outlive the unlock sequence (StopSenders on pump change)
- Concurrent K-Line fast unlock: awaits session Connected, sends RAM timer shortcut
({02 88 02 03 A8 01 00}), verifies via CAN TestUnlock before skipping wait
- Fix Type 1 verification (Value == 0 means unlocked, was inverted)
K-Line fast unlock support:
- IKwpService.TryFastUnlockAsync / KwpService implementation
Additional features:
- ILocalizationService with ES/EN resource dictionaries and runtime switching
- Safety dialogs: VoltageWarning, OilPumpConfirm, RpmSafetyWarning
- SettingsDialog for app configuration
- BenchService enhancements, ConfigurationService improvements, PDF report updates
- All UI strings localized via DynamicResource
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<!-- Header -->
|
||||
<TextBlock Grid.ColumnSpan="3" Text="ADVANCE MONITORING"
|
||||
<TextBlock Grid.ColumnSpan="3" Text="{DynamicResource Angle.Header}"
|
||||
HorizontalAlignment="Center" FontSize="20"
|
||||
FontWeight="Bold" FontStyle="Italic"
|
||||
Foreground="DimGray" Margin="0,0,0,4"/>
|
||||
@@ -32,10 +32,10 @@
|
||||
<Button Content="0" Width="28" Height="28" FontWeight="Bold"
|
||||
VerticalAlignment="Center" Margin="0,0,4,0"
|
||||
Command="{Binding SetPsgZeroCommand}"
|
||||
ToolTip="Set PSG zero reference"/>
|
||||
ToolTip="{DynamicResource Angle.SetPsgZero}"/>
|
||||
<Border Style="{DynamicResource LcdBlue}" Padding="4,0" Width="170">
|
||||
<DockPanel>
|
||||
<TextBlock Text="PSG:" DockPanel.Dock="Left"
|
||||
<TextBlock Text="{DynamicResource Angle.Psg}" DockPanel.Dock="Left"
|
||||
VerticalAlignment="Bottom" Margin="2,0,0,8"
|
||||
FontSize="10" FontWeight="Bold"
|
||||
Foreground="{Binding PsgAngleForeground}"/>
|
||||
@@ -56,10 +56,10 @@
|
||||
<Button Content="0" Width="28" Height="28" FontWeight="Bold"
|
||||
VerticalAlignment="Center" Margin="0,0,4,0"
|
||||
Command="{Binding SetInjZeroCommand}"
|
||||
ToolTip="Set INJ zero reference"/>
|
||||
ToolTip="{DynamicResource Angle.SetInjZero}"/>
|
||||
<Border Style="{DynamicResource LcdBlue}" Padding="4,0" Width="170">
|
||||
<DockPanel>
|
||||
<TextBlock Text="INJ:" DockPanel.Dock="Left"
|
||||
<TextBlock Text="{DynamicResource Angle.Inj}" DockPanel.Dock="Left"
|
||||
VerticalAlignment="Bottom" Margin="2,0,0,8"
|
||||
FontSize="10" FontWeight="Bold"
|
||||
Foreground="{Binding InjAngleForeground}"/>
|
||||
@@ -105,7 +105,7 @@
|
||||
<!-- ABS (manual encoder) -->
|
||||
<Border Style="{DynamicResource LcdBlue}" Height="56" Margin="0,2" Padding="4,0">
|
||||
<DockPanel>
|
||||
<TextBlock Text="ABS º:" DockPanel.Dock="Left"
|
||||
<TextBlock Text="{DynamicResource Angle.AbsDeg}" DockPanel.Dock="Left"
|
||||
VerticalAlignment="Bottom" Margin="4,0,0,8"
|
||||
FontSize="10" FontWeight="Bold" Foreground="#FFEBEBFF"/>
|
||||
<TextBlock Text="{Binding ManualAngleText}"
|
||||
@@ -118,7 +118,7 @@
|
||||
<!-- LOCK angle result -->
|
||||
<Border Style="{DynamicResource LcdBlue}" Height="56" Margin="0,2" Padding="4,0">
|
||||
<DockPanel>
|
||||
<TextBlock Text="LOCK º:" DockPanel.Dock="Left"
|
||||
<TextBlock Text="{DynamicResource Angle.LockDeg}" DockPanel.Dock="Left"
|
||||
VerticalAlignment="Bottom" Margin="4,0,0,8"
|
||||
FontSize="10" FontWeight="Bold" Foreground="#FFEBEBFF"/>
|
||||
<TextBlock Text="{Binding LockAngleDisplay}"
|
||||
|
||||
@@ -20,27 +20,27 @@
|
||||
|
||||
<!-- CAN frame fields -->
|
||||
<WrapPanel Margin="0,0,0,4">
|
||||
<Label Content="CAN-Bus ID (0x)" VerticalAlignment="Bottom" Foreground="Black"/>
|
||||
<Label Content="{DynamicResource BenchParam.CanBusId}" VerticalAlignment="Bottom" Foreground="Black"/>
|
||||
<TextBox Text="{Binding MessageIdHex, UpdateSourceTrigger=LostFocus}"
|
||||
Width="40" VerticalAlignment="Center"
|
||||
Background="#66FFFFFF" BorderBrush="{x:Null}" Height="19"/>
|
||||
|
||||
<Label Content="Byte L" VerticalAlignment="Bottom" Foreground="Black" Margin="8,0,0,0"/>
|
||||
<Label Content="{DynamicResource BenchParam.ByteL}" VerticalAlignment="Bottom" Foreground="Black" Margin="8,0,0,0"/>
|
||||
<TextBox Text="{Binding ByteL, UpdateSourceTrigger=LostFocus}"
|
||||
Width="35" VerticalAlignment="Center"
|
||||
Background="#66FFFFFF" BorderBrush="{x:Null}" Height="19"/>
|
||||
|
||||
<Label Content="Byte H" VerticalAlignment="Bottom" Foreground="Black" Margin="8,0,0,0"/>
|
||||
<Label Content="{DynamicResource BenchParam.ByteH}" VerticalAlignment="Bottom" Foreground="Black" Margin="8,0,0,0"/>
|
||||
<TextBox Text="{Binding ByteH, UpdateSourceTrigger=LostFocus}"
|
||||
Width="35" VerticalAlignment="Center"
|
||||
Background="#66FFFFFF" BorderBrush="{x:Null}" Height="19"/>
|
||||
|
||||
<Label Content="Filter α" VerticalAlignment="Bottom" Foreground="Black" Margin="8,0,0,0"/>
|
||||
<Label Content="{DynamicResource BenchParam.FilterAlpha}" VerticalAlignment="Bottom" Foreground="Black" Margin="8,0,0,0"/>
|
||||
<TextBox Text="{Binding Alpha, UpdateSourceTrigger=LostFocus}"
|
||||
Width="40" VerticalAlignment="Center"
|
||||
Background="#66FFFFFF" BorderBrush="{x:Null}" Height="19"/>
|
||||
|
||||
<CheckBox Content="Enable formula" IsChecked="{Binding FormulaEnabled}"
|
||||
<CheckBox Content="{DynamicResource BenchParam.EnableFormula}" IsChecked="{Binding FormulaEnabled}"
|
||||
VerticalAlignment="Center" Foreground="Black" Margin="12,0,0,0"/>
|
||||
</WrapPanel>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="150" d:DesignWidth="800" MaxHeight="150">
|
||||
d:DesignHeight="150" d:DesignWidth="460" MaxHeight="150">
|
||||
|
||||
<UserControl.Resources>
|
||||
<Style x:Key="LcdGreen" TargetType="Border">
|
||||
@@ -29,18 +29,18 @@
|
||||
</Style>
|
||||
</UserControl.Resources>
|
||||
|
||||
<Grid Margin="50,0">
|
||||
<Grid Margin="16,8">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="75"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="120"/>
|
||||
<ColumnDefinition Width="450"/>
|
||||
<ColumnDefinition Width="144" MinWidth="60"/>
|
||||
<ColumnDefinition MinWidth="200"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<!-- LEFT: version picker + read/write buttons -->
|
||||
<ComboBox Margin="5" VerticalAlignment="Bottom"
|
||||
<ComboBox Margin="4" VerticalAlignment="Bottom"
|
||||
SelectedIndex="{Binding VersionIndex}">
|
||||
<ComboBoxItem Content="V1"/>
|
||||
<ComboBoxItem Content="V2"/>
|
||||
@@ -48,40 +48,51 @@
|
||||
<ComboBoxItem Content="V4"/>
|
||||
</ComboBox>
|
||||
|
||||
<Grid Grid.Row="1">
|
||||
<Grid Grid.Row="1" Margin="4">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition Width="4"/>
|
||||
<ColumnDefinition/>
|
||||
|
||||
</Grid.ColumnDefinitions>
|
||||
<Button Content="READ" Margin="2"
|
||||
<Button Content="{DynamicResource Dfi.Read}"
|
||||
Command="{Binding ReadDfiCommand}"
|
||||
FontSize="12" FontWeight="Bold" Padding="4"/>
|
||||
<Button Grid.Column="1" Content="WRITE" Margin="2"
|
||||
<Button Grid.Column="2" Content="{DynamicResource Dfi.Write}"
|
||||
Command="{Binding WriteDfiCommand}"
|
||||
FontSize="12" FontWeight="Bold" Padding="4"/>
|
||||
</Grid>
|
||||
|
||||
<!-- TOP RIGHT: DFI value LCD + auto checkbox -->
|
||||
<Grid Grid.Row="0" Grid.Column="1" Margin="150,5">
|
||||
<Grid Grid.Row="0" Grid.Column="1" Margin="4">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition Width="Auto" MinWidth="200"/>
|
||||
<ColumnDefinition MinWidth="100"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border Grid.ColumnSpan="2" Style="{StaticResource LcdGreen}"/>
|
||||
<Border Grid.ColumnSpan="2" BorderThickness="1" BorderBrush="Black" SnapsToDevicePixels="True"/>
|
||||
<TextBlock Text="DFI:"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Bottom"
|
||||
Foreground="Black" FontSize="18" FontFamily="Consolas"/>
|
||||
<TextBlock Text="{Binding CurrentDfi, StringFormat=F2, Mode=OneWay}"
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
FontSize="26" FontWeight="Bold" Foreground="Black"/>
|
||||
<Border Grid.ColumnSpan="1" Style="{StaticResource LcdGreen}" Margin="0,0,12,0" >
|
||||
<Grid Grid.Row="1" >
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{DynamicResource Dfi.Label}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Foreground="Black" FontSize="18" FontFamily="Consolas"/>
|
||||
<TextBlock Text="{Binding CurrentDfi, StringFormat=F2, Mode=OneWay}"
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
FontSize="26" FontWeight="Bold" Foreground="Black"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border Grid.ColumnSpan="1" BorderThickness="1" BorderBrush="Black" Margin="0,0,12,0" SnapsToDevicePixels="True"/>
|
||||
|
||||
</Grid>
|
||||
|
||||
<!-- AUTO checkbox — sits outside the column pair; placed in Column=1 outside normal layout -->
|
||||
<CheckBox IsChecked="{Binding IsAutoMode}"
|
||||
Content="AUTO"
|
||||
Grid.Row="0" Grid.Column="1"
|
||||
Content="{DynamicResource Dfi.Auto}"
|
||||
Grid.Row="0" Grid.Column="1"
|
||||
Height="Auto"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Center"
|
||||
Margin="0,0,10,0"
|
||||
Foreground="Black" FontSize="20"/>
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Text="FBKW - Advance Control" HorizontalAlignment="Center"
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Fbkw}" HorizontalAlignment="Center"
|
||||
FontSize="13" Foreground="Black" Margin="0,0,0,2"/>
|
||||
|
||||
<DockPanel Grid.Row="1" Margin="4,0,4,2">
|
||||
@@ -45,7 +45,7 @@
|
||||
Width="28" Height="28" Margin="0,0,4,0"
|
||||
Background="Transparent" BorderBrush="Transparent"
|
||||
Content="..." FontWeight="Bold" FontSize="14"
|
||||
ToolTip="Min / Step / Max"/>
|
||||
ToolTip="{DynamicResource PumpCtrl.MinStepMax}"/>
|
||||
<!-- Numeric text box -->
|
||||
<TextBox DockPanel.Dock="Right" Width="50" Height="28" Margin="4,0,0,0"
|
||||
TextAlignment="Center" VerticalContentAlignment="Center"
|
||||
@@ -68,17 +68,17 @@
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<TextBox Text="{Binding FbkwMin, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource SettingsTextBox}"/>
|
||||
<TextBlock Text="Min" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Min}" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<TextBox Text="{Binding FbkwStep, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource SettingsTextBox}"/>
|
||||
<TextBlock Text="Step" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Step}" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<TextBox Text="{Binding FbkwMax, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource SettingsTextBox}"/>
|
||||
<TextBlock Text="Max" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Max}" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</UniformGrid>
|
||||
</Border>
|
||||
@@ -92,7 +92,7 @@
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Text="ME - Quantity Control" HorizontalAlignment="Center"
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Me}" HorizontalAlignment="Center"
|
||||
FontSize="13" Foreground="Black" Margin="0,0,0,2"/>
|
||||
|
||||
<DockPanel Grid.Row="1" Margin="4,0,4,2">
|
||||
@@ -100,7 +100,7 @@
|
||||
Width="28" Height="28" Margin="0,0,4,0"
|
||||
Background="Transparent" BorderBrush="Transparent"
|
||||
Content="..." FontWeight="Bold" FontSize="14"
|
||||
ToolTip="Min / Step / Max"/>
|
||||
ToolTip="{DynamicResource PumpCtrl.MinStepMax}"/>
|
||||
<TextBox DockPanel.Dock="Right" Width="50" Height="28" Margin="4,0,0,0"
|
||||
TextAlignment="Center" VerticalContentAlignment="Center"
|
||||
FontWeight="Bold" FontSize="13"
|
||||
@@ -120,17 +120,17 @@
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<TextBox Text="{Binding MeMin, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource SettingsTextBox}"/>
|
||||
<TextBlock Text="Min" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Min}" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<TextBox Text="{Binding MeStep, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource SettingsTextBox}"/>
|
||||
<TextBlock Text="Step" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Step}" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<TextBox Text="{Binding MeMax, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource SettingsTextBox}"/>
|
||||
<TextBlock Text="Max" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Max}" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</UniformGrid>
|
||||
</Border>
|
||||
@@ -145,7 +145,7 @@
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Text="ME - Pre-inj Quantity" HorizontalAlignment="Center"
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.PreInj}" HorizontalAlignment="Center"
|
||||
FontSize="13" Foreground="Black" Margin="0,0,0,2"/>
|
||||
|
||||
<DockPanel Grid.Row="1" Margin="4,0,4,2">
|
||||
@@ -153,7 +153,7 @@
|
||||
Width="28" Height="28" Margin="0,0,4,0"
|
||||
Background="Transparent" BorderBrush="Transparent"
|
||||
Content="..." FontWeight="Bold" FontSize="14"
|
||||
ToolTip="Min / Step / Max"/>
|
||||
ToolTip="{DynamicResource PumpCtrl.MinStepMax}"/>
|
||||
<TextBox DockPanel.Dock="Right" Width="50" Height="28" Margin="4,0,0,0"
|
||||
TextAlignment="Center" VerticalContentAlignment="Center"
|
||||
FontWeight="Bold" FontSize="13"
|
||||
@@ -173,17 +173,17 @@
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<TextBox Text="{Binding PreInMin, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource SettingsTextBox}"/>
|
||||
<TextBlock Text="Min" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Min}" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<TextBox Text="{Binding PreInStep, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource SettingsTextBox}"/>
|
||||
<TextBlock Text="Step" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Step}" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<TextBox Text="{Binding PreInMax, UpdateSourceTrigger=PropertyChanged}"
|
||||
Style="{StaticResource SettingsTextBox}"/>
|
||||
<TextBlock Text="Max" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
<TextBlock Text="{DynamicResource PumpCtrl.Max}" Style="{StaticResource SettingsLabel}" HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
</UniformGrid>
|
||||
</Border>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="Pump:" VerticalAlignment="Center" Margin="0,0,8,0" FontSize="14"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.Label}" VerticalAlignment="Center" Margin="0,0,8,0" FontSize="14"/>
|
||||
<ComboBox Grid.Column="1"
|
||||
ItemsSource="{Binding PumpIds}"
|
||||
SelectedItem="{Binding SelectedPumpId}"
|
||||
@@ -36,43 +36,43 @@
|
||||
|
||||
<StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="DFI:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.Dfi}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlineDfi}" FontSize="12" FontFamily="Consolas"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="Pump ID:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.PumpId}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlinePumpId}" FontSize="12" FontFamily="Consolas"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="Serial No:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.SerialNo}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlineSerialNumber}" FontSize="12" FontFamily="Consolas"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="Model Ref:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.ModelRef}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlineModelRef}" FontSize="12" FontFamily="Consolas"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="Data Record:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.DataRecord}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlineDataRecord}" FontSize="12" FontFamily="Consolas"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="Pump Ctrl:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.PumpCtrl}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlinePumpControl}" FontSize="12" FontFamily="Consolas"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="Model Index:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.ModelIndex}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlineModelIndex}" FontSize="12" FontFamily="Consolas"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="SW Ver 1:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.SwVer1}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlineSwVersion1}" FontSize="12" FontFamily="Consolas"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="SW Ver 2:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.SwVer2}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlineSwVersion2}" FontSize="12" FontFamily="Consolas"/>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="Errors:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.Errors}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlineErrors}" FontSize="12" FontFamily="Consolas" Foreground="DarkRed"/>
|
||||
</StackPanel>
|
||||
<!-- ConnectError row: auto-collapses when empty via DataTrigger -->
|
||||
@@ -86,15 +86,15 @@
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</StackPanel.Style>
|
||||
<TextBlock Text="Error:" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{DynamicResource PumpId.Error}" FontSize="12" Margin="0,0,4,0" Foreground="Gray" Width="90"/>
|
||||
<TextBlock Text="{Binding KlineConnectError}" FontSize="12" FontFamily="Consolas" Foreground="Red"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="6,0,0,0">
|
||||
<Button Content="Read K-Line" Width="90" Margin="0,2"
|
||||
<Button Content="{DynamicResource PumpId.ReadKLine}" Width="90" Margin="0,2"
|
||||
Command="{Binding ReadKlineCommand}"/>
|
||||
<Button Content="Disconnect" Width="90" Margin="0,2"
|
||||
<Button Content="{DynamicResource PumpId.Disconnect}" Width="90" Margin="0,2"
|
||||
Command="{Binding DisconnectKLineCommand}"/>
|
||||
<!-- Progress bar shown during K-Line read -->
|
||||
<ProgressBar Value="{Binding ProgressPercent, Mode=OneWay}"
|
||||
|
||||
@@ -72,12 +72,12 @@
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="Phase" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray"/>
|
||||
<TextBlock Text="Parameter" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="1"/>
|
||||
<TextBlock Text="Target" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="2"/>
|
||||
<TextBlock Text="Tol ±" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="3"/>
|
||||
<TextBlock Text="Average" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="4"/>
|
||||
<TextBlock Text="Result" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="5"/>
|
||||
<TextBlock Text="{DynamicResource Result.Phase}" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray"/>
|
||||
<TextBlock Text="{DynamicResource Result.Parameter}" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="1"/>
|
||||
<TextBlock Text="{DynamicResource Result.Target}" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="2"/>
|
||||
<TextBlock Text="{DynamicResource Result.Tolerance}" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="3"/>
|
||||
<TextBlock Text="{DynamicResource Result.Average}" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="4"/>
|
||||
<TextBlock Text="{DynamicResource Result.ResultHeader}" FontSize="10" FontWeight="Bold" Margin="3,0" Foreground="Gray" Grid.Column="5"/>
|
||||
</Grid>
|
||||
|
||||
<!-- Result rows -->
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
Margin="16,0,0,0"/>
|
||||
|
||||
<!-- Critical indicator -->
|
||||
<TextBlock Text="Critical" FontSize="9"
|
||||
<TextBlock Text="{DynamicResource Test.Critical}" FontSize="9"
|
||||
Foreground="#E65100" FontWeight="Bold"
|
||||
HorizontalAlignment="Center"
|
||||
Visibility="{Binding IsCritical, Converter={StaticResource BoolToVis}}"/>
|
||||
@@ -178,13 +178,13 @@
|
||||
Margin="0,3,0,0">
|
||||
<!-- Ready values -->
|
||||
<StackPanel Visibility="{Binding ReadyValues.Count, FallbackValue=Collapsed}">
|
||||
<TextBlock Text="Required:" FontSize="9" Foreground="#666"
|
||||
<TextBlock Text="{DynamicResource Test.Required}" FontSize="9" Foreground="#666"
|
||||
FontWeight="SemiBold" Margin="0,1,0,0"/>
|
||||
<ItemsControl ItemsSource="{Binding ReadyValues}"/>
|
||||
</StackPanel>
|
||||
|
||||
<!-- Send values -->
|
||||
<TextBlock Text="Test:" FontSize="9" Foreground="#666"
|
||||
<TextBlock Text="{DynamicResource Test.TestLabel}" FontSize="9" Foreground="#666"
|
||||
FontWeight="SemiBold" Margin="0,2,0,0"/>
|
||||
<ItemsControl ItemsSource="{Binding OperationValues}"/>
|
||||
</StackPanel>
|
||||
@@ -265,17 +265,17 @@
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal"
|
||||
VerticalAlignment="Center" Margin="16,0,0,0">
|
||||
<TextBlock FontSize="10" Foreground="DimGray">
|
||||
<Run Text="Cond: "/>
|
||||
<Run Text="{DynamicResource Test.Condition}"/>
|
||||
<Run Text="{Binding ConditioningTimeSec, Mode=OneWay}"/>
|
||||
<Run Text="s"/>
|
||||
</TextBlock>
|
||||
<TextBlock FontSize="10" Foreground="DimGray" Margin="10,0,0,0">
|
||||
<Run Text="Meas: "/>
|
||||
<Run Text="{DynamicResource Test.Measurement}"/>
|
||||
<Run Text="{Binding MeasurementTimeSec, Mode=OneWay}"/>
|
||||
<Run Text="s"/>
|
||||
</TextBlock>
|
||||
<TextBlock FontSize="10" Foreground="DimGray" Margin="10,0,0,0">
|
||||
<Run Text="M/s: "/>
|
||||
<Run Text="{DynamicResource Test.MeasPerSec}"/>
|
||||
<Run Text="{Binding MeasurementsPerSecond, StringFormat=F1, Mode=OneWay}"/>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
@@ -323,17 +323,17 @@
|
||||
<ColumnDefinition/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Button Content="▶ START TEST" FontSize="15" FontWeight="Bold"
|
||||
<Button Content="{DynamicResource Test.StartTest}" FontSize="15" FontWeight="Bold"
|
||||
Height="44" Margin="0,0,4,0"
|
||||
Command="{Binding DataContext.StartTestCommand,
|
||||
RelativeSource={RelativeSource AncestorType=Window}}"
|
||||
Foreground="DarkGreen"/>
|
||||
<Button Grid.Column="1" Content="■ STOP" FontSize="15" FontWeight="Bold"
|
||||
<Button Grid.Column="1" Content="{DynamicResource Test.Stop}" FontSize="15" FontWeight="Bold"
|
||||
Height="44" Margin="4,0"
|
||||
Command="{Binding DataContext.StopTestCommand,
|
||||
RelativeSource={RelativeSource AncestorType=Window}}"
|
||||
Foreground="DarkRed"/>
|
||||
<Button Grid.Column="2" Content="📄 Report" FontSize="13"
|
||||
<Button Grid.Column="2" Content="{DynamicResource Test.Report}" FontSize="13"
|
||||
Height="44" Margin="4,0,0,0"
|
||||
Command="{Binding DataContext.GenerateReportCommand,
|
||||
RelativeSource={RelativeSource AncestorType=Window}}"/>
|
||||
@@ -353,14 +353,14 @@
|
||||
<!-- Show values toggle -->
|
||||
<CheckBox IsChecked="{Binding ShowOperationValues}"
|
||||
VerticalAlignment="Center">
|
||||
<TextBlock Text="Show values" FontSize="12"/>
|
||||
<TextBlock Text="{DynamicResource Test.ShowValues}" FontSize="12"/>
|
||||
</CheckBox>
|
||||
|
||||
<!-- Check all button -->
|
||||
<Button Grid.Column="1" Margin="12,0,0,0"
|
||||
Command="{Binding ToggleCheckAllCommand}"
|
||||
Padding="6,2" ToolTip="Enable/disable all phases">
|
||||
<TextBlock Text="Check All" FontSize="11"/>
|
||||
<TextBlock Text="{DynamicResource Test.CheckAll}" FontSize="11"/>
|
||||
</Button>
|
||||
|
||||
<!-- Remaining time -->
|
||||
@@ -368,7 +368,7 @@
|
||||
Foreground="DimGray" FontSize="12" Margin="0,0,4,0">
|
||||
<Run Text="~"/>
|
||||
<Run Text="{Binding RemainingSeconds, Mode=OneWay}"/>
|
||||
<Run Text="s remaining"/>
|
||||
<Run Text="{DynamicResource Test.SecondsRemaining}"/>
|
||||
</TextBlock>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
Reference in New Issue
Block a user