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(); }