diff --git a/HanddleAI/HandleAiUi-new/appCore.hpp b/HanddleAI/HandleAiUi-new/appCore.hpp index 44a0d7fd..1818667c 100644 --- a/HanddleAI/HandleAiUi-new/appCore.hpp +++ b/HanddleAI/HandleAiUi-new/appCore.hpp @@ -9,7 +9,7 @@ #include #include -#define enableHandleAiModel 1 +#define enableHandleAiModel 0 #define disableBackEndCheck 1 #define disableeAlgo 0 #define enableHideConsle 1 diff --git a/HanddleAI/HandleAiUi-new/front/pages/displayPageWidget.h b/HanddleAI/HandleAiUi-new/front/pages/displayPageWidget.h index ef1111d2..f76e9870 100644 --- a/HanddleAI/HandleAiUi-new/front/pages/displayPageWidget.h +++ b/HanddleAI/HandleAiUi-new/front/pages/displayPageWidget.h @@ -46,8 +46,7 @@ public: leftItemInit(); rightItemInit1(); rightItemInit2(); - QObject::connect(historyImgs, &historyShowListWidget::itemClickSignal, this, &displayWidget::historyClick); - + connectFunc(); //historyImgs->addData(true, "D:/CCD/yuantu/2024-06-04/23H/TEST/1 (1).bmp", QPixmap("D:/CCD/yuantu/2024-06-04/23H/TEST/1 (1).bmp")); } void rightItemInit1() @@ -91,6 +90,18 @@ public: //leftWidget->setMaximumWidth(width / 1.2); //rightWidget->setMaximumWidth(width / 2); } + void connectFunc() + { + QObject::connect(historyImgs, &historyShowListWidget::itemClickSignal, + this, &displayWidget::historyClick); + connect(_switchProductWidget, &switchProductWidget::switchProductSignal, + _uiModuleLocationMap, [=](int index) + { + _uiModuleLocationMap->refreshToCurrentProduct(); + /*_uiModuleLocationMap->loadSignRects(_core._appConfig.productDatas[index].productSign); + _uiModuleLocationMap->setImg(QPixmap(QString::fromStdString(_core._appConfig.productDatas[index].imgPosPath)));*/ + }); + } public slots: void recvMainWindowStdLogMsg(QString msg) { diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_LocationMap.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_LocationMap.h index 5cb00f1d..e2e85cfd 100644 --- a/HanddleAI/HandleAiUi-new/uiModule/uiModule_LocationMap.h +++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_LocationMap.h @@ -83,10 +83,6 @@ public: setEnabled(false); scene = new QGraphicsScene(); this->setScene(scene); - imgLabel = new QLabel(); - scene->clear(); - scene->addWidget(imgLabel); - imgLabel->setMaximumSize(9999, 9999); this->setObjectName("SonGraphicsView"); this->setStyleSheet("QGraphicsView#SonGraphicsView {" "background: transparent;" @@ -95,10 +91,7 @@ public: "background-position: center center;" "}"); mutex.unlock(); - QPixmap pixmap("./imgPosTip/asr1006.png"); - setImg(pixmap); - auto cData = _core._appConfig._switchProductWidgetDataPtr.getCurrentProductData(); - loadSignRects(cData.productSign); + refreshToCurrentProduct(); resetToDefault(); } void setImg(QPixmap pixmap) @@ -111,8 +104,16 @@ public: scene->clear(); setEnabled(false); } + void refreshToCurrentProduct() + { + auto cData = _core._appConfig._switchProductWidgetDataPtr.getCurrentProductData(); + QPixmap pixmap(QString::fromStdString(cData.imgPosPath)); + setImg(pixmap); + loadSignRects(cData.productSign); + } void loadSignRects(std::unordered_map&rects) { + flashItems.clear(); for (auto& data : rects) { FlashingRectItem* _FlashingRectItem = new FlashingRectItem(0,0, data.second.posRect.width, data.second.posRect.height); @@ -222,8 +223,12 @@ private: void showImg(QPixmap img) { mutex.lock(); + scene->clear(); setEnabled(true); setMouseTracking(true); + imgLabel = new QLabel(); + imgLabel->setMaximumSize(9999, 9999); + scene->addWidget(imgLabel); QRect rect = img.rect(); imageWidth = rect.width(); imageHeight = rect.height(); diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h index 10c096a7..272cbc5f 100644 --- a/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h +++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h @@ -85,7 +85,14 @@ public: }); connect(switchBtn, &QPushButton::clicked, this, &switchProductWidget::startSwitch); connect(productSelect, &QComboBox::currentTextChanged, this, &switchProductWidget::currentProductSwitch); - connect(productNameTypeSwitch, &QComboBox::currentTextChanged, this, [=]() {productSelectFresh(productNameTypeSwitch->currentIndex()); }); + connect(productSelect, &QComboBox::currentTextChanged, this, [=]() + { + emit switchProductSignal(productSelect->currentIndex()); + }); + connect(productNameTypeSwitch, &QComboBox::currentTextChanged, this, [=]() + { + productSelectFresh(productNameTypeSwitch->currentIndex()); + }); } void productSelectFresh(int index) { diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp index 6a8fa414..d8e955a0 100644 Binary files a/lib/Hd_3DCameraLMI_module_PointLazer.exp and b/lib/Hd_3DCameraLMI_module_PointLazer.exp differ diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.lib b/lib/Hd_3DCameraLMI_module_PointLazer.lib index 36c75b14..b04150d6 100644 Binary files a/lib/Hd_3DCameraLMI_module_PointLazer.lib and b/lib/Hd_3DCameraLMI_module_PointLazer.lib differ diff --git a/lib/Hd_DalsaCamera_module.exp b/lib/Hd_DalsaCamera_module.exp index da2ea450..27cfbc16 100644 Binary files a/lib/Hd_DalsaCamera_module.exp and b/lib/Hd_DalsaCamera_module.exp differ diff --git a/lib/Hd_DalsaCamera_module.lib b/lib/Hd_DalsaCamera_module.lib index cc2d36e5..9c451b2e 100644 Binary files a/lib/Hd_DalsaCamera_module.lib and b/lib/Hd_DalsaCamera_module.lib differ diff --git a/lib/Hd_FinsTcp_module.exp b/lib/Hd_FinsTcp_module.exp index 26d6e581..8842446e 100644 Binary files a/lib/Hd_FinsTcp_module.exp and b/lib/Hd_FinsTcp_module.exp differ diff --git a/lib/Hd_FinsTcp_module.lib b/lib/Hd_FinsTcp_module.lib index a50e177e..f679fdae 100644 Binary files a/lib/Hd_FinsTcp_module.lib and b/lib/Hd_FinsTcp_module.lib differ diff --git a/lib/Hd_MvCamera_module_GENTL.exp b/lib/Hd_MvCamera_module_GENTL.exp index 6429d839..ebd6dce5 100644 Binary files a/lib/Hd_MvCamera_module_GENTL.exp and b/lib/Hd_MvCamera_module_GENTL.exp differ diff --git a/lib/Hd_MvCamera_module_GENTL.lib b/lib/Hd_MvCamera_module_GENTL.lib index a65c613a..578b535e 100644 Binary files a/lib/Hd_MvCamera_module_GENTL.lib and b/lib/Hd_MvCamera_module_GENTL.lib differ diff --git a/lib/Hd_MvCamera_module_GIGE.exp b/lib/Hd_MvCamera_module_GIGE.exp index 08f548f7..1d1dc4c0 100644 Binary files a/lib/Hd_MvCamera_module_GIGE.exp and b/lib/Hd_MvCamera_module_GIGE.exp differ diff --git a/lib/Hd_MvCamera_module_GIGE.lib b/lib/Hd_MvCamera_module_GIGE.lib index b1396b9b..f5ba12df 100644 Binary files a/lib/Hd_MvCamera_module_GIGE.lib and b/lib/Hd_MvCamera_module_GIGE.lib differ diff --git a/lib/Hd_ResultsSummary_module.exp b/lib/Hd_ResultsSummary_module.exp index e310258b..98647907 100644 Binary files a/lib/Hd_ResultsSummary_module.exp and b/lib/Hd_ResultsSummary_module.exp differ diff --git a/lib/Hd_ResultsSummary_module.lib b/lib/Hd_ResultsSummary_module.lib index a61fbd40..ff33633f 100644 Binary files a/lib/Hd_ResultsSummary_module.lib and b/lib/Hd_ResultsSummary_module.lib differ diff --git a/lib/Hd_SocketModule_ModbusTcp.exp b/lib/Hd_SocketModule_ModbusTcp.exp index 49ff857d..30c37bd2 100644 Binary files a/lib/Hd_SocketModule_ModbusTcp.exp and b/lib/Hd_SocketModule_ModbusTcp.exp differ diff --git a/lib/Hd_SocketModule_ModbusTcp.lib b/lib/Hd_SocketModule_ModbusTcp.lib index 5ec47732..7d987e79 100644 Binary files a/lib/Hd_SocketModule_ModbusTcp.lib and b/lib/Hd_SocketModule_ModbusTcp.lib differ