继续调整

View/die-bonder-ui/CameraMaterialGroupWnd/CameraImage/CameraImageHandler.cpp

@@ -68,6 +68,7 @@ MaterialBox* CameraImageHandler::getMaterialBox() const
 }
 
 void CameraImageHandler::initGroup(int CameraId) {
+   /* int CameraId, QString path, enum MaterialWindowType materialWindowType*/
     QStringList dispmodel1;
     dispmodel1 << "P die align" << "D device align";
 

View/die-bonder-ui/CameraMaterialGroupWnd/Group.cpp

@@ -102,12 +102,14 @@ bool Group::eventFilter(QObject *obj, QEvent *event)
                 index = 1;
                 settings.setValue("Index", 1);
                 check_selected(1);
+                setEnableControls(true);
             } 
             else if (obj == this->ui->Imagewidget_right)
             {
                 index = 2;
                 settings.setValue("Index", 2);
                 check_selected(2);
+                setEnableControls(false);
             }
             emit SetCurrentSelectSig(groupId, index);
             emit SendGroupSelectedSignals(this, index);
@@ -201,11 +203,9 @@ void Group::on_DatacomboBox_currentIndexChanged(int index){
 
 void Group::UpDataImageShowSlots(const QPixmap& imageData)
 {
-    ui->Imagewidget_left->setGeometry(ui->Imagewidget_left->pos().x(),
-        ui->Imagewidget_left->pos().y(),
-        ui->Imagewidget_left->width(),
-        ui->Imagewidget_left->height());
-    ui->Imagewidget_left->setPixmap(imageData);
+    QSize size_left = ui->Imagewidget_left->size();
+    QPixmap scaledPixmap = imageData.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    ui->Imagewidget_left->setPixmap(scaledPixmap);
 
     emit SetUpDataImageShowSig(imageData);
 }

View/die-bonder-ui/Login.cpp

@@ -57,6 +57,10 @@ void Login::onUserNameChanged(const QString &userName)
 
 void Login::on_SinginButton_clicked()
 {
+
+    emit SendSwitchOriginalWndSignals();
+    return;
+
     QString strTip;
 
     QString strUser = ui->userNameLineEdit->text().trimmed();

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

@@ -26,10 +26,15 @@ MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget *parent)
     lastLastGroupId = settings.value("LastLastGroupId", 0).toInt();
     settings.endGroup();
 
-    QStringList a = getImageslist();
-    qDebug() << a;
+    QString buildDirPath = QCoreApplication::applicationDirPath();
+    QDir buildDirectory(buildDirPath);
+    QStringList files = getImageslist(buildDirectory.filePath("photos"));
+    for (const QString& file : files) {
+        qDebug() << file;
+    }
     ui->control_r->HideOrShowPage(false);
     ui->control_L->HideOrShowPage(false);
+    ui->viewwidgetgroup_L->setBlueBord();
     qApp->installEventFilter(this);
 }
 
@@ -69,7 +74,21 @@ void MainAndSecondaryCamerasWnd::initFrom()
     lastIndex = lastWndType;
     lastGroupId = LastGroup;
 
+    QSettings settings("YourCompany", "YourApplication_");
+    int groupId = settings.value("GroupId", 0).toInt();
+    int index = settings.value("Index", 0).toInt();
+
     checkSettings();
+
+
+
+    if (lastIndex == 1) {
+        GetCurrentSelectSlots(lastGroupId, lastIndex);
+    }
+    if(index == 1){
+        GetCurrentSelectSlots(groupId, index);
+    }
+
 }
 
 void MainAndSecondaryCamerasWnd::InitPage()
@@ -91,7 +110,7 @@ void MainAndSecondaryCamerasWnd::InitPage()
             //JMessageTip::Message_warning("a");
         }
         QList<int> numbers;
-        nSize = 8;
+        
         for (int i = 1; i <= nSize; i++)
         {
             numbers.push_back(i);
@@ -407,7 +426,7 @@ void MainAndSecondaryCamerasWnd::UpdataLightJoystickSwitchPage()
             {
                 bShow = true;
             }
-            Fun(m_veCurrentSelectGroup[1].pSelectGroup,ui->control_L, ui->viewwidgetgroup_R, bShow);
+            Fun(m_veCurrentSelectGroup[1].pSelectGroup,ui->control_r, ui->viewwidgetgroup_R, bShow);
 
         }
     }
@@ -646,21 +665,19 @@ void MainAndSecondaryCamerasWnd::CheckIs()
         showAndHide_L();
     }*/
 }
-QStringList MainAndSecondaryCamerasWnd::getImageslist() {
-    // 指定图片文件夹路径
-    QString folderPath = "photos/";
+QStringList MainAndSecondaryCamerasWnd::getImageslist(const QString& path) {
 
     // 创建 QDir 对象
-    QDir dir(folderPath);
+    QDir dir(path);
 
     // 检查文件夹是否存在
     if (!dir.exists()) {
-        qWarning() << "Folder does not exist:" << folderPath;
+        qWarning() << "Folder does not exist:" ;
     }
 
     // 获取文件夹中的所有图片文件
     QStringList filters;
     filters << "*.png" << "*.jpg" << "*.jpeg" << "*.bmp" << "*.gif"; // 添加你需要的图片格式
-    QStringList images = dir.entryList(filters, QDir::Files);
-    return images;
+    QStringList fileList = dir.entryList(filters, QDir::Files);
+    return fileList;
 }

View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.h

@@ -33,7 +33,7 @@ public:
      */
     void updateMaterialWidget(int side, int materialWndType, int groupId);
 
-    QStringList getImageslist();
+    QStringList getImageslist(const QString& path);
 
 public slots:
 

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

@@ -489,3 +489,7 @@ void ControlOperationPage::setEnableControls(bool enable) {
     
 }
 
+void ControlOperationPage::setBlueBord() {
+    ui->BackGround->setStyleSheet(QString::fromUtf8("border: 4px solid blue;"));
+}
+

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

@@ -50,6 +50,7 @@ public:
      */
     void UpDateCameraBind(CameraBind* pCameraBind);
     void setEnableControls(bool enable);
+    void setBlueBord();
 private slots:
     void on_ZoomUpButton_clicked();
     void on_ZoomOutButton_clicked();