|
@@ -1324,12 +1324,20 @@ void MainWindow::threadpic(int ncampos)
|
|
|
QImage image2 = QImage(static_cast<uchar*>(rgbImg.data), rgbImg.cols, rgbImg.rows, QImage::Format_RGB888);
|
|
|
|
|
|
#ifndef TESTH264
|
|
|
- mMutexCam[ncampos].lock();
|
|
|
-// emit CamUpdate(ncampos,image2);
|
|
|
- *mpImageCam[ncampos] = image2.copy();
|
|
|
- mbCamUpdate[ncampos] = true;
|
|
|
- mMutexCam[ncampos].unlock();
|
|
|
- emit CamUpdate(ncampos);
|
|
|
+ if(ncampos<2)
|
|
|
+ {
|
|
|
+ mMutexCam[ncampos].lock();
|
|
|
+ // emit CamUpdate(ncampos,image2);
|
|
|
+ *mpImageCam[ncampos] = image2.copy();
|
|
|
+ mbCamUpdate[ncampos] = true;
|
|
|
+ mMutexCam[ncampos].unlock();
|
|
|
+ emit CamUpdate(ncampos);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if(ncampos == 2)gwleft->SetImage(image2);
|
|
|
+ if(ncampos == 3)gwright->SetImage(image2);
|
|
|
+ }
|
|
|
#else
|
|
|
unsigned int j;
|
|
|
for(j=0;j<NUM_CAM;j++)
|