Browse Source

修改控制名称

JonYang 3 days ago
parent
commit
d6d6c865f7

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

@@ -93,8 +93,8 @@ void MainAndSecondaryCamerasWnd::InitPage()
         nSize = m_pMainCameraBind->m_vecCamera.size();
         if (nSize == 0) // 针对获取不到的情况
         {
-            //nSize = 5;
-            JMessageTip::Message_warning("a");
+            nSize = 5;
+            //JMessageTip::Message_warning("a");
         }
         QList<int> numbers;
         for (int i = 1; i <= nSize; i++)

+ 4 - 4
View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.ui

@@ -73,7 +73,7 @@
      </rect>
     </property>
    </widget>
-   <widget class="ViewWidgetGroup" name="viewwidgetgroup_L" native="true">
+   <widget class="ControlOperationPage" name="viewwidgetgroup_L" native="true">
     <property name="geometry">
      <rect>
       <x>10</x>
@@ -83,7 +83,7 @@
      </rect>
     </property>
    </widget>
-   <widget class="ViewWidgetGroup" name="viewwidgetgroup_R" native="true">
+   <widget class="ControlOperationPage" name="viewwidgetgroup_R" native="true">
     <property name="geometry">
      <rect>
       <x>555</x>
@@ -103,9 +103,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ViewWidgetGroup</class>
+   <class>ControlOperationPage</class>
    <extends>QWidget</extends>
-   <header>src/RewriteControl/viewwidgetgroup.h</header>
+   <header>src/RewriteControl/ControlOperationPage.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

+ 3 - 3
View/die-bonder-ui/SBTdie-bonder-ui.vcxproj

@@ -237,9 +237,9 @@
     <ClCompile Include="Src\common\JLogAllOutput.cpp" />
     <ClCompile Include="Src\common\JMessageTip.cpp" />
     <ClCompile Include="Src\common\JUserAccountsData.cpp" />
+    <ClCompile Include="Src\RewriteControl\ControlOperationPage.cpp" />
     <ClCompile Include="Src\RewriteControl\LightJoystickSwitchPage.cpp" />
     <ClCompile Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.cpp" />
-    <ClCompile Include="Src\RewriteControl\viewwidgetgroup.cpp" />
     <ClCompile Include="Src\Sql\SqlOperation.cpp" />
     <ClCompile Include="Src\SystemInfoPage\PageWnd\AccountMaintenanceWnd.cpp" />
     <ClCompile Include="Src\SystemInfoPage\PageWnd\AddUserAccountWnd.cpp" />
@@ -262,8 +262,8 @@
     <ClInclude Include="Src\common\JUserAccountsData.h" />
     <ClInclude Include="Src\common\UserManagementShared.h" />
     <QtMoc Include="Src\RewriteControl\LightJoystickSwitchPage.h" />
-    <QtMoc Include="Src\RewriteControl\viewwidgetgroup.h" />
     <QtMoc Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.h" />
+    <QtMoc Include="Src\RewriteControl\ControlOperationPage.h" />
     <ClInclude Include="Src\Sql\SqlOperation.h" />
     <QtMoc Include="Src\CameraBind.h" />
     <QtMoc Include="OriginalWnd\CameraDataHandleAndShow.h">
@@ -341,9 +341,9 @@
     </QtUic>
     <QtUic Include="OriginalWnd\SingleCameraOperationWnd.ui">
     </QtUic>
+    <QtUic Include="Src\RewriteControl\ControlOperationPage.ui" />
     <QtUic Include="Src\RewriteControl\LightJoystickSwitchPage.ui" />
     <QtUic Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.ui" />
-    <QtUic Include="Src\RewriteControl\viewwidgetgroup.ui" />
     <QtUic Include="Src\SystemInfoPage\PageWnd\AccountMaintenanceWnd.ui" />
     <QtUic Include="Src\SystemInfoPage\PageWnd\AddUserAccountWnd.ui" />
     <QtUic Include="Src\SystemInfoPage\PageWnd\LanguageSwitchWnd.ui" />

+ 9 - 9
View/die-bonder-ui/SBTdie-bonder-ui.vcxproj.filters

@@ -234,12 +234,12 @@
     <ClCompile Include="Src\RewriteControl\LightJoystickSwitchPage.cpp">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </ClCompile>
-    <ClCompile Include="Src\RewriteControl\viewwidgetgroup.cpp">
-      <Filter>Source Files\Src\RewriteControl</Filter>
-    </ClCompile>
     <ClCompile Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.cpp">
       <Filter>Source Files\Src\RewriteControl\MsgDlg</Filter>
     </ClCompile>
