sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Remove data transfer in gui.

Browse Source
This commit is contained in:
sunwen
2025-02-13 14:29:40 +08:00
parent 80be60042a
commit 7c66abb72d
10 changed files with 340 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/forms/recon/ReconFormWidget.cpp
View File

@@ -26,7 +26,6 @@ ReconFormWidget::ReconFormWidget(QWidget *parent)
, mScanTable(new SlideTableView(this))
, mSearchWidget(new ScanSearchCriteriaForm(this))
, mModel(nullptr)
, mRefreshTimer(new QTimer(this))
{
auto layout = new QHBoxLayout(ui->commandWidget);
layout->setAlignment(Qt::AlignmentFlag::AlignLeft);
@@ -51,10 +50,8 @@ ReconFormWidget::ReconFormWidget(QWidget *parent)
// DeviceManager::Default()->updateReconState();
// });
connect(DeviceManager::Default(), &DeviceManager::updateReconStateFinished, mModel, &QSqlTableModel::select);
connect(DeviceManager::Default(), &DeviceManager::transferStatusUpdated, mModel, &QSqlTableModel::select);
connect(mSearchWidget, &ScanSearchCriteriaForm::searchFilterUpdated, this, &ReconFormWidget::updateSearchFilter);
connect(mSearchWidget, &ScanSearchCriteriaForm::refreshData, DeviceManager::Default(), &DeviceManager::updateReconState);
connect(mRefreshTimer, &QTimer::timeout, this, &ReconFormWidget::refreshTransferprogress);
connect(EventCenter::Default(), &EventCenter::AnonymousModeChanged, this, &ReconFormWidget::updateSearchFilter);
connect(EventCenter::Default(), &EventCenter::ReloadLanguage, this, &ReconFormWidget::reloadLanguage);
}
@@ -126,12 +123,10 @@ void ReconFormWidget::showEvent(QShowEvent *aEvent)
{
TabFormWidget::showEvent(aEvent);
DeviceManager::Default()->updateReconState();
mRefreshTimer->start(1000);
}
void ReconFormWidget::hideEvent(QHideEvent *aEvent)
{
mRefreshTimer->stop();
TabFormWidget::hideEvent(aEvent);
}
@@ -140,14 +135,6 @@ int ReconFormWidget::getTableColumnIndex(const QString& aColumnName)
return mModel->record().indexOf(aColumnName);
}
void ReconFormWidget::refreshTransferprogress()
{
if(DeviceManager::Default()->updateTransferProgress())
{
mScanTable->viewport()->update();
}
}
void ReconFormWidget::reloadLanguage()
{
mModel->setHeaderData(getTableColumnIndex("PatientID"), Qt::Horizontal, tr("Patient ID"));

2
src/forms/recon/ReconFormWidget.h
View File

@@ -24,7 +24,6 @@ protected:
private slots:
void updateSearchFilter();
void refreshTransferprogress();
void reloadLanguage();
private:
@@ -34,7 +33,6 @@ private:
SlideTableView* mScanTable;
ScanSearchCriteriaForm* mSearchWidget;
QSqlTableModel *mModel;
QTimer* mRefreshTimer;
void initTableView(QHBoxLayout *contentLayout);

32
src/forms/recon/ReconStateDelegate.cpp
View File

@@ -22,37 +22,7 @@ void ReconStateDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
switch (state)
{
case 0:
displayText = tr("Wait to transfer");
break;
case 100:
{
displayText = tr("Transfering");
int progress = DeviceManager::Default()->getTransferProgress();
QRect textRect = option.rect;
textRect.setRight(option.rect.right() - 180);
painter->drawText(textRect, Qt::AlignCenter, displayText);
QRect progressBarRect = option.rect;
progressBarRect.setLeft(textRect.right() + 10);
progressBarRect.setRight(option.rect.right() - 5);
progressBarRect.setTop(option.rect.top() + 5);
progressBarRect.setBottom(option.rect.bottom() - 5);
QStyleOptionProgressBarV2 progressBarOption;
progressBarOption.rect = progressBarRect;
progressBarOption.minimum = 0;
progressBarOption.maximum = 100;
progressBarOption.progress = progress;
QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter);
painter->restore();
return;
}
case 104:
displayText = tr("Transfer failed");
painter->setPen(QColor(Qt::red));
break;
case 200:
displayText = tr("Transfer completed");
displayText = tr("Scan completed");
break;
case 204:
displayText = tr("Recon create failed");

25
src/forms/settings/SystemCorrectionForm.cpp
View File

@@ -17,7 +17,6 @@ SystemCorrectionForm::SystemCorrectionForm(QWidget* aParent)
, mCurrentEmptyScanDate(new QLabel(this))
, mExpirationEmptyScanDate(new QLabel(this))
, mCurrentEmptyScanState(new QLabel(this))
, mTimer(new QTimer(this))
, mEmptyScanState()
{
setObjectName("SystemCorrectionForm");
@@ -115,8 +114,6 @@ void SystemCorrectionForm::init()
LOG_USER_OPERATION("Start Empty Scan")
});
mTimer->setInterval(1000);
connect(mTimer, &QTimer::timeout, this, &SystemCorrectionForm::updateEmptyScanTransferProgress);
connect(EventCenter::Default(), &EventCenter::EmptyScanFinished, this, &SystemCorrectionForm::updateEmptyScanDate);
connect(EventCenter::Default(), &EventCenter::EmptyScanDataStateUpdated, this, &SystemCorrectionForm::updateEmptyScanState);
connect(EventCenter::Default(), &EventCenter::EmptyScanDataExpire, this, &SystemCorrectionForm::updateEmptyScanDateExpire);
@@ -138,26 +135,9 @@ void SystemCorrectionForm::updateEmptyScanDate()
void SystemCorrectionForm::updateEmptyScanState()
{
mEmptyScanState = SQLHelper::queryValue("SELECT State FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toInt();
if(mEmptyScanState == 100 && !mTimer->isActive())
{
mTimer->start();
}
else if(mEmptyScanState != 100 && mTimer->isActive())
{
mTimer->stop();
}
mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState)));
}
void SystemCorrectionForm::updateEmptyScanTransferProgress()
{
if(DeviceManager::Default()->updateTransferProgress())
{
int progress = DeviceManager::Default()->getTransferProgress();
mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState) + QString::number(progress) + "%"));
}
}
void SystemCorrectionForm::updateEmptyScanBroked()
{
mEmptyScanState = -1;
@@ -176,10 +156,7 @@ QString SystemCorrectionForm::getStateString(int aState)
{
case -2: return QString("<font color='red'>&nbsp;&nbsp;%1</font>").arg(tr("Expired"));
case -1: return QString("<font color='red'>&nbsp;&nbsp;%1</font>").arg(tr("Broked"));
case 0: return tr("Wait To Transfer");
case 100: return tr("Transferring");
case 104: return QString("<font color='red'>&nbsp;&nbsp;%1</font>").arg(tr("Transfer Failed"));
case 200: return tr("Transfer succeed");
case 0: return tr("Scan completed");
case 204: return QString("<font color='red'>&nbsp;&nbsp;%1</font>").arg(tr("Recon Error"));
case 300: return tr("Normal");
case 304: return QString("<font color='red'>&nbsp;&nbsp;%1</font>").arg(tr("Recon Error"));

2
src/forms/settings/SystemCorrectionForm.h
View File

@@ -21,7 +21,6 @@ private:
private slots:
void updateEmptyScanDate();
void updateEmptyScanState();
void updateEmptyScanTransferProgress();
void updateEmptyScanDateExpire();
void updateEmptyScanBroked();
@@ -29,7 +28,6 @@ private:
QLabel* mCurrentEmptyScanDate;
QLabel* mExpirationEmptyScanDate;
QLabel* mCurrentEmptyScanState;
QTimer* mTimer;
int mEmptyScanState;
};