|
@@ -37,6 +37,7 @@ MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget* parent)
|
|
|
MainAndSecondaryCamerasWnd::~MainAndSecondaryCamerasWnd()
|
|
|
{
|
|
|
UnCameraBind();
|
|
|
+ disconnect(m_timerMaterial, &QTimer::timeout, this, &MainAndSecondaryCamerasWnd::UpdateMaterialByTimer);
|
|
|
m_timerMaterial->stop();
|
|
|
delete ui;
|
|
|
}
|
|
@@ -160,12 +161,19 @@ void MainAndSecondaryCamerasWnd::InitPage()
|
|
|
delete manager;
|
|
|
}
|
|
|
//清理ui->viewwidgetgroup_L
|
|
|
- int width = ui->viewwidgetgroup_L->width();
|
|
|
- int height = ui->viewwidgetgroup_L->height();
|
|
|
- QPixmap pixmap(width, height);
|
|
|
- pixmap.fill(Qt::white); // 白色背景
|
|
|
- GetGroupImageShowSignalsTo_L(pixmap);
|
|
|
-
|
|
|
+ //int width = ui->viewwidgetgroup_L->width();
|
|
|
+ //int height = ui->viewwidgetgroup_L->height();
|
|
|
+ //QPixmap pixmap(width, height);
|
|
|
+ //pixmap.fill(Qt::white); // 白色背景
|
|
|
+ //GetGroupImageShowSignalsTo_L(pixmap);
|
|
|
+ /*delete ui->viewwidgetgroup_L;
|
|
|
+ ControlOperationPage* viewwidgetgroup_L;
|
|
|
+ viewwidgetgroup_L = new ControlOperationPage(ui->centralwidget);
|
|
|
+ viewwidgetgroup_L->setObjectName(QString::fromUtf8("viewwidgetgroup_L"));
|
|
|
+ viewwidgetgroup_L->setGeometry(QRect(10, 10, 525, 605));
|
|
|
+ viewwidgetgroup_L->setBlueBord();
|
|
|
+ connect(viewwidgetgroup_L, &ControlOperationPage::send_ComboBox_singal, this, &MainAndSecondaryCamerasWnd::HandleComboxchange_L);*/
|
|
|
+ ui->viewwidgetgroup_L->getOperatewidget()->clearPixmap();
|
|
|
// 设置控件的最小高度和最大宽度
|
|
|
int minHeight = 162;
|
|
|
int maxWidth = 244;
|