feat: redesign Bench page with Fluent card layout and radial advance monitor

Three-column layout replacing the old HMI grid:
- BenchRpmCommandCard: inline numeric input, 2×4 preset grid, Start/Stop
- BenchActuatorsCard: direction toggle, oil pump, temperature PID, misc relays
  with FluentStateToggle showing checked state via AccentFillColor
- BenchLiveDataCard: 2×5 KPI tiles (RPM, P1, P2, Q-Delivery, Q-Over, temps)
- BenchChartsCard: 2×2 compact chart grid (Delivery, Over, P1, P2)
- AdvanceMonitorCard: RadialAngleGauge custom FrameworkElement + PSG/INJ readouts,
  Δ° lock offset input, Zero PSG / Zero INJ buttons

Supporting changes:
- AngleDisplayViewModel: promote _currentManualDegrees, _isLockSet to
  [ObservableProperty]; add PsgRelativeDegrees, InjEncoderDegreesValue,
  TargetLockAngle, IsRunningMode (29/31 hysteresis); computed PrimaryGaugeAngle,
  TargetAngleForGauge, SecondaryGaugeAngle
- BenchControlViewModel: add IsDirectionLeft computed property,
  SetDirectionRightCommand, SetDirectionLeftCommand, ApplyRpmCommand
- FlowmeterChartView: add IsCompact DP (false default) for 90px compact height
- Styles.xaml: add IsChecked trigger to FluentStateToggle (accent fill + white text)
- Strings.en/es.xaml: add all new card and actuator string keys

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-04-20 17:45:59 +02:00
parent 70be693116
commit 69bfda54e1
19 changed files with 1361 additions and 59 deletions

View File

