diff --git a/src/aboutwidget.cpp b/src/aboutwidget.cpp index b4aac20..1646e02 100644 --- a/src/aboutwidget.cpp +++ b/src/aboutwidget.cpp @@ -8,6 +8,7 @@ #include "json/cmdhelper.h" #include #include "AppVersion.h" +#include "device/DeviceManager.h" AboutWidget::AboutWidget(QWidget* parent) : QWidget(parent) @@ -76,7 +77,7 @@ void AboutWidget::initUi() pMainLayout->addWidget(pGuiVer); pEmbededSoftVer = new QLabel(this); - pEmbededSoftVer->setText(tr("Embedded Software V1.5")); + pEmbededSoftVer->setText(tr("Embedded Software V%1").arg(getEmbVersion())); pEmbededSoftVer->setContentsMargins(subContentMargin, 0, 0, 0); pMainLayout->addWidget(pEmbededSoftVer); @@ -156,7 +157,7 @@ void AboutWidget::initUi() pBtnHelp->setText(tr("?")); pCompanyCopyRight->setText(tr("Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed")); pGuiVer->setText(QString(tr("GUI Software V%1")).arg(getGUIVersion())); - pEmbededSoftVer->setText(tr("Embedded Software V1.5")); + pEmbededSoftVer->setText(tr("Embedded Software V%1").arg(getEmbVersion())); pReconSotfVer->setText(tr("Reconstruction Software V1.2")); pFEBVer->setText(tr("FEB Information")); }); @@ -182,3 +183,7 @@ void AboutWidget::openHelpFile() QString AboutWidget::getGUIVersion() { return QString("%1.%2.%3").arg(GUI_VERSION_MAJOR).arg(GUI_VERSION_MINOR).arg(GUI_VERSION_BUILD); } + +QString AboutWidget::getEmbVersion() { + return DeviceManager::Default()->getSoftwareVersion(); +} diff --git a/src/aboutwidget.h b/src/aboutwidget.h index 8b48cb2..1d4afdd 100644 --- a/src/aboutwidget.h +++ b/src/aboutwidget.h @@ -21,6 +21,7 @@ public: ~AboutWidget(); QString getGUIVersion(); + QString getEmbVersion(); private slots: void openHelpFile(); diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index df1a367..e699ffd 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -310,3 +310,7 @@ void DeviceManager::close() { previewDataCaller->terminate(); delete previewDataCaller; } + +QString DeviceManager::getSoftwareVersion() { + return GetDeviceInfo(VERSION); +} diff --git a/src/device/DeviceManager.h b/src/device/DeviceManager.h index 79e1e97..7de8a5a 100644 --- a/src/device/DeviceManager.h +++ b/src/device/DeviceManager.h @@ -20,6 +20,7 @@ public: void setErrorOccurred(bool v){ errorOccurred = v; } + QString getSoftwareVersion(); bool getErrorOccurred(){ return errorOccurred; }