修复了相机切换崩溃的bug

View/die-bonder-ui/OriginalWnd/DbTreeViewManager.cpp

@@ -2387,6 +2387,8 @@ void DbTreeViewManager::displayThirdLevelFields(const QList<Table_Control_Data>&
                         }
                         });
 
+                    rightLayout->addLayout(radioLayout);
+
                     QPushButton* btnDefault = new QPushButton(QStringLiteral("默认"));
                     btnDefault->setFixedSize(60, 28);
                     btnDefault->setStyleSheet(R"(
@@ -2411,7 +2413,6 @@ void DbTreeViewManager::displayThirdLevelFields(const QList<Table_Control_Data>&
                             }
                         }
                         });
-                    rightLayout->addLayout(radioLayout);
                 } 
                 else if (fieldType == "checkbox" || fieldType == "BOOL")
                 {
@@ -2777,6 +2778,11 @@ void DbTreeViewManager::displayThirdLevelFields(const QList<Table_Control_Data>&
                         }
                         });
 
+                    switchLayout->addWidget(switchBox);
+                    switchLayout->addWidget(switchLabel);
+                    rightLayout->addWidget(switchContainer);
+                    createdWidget = switchBox;
+
                     QPushButton* btnDefault = new QPushButton(QStringLiteral("默认"));
                     btnDefault->setFixedSize(60, 28);
                     btnDefault->setStyleSheet(R"(
@@ -2795,18 +2801,14 @@ void DbTreeViewManager::displayThirdLevelFields(const QList<Table_Control_Data>&
                         if (!fieldDefult.isEmpty()) {
                             if (fieldDefult == "on") {
                                 switchBox->setChecked(true);
-                                switchLabel->setText(tr("Open","开"));
+                                switchLabel->setText(tr("Open", "开"));
                             }
                             else {
                                 switchBox->setChecked(false);
-                                switchLabel->setText(tr("Close","关"));
+                                switchLabel->setText(tr("Close", "关"));
                             }
                         }
                         });
-                    switchLayout->addWidget(switchBox);
-                    switchLayout->addWidget(switchLabel);
-                    rightLayout->addWidget(switchContainer);
-                    createdWidget = switchBox;
                 } 
                 else if (fieldType == "combined" || fieldType == "POSITION")
                 {

View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.cpp

@@ -275,7 +275,7 @@ void ControlOperationPage::setScaleFactorSize(QPixmap scaledImage) {
     //QPixmap curr_scaledImage = scaledImage.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
    // ui->Operatewidget->setPixmapAndPoint(curr_scaledImage, m_previousScaleFactor, m_scaleFactor, m_mousePos);
    // ui->Operatewidget->setPixmap(curr_scaledImage);
-    if (m_currentImageView == nullptr) {
+    if (m_currentImageView == nullptr || m_currentMode == ModeView) {
         updateOperateWidget(scaledImage);
     }
     else

View/die-bonder-ui/Src/Sql/SqlOperation.cpp

@@ -392,7 +392,7 @@ int SqlOperation::loadGivenTableControlData(QString tableName, Table_Control_Dat
         return -1;
     } else
     {
-        QString sql = QString("SELECT GroupId, Name, Describe,Describe_Eng, Type, Value, UpperLimit,LowerLimit,Unit, UserGrade, ChangeFlag, Icon, Enable, CallFun FROM %1 ").arg(tableName);
+        QString sql = QString("SELECT GroupId, Name, Describe,Describe_Eng, Type, Value, Defult, UpperLimit,LowerLimit,Unit, UserGrade, ChangeFlag, Icon, Enable, CallFun FROM %1 ").arg(tableName);
         QSqlQuery queryBond(db);
         queryBond.prepare(sql);
         if (queryBond.exec())
@@ -408,6 +408,7 @@ int SqlOperation::loadGivenTableControlData(QString tableName, Table_Control_Dat
                 //value.strDescribe_Eng = queryBond.value("Describe_Eng").toString().toStdString();
                 value.strType = queryBond.value("Type").toString().toStdString();
                 value.strValue = queryBond.value("Value").toString().toStdString();
+                value.strDefult = queryBond.value("Defult").toString().toStdString();
                 value.strUpperLimit = queryBond.value("UpperLimit").toString().toStdString();
                 value.strLowerLimit = queryBond.value("LowerLimit").toString().toStdString();
                 value.strUnit = queryBond.value("Unit").toString().toStdString();