@@ -0,0 +1,125 @@
<UserControl x:Class="HC_APTBS.Views.UserControls.AdvanceMonitorCard"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:ctrl="clr-namespace:HC_APTBS.Views.Controls"
mc:Ignorable="d"
d:DesignHeight="560" d:DesignWidth="320">
<!--
Advance Monitor card — radial angle gauge, PSG/INJ readouts,
Δ° offset input, Zero PSG / Zero INJ buttons.
DataContext = BenchPageViewModel; all bindings go through AngleDisplay.*.
-->
<Border Style="{StaticResource PumpCard}">
<DockPanel LastChildFill="True">
<!-- ── Card header ─────────────────────────────────────────── -->
<DockPanel DockPanel.Dock="Top" Margin="0,0,0,10">
<ui:SymbolIcon DockPanel.Dock="Left" Symbol="CompassNorthwest24" FontSize="16"
Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
Margin="0,0,8,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Advance.Title}"
Style="{StaticResource PumpCardHeader}" Margin="0"/>
</DockPanel>
<!-- ── Zero buttons (docked bottom first) ─────────────────── -->
<UniformGrid DockPanel.Dock="Bottom" Rows="1" Columns="2" Margin="0,10,0,0">
<ui:Button Margin="0,0,4,0" Height="40"
Content="{DynamicResource Bench.Advance.ZeroPsg}"
Command="{Binding AngleDisplay.SetPsgZeroCommand}"
Appearance="Secondary"/>
<ui:Button Margin="4,0,0,0" Height="40"
Content="{DynamicResource Bench.Advance.ZeroInj}"
Command="{Binding AngleDisplay.SetInjZeroCommand}"
Appearance="Secondary"/>
</UniformGrid>
<!-- ── Δ° offset row (docked bottom) ──────────────────────── -->
<Grid DockPanel.Dock="Bottom" Margin="0,10,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="8"/>
<ColumnDefinition Width="90"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{DynamicResource Bench.Advance.Delta}"
FontSize="13" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
VerticalAlignment="Center" Margin="0,0,8,0"/>
<TextBox Grid.Column="1"
Text="{Binding AngleDisplay.LockAngleDeltaInput,
UpdateSourceTrigger=PropertyChanged}"
FontFamily="Consolas" FontSize="16" FontWeight="SemiBold"
Height="36" VerticalContentAlignment="Center"
HorizontalContentAlignment="Right" Padding="8,0"/>
<Border Grid.Column="3"
Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Padding="8,4">
<TextBlock Text="{Binding AngleDisplay.LockAngleDisplay}"
Foreground="{Binding AngleDisplay.LockAngleForeground}"
FontFamily="Consolas" FontSize="16" FontWeight="SemiBold"
VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
</Grid>
<!-- ── PSG / INJ mini readouts (docked bottom) ────────────── -->
<UniformGrid DockPanel.Dock="Bottom" Rows="1" Columns="2" Margin="0,10,0,0">
<!-- PSG -->
<Border Margin="0,0,4,0"
Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Padding="10,8">
<StackPanel>
<TextBlock Text="PSG" FontSize="10" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,2"/>
<TextBlock Text="{Binding AngleDisplay.PsgRelativeAngle}"
Foreground="{Binding AngleDisplay.PsgAngleForeground}"
FontFamily="Consolas" FontSize="20" FontWeight="SemiBold"/>
<TextBlock Text="{Binding AngleDisplay.PsgEncoderAngle}"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontFamily="Consolas" FontSize="11"
Margin="0,2,0,0"/>
</StackPanel>
</Border>
<!-- INJ -->
<Border Margin="4,0,0,0"
Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Padding="10,8">
<StackPanel>
<TextBlock Text="INJ" FontSize="10" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,2"/>
<TextBlock Text="{Binding AngleDisplay.InjRelativeAngle}"
Foreground="{Binding AngleDisplay.InjAngleForeground}"
FontFamily="Consolas" FontSize="20" FontWeight="SemiBold"/>
<TextBlock Text="{Binding AngleDisplay.InjEncoderAngle}"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontFamily="Consolas" FontSize="11"
Margin="0,2,0,0"/>
</StackPanel>
</Border>
</UniformGrid>
<!-- ── Radial gauge (fills remaining space) ────────────────── -->
<ctrl:RadialAngleGauge
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
MinHeight="200"
PrimaryAngle="{Binding AngleDisplay.PrimaryGaugeAngle}"
TargetAngle="{Binding AngleDisplay.TargetAngleForGauge}"
SecondaryAngle="{Binding AngleDisplay.SecondaryGaugeAngle}"
PrimaryBrush="{Binding AngleDisplay.PsgAngleForeground}"
TargetBrush="{Binding AngleDisplay.LockAngleForeground}"
IsRunningMode="{Binding AngleDisplay.IsRunningMode}"/>
</DockPanel>
</Border>
</UserControl>

View File

@@ -0,0 +1,14 @@
using System.Windows.Controls;
namespace HC_APTBS.Views.UserControls
{
/// <summary>
/// Fluent card hosting the radial advance angle gauge, PSG/INJ readouts,
/// lock-offset input, and set-zero buttons.
/// DataContext = <see cref="HC_APTBS.ViewModels.Pages.BenchPageViewModel"/>.
/// </summary>
public partial class AdvanceMonitorCard : UserControl
{
public AdvanceMonitorCard() => InitializeComponent();
}
}

View File

