LucianoDev
69bfda54e1
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>
64 lines
2.8 KiB
XML
64 lines
2.8 KiB
XML
<UserControl x:Class="HC_APTBS.Views.Pages.BenchPage"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
xmlns:uc="clr-namespace:HC_APTBS.Views.UserControls"
|
|
mc:Ignorable="d"
|
|
d:DesignHeight="900" d:DesignWidth="1400">
|
|
<!--
|
|
Bench page — Fluent card redesign.
|
|
DataContext = BenchPageViewModel.
|
|
Row 0: InterlockBannerView (Auto).
|
|
Row 1: three-column card layout.
|
|
Col 0 (1* MinWidth=320): BenchRpmCommandCard (Auto) + BenchActuatorsCard (*).
|
|
Col 1 (1.8* MinWidth=520): BenchLiveDataCard (Auto) + BenchChartsCard (*).
|
|
Col 2 (1* MinWidth=300): AdvanceMonitorCard (*).
|
|
-->
|
|
<Grid Margin="12">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="*"/>
|
|
</Grid.RowDefinitions>
|
|
|
|
<!-- Interlock banner — hidden unless an interlock condition is active -->
|
|
<uc:InterlockBannerView Grid.Row="0" DataContext="{Binding Interlock}"
|
|
Margin="0,0,0,8"/>
|
|
|
|
<!-- Three-column body -->
|
|
<Grid Grid.Row="1">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="1*" MinWidth="320"/>
|
|
<ColumnDefinition Width="8"/>
|
|
<ColumnDefinition Width="1.8*" MinWidth="520"/>
|
|
<ColumnDefinition Width="8"/>
|
|
<ColumnDefinition Width="1*" MinWidth="300"/>
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<!-- ── Col 0: RPM command (top) + Actuators (fill) ──────────── -->
|
|
<Grid Grid.Column="0">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="*"/>
|
|
</Grid.RowDefinitions>
|
|
<uc:BenchRpmCommandCard Grid.Row="0"/>
|
|
<uc:BenchActuatorsCard Grid.Row="1" Margin="0,8,0,0"/>
|
|
</Grid>
|
|
|
|
<!-- ── Col 2: Live data (top) + Charts (fill) ───────────────── -->
|
|
<Grid Grid.Column="2">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="*"/>
|
|
</Grid.RowDefinitions>
|
|
<uc:BenchLiveDataCard Grid.Row="0"/>
|
|
<uc:BenchChartsCard Grid.Row="1" Margin="0,8,0,0"/>
|
|
</Grid>
|
|
|
|
<!-- ── Col 4: Advance monitor (fills column) ────────────────── -->
|
|
<uc:AdvanceMonitorCard Grid.Column="4"/>
|
|
|
|
</Grid>
|
|
</Grid>
|
|
</UserControl>
|