Charts - Add faint background grid (0.75px, #E0E0E0) to all live charts; matches PDF report style - Show min/max tolerance bands on P1/P2 pressure charts during test runs (previously only Q-Delivery/Q-Over) - Broaden BenchService.ToleranceUpdated to fire for every phase receive; UI routes by name - Clear P1/P2 traces on PhaseChanged alongside Delivery/Over CAN - Normalize QDelivery flow rate to 1000 RPM reference before IIR filter so RPM spikes are low-pass filtered with flow-rate transients (matches old_source behavior) Pump page - Reorder columns: identification left, commands center, live data right - PreIn control always visible; disabled when pump lacks pre-injection (rename IsPreInVisible -> IsPreInAvailable) - Swap value/label order in command cards - Remove redundant KlineErrors row from identification card Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
66 lines
2.9 KiB
XML
66 lines
2.9 KiB
XML
<UserControl x:Class="HC_APTBS.Views.Pages.PumpPage"
|
|
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">
|
|
<!--
|
|
Pump page — ECU diagnostics and control.
|
|
DataContext = PumpPageViewModel.
|
|
|
|
Layout: top strip (row 0) + 3-column card body (row 1).
|
|
Col 0 (1*, MinWidth=260): PumpCommandsCard (2*) + DfiCalibrationCard (1*)
|
|
Col 1 (1.5*): PumpLiveDataCard (fills)
|
|
Col 2 (1*, MinWidth=280): PumpIdentificationCard (Auto) + DtcCard (*)
|
|
-->
|
|
<UserControl.Resources>
|
|
<BooleanToVisibilityConverter x:Key="BoolToVis"/>
|
|
</UserControl.Resources>
|
|
|
|
<Grid Margin="12">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="*"/>
|
|
</Grid.RowDefinitions>
|
|
|
|
<!-- ── Top status strip ─────────────────────────────────────────────── -->
|
|
<uc:PumpTopStripView Grid.Row="0"/>
|
|
|
|
<!-- ── Body: 3-column card layout ───────────────────────────────────── -->
|
|
<Grid Grid.Row="1">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="1*" MinWidth="260"/>
|
|
<ColumnDefinition Width="1*" MinWidth="280"/>
|
|
<ColumnDefinition Width="1.5*" />
|
|
</Grid.ColumnDefinitions>
|
|
|
|
<!-- Col 0: Commands (top 2*) + Idling Calibration (bottom 1*) -->
|
|
<Grid Grid.Column="1">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="2*"/>
|
|
<RowDefinition Height="1*"/>
|
|
</Grid.RowDefinitions>
|
|
|
|
<uc:PumpCommandsCard Grid.Row="0" DataContext="{Binding PumpControl}"/>
|
|
<uc:DfiCalibrationCard Grid.Row="1" DataContext="{Binding DfiViewModel}"/>
|
|
</Grid>
|
|
|
|
<!-- Col 1: Live Data (full height) -->
|
|
<uc:PumpLiveDataCard Grid.Column="2"/>
|
|
|
|
<!-- Col 2: Identification (Auto) + DTCs (*) -->
|
|
<Grid Grid.Column="0">
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="*"/>
|
|
</Grid.RowDefinitions>
|
|
|
|
<uc:PumpIdentificationCard Grid.Row="0" DataContext="{Binding Identification}"/>
|
|
<uc:DtcCard Grid.Row="1" DataContext="{Binding DtcList}"/>
|
|
</Grid>
|
|
</Grid>
|
|
</Grid>
|
|
</UserControl>
|