Code clean, and code style error fix.

This commit is contained in:
Krad
2022-04-22 17:16:45 +08:00
parent 7cee364fc3
commit 27487fdf3c
21 changed files with 198 additions and 240 deletions

View File

@@ -5,7 +5,6 @@
#include "DateSelectDialog.h"
#include <QVBoxLayout>
#include "components/DateSlidePickerBox.h"
#include <QDate>
DateSelectDialog::DateSelectDialog(QWidget *parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {
this->setFixedSize(460, 380);
QVBoxLayout* layout = new QVBoxLayout(formWidget);

View File

@@ -14,7 +14,7 @@
#include "DateSelectDialog.h"
#include "components/Listbox.h"
int queryValue(QSqlTableModel* model, int colID, QVariant var)
int queryValue(QSqlTableModel* model, int colID, const QVariant& var)
{
for (int i = 0; i < model->rowCount(); ++i) {
if (model->data(model->index(i, colID)) == var) return i;

View File

@@ -3,9 +3,7 @@
//
#include "AccountRoleComboDelegate.h"
#include <QComboBox>
#include <QPainter>
#include <QStyleOptionViewItem>
#include "db/SQLHelper.h"
AccountRoleComboDelegate::AccountRoleComboDelegate(QWidget *parent):QItemDelegate(parent) {
SQLHelper::QueryMap("select RoleID,RoleName from Role",map);

View File

@@ -6,7 +6,7 @@
#include <QPainter>
#include <QMouseEvent>
#include <QLabel>
#include <QFont>
#include <qdebug.h>
const int fontSize = 80;
SlidePickerBox::SlidePickerBox(QWidget *parent):QWidget(parent) {
@@ -143,7 +143,7 @@ void SlidePickerBox::paintText(QString txt, int x, int y, const QColor& color) {
painter.drawText(x,y,txt);
}
void SlidePickerBox::setItems(QStringList itemsList) {
void SlidePickerBox::setItems(const QStringList& itemsList) {
this->items = itemsList;
hideLabel(selectedLbl);
hideLabel(prevLbl);

View File

@@ -12,7 +12,7 @@ class SlidePickerBox:public QWidget {
public:
explicit SlidePickerBox(QWidget *parent = nullptr);
QString getSelectedValue();
void setItems(QStringList itemsList);
void setItems(const QStringList& itemsList);
void addItem(QString& item) {
this->items.append(item);
}

View File

@@ -6,7 +6,7 @@
#include <QScrollBar>
#include <QMouseEvent>
#include <QApplication>
#include <math.h>
#include <cmath>
SlideableTableView::SlideableTableView(QWidget *parent) : QTableView(parent) {

View File

@@ -229,23 +229,23 @@ QColor Battery::getNormalColorEnd() const
QSize Battery::sizeHint() const
{
return QSize(90, 120);
return {90, 120};
}
QSize Battery::minimumSizeHint() const
{
return QSize(10, 30);
return {10, 30};
}
void Battery::setRange(double minValue, double maxValue)
void Battery::setRange(double minVal, double maxVal)
{
//如果最小值大于或者等于最大值则不设置
if (minValue >= maxValue) {
if (minVal >= maxVal) {
return;
}
this->minValue = minValue;
this->maxValue = maxValue;
this->minValue = minVal;
this->maxValue = maxVal;
//如果目标值不在范围值内,则重新设置目标值
//值小于最小值则取最小值,大于最大值则取最大值
@@ -259,19 +259,19 @@ void Battery::setRange(double minValue, double maxValue)
this->update();
}
void Battery::setRange(int minValue, int maxValue)
void Battery::setRange(int minVal, int maxVal)
{
setRange((double)minValue, (double)maxValue);
setRange((double)minVal, (double)maxVal);
}
void Battery::setMinValue(double minValue)
void Battery::setMinValue(double minVal)
{
setRange(minValue, maxValue);
setRange(minVal, maxValue);
}
void Battery::setMaxValue(double maxValue)
void Battery::setMaxValue(double maxVal)
{
setRange(minValue, maxValue);
setRange(minValue, maxVal);
}
void Battery::setValue(double value)

View File

@@ -45,7 +45,7 @@ ImageSwitch::ButtonStyle ImageSwitch::getButtonStyle() const
QSize ImageSwitch::sizeHint() const
{
return QSize(100, 50);
return {100, 50};
}
QSize ImageSwitch::minimumSizeHint() const
@@ -53,19 +53,19 @@ QSize ImageSwitch::minimumSizeHint() const
return sizeHint();
}
void ImageSwitch::setChecked(bool isChecked)
void ImageSwitch::setChecked(bool value)
{
if (this->isChecked != isChecked) {
this->isChecked = isChecked;
if (this->isChecked != value) {
this->isChecked = value;
imgFile = isChecked ? imgOnFile : imgOffFile;
this->update();
}
}
void ImageSwitch::setButtonStyle(const ImageSwitch::ButtonStyle& buttonStyle)
void ImageSwitch::setButtonStyle(const ImageSwitch::ButtonStyle& style)
{
if (this->buttonStyle != buttonStyle) {
this->buttonStyle = buttonStyle;
if (this->buttonStyle != style) {
this->buttonStyle = style;
if (buttonStyle == ButtonStyle_1) {
imgOffFile = ":/icons/imageswitch/btncheckoff1.png";

View File

@@ -24,7 +24,7 @@ bool SelectDialog::updateReferenceData() {
return true;
}
void SelectDialog::setValues(QStringList dates) {
void SelectDialog::setValues(const QStringList& dates) {
box->setItems(dates);
}

View File

@@ -12,7 +12,7 @@ class SelectDialog :public GUIFormBaseDialog{
public:
explicit SelectDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
~SelectDialog() override;
void setValues(QStringList values);
void setValues(const QStringList& values);
QString getSelectedValue();
void setSelectedValue(const QString& val);
protected:

View File

@@ -11,13 +11,11 @@
#include <QUuid>
#include <QDate>
#include "db/SQLHelper.h"
#include "editpatientform.h"
#include "guimacros.h"
#include "event/EventCenter.h"
#include "src/dialogs/AccountFormDialog.h"
#include <QDebug>
#include "log/UserOperationLog.h"
#include <QSortFilterProxyModel>
#include "src/components/VerticalTextToolButton.h"
#include "dialogs/AlertDialog.h"
@@ -158,7 +156,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
table->selectRow(0);
model->selectRow(0);
}
LOG_USER_OPERATION(AddPatient);
LOG_USER_OPERATION(AddPatient)
btnSelect->setEnabled(true);
});
@@ -208,11 +206,11 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
//TODO:add some error handle logic
}
if (isAdd) {
LOG_USER_OPERATION(AddPatient);
LOG_USER_OPERATION(AddPatient)
}
else
{
LOG_USER_OPERATION(ChangePatientInfo);
LOG_USER_OPERATION(ChangePatientInfo)
}
btnSelect->setEnabled(true);
});
@@ -247,7 +245,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
table->selectRow(0);
model->selectRow(0);
setPatientDetail(table, model, edit_patient);
LOG_USER_OPERATION(DeletePatient);
LOG_USER_OPERATION(DeletePatient)
}
} else {
//TODO:error handle
@@ -265,7 +263,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
EventCenter::Default()->triggerEvent(GUIEvents::PatientSelected, nullptr, edit_patient->getPatientInformation()->Copy());
selectedPatientUID = edit_patient->getPatientInformation()->PatientUID;
LOG_USER_OPERATION(SelectPatient);
LOG_USER_OPERATION(SelectPatient)
});
// btn account slot

View File

@@ -7,13 +7,9 @@
#include <QStackedWidget>
#include <QStringListModel>
#include <QListWidget>
#include "src/forms/tabformwidget.h"
#include <QListWidgetItem>
#include "ui_tabformwidget.h"
#include <QLabel>
#include "UserOperationLogForm.h"
#include "generalform.h"
#include <QPushButton>
#include "systemsettingform.h"
#include "AccountTableForm.h"
#include "event/EventCenter.h"
@@ -57,20 +53,6 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm
systemSettingForm* systemSetting = new systemSettingForm(this);
stackedWidget->addWidget(systemSetting);
//QLabel* systemSetting = new QLabel(this);
//systemSetting->setText("systemSetting");
//stackedWidget->addWidget(systemSetting);
//QLabel* Info = new QLabel(this);
//Info->setText("info");
//stackedWidget->addWidget(Info);
//UserOperationLogForm* operationLogForm = new UserOperationLogForm(this);
//stackedWidget->addWidget(operationLogForm);
//QLabel* about = new QLabel(this);
//about->setText(tr("About"));
AboutWidget* about = new AboutWidget(this);
stackedWidget->addWidget(about);

View File

@@ -71,16 +71,16 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
lockTime->setText(JsonObject::Instance()->lockScreenTimeout());
//connection
connect(instName, &QLineEdit::textChanged, [=](QString str)
connect(instName, &QLineEdit::textChanged, [=](const QString& str)
{
JsonObject::Instance()->setInstitutionName(str);
});
connect(instAddr, &QLineEdit::textChanged, [=](QString str)
connect(instAddr, &QLineEdit::textChanged, [=](const QString& str)
{
JsonObject::Instance()->setInstitutionAddr(str);
});
connect(lockTime, &QLineEdit::textChanged, [=](QString str)
connect(lockTime, &QLineEdit::textChanged, [=](const QString& str)
{
//take effect
JsonObject::Instance()->setLockScreenTimeout(str);

View File

@@ -2,16 +2,11 @@
#include "ui_systemsettingform.h"
#include <QPushButton>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QDebug>
#include <QLabel>
#include <QLineEdit>
#include <QEvent>
#include <QToolButton>
#include "src/dialogs/SelectDialog.h"
#include "components/imageswitch.h"
#include "network/networkcfgdialog.h"
#include "network/dicomcfgdialog.h"
#include "network/getadminpsw.h"
@@ -20,7 +15,6 @@
#include "event/EventCenter.h"
#include "device/DeviceManager.h"
#include "json/cmdhelper.h"
#include "appvals/AppGlobalValues.h"
systemSettingForm::systemSettingForm(QWidget* parent) :
QWidget(parent),

View File

@@ -48,7 +48,7 @@ bool User::submitChange() {
return result;
}
bool User::QueryUser(QString userID, QString Pwd) {
bool User::QueryUser(const QString& userID, const QString& Pwd) {
QString sql = QString("select * from Account where UserCode=:userID and Password=:pwd");
QMap<QString,QVariant> map;
@@ -82,7 +82,7 @@ bool User::QueryUser(QString userID, QString Pwd) {
}
bool User::existsUser(QString userCode) {
bool User::existsUser(const QString& userCode) {
QString sql = QString("select * from Account where UserCode=:userID");
QMap<QString,QVariant> map;
QMap<QString,QVariant> params;
@@ -91,7 +91,7 @@ bool User::existsUser(QString userCode) {
return !map.isEmpty();
}
bool User::getUser(QString userUID, User& user) {
bool User::getUser(const QString& userUID, User& user) {
QString sql = QString("select * from Account where UserID=:userUID");
QMap<QString,QVariant> map;
QMap<QString,QVariant> params;
@@ -113,7 +113,7 @@ bool User::getUser(QString userUID, User& user) {
static bool LOAD_ALL_ROLE = false;
static QMap<QString,QString> roleCache;
QString User::getRoleName(QString RoleID) {
QString User::getRoleName(const QString& RoleID) {
if (roleCache.contains(RoleID)) return roleCache[RoleID];
QString sql = QString("select RoleName from Role where RoleID=:RoleID");
QMap<QString,QVariant> map;
@@ -124,7 +124,7 @@ QString User::getRoleName(QString RoleID) {
return map["RoleName"].toString();
}
QString User::getRoleID(QString RoleName) {
QString User::getRoleID(const QString& RoleName) {
if (roleCache.values().contains(RoleName)) {
int index = roleCache.values().indexOf(RoleName);
return roleCache.keys()[index];
@@ -155,7 +155,7 @@ QStringList User::getAllRoleName() {
return roleCache.values();
}
bool User::insertUser(QString UserCode, User &user) {
bool User::insertUser(const QString& UserCode, User &user) {
user.m_UserID = QUuid::createUuid().toString();
user.m_UserCode = UserCode;
static QString updateSQL = "insert into Account (%1) values (%2)";

View File

@@ -20,8 +20,8 @@ USER_PROPERTY(Comment)
class User:public QObject {
Q_OBJECT
public:
static bool QueryUser(QString userID, QString Pwd);
static bool existsUser(QString userCode);
static bool QueryUser(const QString& userID, const QString& Pwd);
static bool existsUser(const QString& userCode);
static QString getEncryptedPassword(const QString& password)
{
QByteArray bytePwd = password.toLatin1();
@@ -31,8 +31,8 @@ public:
static User* Current(){
return currentUser;
}
static bool getUser(QString userUID,User& user);
static bool insertUser(QString UserCode,User& user);
static bool getUser(const QString& userUID,User& user);
static bool insertUser(const QString& UserCode,User& user);
explicit User(QObject *parent=nullptr);
~User();
QString getIndexName(){
@@ -65,8 +65,8 @@ public:
bool isAdmin();
bool isEngineer();
bool resetPassword();
static QString getRoleName(QString RoleID);
static QString getRoleID(QString RoleName);
static QString getRoleName(const QString& RoleID);
static QString getRoleID(const QString& RoleName);
static QStringList getAllRoleName();
private:
static User* currentUser;

View File

@@ -6,8 +6,6 @@
#include <QLabel>
#include <QtWidgets/QLineEdit>
#include "getadminpsw.h"
#include "device/networkmanager.h"
#include "device/networkmanager.h"
GetAdminPsw::GetAdminPsw(QWidget* parent, Qt::WindowFlags f) : GUIFormBaseDialog(parent, f) {

View File

@@ -15,6 +15,10 @@
<source>Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GUI Software V1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Embedded Software V1.5</source>
<translation type="unfinished"></translation>
@@ -51,10 +55,6 @@
<source>Loading...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>GUI Software V%1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AccountFormDialog</name>
@@ -587,10 +587,6 @@ parameters
<source>Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete Patient &quot;%1&quot; ?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TabFormWidget</name>

View File

@@ -4,74 +4,74 @@
<context>
<name>AboutWidget</name>
<message>
<location filename="../aboutwidget.cpp" line="57"/>
<location filename="../aboutwidget.cpp" line="155"/>
<location filename="../aboutwidget.cpp" line="56"/>
<location filename="../aboutwidget.cpp" line="154"/>
<source>HJ-USCT-01 V1.0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="61"/>
<location filename="../aboutwidget.cpp" line="156"/>
<location filename="../aboutwidget.cpp" line="60"/>
<location filename="../aboutwidget.cpp" line="155"/>
<source>?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="133"/>
<location filename="../aboutwidget.cpp" line="132"/>
<source>cJSON</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="157"/>
<location filename="../aboutwidget.cpp" line="156"/>
<source>Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="67"/>
<location filename="../aboutwidget.cpp" line="73"/>
<location filename="../aboutwidget.cpp" line="157"/>
<source>GUI Software V1.3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="66"/>
<source>Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="74"/>
<location filename="../aboutwidget.cpp" line="78"/>
<location filename="../aboutwidget.cpp" line="158"/>
<source>GUI Software V%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="79"/>
<location filename="../aboutwidget.cpp" line="159"/>
<source>Embedded Software V1.5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="84"/>
<location filename="../aboutwidget.cpp" line="160"/>
<location filename="../aboutwidget.cpp" line="83"/>
<location filename="../aboutwidget.cpp" line="159"/>
<source>Reconstruction Software V1.2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="90"/>
<location filename="../aboutwidget.cpp" line="161"/>
<location filename="../aboutwidget.cpp" line="89"/>
<location filename="../aboutwidget.cpp" line="160"/>
<source>FEB Information</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="96"/>
<location filename="../aboutwidget.cpp" line="95"/>
<source>Qt 5.12.0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="117"/>
<location filename="../aboutwidget.cpp" line="122"/>
<location filename="../aboutwidget.cpp" line="116"/>
<location filename="../aboutwidget.cpp" line="121"/>
<source>Loading...</source>
<translation></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="126"/>
<location filename="../aboutwidget.cpp" line="125"/>
<source>Copyright (c) 1994-2021, OFFIS e.V.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../aboutwidget.cpp" line="137"/>
<location filename="../aboutwidget.cpp" line="136"/>
<source>Copyright (c) 2009-2017 Dave Gamble</source>
<translation type="unfinished"></translation>
</message>
@@ -145,18 +145,18 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../AccountFormDialog.cpp" line="146"/>
<location filename="../AccountFormDialog.cpp" line="143"/>
<source>Reset password to &quot;123456&quot; ?</source>
<translation>&quot;123456&quot;?</translation>
</message>
<message>
<location filename="../AccountFormDialog.cpp" line="151"/>
<location filename="../AccountFormDialog.cpp" line="148"/>
<source>Inner error, can&apos;t find reference user!</source>
<translation></translation>
</message>
<message>
<location filename="../AccountFormDialog.cpp" line="156"/>
<location filename="../AccountFormDialog.cpp" line="194"/>
<location filename="../AccountFormDialog.cpp" line="153"/>
<location filename="../AccountFormDialog.cpp" line="191"/>
<source>Submit change to database fail!</source>
<translation></translation>
</message>
@@ -166,34 +166,34 @@
<translation></translation>
</message>
<message>
<location filename="../AccountFormDialog.cpp" line="182"/>
<location filename="../AccountFormDialog.cpp" line="204"/>
<location filename="../AccountFormDialog.cpp" line="225"/>
<location filename="../AccountFormDialog.cpp" line="179"/>
<location filename="../AccountFormDialog.cpp" line="201"/>
<location filename="../AccountFormDialog.cpp" line="222"/>
<source>User Name can&apos;t be empty!</source>
<translation></translation>
</message>
<message>
<location filename="../AccountFormDialog.cpp" line="221"/>
<location filename="../AccountFormDialog.cpp" line="218"/>
<source>User ID can&apos;t be empty!</source>
<translation>ID不能为空</translation>
</message>
<message>
<location filename="../AccountFormDialog.cpp" line="229"/>
<location filename="../AccountFormDialog.cpp" line="226"/>
<source>Password can&apos;t be empty!</source>
<translation></translation>
</message>
<message>
<location filename="../AccountFormDialog.cpp" line="233"/>
<location filename="../AccountFormDialog.cpp" line="230"/>
<source>Inner error ,unset data model!</source>
<translation></translation>
</message>
<message>
<location filename="../AccountFormDialog.cpp" line="237"/>
<location filename="../AccountFormDialog.cpp" line="234"/>
<source>User Id exists!</source>
<translation>ID已存在</translation>
</message>
<message>
<location filename="../AccountFormDialog.cpp" line="273"/>
<location filename="../AccountFormDialog.cpp" line="270"/>
<source>Submit to data base fail!</source>
<translation></translation>
</message>
@@ -207,47 +207,47 @@
</message>
<message>
<location filename="../AccountTableForm.cpp" line="37"/>
<location filename="../AccountTableForm.cpp" line="129"/>
<location filename="../AccountTableForm.cpp" line="128"/>
<source>Name</source>
<translation></translation>
</message>
<message>
<location filename="../AccountTableForm.cpp" line="38"/>
<location filename="../AccountTableForm.cpp" line="130"/>
<location filename="../AccountTableForm.cpp" line="129"/>
<source>Role</source>
<translation></translation>
</message>
<message>
<location filename="../AccountTableForm.cpp" line="39"/>
<location filename="../AccountTableForm.cpp" line="131"/>
<location filename="../AccountTableForm.cpp" line="130"/>
<source>Comment</source>
<translation></translation>
</message>
<message>
<location filename="../AccountTableForm.cpp" line="64"/>
<location filename="../AccountTableForm.cpp" line="133"/>
<location filename="../AccountTableForm.cpp" line="63"/>
<location filename="../AccountTableForm.cpp" line="132"/>
<source>Add</source>
<translation></translation>
</message>
<message>
<location filename="../AccountTableForm.cpp" line="65"/>
<location filename="../AccountTableForm.cpp" line="134"/>
<location filename="../AccountTableForm.cpp" line="64"/>
<location filename="../AccountTableForm.cpp" line="133"/>
<source>Edit</source>
<translation></translation>
</message>
<message>
<location filename="../AccountTableForm.cpp" line="66"/>
<location filename="../AccountTableForm.cpp" line="135"/>
<location filename="../AccountTableForm.cpp" line="65"/>
<location filename="../AccountTableForm.cpp" line="134"/>
<source>Delete</source>
<translation></translation>
</message>
<message>
<location filename="../AccountTableForm.cpp" line="112"/>
<location filename="../AccountTableForm.cpp" line="111"/>
<source>Can&apos;t delete current log in account!</source>
<translation></translation>
</message>
<message>
<location filename="../AccountTableForm.cpp" line="119"/>
<location filename="../AccountTableForm.cpp" line="118"/>
<source>Delete account with ID:&quot;%1&quot;!</source>
<translation>ID:&quot;%1&quot;!</translation>
</message>
@@ -255,20 +255,20 @@
<context>
<name>AdminSettingForm</name>
<message>
<location filename="../AdminSettingForm.cpp" line="33"/>
<location filename="../AdminSettingForm.cpp" line="84"/>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<source>General</source>
<translation></translation>
</message>
<message>
<location filename="../AdminSettingForm.cpp" line="33"/>
<location filename="../AdminSettingForm.cpp" line="84"/>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<source>Account</source>
<translation></translation>
</message>
<message>
<location filename="../AdminSettingForm.cpp" line="33"/>
<location filename="../AdminSettingForm.cpp" line="84"/>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<source>System</source>
<translation></translation>
</message>
@@ -297,8 +297,8 @@
<translation type="vanished"></translation>
</message>
<message>
<location filename="../AdminSettingForm.cpp" line="33"/>
<location filename="../AdminSettingForm.cpp" line="84"/>
<location filename="../AdminSettingForm.cpp" line="32"/>
<location filename="../AdminSettingForm.cpp" line="82"/>
<source>About</source>
<translation></translation>
</message>
@@ -362,37 +362,37 @@
<context>
<name>EditPatientForm</name>
<message>
<location filename="../../cmake-build-debug/ui_editpatientform.h" line="142"/>
<location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="142"/>
<source>Form</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_editpatientform.h" line="143"/>
<location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="143"/>
<source>...</source>
<translation type="unfinished">DICOM</translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_editpatientform.h" line="144"/>
<location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="144"/>
<source>ID</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_editpatientform.h" line="145"/>
<location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="145"/>
<source>Name</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_editpatientform.h" line="147"/>
<location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="147"/>
<source>Date Of Birth</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_editpatientform.h" line="148"/>
<location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="148"/>
<source>Comment</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_editpatientform.h" line="146"/>
<location filename="../../out/build/x64-Debug/ui_editpatientform.h" line="146"/>
<source>Gender</source>
<translation></translation>
</message>
@@ -442,12 +442,12 @@
<context>
<name>GUIMessageDialog</name>
<message>
<location filename="../../cmake-build-debug/ui_guimessagedialog.h" line="106"/>
<location filename="../../out/build/x64-Debug/ui_guimessagedialog.h" line="106"/>
<source>Dialog</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_guimessagedialog.h" line="109"/>
<location filename="../../out/build/x64-Debug/ui_guimessagedialog.h" line="109"/>
<source>...</source>
<translation></translation>
</message>
@@ -555,7 +555,7 @@
<context>
<name>InputObject</name>
<message>
<location filename="../../cmake-build-debug/ui_inputobject.h" line="113"/>
<location filename="../../out/build/x64-Debug/ui_inputobject.h" line="113"/>
<source>Form</source>
<translation></translation>
</message>
@@ -590,7 +590,7 @@
<context>
<name>MainWindow</name>
<message>
<location filename="../../cmake-build-debug/ui_mainwindow.h" line="40"/>
<location filename="../../out/build/x64-Debug/ui_mainwindow.h" line="40"/>
<source>MainWindow</source>
<translation></translation>
</message>
@@ -626,47 +626,47 @@
<context>
<name>PatientInformationForm</name>
<message>
<location filename="../../cmake-build-debug/ui_patientinformationform.h" line="118"/>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="118"/>
<source>Form</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_patientinformationform.h" line="119"/>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="119"/>
<source>Patient Information</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_patientinformationform.h" line="120"/>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="120"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;PatientID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ID:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_patientinformationform.h" line="121"/>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="121"/>
<source>Someone Somebody</source>
<translation>XXX</translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_patientinformationform.h" line="122"/>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="122"/>
<source>2021/11/11</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_patientinformationform.h" line="123"/>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="123"/>
<source>Female</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_patientinformationform.h" line="124"/>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="124"/>
<source>Acc# 27812398</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_patientinformationform.h" line="127"/>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="127"/>
<source>Current Protocol</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_patientinformationform.h" line="128"/>
<location filename="../../out/build/x64-Debug/ui_patientinformationform.h" line="128"/>
<location filename="../patientinformationform.cpp" line="42"/>
<source>LEFT ONLY</source>
<translation></translation>
@@ -769,80 +769,75 @@ parameters
<context>
<name>SelectFormWidget</name>
<message>
<location filename="../SelectFormWidget.cpp" line="48"/>
<location filename="../SelectFormWidget.cpp" line="301"/>
<location filename="../SelectFormWidget.cpp" line="45"/>
<location filename="../SelectFormWidget.cpp" line="288"/>
<source>Account</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="49"/>
<location filename="../SelectFormWidget.cpp" line="46"/>
<source>Worklist</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="60"/>
<location filename="../SelectFormWidget.cpp" line="303"/>
<location filename="../SelectFormWidget.cpp" line="57"/>
<location filename="../SelectFormWidget.cpp" line="290"/>
<source>Add</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="61"/>
<location filename="../SelectFormWidget.cpp" line="304"/>
<location filename="../SelectFormWidget.cpp" line="58"/>
<location filename="../SelectFormWidget.cpp" line="291"/>
<source>Edit</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="62"/>
<location filename="../SelectFormWidget.cpp" line="305"/>
<location filename="../SelectFormWidget.cpp" line="59"/>
<location filename="../SelectFormWidget.cpp" line="292"/>
<source>Delete</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="63"/>
<location filename="../SelectFormWidget.cpp" line="306"/>
<location filename="../SelectFormWidget.cpp" line="60"/>
<location filename="../SelectFormWidget.cpp" line="293"/>
<source>Select</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="87"/>
<location filename="../SelectFormWidget.cpp" line="295"/>
<location filename="../SelectFormWidget.cpp" line="82"/>
<location filename="../SelectFormWidget.cpp" line="282"/>
<source>Name</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="88"/>
<location filename="../SelectFormWidget.cpp" line="296"/>
<location filename="../SelectFormWidget.cpp" line="83"/>
<location filename="../SelectFormWidget.cpp" line="283"/>
<source>Birth Date</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="89"/>
<location filename="../SelectFormWidget.cpp" line="297"/>
<location filename="../SelectFormWidget.cpp" line="84"/>
<location filename="../SelectFormWidget.cpp" line="284"/>
<source>Gender</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="90"/>
<location filename="../SelectFormWidget.cpp" line="298"/>
<location filename="../SelectFormWidget.cpp" line="85"/>
<location filename="../SelectFormWidget.cpp" line="285"/>
<source>Add Date</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="91"/>
<location filename="../SelectFormWidget.cpp" line="299"/>
<location filename="../SelectFormWidget.cpp" line="86"/>
<location filename="../SelectFormWidget.cpp" line="286"/>
<source>Comment</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="236"/>
<source>Delete Patient &quot;%1&quot; ?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TabFormWidget</name>
<message>
<location filename="../../cmake-build-debug/ui_tabformwidget.h" line="54"/>
<location filename="../../out/build/x64-Debug/ui_tabformwidget.h" line="54"/>
<source>Form</source>
<translation></translation>
</message>
@@ -899,7 +894,7 @@ parameters
<context>
<name>dicomCfgDialog</name>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="321"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="321"/>
<source>Dialog</source>
<translation></translation>
</message>
@@ -908,57 +903,57 @@ parameters
<translation type="vanished">DICOM </translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="322"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="322"/>
<source>DICOM Settings</source>
<translation>DICOM </translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="326"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="329"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="337"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="326"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="329"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="337"/>
<source>Name</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="323"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="330"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="336"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="323"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="330"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="336"/>
<source>IP</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="325"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="332"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="335"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="325"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="332"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="335"/>
<source>Port</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="324"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="331"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="338"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="324"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="331"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="338"/>
<source>AE</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="328"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="328"/>
<source>Worklist</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="327"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="333"/>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="339"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="327"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="333"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="339"/>
<source>...</source>
<translation>DICOM</translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="334"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="334"/>
<source>PACS</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_dicomcfgdialog.h" line="340"/>
<location filename="../../out/build/x64-Debug/ui_dicomcfgdialog.h" line="340"/>
<source>3D Recon</source>
<translation></translation>
</message>
@@ -976,18 +971,18 @@ parameters
<context>
<name>networkCfgDialog</name>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="453"/>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="454"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="453"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="454"/>
<source>Network Settings</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="464"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="464"/>
<source>Address</source>
<translation>IP配置</translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="455"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="455"/>
<location filename="../network/networkcfgdialog.cpp" line="33"/>
<source>IP Address</source>
<translation>IP地址</translation>
@@ -1001,85 +996,85 @@ parameters
<translation type="vanished"></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="457"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="457"/>
<source>Dev</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="459"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="459"/>
<source>Subnet Mask</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="460"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="460"/>
<source>Additional Address</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="461"/>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="468"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="461"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="468"/>
<source>Add</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="462"/>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="469"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="462"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="469"/>
<source>Edit</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="463"/>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="470"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="463"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="470"/>
<source>Delete</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="471"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="471"/>
<source>Routing</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="466"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="466"/>
<source>Default IPv4 Gateway</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="456"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="456"/>
<source>DHCP</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="467"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="467"/>
<source>Routing Table</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="472"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="472"/>
<source>Name</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="473"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="473"/>
<source>Port</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="474"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="474"/>
<source>AE</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="475"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="475"/>
<source>IP</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="476"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="476"/>
<source>DICOM</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_networkcfgdialog.h" line="477"/>
<location filename="../../out/build/x64-Debug/ui_networkcfgdialog.h" line="477"/>
<source>Result</source>
<translation></translation>
</message>
@@ -1113,7 +1108,7 @@ parameters
<context>
<name>systemSettingForm</name>
<message>
<location filename="../../cmake-build-debug/ui_systemsettingform.h" line="281"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="281"/>
<source>Form</source>
<translation></translation>
</message>
@@ -1122,17 +1117,17 @@ parameters
<translation type="vanished"></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_systemsettingform.h" line="282"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="282"/>
<source>Protocal</source>
<translation></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_systemsettingform.h" line="286"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="286"/>
<source>Worklist Filter</source>
<translation>Worklist过滤器</translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_systemsettingform.h" line="289"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="289"/>
<source>Disk Storage</source>
<translation></translation>
</message>
@@ -1141,7 +1136,7 @@ parameters
<translation type="vanished">DICOM</translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_systemsettingform.h" line="284"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="284"/>
<source>Auto Verify</source>
<translation></translation>
</message>
@@ -1150,7 +1145,7 @@ parameters
<translation type="vanished"></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_systemsettingform.h" line="285"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="285"/>
<source>IP</source>
<translation></translation>
</message>
@@ -1167,7 +1162,7 @@ parameters
<translation type="vanished"></translation>
</message>
<message>
<location filename="../../cmake-build-debug/ui_systemsettingform.h" line="288"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="288"/>
<source>DICOM</source>
<translation></translation>
</message>

View File

@@ -1,6 +1,5 @@
#include "InputObject.h"
#include "ui_inputobject.h"
//#include "qdesktopwidget.h"
#include <QDebug>
#include <QEvent>
#include <QKeyEvent>

View File

@@ -29,9 +29,8 @@ void LanguageSwitcher::setDefaultLanguage(QString str)
QString lan = QString(":/translations/" + str + ".qm");
if (translator->load(lan))
{
//qDebug() << "installTranslator";
//QApplication::installTranslator(translator);
EventCenter::Default()->triggerEvent(ReloadLanguage, nullptr, nullptr);
}
EventCenter::Default()->triggerEvent(ReloadLanguage, nullptr, nullptr);
}