Update to dms control phase1.

src/dialogs/DialogManager.cpp

@@ -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);
     }
 }
 

src/dialogs/DialogManager.h

@@ -52,6 +52,7 @@ public:
     int requestEditPatientInfo(PatientInformation* aPatientFrom, QSqlTableModel* aModel);
     int requestAlertMessage(const QString& aMessage, DialogButtonMode aButtonMode,const QString& aTitle = QString());
     DialogResult requestSelectDate(const QString& aDate);
+    DialogResult requestSelectTime(const int& aSeconds);
     DialogResult requestSelectLanguage();
     DialogResult requestSelectProtocal();
     DialogResult requestSelectFilter();

src/dialogs/EditPatientDialog.cpp

@@ -10,7 +10,7 @@
 #include <QSqlTableModel>
 #include <QSqlError>
 #include <QUuid>
-#include <qDebug>
+#include <QDebug>
 
 #include "dialogs/SelectDialog.h"
 #include "dialogs/DialogManager.h"

src/dialogs/GUIMessageDialog.cpp

@@ -94,7 +94,7 @@ void GUIMessageDialog::startLoading() {
             mTimerID = -1;
         }
         accept();
-        EventCenter::Default()->triggerEvent(GUIEvents::RequestStop, nullptr, nullptr);
+        EventCenter::Default()->triggerEvent(GUIEvents::RequestFullScanStop, nullptr, nullptr);
         LOG_USER_OPERATION(Stop);
     });
     mTimerID = startTimer(100);
@@ -162,4 +162,4 @@ QPoint GUIMessageDialog::getDialogPos()
 {
     return mUI->innerWidget->pos();
 }
-;
+;

src/dialogs/MultyMessageDialog.cpp

@@ -48,16 +48,16 @@ void MultyMessageDialog::initializeIcon()
 {
     switch (mLevel)
     {
-    case Info:
+    case MessageLevel::Info:
         mIcon->setObjectName("MultyMessageDialogInfo");
         break;
-    case Warning:
+    case MessageLevel::Warning:
         mIcon->setObjectName("MultyMessageDialogWarning");
         break;
-    case Error:
+    case MessageLevel::Error:
         mIcon->setObjectName("MultyMessageDialogError");
         break;
-    case Sucess:
+    case MessageLevel::Sucess:
         mIcon->setObjectName("MultyMessageDialogSucess");
         break;
     default:

src/dialogs/MultyMessageDialog.h

@@ -52,4 +52,4 @@ private:
 
 };
 
-#endif // MULTYMESSAGEDIALOG_H
+#endif // MULTYMESSAGEDIALOG_H

src/dialogs/TimeSelectDialog.cpp

@@ -0,0 +1,40 @@
+#include "TimeSelectDialog.h"
+#include "components/TimeSliderPickerBox.h"
+
+#include <QVBoxLayout>
+
+TimeSelectDialog::TimeSelectDialog(QWidget *aParent, Qt::WindowFlags f)
+    : GUIFormBaseDialog(aParent)
+    , mSlidePickerBox(new TimeSlidePickerBox(mFormWidget))
+{
+    this->setFixedSize(460, 380);
+    QVBoxLayout* layout = new QVBoxLayout(mFormWidget);
+    mSlidePickerBox->setObjectName("slidePicker");
+    layout->addWidget(mSlidePickerBox);
+}
+
+TimeSelectDialog::~TimeSelectDialog()
+{
+
+}
+
+void TimeSelectDialog::setSelectedValue(const int& aSeconds)
+{
+    mSlidePickerBox->setSelectedValue(aSeconds);
+    mSlidePickerBox->resizeLabel();
+}
+
+QString TimeSelectDialog::getSelectedValue() const
+{
+    return mSlidePickerBox->getSelectedValue();
+}
+
+bool TimeSelectDialog::updateReferenceData()
+{
+    return true;
+}
+
+int TimeSelectDialog::getTotalSeconds() const
+{
+    return mSlidePickerBox->getTotalSeconds();
+}

src/dialogs/TimeSelectDialog.h

@@ -0,0 +1,24 @@
+#ifndef GUI_TIMESELECTDIALOG_H
+#define GUI_TIMESELECTDIALOG_H
+
+#include "dialogs/GUIFormBaseDialog.h"
+
+class TimeSlidePickerBox;
+
+class TimeSelectDialog : public GUIFormBaseDialog
+{
+    Q_OBJECT
+public:
+    explicit TimeSelectDialog(QWidget *aParent, Qt::WindowFlags f = Qt::WindowFlags());
+    ~TimeSelectDialog() override;
+    QString getSelectedValue() const;
+    int getTotalSeconds() const;
+    void setSelectedValue(const int& aSeconds);
+
+protected:
+    bool updateReferenceData() override;
+    TimeSlidePickerBox* mSlidePickerBox;
+};
+
+
+#endif //GUI_TIMESELECTDIALOG_H