+    <ClCompile Include="Src\RewriteControl\ControlOperationPage.cpp">
+      <Filter>Source Files\Src\RewriteControl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="ImageWidget.h">
@@ -314,12 +314,12 @@
     <QtMoc Include="Src\RewriteControl\LightJoystickSwitchPage.h">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </QtMoc>
-    <QtMoc Include="Src\RewriteControl\viewwidgetgroup.h">
-      <Filter>Source Files\Src\RewriteControl</Filter>
-    </QtMoc>
     <QtMoc Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.h">
       <Filter>Source Files\Src\RewriteControl\MsgDlg</Filter>
     </QtMoc>
+    <QtMoc Include="Src\RewriteControl\ControlOperationPage.h">
+      <Filter>Source Files\Src\RewriteControl</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">
@@ -372,12 +372,12 @@
     <QtUic Include="Src\RewriteControl\LightJoystickSwitchPage.ui">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </QtUic>
-    <QtUic Include="Src\RewriteControl\viewwidgetgroup.ui">
-      <Filter>Source Files\Src\RewriteControl</Filter>
-    </QtUic>
     <QtUic Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.ui">
       <Filter>Source Files\Src\RewriteControl\MsgDlg</Filter>
     </QtUic>
+    <QtUic Include="Src\RewriteControl\ControlOperationPage.ui">
+      <Filter>Source Files\Src\RewriteControl</Filter>
+    </QtUic>
   </ItemGroup>
   <ItemGroup>
     <None Include="images\Participation display\BlackDiamond.png">

+ 21 - 21
View/die-bonder-ui/Src/RewriteControl/viewwidgetgroup.cpp → View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.cpp

@@ -1,19 +1,19 @@
-#include "viewwidgetgroup.h"
-#include "ui_viewwidgetgroup.h"
+#include "ControlOperationPage.h"
+#include "ui_ControlOperationPage.h"
 
-ViewWidgetGroup::ViewWidgetGroup(QWidget *parent)
+ControlOperationPage::ControlOperationPage(QWidget *parent)
     : QWidget(parent)
-    , ui(new Ui::ViewWidgetGroup)
+    , ui(new Ui::ControlOperationPage)
 {
     ui->setupUi(this);
 }
 
-ViewWidgetGroup::~ViewWidgetGroup()
+ControlOperationPage::~ControlOperationPage()
 {
     delete ui;
 }
 
