diff --git a/CSI-H238M/CSI-H238M/Models/Model.cs b/CSI-H238M/CSI-H238M/Models/Model.cs index 61aae5e..d3fe798 100644 --- a/CSI-H238M/CSI-H238M/Models/Model.cs +++ b/CSI-H238M/CSI-H238M/Models/Model.cs @@ -32,15 +32,10 @@ namespace COFTester.Models /// public class TestParameters : INotifyPropertyChanged { - private string _standard = "GB 10006"; private double _sledMass = 0.0; // 不设置默认值,从寄存器读取 private double _testSpeed = 0.0; // 不设置默认值,从寄存器读取 private double _testDuration = 0.0; // 不设置默认值,从寄存器读取 private double _testStroke = 0.0; // 不设置默认值,从寄存器读取 - private double _staticCalcStart = 0.0; - private double _staticCalcEnd = 5.0; - private double _kineticCalcStart = 10.0; - private double _kineticCalcEnd = 75.0; private double _sampleWidth = 25.0; // 試樣寬度 (mm),用於剝離強度計算 // 手动控制参数 - 不设置默认值,从寄存器读取 @@ -65,20 +60,12 @@ namespace COFTester.Models private bool _directionRight = true; private bool _directionLeft = false; - public string Standard - { - get => _standard; - set - { - if (_standard != value) - { - _standard = value; - OnPropertyChanged(); - // 当标准改变时,自动应用该标准的推荐参数 - ApplyStandardParameters(); - } - } - } + // 固定值 - 不再从UI配置,仅用于向后兼容 + public string Standard { get; set; } = "GB 10006"; + public double StaticCalcStart { get; set; } = 0.0; + public double StaticCalcEnd { get; set; } = 5.0; + public double KineticCalcStart { get; set; } = 10.0; + public double KineticCalcEnd { get; set; } = 75.0; public double SledMass { @@ -104,30 +91,6 @@ namespace COFTester.Models set { _testStroke = value; OnPropertyChanged(); } } - public double StaticCalcStart - { - get => _staticCalcStart; - set { _staticCalcStart = value; OnPropertyChanged(); } - } - - public double StaticCalcEnd - { - get => _staticCalcEnd; - set { _staticCalcEnd = value; OnPropertyChanged(); } - } - - public double KineticCalcStart - { - get => _kineticCalcStart; - set { _kineticCalcStart = value; OnPropertyChanged(); } - } - - public double KineticCalcEnd - { - get => _kineticCalcEnd; - set { _kineticCalcEnd = value; OnPropertyChanged(); } - } - /// /// 試樣寬度 (mm),用於 GB/T 2792 剝離強度計算 /// 標準試樣寬度:25mm @@ -265,37 +228,6 @@ namespace COFTester.Models public string MaterialType { get; set; } = "Plastic Film"; // 材料類型 public string Operator { get; set; } = "Default"; // 操作員 - /// - /// 根据选择的标准自动应用推荐参数 - /// - private void ApplyStandardParameters() - { - var standard = TestStandardManager.GetAllStandards() - .FirstOrDefault(s => s.Name == _standard); - - if (standard != null) - { - _sledMass = standard.RecommendedSledMass; - _testSpeed = standard.RecommendedTestSpeed; - _testDuration = standard.RecommendedTestDuration; - _testStroke = standard.RecommendedStroke; - _staticCalcStart = standard.StaticCalcStart; - _staticCalcEnd = standard.StaticCalcEnd; - _kineticCalcStart = standard.KineticCalcStart; - _kineticCalcEnd = standard.KineticCalcEnd; - - // 通知所有属性已更改 - OnPropertyChanged(nameof(SledMass)); - OnPropertyChanged(nameof(TestSpeed)); - OnPropertyChanged(nameof(TestDuration)); - OnPropertyChanged(nameof(TestStroke)); - OnPropertyChanged(nameof(StaticCalcStart)); - OnPropertyChanged(nameof(StaticCalcEnd)); - OnPropertyChanged(nameof(KineticCalcStart)); - OnPropertyChanged(nameof(KineticCalcEnd)); - } - } - public event PropertyChangedEventHandler? PropertyChanged; protected void OnPropertyChanged([CallerMemberName] string? name = null) { diff --git a/CSI-H238M/CSI-H238M/ViewModels/ConfigViewModel.cs b/CSI-H238M/CSI-H238M/ViewModels/ConfigViewModel.cs index 32552fc..8219496 100644 --- a/CSI-H238M/CSI-H238M/ViewModels/ConfigViewModel.cs +++ b/CSI-H238M/CSI-H238M/ViewModels/ConfigViewModel.cs @@ -13,9 +13,7 @@ namespace COFTester.ViewModels { public class ConfigViewModel : INotifyPropertyChanged { - private TestStandard? _selectedStandard; private TestParameters _configParams; - private bool _showKineticWarning; private readonly IDataAcquisitionService? _daqService; public ConfigViewModel(TestParameters currentParams, IDataAcquisitionService? daqService = null) @@ -27,15 +25,10 @@ namespace COFTester.ViewModels _configParams = new TestParameters { // 基本測試參數 - 初始化為 0(空值) - Standard = currentParams.Standard, // 保留標準選擇 SledMass = 0.0, TestSpeed = 0.0, TestDuration = 0.0, TestStroke = 0.0, - StaticCalcStart = currentParams.StaticCalcStart, // 保留計算區間 - StaticCalcEnd = currentParams.StaticCalcEnd, - KineticCalcStart = currentParams.KineticCalcStart, - KineticCalcEnd = currentParams.KineticCalcEnd, SampleWidth = currentParams.SampleWidth, // 保留試樣寬度 // 手動控制參數 - 初始化為 0(空值) @@ -55,16 +48,6 @@ namespace COFTester.ViewModels DirectionLeft = currentParams.DirectionLeft }; - // 載入所有標準 - Standards = TestStandardManager.GetAllStandards(); - - // 選擇當前標準 - _selectedStandard = Standards.FirstOrDefault(s => s.Name == currentParams.Standard) - ?? Standards.First(); - - // 更新警告狀態 - UpdateKineticWarning(); - ApplyCommand = new RelayCommand(Apply); CancelCommand = new RelayCommand(Cancel); @@ -155,41 +138,6 @@ namespace COFTester.ViewModels } public LanguageResources Lang => LanguageResources.Instance; - - public List Standards { get; } - - public TestStandard? SelectedStandard - { - get => _selectedStandard; - set - { - if (_selectedStandard != value) - { - _selectedStandard = value; - OnPropertyChanged(); - - // 自動填充推薦值 - if (_selectedStandard != null) - { - ApplyRecommendedValues(_selectedStandard); - UpdateKineticWarning(); - } - } - } - } - - public bool ShowKineticWarning - { - get => _showKineticWarning; - set - { - if (_showKineticWarning != value) - { - _showKineticWarning = value; - OnPropertyChanged(); - } - } - } public TestParameters ConfigParams { @@ -207,27 +155,6 @@ namespace COFTester.ViewModels public event EventHandler? RequestClose; public event EventHandler? ConfigApplied; - private void UpdateKineticWarning() - { - ShowKineticWarning = _selectedStandard != null && !_selectedStandard.SupportsKineticFriction; - } - - private void ApplyRecommendedValues(TestStandard standard) - { - ConfigParams.Standard = standard.Name; - ConfigParams.SledMass = standard.RecommendedSledMass; - ConfigParams.TestSpeed = standard.RecommendedTestSpeed; - ConfigParams.TestDuration = standard.RecommendedTestDuration; - ConfigParams.TestStroke = standard.RecommendedStroke; - ConfigParams.StaticCalcStart = standard.StaticCalcStart; - ConfigParams.StaticCalcEnd = standard.StaticCalcEnd; - ConfigParams.KineticCalcStart = standard.KineticCalcStart; - ConfigParams.KineticCalcEnd = standard.KineticCalcEnd; - - // 通知所有屬性更新 - OnPropertyChanged(nameof(ConfigParams)); - } - private void Apply() { ConfigApplied?.Invoke(this, ConfigParams); diff --git a/CSI-H238M/CSI-H238M/ViewModels/ViewModel.cs b/CSI-H238M/CSI-H238M/ViewModels/ViewModel.cs index ba3211f..a7b7456 100644 --- a/CSI-H238M/CSI-H238M/ViewModels/ViewModel.cs +++ b/CSI-H238M/CSI-H238M/ViewModels/ViewModel.cs @@ -1220,10 +1220,6 @@ namespace COFTester.ViewModels Parameters.TestSpeed = newParams.TestSpeed; Parameters.TestDuration = newParams.TestDuration; Parameters.TestStroke = newParams.TestStroke; - Parameters.StaticCalcStart = newParams.StaticCalcStart; - Parameters.StaticCalcEnd = newParams.StaticCalcEnd; - Parameters.KineticCalcStart = newParams.KineticCalcStart; - Parameters.KineticCalcEnd = newParams.KineticCalcEnd; // 更新手動控制參數 Parameters.HorizontalManualSpeed = newParams.HorizontalManualSpeed; diff --git a/CSI-H238M/CSI-H238M/Views/ConfigWindow.xaml b/CSI-H238M/CSI-H238M/Views/ConfigWindow.xaml index 179e33f..d97077e 100644 --- a/CSI-H238M/CSI-H238M/Views/ConfigWindow.xaml +++ b/CSI-H238M/CSI-H238M/Views/ConfigWindow.xaml @@ -58,127 +58,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -330,49 +209,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CSI-H238M/config.json b/CSI-H238M/config.json index ba0b43f..604ad46 100644 --- a/CSI-H238M/config.json +++ b/CSI-H238M/config.json @@ -83,14 +83,14 @@ "AutoSaveResults": true, "DefaultTestParameters": { "Standard": "ASTM D1894", - "SledMass": 200, - "TestSpeed": 150, - "TestDuration": 30, - "TestStroke": 150, "StaticCalcStart": 0, "StaticCalcEnd": 5, "KineticCalcStart": 10, "KineticCalcEnd": 150, + "SledMass": 200, + "TestSpeed": 150, + "TestDuration": 30, + "TestStroke": 150, "SampleWidth": 25, "HorizontalManualSpeed": 10, "HorizontalManualDisplacement": 5,