@@ -0,0 +1,219 @@
<UserControl x:Class="HC_APTBS.Views.UserControls.BenchActuatorsCard"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
mc:Ignorable="d"
d:DesignHeight="560" d:DesignWidth="320">
<!--
Actuators & Relays card — sub-sections for direction, oil pump + counter,
temperature control, and misc relays.
DataContext = BenchPageViewModel (binds BenchControl.*, TempControl.*, RelayBank.*).
-->
<Border Style="{StaticResource PumpCard}">
<StackPanel>
<!-- ── Card header ─────────────────────────────────────────── -->
<DockPanel Margin="0,0,0,12">
<ui:SymbolIcon DockPanel.Dock="Left" Symbol="ToggleLeft24" FontSize="16"
Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
Margin="0,0,8,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Actuators.Title}"
Style="{StaticResource PumpCardHeader}" Margin="0"/>
</DockPanel>
<!-- ── Direction ──────────────────────────────────────────── -->
<TextBlock Text="{DynamicResource Bench.Actuators.Direction}"
FontSize="11" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,6"/>
<Grid Margin="0,0,0,12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="8"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<!-- Right — IsChecked=OneWay shows active state; Command performs the change -->
<ToggleButton Grid.Column="0" Height="40"
IsChecked="{Binding BenchControl.IsDirectionRight, Mode=OneWay}"
Command="{Binding BenchControl.SetDirectionRightCommand}"
Style="{StaticResource FluentStateToggle}">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<ui:SymbolIcon Symbol="ArrowRight24" FontSize="14" Margin="0,0,4,0"/>
<TextBlock Text="{DynamicResource Bench.Actuators.DirRight}" VerticalAlignment="Center"/>
</StackPanel>
</ToggleButton>
<!-- Left — IsDirectionLeft is the computed inverse of IsDirectionRight -->
<ToggleButton Grid.Column="2" Height="40"
IsChecked="{Binding BenchControl.IsDirectionLeft, Mode=OneWay}"
Command="{Binding BenchControl.SetDirectionLeftCommand}"
Style="{StaticResource FluentStateToggle}">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<ui:SymbolIcon Symbol="ArrowLeft24" FontSize="14" Margin="0,0,4,0"/>
<TextBlock Text="{DynamicResource Bench.Actuators.DirLeft}" VerticalAlignment="Center"/>
</StackPanel>
</ToggleButton>
</Grid>
<!-- ── Divider ─────────────────────────────────────────────── -->
<Border Height="1" Background="{DynamicResource ControlStrokeColorDefaultBrush}"
Margin="0,0,0,10"/>
<!-- ── Oil pump + Counter ──────────────────────────────────── -->
<TextBlock Text="{DynamicResource Bench.Actuators.OilPump}"
FontSize="11" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,6"/>
<Grid Margin="0,0,0,8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="8"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<ToggleButton Grid.Column="0" Height="40"
IsChecked="{Binding BenchControl.IsOilPumpOn}"
Style="{StaticResource FluentStateToggle}">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Drop24" FontSize="14" Margin="0,0,4,0"/>
<TextBlock Text="{DynamicResource Bench.Actuators.OilPump}" VerticalAlignment="Center"/>
</StackPanel>
</ToggleButton>
<Border Grid.Column="2" Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Padding="8,6">
<StackPanel>
<TextBlock Text="{DynamicResource Bench.Actuators.Counter}"
FontSize="10"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,2"/>
<TextBlock Text="{Binding BenchControl.BenchCounterValue, StringFormat=F0}"
FontFamily="Consolas" FontSize="18" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
</StackPanel>
</Border>
</Grid>
<!-- Counter input row -->
<Grid Margin="0,0,0,12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="8"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBox Grid.Column="0"
Text="{Binding BenchControl.CounterInputText, UpdateSourceTrigger=PropertyChanged}"
FontFamily="Consolas" FontSize="16"
Height="36" VerticalContentAlignment="Center"
HorizontalContentAlignment="Right" Padding="8,0"/>
<ui:Button Grid.Column="2" Height="36"
Content="{DynamicResource Bench.Actuators.Set}"
Command="{Binding BenchControl.SendCounterCommand}"
Appearance="Secondary"/>
</Grid>
<!-- ── Divider ─────────────────────────────────────────────── -->
<Border Height="1" Background="{DynamicResource ControlStrokeColorDefaultBrush}"
Margin="0,0,0,10"/>
<!-- ── Temperature control ─────────────────────────────────── -->
<TextBlock Text="{DynamicResource Bench.Actuators.Temperature}"
FontSize="11" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,6"/>
<!-- Setpoint + tolerance input -->
<Grid Margin="0,0,0,8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="6"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="8"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBox Grid.Column="0"
Text="{Binding TempControl.SetpointText, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{DynamicResource Bench.Actuators.Setpoint}"
FontFamily="Consolas" FontSize="16"
Height="36" VerticalContentAlignment="Center"
HorizontalContentAlignment="Right" Padding="8,0"/>
<TextBlock Grid.Column="0" Text="°C" FontSize="11"
VerticalAlignment="Center" HorizontalAlignment="Right"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" IsHitTestVisible="False"/>
<TextBox Grid.Column="2"
Text="{Binding TempControl.ToleranceText, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{DynamicResource Bench.Actuators.Tolerance}"
FontFamily="Consolas" FontSize="16"
Height="36" VerticalContentAlignment="Center"
HorizontalContentAlignment="Right" Padding="8,0"/>
<ui:Button Grid.Column="4" Height="36"
Content="{DynamicResource Bench.RpmCommand.Apply}"
Command="{Binding TempControl.ApplySetpointCommand}"
Appearance="Secondary"/>
</Grid>
<!-- Heater / Deposit Cooler / T-in Cooler toggles -->
<UniformGrid Rows="1" Columns="3" Margin="0,0,0,12">
<ToggleButton Height="38" Margin="0,0,2,0"
IsChecked="{Binding TempControl.IsHeaterOn}"
Style="{StaticResource FluentStateToggle}">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Fire16" FontSize="13" Margin="0,0,3,0"/>
<TextBlock Text="{DynamicResource Bench.Actuators.Heater}" VerticalAlignment="Center" FontSize="11"/>
</StackPanel>
</ToggleButton>
<ToggleButton Height="38" Margin="2,0,2,0"
IsChecked="{Binding TempControl.IsDepositCoolerOn}"
Style="{StaticResource FluentStateToggle}">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="ArrowDown16" FontSize="13" Margin="0,0,3,0"/>
<TextBlock Text="{DynamicResource Bench.Actuators.DepositCooler}" VerticalAlignment="Center" FontSize="11"/>
</StackPanel>
</ToggleButton>
<ToggleButton Height="38" Margin="2,0,0,0"
IsChecked="{Binding TempControl.IsTinCoolerOn}"
Style="{StaticResource FluentStateToggle}">
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Drop16" FontSize="13" Margin="0,0,3,0"/>
<TextBlock Text="{DynamicResource Bench.Actuators.TinCooler}" VerticalAlignment="Center" FontSize="11"/>
</StackPanel>
</ToggleButton>
</UniformGrid>
<!-- ── Divider ─────────────────────────────────────────────── -->
<Border Height="1" Background="{DynamicResource ControlStrokeColorDefaultBrush}"
Margin="0,0,0,10"/>
<!-- ── Misc relays ─────────────────────────────────────────── -->
<TextBlock Text="{DynamicResource Bench.Actuators.Relays}"
FontSize="11" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,6"/>
<UniformGrid Rows="1" Columns="3">
<ToggleButton Height="38" Margin="0,0,2,0"
IsChecked="{Binding RelayBank.IsElectronicOn}"
Style="{StaticResource FluentStateToggle}">
<TextBlock Text="{DynamicResource Bench.Actuators.Electronic}" FontSize="11"
VerticalAlignment="Center" HorizontalAlignment="Center"/>
</ToggleButton>
<ToggleButton Height="38" Margin="2,0,2,0"
IsChecked="{Binding RelayBank.IsFlasherOn}"
Style="{StaticResource FluentStateToggle}">
<TextBlock Text="{DynamicResource Bench.Actuators.Flasher}" FontSize="11"
VerticalAlignment="Center" HorizontalAlignment="Center"/>
</ToggleButton>
<ToggleButton Height="38" Margin="2,0,0,0"
IsChecked="{Binding RelayBank.IsPulse4SignalOn}"
Style="{StaticResource FluentStateToggle}">
<TextBlock Text="{DynamicResource Bench.Actuators.Pulse4}" FontSize="11"
VerticalAlignment="Center" HorizontalAlignment="Center"/>
</ToggleButton>
</UniformGrid>
</StackPanel>
</Border>
</UserControl>

