DEV_OUTPATH Test
This commit is contained in:
@@ -113,6 +113,8 @@ const char* GetDeviceInfo(DeviceInfo infoType) {
|
|||||||
return "28";
|
return "28";
|
||||||
case VERSION:
|
case VERSION:
|
||||||
return "6.6.06";
|
return "6.6.06";
|
||||||
|
case DEV_OUTPATH:
|
||||||
|
return "path to store bin";
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ typedef enum {
|
|||||||
//kinds of device information
|
//kinds of device information
|
||||||
typedef enum {
|
typedef enum {
|
||||||
MEAN_TEMPERATURE,
|
MEAN_TEMPERATURE,
|
||||||
VERSION
|
VERSION,
|
||||||
|
DEV_OUTPATH
|
||||||
} DeviceInfo;
|
} DeviceInfo;
|
||||||
|
|
||||||
extern int InitLib(void(*)(const char *msg));
|
extern int InitLib(void(*)(const char *msg));
|
||||||
|
|||||||
@@ -314,3 +314,7 @@ void DeviceManager::close() {
|
|||||||
QString DeviceManager::getSoftwareVersion() {
|
QString DeviceManager::getSoftwareVersion() {
|
||||||
return GetDeviceInfo(VERSION);
|
return GetDeviceInfo(VERSION);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString DeviceManager::getScanOutputPath() {
|
||||||
|
return GetDeviceInfo(DEV_OUTPATH);
|
||||||
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ public:
|
|||||||
errorOccurred = v;
|
errorOccurred = v;
|
||||||
}
|
}
|
||||||
QString getSoftwareVersion();
|
QString getSoftwareVersion();
|
||||||
|
QString getScanOutputPath();
|
||||||
bool getErrorOccurred(){
|
bool getErrorOccurred(){
|
||||||
return errorOccurred;
|
return errorOccurred;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,7 +77,8 @@ void AboutWidget::initUi()
|
|||||||
pMainLayout->addWidget(pGuiVer);
|
pMainLayout->addWidget(pGuiVer);
|
||||||
|
|
||||||
pEmbededSoftVer = new QLabel(this);
|
pEmbededSoftVer = new QLabel(this);
|
||||||
pEmbededSoftVer->setText(tr("Embedded Software %1").arg(getEmbVersion()));
|
// pEmbededSoftVer->setText(tr("Embedded Software %1").arg(getEmbVersion()));
|
||||||
|
pEmbededSoftVer->setText(tr("Embedded Software %1, Data store Path:%2").arg(getEmbVersion(), getDataStorePath()));
|
||||||
pEmbededSoftVer->setContentsMargins(subContentMargin, 0, 0, 0);
|
pEmbededSoftVer->setContentsMargins(subContentMargin, 0, 0, 0);
|
||||||
pMainLayout->addWidget(pEmbededSoftVer);
|
pMainLayout->addWidget(pEmbededSoftVer);
|
||||||
|
|
||||||
@@ -157,7 +158,8 @@ void AboutWidget::initUi()
|
|||||||
pBtnHelp->setText(tr("?"));
|
pBtnHelp->setText(tr("?"));
|
||||||
pCompanyCopyRight->setText(tr("Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed"));
|
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()));
|
pGuiVer->setText(QString(tr("GUI Software V%1")).arg(getGUIVersion()));
|
||||||
pEmbededSoftVer->setText(tr("Embedded Software %1").arg(getEmbVersion()));
|
// pEmbededSoftVer->setText(tr("Embedded Software %1").arg(getEmbVersion()));
|
||||||
|
pEmbededSoftVer->setText(tr("Embedded Software %1, Data store Path:%2").arg(getEmbVersion(), getDataStorePath()));
|
||||||
pReconSotfVer->setText(tr("Reconstruction Software V1.2"));
|
pReconSotfVer->setText(tr("Reconstruction Software V1.2"));
|
||||||
pFEBVer->setText(tr("FEB Information"));
|
pFEBVer->setText(tr("FEB Information"));
|
||||||
});
|
});
|
||||||
@@ -191,3 +193,7 @@ QString AboutWidget::getGUIVersion() {
|
|||||||
QString AboutWidget::getEmbVersion() {
|
QString AboutWidget::getEmbVersion() {
|
||||||
return DeviceManager::Default()->getSoftwareVersion();
|
return DeviceManager::Default()->getSoftwareVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString AboutWidget::getDataStorePath() {
|
||||||
|
return DeviceManager::Default()->getScanOutputPath();;
|
||||||
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public:
|
|||||||
|
|
||||||
QString getGUIVersion();
|
QString getGUIVersion();
|
||||||
QString getEmbVersion();
|
QString getEmbVersion();
|
||||||
|
QString getDataStorePath();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void openHelpFile();
|
void openHelpFile();
|
||||||
|
|||||||
Reference in New Issue
Block a user