Update to dms control phase1.
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
#include "dialogs/EditPatientDialog.h"
|
||||
#include "dialogs/AlertDialog.h"
|
||||
#include "dialogs/DateSelectDialog.h"
|
||||
#include "dialogs/TimeSelectDialog.h"
|
||||
#include "dialogs/SelectDialog.h"
|
||||
#include "dialogs/GetWorkListDialog.h"
|
||||
|
||||
@@ -89,6 +90,11 @@ void DialogManager::requestLogin(QWidget* aParent)
|
||||
if (!mFunctionDialog){
|
||||
mFunctionDialog = new LoginDialog(aParent);
|
||||
}
|
||||
|
||||
if(mFunctionDialog->isRunning())
|
||||
{
|
||||
return;
|
||||
}
|
||||
setTopWidget(mFunctionDialog);
|
||||
mFunctionDialog->setWindowModality(Qt::WindowModal);
|
||||
mFunctionDialog->exec();
|
||||
@@ -188,6 +194,17 @@ DialogResult DialogManager::requestSelectDate(const QString& aDate)
|
||||
return DialogResult(ret,dialog.getSelectedValue());
|
||||
}
|
||||
|
||||
DialogResult DialogManager::requestSelectTime(const int& aSeconds)
|
||||
{
|
||||
TimeSelectDialog dialog(mTopWidget);
|
||||
setTopWidget(&dialog);
|
||||
dialog.setSelectedValue(aSeconds);
|
||||
dialog.setWindowModality(Qt::WindowModal);
|
||||
int ret = dialog.exec();
|
||||
releaseTopWidget(&dialog);
|
||||
return DialogResult(ret, dialog.getTotalSeconds());
|
||||
}
|
||||
|
||||
DialogResult DialogManager::requestSelectLanguage()
|
||||
{
|
||||
SelectDialog dialog(mTopWidget);
|
||||
@@ -366,7 +383,6 @@ void DialogManager::invokeOperationStart(QObject *parent, QObject *msg) {
|
||||
}
|
||||
mOperationMessageDialog->hideExitButton();
|
||||
mOperationMessageDialog->startLoading();
|
||||
AppGlobalValues::setInProcessing(true);
|
||||
if (mOperationMessageDialog->isHidden())
|
||||
{
|
||||
mOperationMessageDialog->showFullScreen();
|
||||
@@ -413,10 +429,10 @@ void DialogManager::invokeOperationEnd(QObject *parent, QObject *msg) {
|
||||
if (!mOperationMessageDialog) return;
|
||||
if (!mOperationMessageDialog->isHidden())
|
||||
{
|
||||
if (msg && ((QVariant*)msg)->toBool())
|
||||
if (msg != nullptr)
|
||||
{
|
||||
mOperationMessageDialog->stopLoading();
|
||||
mOperationMessageDialog->showMessage("Scan completed!");
|
||||
mOperationMessageDialog->showMessage(*(QString*)msg);
|
||||
mOperationMessageDialog->showExitButton();
|
||||
mOperationMessageDialog->setWindowModality(Qt::WindowModal);
|
||||
mOperationMessageDialog->showFullScreen();
|
||||
@@ -427,7 +443,6 @@ void DialogManager::invokeOperationEnd(QObject *parent, QObject *msg) {
|
||||
mOperationMessageDialog->accept();
|
||||
}
|
||||
delete mOperationMessageDialog;
|
||||
AppGlobalValues::setInProcessing(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user