diff --git a/HanddleAI/HandleAiUi-new/CMakeLists.txt b/HanddleAI/HandleAiUi-new/CMakeLists.txt index af0370f7..d1ffb1f6 100644 --- a/HanddleAI/HandleAiUi-new/CMakeLists.txt +++ b/HanddleAI/HandleAiUi-new/CMakeLists.txt @@ -108,7 +108,7 @@ else() ${HANDLEAI_SRC_FILES} ${ALGO_HEAD_FILES} ${ALGO_SRC_FILES} - ${UI_FILES} "ff.rc" "icon.qrc" ) + ${UI_FILES} "ff.rc" "icon.qrc" "uiModule/uiModule_switchProduct.h") else() add_executable( ${CURRENT_FOLDER} WIN32 ${HEAD_FILES} diff --git a/HanddleAI/HandleAiUi-new/arrow.png b/HanddleAI/HandleAiUi-new/arrow.png deleted file mode 100644 index e70f0804..00000000 Binary files a/HanddleAI/HandleAiUi-new/arrow.png and /dev/null differ diff --git a/HanddleAI/HandleAiUi-new/main.cpp b/HanddleAI/HandleAiUi-new/main.cpp index ad0141f7..57127c50 100644 --- a/HanddleAI/HandleAiUi-new/main.cpp +++ b/HanddleAI/HandleAiUi-new/main.cpp @@ -22,42 +22,8 @@ void connectSignalAndSlots(MainWindow* front, backEndManager* back) QObject::connect(front, &MainWindow::reInitSignal, back, &backEndManager::initialization); QObject::connect(front->_loadingWidget.retryBtn, &QPushButton::clicked, back, &backEndManager::initialization); } -//exmple 860 168/144 1 -QByteArray createReadPlcQByteArray(int pos, int areaCode, int lenth) -{ - int pos1 = std::max(0, pos - 255); - int pos2 = pos - pos1; - QString str1 = QString("%1").arg(pos1, 2, 16, QLatin1Char('0')).toUpper(); - QString str2 = QString("%1").arg(pos2, 2, 16, QLatin1Char('0')).toUpper(); - QString str3 = QString("%1").arg(lenth, 2, 16, QLatin1Char('0')).toUpper(); - QString str = QString("50 00 00 FF FF 03 00 0C 00 0A 00 01 04 00 00 %1 %2 00 %3 %4 00") - .arg(str1) - .arg(str2) - .arg(QString::number(areaCode, 16).toUpper()) - .arg(str3); - return QByteArray::fromHex(str.toStdString().c_str()); -} -//exmple 862 168/144 1 1 -QByteArray createwritePlcQByteArray(int pos, int areaCode, int lenth, int value) -{ - int pos1 = std::max(0, pos - 255); - int pos2 = pos - pos1; - - QString str1 = QString("%1").arg(pos1, 2, 16, QLatin1Char('0')).toUpper(); - QString str2 = QString("%1").arg(pos2, 2, 16, QLatin1Char('0')).toUpper(); - QString str3 = QString("%1").arg(lenth, 2, 16, QLatin1Char('0')).toUpper(); - QString str4 = QString("%1").arg(value, 2, 16, QLatin1Char('0')).toUpper(); - QString str = QString("50 00 00 FF FF 03 00 0E 00 0A 00 01 14 00 00 %1 %2 00 %3 00 %4 00 %5 00") - .arg(str1) - .arg(str2) - .arg(QString::number(areaCode, 16).toUpper()) - .arg(str3) - .arg(str4); - return QByteArray::fromHex(str.toStdString().c_str()); -} int main(int argc, char* argv[]) { - QByteArray r = createReadPlcQByteArray(102, 168, 1); QApplication a(argc, argv); LogMsg::Create(LogMsg::LogMsgType::DebugMsg); //检测是否已运行 diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h index 381b0975..70716b91 100644 --- a/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h +++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_summaryDataManager.h @@ -5,6 +5,8 @@ #include #include #include +#include + class summaryDataManager { public: @@ -146,6 +148,8 @@ public: progressBar3->setProgress(0.8); layout->addWidget(progressBar3); + switchProductWidget* _switchProductWidget = new switchProductWidget(); + layout->addWidget(_switchProductWidget); LogWindow* log = new LogWindow(); layout->addWidget(log); } diff --git a/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h b/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h new file mode 100644 index 00000000..a50347b3 --- /dev/null +++ b/HanddleAI/HandleAiUi-new/uiModule/uiModule_switchProduct.h @@ -0,0 +1,60 @@ +#include +#include +#include +#include +#include +class switchProductWidget : public QWidget +{ +public: + int currentProductIndex = 0; + QHBoxLayout* layout = new QHBoxLayout(this); + fancyButtonText* switchBtn = new fancyButtonText(100, 60, "޸", "޸ĵǰ"); + QComboBox* productSelect = new QComboBox(this); + QLabel* currentProduct = new QLabel(this); + switchProductWidget() + { + this->setLayout(layout); + + productSelect->addItem("Ʒ1"); + productSelect->addItem("Ʒ2"); + + layout->addWidget(productSelect); + productSelect->hide(); + + currentProduct->setText("Ʒ1"); + layout->addWidget(currentProduct); + layout->addWidget(switchBtn); + + connect(switchBtn, &QPushButton::clicked, this, &switchProductWidget::startSwitch); + connect(productSelect, &QComboBox::currentTextChanged, this, &switchProductWidget::currentProductSwitch); + } +private: + int siwtchBtnState = 0; +private slots: + void startSwitch() + { + if(siwtchBtnState == 0) + { + currentProduct->hide(); + productSelect->show(); + switchBtn->setText("ȡ"); + siwtchBtnState = 1; + return; + } + else if (siwtchBtnState == 1) + { + currentProduct->show(); + productSelect->hide(); + switchBtn->setText("޸"); + siwtchBtnState = 0; + return; + } + + } + void currentProductSwitch(QString input) + { + int index = productSelect->currentIndex(); + } +}; + +#pragma once \ No newline at end of file diff --git a/lib/Hd_3DCameraLMI_module_PointLazer.exp b/lib/Hd_3DCameraLMI_module_PointLazer.exp index c128f721..88c61749 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 b506c2ad..36c75b14 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 d51dd347..db9cc928 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 c271a24e..cc2d36e5 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 63243947..a1b15cae 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 e7784b3e..a50e177e 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 f0a89b55..607e07c8 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 4010f0a3..a65c613a 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 baf010b9..5c609989 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 110ae8d7..b1396b9b 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 72272a70..0f57bb66 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 8baafc1c..a61fbd40 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 25890329..4e86b6bb 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 b3ff8f19..5ec47732 100644 Binary files a/lib/Hd_SocketModule_ModbusTcp.lib and b/lib/Hd_SocketModule_ModbusTcp.lib differ