-void ViewWidgetGroup::updateOperateWidget(const QPixmap& pixmap, const QStringList& textList){
+void ControlOperationPage::updateOperateWidget(const QPixmap& pixmap, const QStringList& textList){
     QSize size = ui->Operatewidget->size();
     QPixmap scaledPixmap = pixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 
@@ -30,7 +30,7 @@ void ViewWidgetGroup::updateOperateWidget(const QPixmap& pixmap, const QStringLi
 
 }
 // 清除大窗口上当前的布局
-void ViewWidgetGroup::clearLayout() {
+void ControlOperationPage::clearLayout() {
     // 获取当前布局
     QLayout* layout = ui->Operatewidget->layout();
     if (layout) {
@@ -45,20 +45,20 @@ void ViewWidgetGroup::clearLayout() {
     }
 }
 
-void ViewWidgetGroup::on_ZoomUpButton_clicked() {
+void ControlOperationPage::on_ZoomUpButton_clicked() {
     m_mousePos = ui->Operatewidget->geometry().center();
     updateScale(m_scaleFactor * 1.1);
 
 }
 
-void ViewWidgetGroup::on_ZoomOutButton_clicked() {
+void ControlOperationPage::on_ZoomOutButton_clicked() {
     m_mousePos = ui->Operatewidget->geometry().center();
     updateScale(m_scaleFactor * 0.9);
 
 }
 
 // 更新缩放比例
-void ViewWidgetGroup::updateScale(double newScaleFactor) {
+void ControlOperationPage::updateScale(double newScaleFactor) {
     if (newScaleFactor >= 1.0) {
         m_scaleFactor = newScaleFactor;
     } else {
@@ -69,7 +69,7 @@ void ViewWidgetGroup::updateScale(double newScaleFactor) {
 }
 
 // 应用缩放
-void ViewWidgetGroup::applyScale() {
+void ControlOperationPage::applyScale() {
     if (m_currentMode == ModeImage) {
         // 图片模式:缩放图片
         int newWidth = m_currentPixmap.width() * m_scaleFactor;
@@ -91,7 +91,7 @@ void ViewWidgetGroup::applyScale() {
     ui->label_Percentage->setText(QString("%1%").arg(percentageStr));
 }
 
-void ViewWidgetGroup::handleDoubleClick(){
+void ControlOperationPage::handleDoubleClick(){
     if (m_currentMode == ModeImage) {
         QPixmap scaledImage = m_currentPixmap.scaled(m_currentPixmap.width(), m_currentPixmap.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
         ui->Operatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
@@ -106,7 +106,7 @@ void ViewWidgetGroup::handleDoubleClick(){
 
 }
 
-void ViewWidgetGroup::updateMaterialWidget( kinds materialWndType) {
+void ControlOperationPage::updateMaterialWidget( kinds materialWndType) {
 
         clearLayout();
 
@@ -119,7 +119,7 @@ void ViewWidgetGroup::updateMaterialWidget( kinds materialWndType) {
 
 }
 
-void ViewWidgetGroup::KindsofWidget(kinds kind) {
+void ControlOperationPage::KindsofWidget(kinds kind) {
 
 
         ui->Operatewidget->clearPixmap();
@@ -150,27 +150,27 @@ void ViewWidgetGroup::KindsofWidget(kinds kind) {
 
 }
 
-void ViewWidgetGroup::setWafer(Wafer *wafer){
+void ControlOperationPage::setWafer(Wafer *wafer){
     m_wafer = wafer;
     updateMaterialWidget(wafer_kind);
     
 }
-void ViewWidgetGroup::setWaffle(Waffle *waffle){
+void ControlOperationPage::setWaffle(Waffle *waffle){
     m_waffle = waffle;
     updateMaterialWidget(waffle_kind);
 }
-void ViewWidgetGroup::setMaterialBox(MaterialBox *materialbox){
+void ControlOperationPage::setMaterialBox(MaterialBox *materialbox){
     m_materialbox = materialbox;
     updateMaterialWidget(materialbox_kind);
 }
-//void ViewWidgetGroup::setBond(Bond *bond){
+//void ControlOperationPage::setBond(Bond *bond){
 //    m_bond = bond;
 //}
 
-void ViewWidgetGroup::initForm() {
-    connect(ui->Operatewidget, &ImageWidget::sendDoubleClicksignal, this, &ViewWidgetGroup::handleDoubleClick);
+void ControlOperationPage::initForm() {
+    connect(ui->Operatewidget, &ImageWidget::sendDoubleClicksignal, this, &ControlOperationPage::handleDoubleClick);
     ui->Operatewidget->setMouseTracking(true);
 }
-ImageWidget* ViewWidgetGroup::getOperatewidget() {
+ImageWidget* ControlOperationPage::getOperatewidget() {
     return ui->Operatewidget;
 }

+ 5 - 5
View/die-bonder-ui/Src/RewriteControl/viewwidgetgroup.h → View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.h

@@ -11,9 +11,9 @@
 #include "CameraMaterialGroupWnd/CameraImage/CameraImageHandler.h"
 #include "ImageWidget.h"
 namespace Ui {
-class ViewWidgetGroup;
+class ControlOperationPage;
 }
-class ViewWidgetGroup : public QWidget
+class ControlOperationPage : public QWidget
 {
     Q_OBJECT
 
@@ -24,8 +24,8 @@ public:
         materialbox_kind,
         bond_kind
     };
-    explicit ViewWidgetGroup(QWidget *parent = nullptr);
-    ~ViewWidgetGroup();
+    explicit ControlOperationPage(QWidget *parent = nullptr);
+    ~ControlOperationPage();
     void initForm();
     void updateOperateWidget(const QPixmap& pixmap, const QStringList& textList);
     void clearLayout();
@@ -47,7 +47,7 @@ private slots:
     //void on_PenButton_clicked();
     void handleDoubleClick();
 private:
-    Ui::ViewWidgetGroup *ui;
+    Ui::ControlOperationPage*ui;
     QPixmap m_currentPixmap;
     qreal m_scaleFactor;
     QPoint m_mousePos;

+ 2 - 2
View/die-bonder-ui/Src/RewriteControl/viewwidgetgroup.ui → View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ViewWidgetGroup</class>
- <widget class="QWidget" name="ViewWidgetGroup">
+ <class>ControlOperationPage</class>
+ <widget class="QWidget" name="ControlOperationPage">
   <property name="geometry">
    <rect>
     <x>0</x>