From 17c0e7eab74b488aac2cd4b772b4b6dcb48361c4 Mon Sep 17 00:00:00 2001
From: zhenye
Date: Wed, 18 Dec 2024 22:36:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=9B=B8=E6=9C=BA?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cotton_double2.pro.user | 2 +-
widget.cpp | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/cotton_double2.pro.user b/cotton_double2.pro.user
index c4db3ed..3489298 100644
--- a/cotton_double2.pro.user
+++ b/cotton_double2.pro.user
@@ -1,6 +1,6 @@
-
+
EnvironmentId
diff --git a/widget.cpp b/widget.cpp
index 5bbcce3..629b6c2 100644
--- a/widget.cpp
+++ b/widget.cpp
@@ -75,8 +75,8 @@ void Widget::refreshSingleImage(int camera_id)
else if (camera_id == 1)
{
{
- QMutexLocker locker(&gDispPicMutex0);
- current_id = gDispCurrentPicId0;
+ QMutexLocker locker(&gDispPicMutex1);
+ current_id = gDispCurrentPicId1;
}
if (current_id == 0)
@@ -108,15 +108,17 @@ void Widget::on_pushButton_2_clicked()
void Widget::on_btn_goto_sort_clicked()
{
- // 回复当前的
+ // 回复显示的图片
{
QMutexLocker locker(&gDispPicMutex0);
gDispCurrentPicId0 = 0;
}
+ ui->camera_0_img->clear();
{
QMutexLocker locker(&gDispPicMutex1);
gDispCurrentPicId1 = 0;
}
+ ui->camera_1_img->clear();
DestoryCamera();
DestoryLowMac();
}