huangsucan/ADP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询返回数据转double

Browse Source
This commit is contained in:
huangsucan
2026-08-19 20:04:10 +08:00
parent fb6e5b3cb1
commit 38f594e4aa
12 changed files with 283 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DeviceEditModule/ViewModels/IT7800EViewModel.cs
+8 -8
View File
@@ -120,29 +120,29 @@ namespace DeviceEditModule.ViewModels
#region 测量结果属性
private string _measuredVoltage = "—";
public string MeasuredVoltage
private double _measuredVoltage;
public double MeasuredVoltage
{
get => _measuredVoltage;
set => SetProperty(ref _measuredVoltage, value);
}
private string _measuredCurrent = "—";
public string MeasuredCurrent
private double _measuredCurrent;
public double MeasuredCurrent
{
get => _measuredCurrent;
set => SetProperty(ref _measuredCurrent, value);
}
private string _measuredPower = "—";
public string MeasuredPower
private double _measuredPower;
public double MeasuredPower
{
get => _measuredPower;
set => SetProperty(ref _measuredPower, value);
}
private string _measuredFrequency = "—";
public string MeasuredFrequency
private double _measuredFrequency;
public double MeasuredFrequency
{
get => _measuredFrequency;
set => SetProperty(ref _measuredFrequency, value);
DeviceEditModule/ViewModels/N36200ViewModel.cs
+6 -6
View File
@@ -118,22 +118,22 @@ namespace DeviceEditModule.ViewModels
#region 测量结果属性
private string _measuredVoltage = "—";
public string MeasuredVoltage
private double _measuredVoltage;
public double MeasuredVoltage
{
get => _measuredVoltage;
set => SetProperty(ref _measuredVoltage, value);
}
private string _measuredCurrent = "—";
public string MeasuredCurrent
private double _measuredCurrent;
public double MeasuredCurrent
{
get => _measuredCurrent;
set => SetProperty(ref _measuredCurrent, value);
}
private string _measuredPower = "—";
public string MeasuredPower
private double _measuredPower;
public double MeasuredPower
{
get => _measuredPower;
set => SetProperty(ref _measuredPower, value);
DeviceEditModule/ViewModels/N36600ViewModel.cs
+6 -6
View File
@@ -93,22 +93,22 @@ namespace DeviceEditModule.ViewModels
#region 测量结果属性
private string _measuredVoltage = "—";
public string MeasuredVoltage
private double _measuredVoltage;
public double MeasuredVoltage
{
get => _measuredVoltage;
set => SetProperty(ref _measuredVoltage, value);
}
private string _measuredCurrent = "—";
public string MeasuredCurrent
private double _measuredCurrent;
public double MeasuredCurrent
{
get => _measuredCurrent;
set => SetProperty(ref _measuredCurrent, value);
}
private string _measuredPower = "—";
public string MeasuredPower
private double _measuredPower;
public double MeasuredPower
{
get => _measuredPower;
set => SetProperty(ref _measuredPower, value);
DeviceEditModule/ViewModels/N69200ViewModel.cs
+6 -6
View File
@@ -94,22 +94,22 @@ namespace DeviceEditModule.ViewModels
#region 测量结果属性
private string _measuredVoltage = "—";
public string MeasuredVoltage
private double _measuredVoltage;
public double MeasuredVoltage
{
get => _measuredVoltage;
set => SetProperty(ref _measuredVoltage, value);
}
private string _measuredCurrent = "—";
public string MeasuredCurrent
private double _measuredCurrent;
public double MeasuredCurrent
{
get => _measuredCurrent;
set => SetProperty(ref _measuredCurrent, value);
}
private string _measuredPower = "—";
public string MeasuredPower
private double _measuredPower;
public double MeasuredPower
{
get => _measuredPower;
set => SetProperty(ref _measuredPower, value);
DeviceEditModule/ViewModels/SDS2000X_HDViewModel.cs
+17 -74
View File
@@ -3,7 +3,6 @@ using Prism.Commands;
using Prism.Ioc;
using System;
using System.Globalization;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Input;
@@ -113,22 +112,22 @@ namespace DeviceEditModule.ViewModels
#region 测量结果属性
private string _measuredVpp = "—";
public string MeasuredVpp
private double _measuredVpp;
public double MeasuredVpp
{
get => _measuredVpp;
set => SetProperty(ref _measuredVpp, value);
}
private string _measuredFrequency = "—";
public string MeasuredFrequency
private double _measuredFrequency;
public double MeasuredFrequency
{
get => _measuredFrequency;
set => SetProperty(ref _measuredFrequency, value);
}
private string _measuredRms = "—";
public string MeasuredRms
private double _measuredRms;
public double MeasuredRms
{
get => _measuredRms;
set => SetProperty(ref _measuredRms, value);
@@ -207,40 +206,30 @@ namespace DeviceEditModule.ViewModels
QueryMeasurementsCommand = new DelegateCommand(async () => await Exec(async () =>
{
// 1. 保留设备原生吐出的完整原始字符串
string rawVpp = await _device!.查询实际电压峰峰值(Channel, Ct());
string rawFreq = await _device!.查询实际频率(Channel, Ct());
string rawRms = await _device!.查询实际电压均方根(Channel, Ct());
// 设备层已自动提取纯数值并返回 double
MeasuredVpp = await _device!.查询实际电压峰峰值(Channel, Ct());
MeasuredFrequency = await _device!.查询实际频率(Channel, Ct());
MeasuredRms = await _device!.查询实际电压均方根(Channel, Ct());
// 2. 清洗数据并将科学计数法转为常规小数后赋值给 UI 属性
MeasuredVpp = ParseMeasurement(rawVpp);
MeasuredFrequency = ParseMeasurement(rawFreq);
MeasuredRms = ParseMeasurement(rawRms);
// 3. 在日志中同时体现设备原始报文与解析呈现值，极方便联调
AppendLog($"C{Channel} 测量原始数据 → Vpp:{rawVpp.Trim()} Freq:{rawFreq.Trim()} RMS:{rawRms.Trim()}");
AppendLog($"C{Channel} 界面呈现数值 → Vpp:{MeasuredVpp}V Freq:{MeasuredFrequency}Hz RMS:{MeasuredRms}V");
AppendLog($"C{Channel} 测量结果 → Vpp:{MeasuredVpp:0.######}V Freq:{MeasuredFrequency:0.######}Hz RMS:{MeasuredRms:0.######}V");
}));
QueryVppCommand = new DelegateCommand(async () => await Exec(async () =>
{
string raw = await _device!.查询实际电压峰峰值(Channel, Ct());
MeasuredVpp = ParseMeasurement(raw);
AppendLog($"C{Channel} Vpp: {MeasuredVpp} (Raw: {raw.Trim()})");
MeasuredVpp = await _device!.查询实际电压峰峰值(Channel, Ct());
AppendLog($"C{Channel} Vpp: {MeasuredVpp:0.######} V");
}));
QueryFrequencyCommand = new DelegateCommand(async () => await Exec(async () =>
{
string raw = await _device!.查询实际频率(Channel, Ct());
MeasuredFrequency = ParseMeasurement(raw);
AppendLog($"C{Channel} Freq: {MeasuredFrequency} (Raw: {raw.Trim()})");
MeasuredFrequency = await _device!.查询实际频率(Channel, Ct());
AppendLog($"C{Channel} Freq: {MeasuredFrequency:0.######} Hz");
}));
QueryRmsCommand = new DelegateCommand(async () => await Exec(async () =>
{
string raw = await _device!.查询实际电压均方根(Channel, Ct());
MeasuredRms = ParseMeasurement(raw);
AppendLog($"C{Channel} RMS: {MeasuredRms} (Raw: {raw.Trim()})");
MeasuredRms = await _device!.查询实际电压均方根(Channel, Ct());
AppendLog($"C{Channel} RMS: {MeasuredRms:0.######} V");
}));
Initialize();
@@ -330,52 +319,6 @@ namespace DeviceEditModule.ViewModels
: line + "\n" + ResponseLog;
}
/// <summary>
/// 清洗示波器原始返回的测量字符串（例如 "C1:PAVA RMS,5.57E-03V"）并安全转化为无科学计数法的小数形式。
/// </summary>
/// <param name="rawResponse">设备原始应答数据</param>
/// <returns>可直接绑定到 UI 呈现的字符串数字</returns>
private string ParseMeasurement(string rawResponse)
{
if (string.IsNullOrWhiteSpace(rawResponse)) return "—";
try
{
string cleanData = rawResponse.Trim();
// 1. 斩断报头，提取逗号后面的具体内容（如 "5.57E-03V" 或 "****"）
int commaIndex = cleanData.IndexOf(',');
if (commaIndex == -1) return "—";
string valStr = cleanData.Substring(commaIndex + 1);
var match = Regex.Match(valStr, @"[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?");
if (match.Success)
{
valStr = match.Value;
}
// 3. 校验并拦截设备未测出时的无效星号 "****"
if (valStr.Contains("*") || string.IsNullOrWhiteSpace(valStr))
{
return "0"; // 回归为零或 "—"，防止触发数据异常
}
// 4. 解析科学计数法，并重新以不带科学计数法的小数样式展开
if (double.TryParse(valStr, NumberStyles.Any, CultureInfo.InvariantCulture, out double result))
{
// "0.######" 样式会自动消除末尾无用的冗余零，并显示为普通小数（如 0.00557）
return result.ToString("0.######", CultureInfo.InvariantCulture);
}
}
catch
{
// 捕获可能产生的边缘转换故障，保证轮询线程绝不崩溃
}
return "—";
}
#endregion
public void Dispose()
DeviceEditModule/ViewModels/SPAW7000ViewModel.cs
+17 -58
View File
@@ -101,36 +101,36 @@ namespace DeviceEditModule.ViewModels
#region 测量结果属性
private string _measuredVoltage = "—";
public string MeasuredVoltage
private double _measuredVoltage;
public double MeasuredVoltage
{
get => _measuredVoltage;
set => SetProperty(ref _measuredVoltage, value);
}
private string _measuredCurrent = "—";
public string MeasuredCurrent
private double _measuredCurrent;
public double MeasuredCurrent
{
get => _measuredCurrent;
set => SetProperty(ref _measuredCurrent, value);
}
private string _measuredPower = "—";
public string MeasuredPower
private double _measuredPower;
public double MeasuredPower
{
get => _measuredPower;
set => SetProperty(ref _measuredPower, value);
}
private string _measuredFrequency = "—";
public string MeasuredFrequency
private double _measuredFrequency;
public double MeasuredFrequency
{
get => _measuredFrequency;
set => SetProperty(ref _measuredFrequency, value);
}
private string _measuredPowerFactor = "—";
public string MeasuredPowerFactor
private double _measuredPowerFactor;
public double MeasuredPowerFactor
{
get => _measuredPowerFactor;
set => SetProperty(ref _measuredPowerFactor, value);
@@ -196,20 +196,14 @@ namespace DeviceEditModule.ViewModels
// 只修改这里：保持你原本的 5 次驱动查询调用不变，仅对读回来的科学计数法进行两位小数格式化
QueryAllMeasureCommand = new DelegateCommand(async () => await Exec(async () =>
{
string rawU = await _device!.查询实际电压(Channel, Ct());
string rawI = await _device!.查询实际电流(Channel, Ct());
string rawP = await _device!.查询实际功率(Channel, Ct());
string rawF = await _device!.查询频率(Channel, Ct());
string rawPF = await _device!.查询功率因数(Channel, Ct());
// 设备层已返回 double 数值
MeasuredVoltage = await _device!.查询实际电压(Channel, Ct());
MeasuredCurrent = await _device!.查询实际电流(Channel, Ct());
MeasuredPower = await _device!.查询实际功率(Channel, Ct());
MeasuredFrequency = await _device!.查询频率(Channel, Ct());
MeasuredPowerFactor = await _device!.查询功率因数(Channel, Ct());
// 转换科学计数法格式，如果失败会自动保持原样
MeasuredVoltage = FormatToDecimal(rawU, "F2"); // 电压两位小数
MeasuredCurrent = FormatToDecimal(rawI, "F3"); // 电流通常较小，建议保留3位小数
MeasuredPower = FormatToDecimal(rawP, "F2"); // 功率两位小数
MeasuredFrequency = FormatToDecimal(rawF, "F2"); // 频率两位小数
MeasuredPowerFactor = FormatToDecimal(rawPF, "F3"); // 功率因数保留3位小数
AppendLog($"CH{Channel} 测量 → U:{MeasuredVoltage}V I:{MeasuredCurrent}A P:{MeasuredPower}W F:{MeasuredFrequency}Hz PF:{MeasuredPowerFactor}");
AppendLog($"CH{Channel} 测量 → U:{MeasuredVoltage:F2}V I:{MeasuredCurrent:F3}A P:{MeasuredPower:F2}W F:{MeasuredFrequency:F2}Hz PF:{MeasuredPowerFactor:F3}");
}));
Initialize();
@@ -263,41 +257,6 @@ namespace DeviceEditModule.ViewModels
private CancellationToken Ct() => (_cts = new CancellationTokenSource(TimeSpan.FromSeconds(10))).Token;
/// <summary>
/// 将科学计数法字符串转换为标准小数格式
/// </summary>
private string FormatToDecimal(string rawInput, string decimalFormat = "F2")
{
if (string.IsNullOrWhiteSpace(rawInput))
return "—";
// 去除可能夹杂的命令头，保留数据部分
string cleanInput = CleanResponseHeader(rawInput);
// 解析科学计数法（NumberStyles.Any 和 InvariantCulture 是关键）
if (double.TryParse(cleanInput, NumberStyles.Any, CultureInfo.InvariantCulture, out double value))
{
return value.ToString(decimalFormat, CultureInfo.InvariantCulture);
}
return cleanInput;
}
/// <summary>
/// 辅助清洗：剥离可能伴随吐回的命令头或双引号
/// </summary>
private string CleanResponseHeader(string response)
{
if (string.IsNullOrWhiteSpace(response)) return string.Empty;
string result = response.Trim();
if (result.Contains(" "))
{
int lastSpaceIndex = result.LastIndexOf(' ');
result = result.Substring(lastSpaceIndex + 1).Trim();
}
return result.Replace("\"", "").Replace("'", "").Trim();
}
private async Task Exec(Func<Task> action)
{
if (_device == null)