View File

@@ -0,0 +1,14 @@
using System.Windows.Controls;
namespace HC_APTBS.Views.UserControls
{
/// <summary>
/// Fluent card grouping all bench actuator controls: oil pump, counter, direction,
/// temperature PID, and auxiliary relays.
/// DataContext = <see cref="HC_APTBS.ViewModels.Pages.BenchPageViewModel"/>.
/// </summary>
public partial class BenchActuatorsCard : UserControl
{
public BenchActuatorsCard() => InitializeComponent();
}
}

View File

@@ -0,0 +1,93 @@
<UserControl x:Class="HC_APTBS.Views.UserControls.BenchChartsCard"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:uc="clr-namespace:HC_APTBS.Views.UserControls"
mc:Ignorable="d"
d:DesignHeight="380" d:DesignWidth="560">
<!--
Live Charts card — 2×2 grid of compact chart tiles.
Order: TL = Delivery, TR = Over, BL = P1, BR = P2.
DataContext = BenchPageViewModel.
-->
<Border Style="{StaticResource PumpCard}">
<DockPanel LastChildFill="True">
<!-- ── Card header ─────────────────────────────────────────── -->
<DockPanel DockPanel.Dock="Top" Margin="0,0,0,10">
<ui:SymbolIcon DockPanel.Dock="Left" Symbol="ChartMultiple24" FontSize="16"
Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
Margin="0,0,8,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Charts.Title}"
Style="{StaticResource PumpCardHeader}" Margin="0"/>
</DockPanel>
<!-- ── 2×2 chart grid ──────────────────────────────────────── -->
<UniformGrid Rows="2" Columns="2">
<!-- TL: Q Delivery -->
<Border Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Margin="0,0,4,4" Padding="8,6">
<DockPanel>
<TextBlock DockPanel.Dock="Top"
Text="{DynamicResource Bench.Chart.Delivery}"
FontSize="11" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,4"/>
<uc:FlowmeterChartView IsCompact="True"
DataContext="{Binding FlowmeterChart.Delivery}"/>
</DockPanel>
</Border>
<!-- TR: Q Over -->
<Border Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Margin="4,0,0,4" Padding="8,6">
<DockPanel>
<TextBlock DockPanel.Dock="Top"
Text="{DynamicResource Bench.Chart.Over}"
FontSize="11" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,4"/>
<uc:FlowmeterChartView IsCompact="True"
DataContext="{Binding FlowmeterChart.Over}"/>
</DockPanel>
</Border>
<!-- BL: Pressure P1 -->
<Border Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Margin="0,4,4,0" Padding="8,6">
<DockPanel>
<TextBlock DockPanel.Dock="Top"
Text="{DynamicResource Bench.Chart.P1}"
FontSize="11" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,4"/>
<uc:FlowmeterChartView IsCompact="True"
DataContext="{Binding PressureTrace.P1}"/>
</DockPanel>
</Border>
<!-- BR: Pressure P2 -->
<Border Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Margin="4,4,0,0" Padding="8,6">
<DockPanel>
<TextBlock DockPanel.Dock="Top"
Text="{DynamicResource Bench.Chart.P2}"
FontSize="11" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,4"/>
<uc:FlowmeterChartView IsCompact="True"
DataContext="{Binding PressureTrace.P2}"/>
</DockPanel>
</Border>
</UniformGrid>
</DockPanel>
</Border>
</UserControl>

