This commit is contained in:
Binary file not shown.
@@ -69,7 +69,7 @@ public class TestParameters
|
|||||||
|
|
||||||
|
|
||||||
public double FitStartTime { get; set; } = 0.01; // 默认0.35秒,避开早期扰动
|
public double FitStartTime { get; set; } = 0.01; // 默认0.35秒,避开早期扰动
|
||||||
public double FitEndTime { get; set; } = 0.1;
|
public double FitEndTime { get; set; } = 0.3;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -706,11 +706,20 @@ public partial class D7896ViewModel : ObservableObject
|
|||||||
TemperatureCurveModel.Axes.Add(new LinearAxis { Position = AxisPosition.Left, Title = "温升 (℃)" });
|
TemperatureCurveModel.Axes.Add(new LinearAxis { Position = AxisPosition.Left, Title = "温升 (℃)" });
|
||||||
}
|
}
|
||||||
|
|
||||||
// 加热段曲线(红色)
|
// 根据当前测量索引计算色相 (0 ~ 1)
|
||||||
|
double hue = ((CurrentMeasurementIndex - 1) % 10) / 10.0; // 0, 0.1, 0.2 ... 0.9
|
||||||
|
// 加热曲线颜色:饱和度0.9,亮度0.8
|
||||||
|
var heatColor = OxyColor.FromHsv(hue, 0.9, 0.8);
|
||||||
|
// 冷却曲线颜色:色相偏移0.5(互补色),饱和度0.6,亮度0.8(较淡)
|
||||||
|
double coolHue = hue + 0.5;
|
||||||
|
if (coolHue >= 1.0) coolHue -= 1.0;
|
||||||
|
var coolColor = OxyColor.FromHsv(coolHue, 0.6, 0.8);
|
||||||
|
|
||||||
|
// 加热段曲线(红色系实线)
|
||||||
var heatingSeries = new LineSeries
|
var heatingSeries = new LineSeries
|
||||||
{
|
{
|
||||||
Title = $"第{CurrentMeasurementIndex}次测量 - 加热段",
|
Title = $"第{CurrentMeasurementIndex}次 - 加热",
|
||||||
Color = OxyColors.Red,
|
Color = heatColor,
|
||||||
StrokeThickness = 1.5
|
StrokeThickness = 1.5
|
||||||
};
|
};
|
||||||
for (int i = 0; i < time.Length && time[i] <= 1.0; i++)
|
for (int i = 0; i < time.Length && time[i] <= 1.0; i++)
|
||||||
@@ -719,13 +728,13 @@ public partial class D7896ViewModel : ObservableObject
|
|||||||
}
|
}
|
||||||
TemperatureCurveModel.Series.Add(heatingSeries);
|
TemperatureCurveModel.Series.Add(heatingSeries);
|
||||||
|
|
||||||
// 冷却曲线(蓝色虚线)
|
// 冷却曲线(互补色,虚线)
|
||||||
if (coolingPoints != null && coolingPoints.Count > 0)
|
if (coolingPoints != null && coolingPoints.Count > 0)
|
||||||
{
|
{
|
||||||
var coolingSeries = new LineSeries
|
var coolingSeries = new LineSeries
|
||||||
{
|
{
|
||||||
Title = $"第{CurrentMeasurementIndex}次测量 - 冷却段",
|
Title = $"第{CurrentMeasurementIndex}次 - 冷却",
|
||||||
Color = OxyColors.Blue,
|
Color = coolColor,
|
||||||
StrokeThickness = 1.5,
|
StrokeThickness = 1.5,
|
||||||
LineStyle = LineStyle.Dash
|
LineStyle = LineStyle.Dash
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -208,7 +208,7 @@
|
|||||||
<Border Grid.Row="3" Background="White" CornerRadius="6" Padding="8" Margin="0,5" Effect="{StaticResource CardShadow}">
|
<Border Grid.Row="3" Background="White" CornerRadius="6" Padding="8" Margin="0,5" Effect="{StaticResource CardShadow}">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock Text="{Binding CurveTitle}" FontWeight="Bold" FontSize="13" Margin="0,0,0,5" Foreground="#1E4F7A"/>
|
<TextBlock Text="{Binding CurveTitle}" FontWeight="Bold" FontSize="13" Margin="0,0,0,5" Foreground="#1E4F7A"/>
|
||||||
<oxy:PlotView Model="{Binding TemperatureCurveModel}" Height="220"/>
|
<oxy:PlotView Model="{Binding TemperatureCurveModel}" Height="350"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
@@ -290,8 +290,8 @@
|
|||||||
<TextBox Text="{Binding AverageThermalConductivity, StringFormat=F5}" Width="100" IsReadOnly="True"/>
|
<TextBox Text="{Binding AverageThermalConductivity, StringFormat=F5}" Width="100" IsReadOnly="True"/>
|
||||||
<TextBlock Text="W/m·K" Margin="6,0,30,0"/>
|
<TextBlock Text="W/m·K" Margin="6,0,30,0"/>
|
||||||
<TextBlock Text="平均热扩散率:" Width="120" FontWeight="SemiBold"/>
|
<TextBlock Text="平均热扩散率:" Width="120" FontWeight="SemiBold"/>
|
||||||
<TextBox Text="{Binding AverageThermalDiffusivity, StringFormat=F5}" Width="100" IsReadOnly="True"/>
|
<TextBox Text="{Binding AverageThermalDiffusivity, StringFormat=F10}" Width="100" IsReadOnly="True"/>
|
||||||
<TextBlock Text="×10⁻⁶ m²/s" Margin="6,0,30,0"/>
|
<TextBlock Text="m²/s" Margin="6,0,30,0"/>
|
||||||
<TextBlock Text="平均体积热容:" Width="100" FontWeight="SemiBold"/>
|
<TextBlock Text="平均体积热容:" Width="100" FontWeight="SemiBold"/>
|
||||||
<TextBox Text="{Binding AverageVolumetricHeatCapacity, StringFormat=F2}" Width="100" IsReadOnly="True"/>
|
<TextBox Text="{Binding AverageVolumetricHeatCapacity, StringFormat=F2}" Width="100" IsReadOnly="True"/>
|
||||||
<TextBlock Text="kJ/m³·K" Margin="6,0,0,0"/>
|
<TextBlock Text="kJ/m³·K" Margin="6,0,0,0"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user