|
@@ -27,9 +27,6 @@ SingleCameraOperationWnd::~SingleCameraOperationWnd()
|
|
|
}
|
|
|
|
|
|
void SingleCameraOperationWnd::initFrom() {
|
|
|
- QTimer *timer = new QTimer(this);
|
|
|
- connect(timer, &QTimer::timeout, this, &SingleCameraOperationWnd::checkSettings);
|
|
|
- timer->start(100);
|
|
|
|
|
|
// 设置右上部分
|
|
|
QWidget *viewport = ui->scrollArea->viewport();
|
|
@@ -50,6 +47,8 @@ void SingleCameraOperationWnd::initFrom() {
|
|
|
//connect(widget,&Group::send_button_Signal,this,&SingleCameraOperationWnd::showAndHideButton);
|
|
|
//connect(widget,&Group::send_ComboBox_singal,this,&SingleCameraOperationWnd::handleComBoxChange);
|
|
|
if (widget != nullptr) {
|
|
|
+ connect(widget, &Group::sendUpdateGroupState,
|
|
|
+ this, &SingleCameraOperationWnd::checkSettings);
|
|
|
layout->addWidget(widget);
|
|
|
widgets.append(widget);
|
|
|
groupMap[num] = widget;
|
|
@@ -78,6 +77,7 @@ void SingleCameraOperationWnd::initFrom() {
|
|
|
container->setLayout(layout);
|
|
|
ui->scrollArea->setWidget(container);
|
|
|
ui->scrollArea->resize(261, 700);
|
|
|
+ checkSettings();
|
|
|
|
|
|
|
|
|
}
|
|
@@ -129,10 +129,12 @@ void SingleCameraOperationWnd::loadGroupSettings(int Id, int Index) {
|
|
|
newPixmap = QPixmap(imagePath);
|
|
|
QStringList test = { "1","2" };
|
|
|
ui->viewwidgetgroup->updateOperateWidget(newPixmap);
|
|
|
+ ui->viewwidgetgroup->setEnableControls(true);
|
|
|
|
|
|
}else if (Index == 2) {
|
|
|
|
|
|
updateMaterialWidget(materialWndType, Id);
|
|
|
+ ui->viewwidgetgroup->setEnableControls(false);
|
|
|
|
|
|
}
|
|
|
|