View File

@@ -0,0 +1,14 @@
using System.Windows.Controls;
namespace HC_APTBS.Views.UserControls
{
/// <summary>
/// Fluent card with a 2×2 grid of compact real-time bench charts
/// (Q-Delivery, Q-Over, P1, P2).
/// DataContext = <see cref="HC_APTBS.ViewModels.Pages.BenchPageViewModel"/>.
/// </summary>
public partial class BenchChartsCard : UserControl
{
public BenchChartsCard() => InitializeComponent();
}
}

View File

@@ -0,0 +1,235 @@
<UserControl x:Class="HC_APTBS.Views.UserControls.BenchLiveDataCard"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="800">
<!--
Live bench readings as two rows of five KPI tiles.
Row 1: RPM, P1, P2, Q-Delivery, Q-Over.
Row 2: T-In, T-Out, T4, T-Tank, Bench Temp.
DataContext = BenchPageViewModel.
-->
<UserControl.Resources>
<Style x:Key="BenchKpiTile" TargetType="Border" BasedOn="{StaticResource KpiTile}">
<Setter Property="MinHeight" Value="100"/>
</Style>
</UserControl.Resources>
<Border Style="{StaticResource PumpCard}">
<DockPanel LastChildFill="True">
<!-- ── Card header ─────────────────────────────────────────── -->
<DockPanel DockPanel.Dock="Top" Margin="0,0,0,10">
<ui:SymbolIcon DockPanel.Dock="Left" Symbol="DataLine24" FontSize="16"
Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
Margin="0,0,8,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.LiveData.Title}"
Style="{StaticResource PumpCardHeader}" Margin="0"/>
</DockPanel>
<!-- ── Row 2: T-In, T-Out, T4, T-Tank, Bench Temp ─────────── -->
<UniformGrid DockPanel.Dock="Bottom" Rows="1" Columns="5" Margin="0,6,0,0">
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Temperature24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.TIn}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.TempIn, StringFormat=F1}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Pump.UnitCelsius}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Temperature24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.TOut}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.TempOut, StringFormat=F1}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Pump.UnitCelsius}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Temperature24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.T4}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.Temp4, StringFormat=F1}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Pump.UnitCelsius}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Temperature24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.TTank}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.BenchTemp, StringFormat=F1}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Pump.UnitCelsius}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Temperature24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.BenchTemp}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.BenchTemp, StringFormat=F1}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Pump.UnitCelsius}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
</UniformGrid>
<!-- ── Row 1: RPM, P1, P2, Q-Delivery, Q-Over ─────────────── -->
<UniformGrid Rows="1" Columns="5">
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Gauge24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.Rpm}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.BenchRpm, StringFormat=F0}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Bench.Rpm}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="ArrowTrendingLines24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.P1}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.Pressure, StringFormat=F2}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Bench.Kpi.Unit.Bar}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="ArrowTrendingLines24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.P2}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.Pressure2, StringFormat=F2}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Bench.Kpi.Unit.Bar}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Drop24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.QDelivery}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.QDelivery, StringFormat=F1}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Bench.Kpi.Unit.CcS}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
<Border Style="{StaticResource BenchKpiTile}">
<Grid>
<Grid.RowDefinitions><RowDefinition Height="Auto"/><RowDefinition Height="*"/></Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon Symbol="Drop24" FontSize="13"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,4,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.Kpi.QOver}"
Style="{StaticResource KpiHeaderText}" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom">
<TextBlock Text="{Binding Root.QOver, StringFormat=F1}"
Style="{StaticResource KpiValueText}" FontSize="28"/>
<TextBlock Text="{DynamicResource Bench.Kpi.Unit.CcS}"
Style="{StaticResource KpiUnitText}"/>
</StackPanel>
</Grid>
</Border>
</UniformGrid>
</DockPanel>
</Border>
</UserControl>

