ZengQingming/JoyD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

正确显示区域框线，没收到温度数据时也显示

Browse Source
This commit is contained in:
zqm
2026-01-07 16:37:17 +08:00
parent 5f76208c5a
commit 3b9dd2ca98
1 changed files with 118 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs
View File

@@ -601,7 +601,7 @@ namespace JoyD.Windows.CS.Toprie
// 延迟启动相机，避免界面卡顿 // 延迟启动相机，避免界面卡顿
ThreadPool.QueueUserWorkItem(delegate ThreadPool.QueueUserWorkItem(delegate
{ {
while(!IsDevicePingable) while (!IsDevicePingable)
Thread.Sleep(3000); // 延迟3秒后启动 Thread.Sleep(3000); // 延迟3秒后启动
_isFirst = false; _isFirst = false;
this.Invoke(new Action(() => this.Invoke(new Action(() =>
@@ -2936,23 +2936,7 @@ namespace JoyD.Windows.CS.Toprie
if (_deviceManager.CurrentImageMode == ImageMode.Infrared) if (_deviceManager.CurrentImageMode == ImageMode.Infrared)
{ {
// 2. 如果没有温度数据或温度数据的时间3秒之前，返回 // 1. 先绘制区域框线，不受温度数据影响，只受显示设置影响
TemperatureData temperatureData = _deviceManager.LastTemperature;
if (temperatureData == null || temperatureData.Timestamp == null)
return;
TimeSpan timeDiff = DateTime.Now - temperatureData.Timestamp;
if (timeDiff.TotalSeconds > 3)
return;
// 3. 温度显示菜单下如果未勾选区域温度和全局温度，则不显示任何温度信息
if (!_showGlobalTemperature && !_showAreaTemperature)
return;
// 4. 如果勾选了全局温度且未勾选区域温度，则显示全局温度（居中显示），否则显示区域温度（居中显示）
bool isGlobalTemperatureMode = _showGlobalTemperature && !_showAreaTemperature;
// 5. 如果勾选了区域温度，则显示区域框和编号，否则不显示区域框
if (_showAreaTemperature) if (_showAreaTemperature)
{ {
try try
@@ -2986,7 +2970,21 @@ namespace JoyD.Windows.CS.Toprie
} }
} }
// 6. 根据温度模式显示温度数据 // 2. 温度数据绘制逻辑，仍受温度数据有效性影响
TemperatureData temperatureData = _deviceManager.LastTemperature;
if (temperatureData != null && temperatureData.Timestamp != null)
{
TimeSpan timeDiff = DateTime.Now - temperatureData.Timestamp;
if (timeDiff.TotalSeconds <= 3)
{
// 3. 温度显示菜单下如果未勾选区域温度和全局温度，则不显示任何温度信息
if (!_showGlobalTemperature && !_showAreaTemperature)
return;
// 4. 如果勾选了全局温度且未勾选区域温度，则显示全局温度（居中显示），否则显示区域温度（居中显示）
bool isGlobalTemperatureMode = _showGlobalTemperature && !_showAreaTemperature;
// 5. 根据温度模式显示温度数据
if (isGlobalTemperatureMode) if (isGlobalTemperatureMode)
{ {
// 准备温度文本 // 准备温度文本
@@ -3073,7 +3071,8 @@ namespace JoyD.Windows.CS.Toprie
// 标记信息正在显示 // 标记信息正在显示
_isDisplayingInfo = true; _isDisplayingInfo = true;
} }
}
}
private void SaveTemperatureToolStripMenuItem_Click(object sender, EventArgs e) private void SaveTemperatureToolStripMenuItem_Click(object sender, EventArgs e)
{ {
try try
@@ -3208,5 +3207,5 @@ namespace JoyD.Windows.CS.Toprie
MessageBox.Show($"打开配置窗口时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show($"打开配置窗口时出错: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
} }
} }
} }
} }