View File

@@ -0,0 +1,14 @@
using System.Windows.Controls;
namespace HC_APTBS.Views.UserControls
{
/// <summary>
/// Fluent card with two rows of KPI tiles showing bench live readings
/// (RPM, pressures, flow, temperatures).
/// DataContext = <see cref="HC_APTBS.ViewModels.Pages.BenchPageViewModel"/>.
/// </summary>
public partial class BenchLiveDataCard : UserControl
{
public BenchLiveDataCard() => InitializeComponent();
}
}

View File

@@ -0,0 +1,145 @@
<UserControl x:Class="HC_APTBS.Views.UserControls.BenchRpmCommandCard"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
mc:Ignorable="d"
d:DesignHeight="440" d:DesignWidth="320">
<!--
RPM command card — inline numeric entry, 8 preset buttons, Start/Stop.
DataContext = BenchPageViewModel.
-->
<Border Style="{StaticResource PumpCard}">
<StackPanel>
<!-- ── Card header ─────────────────────────────────────────── -->
<DockPanel Margin="0,0,0,12">
<ui:SymbolIcon DockPanel.Dock="Left" Symbol="Gauge24" FontSize="16"
Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
Margin="0,0,8,0" VerticalAlignment="Center"/>
<TextBlock Text="{DynamicResource Bench.RpmCommand.Title}"
Style="{StaticResource PumpCardHeader}" Margin="0"/>
</DockPanel>
<!-- ── Actual / Target mini readouts ───────────────────────── -->
<Grid Margin="0,0,0,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="8"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0"
Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Padding="10,8">
<StackPanel>
<TextBlock Text="{DynamicResource Bench.RpmCommand.Actual}"
FontSize="11"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,4"/>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock Text="{Binding Root.BenchRpm, StringFormat=F0}"
FontFamily="Consolas" FontSize="26" FontWeight="SemiBold"
Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
<TextBlock Text=" rpm" FontSize="11"
Foreground="{DynamicResource TextFillColorTertiaryBrush}"
VerticalAlignment="Bottom" Margin="0,0,0,3"/>
</StackPanel>
</StackPanel>
</Border>
<Border Grid.Column="2"
Background="{DynamicResource ControlFillColorSecondaryBrush}"
BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
BorderThickness="1" CornerRadius="6" Padding="10,8">
<StackPanel>
<TextBlock Text="{DynamicResource Bench.RpmCommand.Target}"
FontSize="11"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,0,4"/>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock Text="{Binding BenchControl.TargetRpm, StringFormat=F0}"
FontFamily="Consolas" FontSize="26" FontWeight="SemiBold"
Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"/>
<TextBlock Text=" rpm" FontSize="11"
Foreground="{DynamicResource TextFillColorTertiaryBrush}"
VerticalAlignment="Bottom" Margin="0,0,0,3"/>
</StackPanel>
<TextBlock Text="{Binding BenchControl.CommandVoltage, StringFormat='F3\u202FV'}"
FontFamily="Consolas" FontSize="10"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
</StackPanel>
</Border>
</Grid>
<!-- ── Manual RPM input ─────────────────────────────────────── -->
<Grid Margin="0,0,0,8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBox Grid.Column="0"
Text="{Binding BenchControl.RpmInputText, UpdateSourceTrigger=PropertyChanged}"
FontFamily="Consolas" FontSize="20" FontWeight="SemiBold"
Height="40" VerticalContentAlignment="Center"
HorizontalContentAlignment="Right" Padding="8,0"/>
<TextBlock Grid.Column="1" Text="rpm"
VerticalAlignment="Center"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
FontSize="12" Margin="6,0,0,0"/>
</Grid>
<!-- ── Preset RPM buttons 2×4 ──────────────────────────────── -->
<UniformGrid Rows="2" Columns="4" Margin="0,0,0,10">
<ui:Button Content="100" CommandParameter="100"
Command="{Binding BenchControl.SetQuickRpmCommand}"
Appearance="Secondary" Height="40" Margin="2" FontSize="12"/>
<ui:Button Content="200" CommandParameter="200"
Command="{Binding BenchControl.SetQuickRpmCommand}"
Appearance="Secondary" Height="40" Margin="2" FontSize="12"/>
<ui:Button Content="500" CommandParameter="500"
Command="{Binding BenchControl.SetQuickRpmCommand}"
Appearance="Secondary" Height="40" Margin="2" FontSize="12"/>
<ui:Button Content="750" CommandParameter="750"
Command="{Binding BenchControl.SetQuickRpmCommand}"
Appearance="Secondary" Height="40" Margin="2" FontSize="12"/>
<ui:Button Content="1000" CommandParameter="1000"
Command="{Binding BenchControl.SetQuickRpmCommand}"
Appearance="Secondary" Height="40" Margin="2" FontSize="12"/>
<ui:Button Content="1250" CommandParameter="1250"
Command="{Binding BenchControl.SetQuickRpmCommand}"
Appearance="Secondary" Height="40" Margin="2" FontSize="12"/>
<ui:Button Content="1500" CommandParameter="1500"
Command="{Binding BenchControl.SetQuickRpmCommand}"
Appearance="Secondary" Height="40" Margin="2" FontSize="12"/>
<ui:Button Content="2000" CommandParameter="2000"
Command="{Binding BenchControl.SetQuickRpmCommand}"
Appearance="Secondary" Height="40" Margin="2" FontSize="12"/>
</UniformGrid>
<!-- ── Start / Stop ─────────────────────────────────────────── -->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="8"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<ui:Button Grid.Column="0"
Content="{DynamicResource Bench.Start}"
Command="{Binding BenchControl.StartBenchCommand}"
Appearance="Primary" Height="46" FontWeight="Bold" FontSize="14">
<ui:Button.Icon><ui:SymbolIcon Symbol="Play24"/></ui:Button.Icon>
</ui:Button>
<ui:Button Grid.Column="2"
Content="{DynamicResource Bench.Stop}"
Command="{Binding BenchControl.StopBenchCommand}"
Appearance="Danger" Height="46" FontWeight="Bold" FontSize="14">
<ui:Button.Icon><ui:SymbolIcon Symbol="Stop24"/></ui:Button.Icon>
</ui:Button>
</Grid>
</StackPanel>
</Border>
</UserControl>

View File

@@ -0,0 +1,14 @@
using System.Windows.Controls;
namespace HC_APTBS.Views.UserControls
{
/// <summary>
/// Fluent card providing RPM numeric input, preset buttons, Start/Stop and
/// voltage readout for manual bench motor control.
/// DataContext = <see cref="HC_APTBS.ViewModels.Pages.BenchPageViewModel"/>.
/// </summary>
public partial class BenchRpmCommandCard : UserControl
{
public BenchRpmCommandCard() => InitializeComponent();
}
}

View File

@@ -18,7 +18,8 @@
VerticalAlignment="Center"/>
</StackPanel>
<lvc:CartesianChart Grid.Row="1" Height="120"
<lvc:CartesianChart Grid.Row="1"
Height="{Binding ChartHeight, RelativeSource={RelativeSource AncestorType=UserControl}}"
Series="{Binding Series}"
XAxes="{Binding XAxes}"
YAxes="{Binding YAxes}"

View File

@@ -1,3 +1,4 @@
using System.Windows;
using System.Windows.Controls;
namespace HC_APTBS.Views.UserControls
@@ -5,9 +6,34 @@ namespace HC_APTBS.Views.UserControls
/// <summary>
/// UserControl hosting a single real-time flowmeter chart.
/// DataContext is expected to be a <see cref="HC_APTBS.ViewModels.SingleFlowChartViewModel"/>.
/// Set <see cref="IsCompact"/> to <c>true</c> to reduce chart height to 90 px
/// (used in the 2×2 bench chart grid).
/// </summary>
public partial class FlowmeterChartView : UserControl
{
/// <summary>When true the chart height shrinks from 120 to 90 px.</summary>
public static readonly DependencyProperty IsCompactProperty =
DependencyProperty.Register(nameof(IsCompact), typeof(bool), typeof(FlowmeterChartView),
new FrameworkPropertyMetadata(false,
(d, e) => ((FlowmeterChartView)d).ChartHeight = (bool)e.NewValue ? 90.0 : 120.0));
public bool IsCompact
{
get => (bool)GetValue(IsCompactProperty);
set => SetValue(IsCompactProperty, value);
}
/// <summary>Derived chart height (120 or 90); bound in XAML.</summary>
public static readonly DependencyProperty ChartHeightProperty =
DependencyProperty.Register(nameof(ChartHeight), typeof(double), typeof(FlowmeterChartView),
new FrameworkPropertyMetadata(120.0));
public double ChartHeight
{
get => (double)GetValue(ChartHeightProperty);
set => SetValue(ChartHeightProperty, value);
}
public FlowmeterChartView()
{
InitializeComponent();