diff --git a/docs/v0.6.8.txt b/docs/v0.6.8.txt new file mode 100644 index 0000000..cb29f98 --- /dev/null +++ b/docs/v0.6.8.txt @@ -0,0 +1,3 @@ +第一个release版本。 +基本流程已完备,提交系统测试。 +2022年3月8日 \ No newline at end of file diff --git a/src/SelectFormWidget.cpp b/src/SelectFormWidget.cpp index 5eed6da..5a20014 100644 --- a/src/SelectFormWidget.cpp +++ b/src/SelectFormWidget.cpp @@ -103,8 +103,8 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : // table->setSortingEnabled(true); table->setColumnWidth(1, 250); table->setColumnWidth(2, 250); - table->setColumnWidth(3, 120); - table->setColumnWidth(4, 80); + table->setColumnWidth(3, 160); + table->setColumnWidth(4, 120); table->setColumnWidth(5, 250); // table->sortByColumn(5); // table->setSortingEnabled(true); diff --git a/src/fonts/MicrosoftYahei.ttf b/src/fonts/MicrosoftYahei.ttf new file mode 100644 index 0000000..ea3c090 Binary files /dev/null and b/src/fonts/MicrosoftYahei.ttf differ diff --git a/src/icons/arrow-down.png b/src/icons/arrow-down.png new file mode 100644 index 0000000..ce3e433 Binary files /dev/null and b/src/icons/arrow-down.png differ diff --git a/src/icons/arrow-up.png b/src/icons/arrow-up.png new file mode 100644 index 0000000..6d1a186 Binary files /dev/null and b/src/icons/arrow-up.png differ diff --git a/src/res.qrc b/src/res.qrc index 0f889ca..bba3ab3 100644 --- a/src/res.qrc +++ b/src/res.qrc @@ -48,5 +48,7 @@ icons/edit.png icons/hidearrow.png icons/logout.png + icons/arrow-down.png + icons/arrow-up.png diff --git a/src/stylesheet/Dark2.css b/src/stylesheet/Dark2.css index 6d52ead..6b82fd2 100644 --- a/src/stylesheet/Dark2.css +++ b/src/stylesheet/Dark2.css @@ -1 +1 @@ - /*------1.silver-->grey--------------------------*/ *{background-color:#3c3c3c; color:#fcfcfc;margin:0;font-size:16px;} QWidget#need_border{border:1px solid white} QTabBar::tab { height:60px; width:300px; font-size: 25px; background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #505050, stop: 1.0 #333333); border: 2px solid #505050; border-bottom-left-radius: 50%; border-bottom-right-radius: 50%; min-width: 8ex; padding: 2px; } QTabBar::tab:selected, QTabBar::tab:hover { border-top:5px solid #4a88c7; background: #505050;} QTabWidget::pane{margin:0} QPlainTextEdit{border:0px} QGroupBox{border:0px} QLabel{color:#fcfcfc; font-weight:bold; font-size:16px;} QLineEdit{min-height:36px;max-height:36px; border:none;border-bottom:1px solid #505050;color:grey;} QLineEdit:enabled{background-color: #505050;border-bottom-color:#4a88c7;color:#fcfcfc;} QDateEdit{min-height:36px;max-height:36px; border:none;border-bottom:1px solid #505050;color:grey;border-radius:3px;} QDateEdit:enabled{background-color: #505050;border-bottom-color:#4a88c7;color:#fcfcfc;} QTextEdit{ border:1px solid #505050;color:grey;border-radius:3px;} QTextEdit:enabled{background-color: #505050; border:1px solid #4a88c7;color:#fcfcfc;} QComboBox{text-align:center;min-height:36px;max-height:36px; border:1px solid #505050} QComboBox:enabled{background-color: #505050} QComboBox::drop-down{width:20px} QComboBox QAbstractItemView{min-width:120px;} QComboBox QAbstractItemView::item {min-height:60px;max-height:60px; border:1px solid white;} QWidget QToolButton#editvalBtn{font-size:20px;font-weight:normal;border:1px solid darkgray;background: #505050;} QWidget QToolButton#showeditBtn{border-top:1px solid darkgray; border-bottom:1px solid darkgray; border-left:1px solid darkgray; border-radius: 0; border-bottom-left-radius:10px; font-size:20px; font-weight:normal; background: #505050; } QWidget QToolButton#hideeditBtn{border-top:1px solid darkgray; border-bottom:1px solid darkgray; border-left:1px solid darkgray; border-radius: 0; border-top-left-radius:10px; border-bottom-left-radius:10px; font-size:20px; font-weight:normal;background: #505050; } QWidget QToolButton{border:none;border-radius:10%;font-size:26px; /*background: #505050;*/ background: qlineargradient(spread:pad,x1: 0.5, y1: 0, x2: 0.5, y2: 1.0,stop:0 #404040, stop:0.5 #505050,stop:1.0 #404040); font-weight:Bold;padding:5px;} QWidget QToolButton:disabled{border:none;color:#606060;background:#3c3c3c} QWidget QToolButton:hover{background:#505050;} QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;} QPushButton{border:1px solid #505050 ;padding-left:50px;padding-right:50px; border-radius:5px; min-height:28px; max-height:28px; background:qlineargradient(spread:pad, x1:0.50, y1:0, x2:0.5, y2:1, stop:0 #505050, stop:1 #606060);} QListView{border:none;margin:5px; font-weight:bold} QListView::item{ /*background:#4d4d4d;*/ background: qlineargradient(spread:pad,x1: 0.5, y1: 0, x2: 0.5, y2: 1.0,stop:0 #404040, stop:0.5 #505050,stop:1.0 #404040); min-height:30px; border:1px solid #505050; border-radius:5px} QListView::item:selected{background:#365880;font-weight:bold;color:#fcfcfc;} /*QListView::item:selected{ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ABAFE5, stop: 1 #8588B2); border:1px solid #505050; }*/ QHeaderView::section{background-color:#595959;min-height:50px;max-height:50px;font-weight:Bold; font-size:16px; border:1px solid #323232;} QHeaderView::section:horizontal{border-bottom: 1px solid rgb(0,170,255);} QHeaderView::section:vertical{min-height:36px;max-height:36px;} QTableView{border:none;alternate-background-color: #595959;selection-color:#fcfcfc;selection-background-color:#0078d8} /*-----------Specific---------------*/ QLabel#sliderPickerLabel{color:grey;padding:0;background:#505050;font-weight:normal;font-size:50px;} QWidget#topbarWidget{min-height:36px;max-height:36px;} QWidget#contentWidget{border-top:1px solid #505050;} QWidget#contentWidgetWithBBorder{border-top:1px solid #505050; border-bottom:1px solid #323232;} QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #505050; border-bottom:1px solid #323232;} QWidget#commandWidgetnoBBorder{min-height:123px;max-height:123px;border-top:1px solid #505050; } QLabel#logo{min-width:30px;max-width:30px} QLabel#company{min-width:150px;max-width:150px; } QLabel#systemMsgBar{min-width:500px;} QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;} QWidget QWidget#statusBarWidget{min-width:300px;} QToolButton#btn_main{border:2px solid #0078d8;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;} QWidget#editcmdWidget{min-height:83px;max-height:83px;} QWidget#verSpaceLine{ border-right:1px solid #0078d8;} QWidget#topBottomLine{ border-top:2px solid #0078d8;border-bottom:2px solid #0078d8;background:transparent;} /*-----Settings*/ QPushButton#BigBtn{ padding-left:0px; padding-right:0px; min-height:60px; max-height:60px; min-width:140px; max-width:140px; font-size: 20px; font-weight:bold; } /*-----蒙版Dialog-----*/ QDialog QWidget#innerWidget{background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);border-radius:20px;border:5px solid #0078d8; } QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8;} QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px} #spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;} /*-----FormDialog-----*/ QPushButton#btnOK{background:#365880; font-weight:bold} QDialog#formDialog{border:3px solid grey; border-radius:8px} QWidget#slider_one{border:1px solid #505050; border-radius:8px} QWidget#formWidget QLabel#endline{border-bottom:1px solid grey} QWidget#formWidget{font-size:30px;} QLabel#title{font-size:30px; border-bottom:1px solid #3078d8 } QWidget#edit_patient{min-width:300px;max-width:300px;} QToolButton#sexBtn{min-width:120px;max-width:120px;font-size:20px;padding:2px;} QToolButton#sexBtn:disabled{color:grey} QWidget#sexpanelwidget{border:1px solid #505050;} QWidget#sexpanelwidget:enabled{background-color: #505050;} QToolButton#sexBtn:checked{border:2px solid darkorange;padding:0px;} /*---------Abount----------*/ QLabel#normal{color:#fcfcfc; font-weight:normal; font-size:16px;} QDialog#loginform{background-color:#3c3c3c; color:white;margin:0;font-size:16px;} QDialog#loginform QLabel#title{font-Size:98px;color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);} QLabel#warn{color:#930000;background:transparent;font-size:20px;} QFrame#login_frame_username{min-width:700px;max-width:700px;max-height:500px;min-height:500px; border:1px solid #0078d8;border-radius:20px; background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 darkgray, stop: 0.5 gray, stop: 1.0 darkgray);} QDialog#loginform QLineEdit{min-height:100px;max-height:100px; border:1px solid silver;border-radius:10px;font-size:26px;} QDialog#loginform QLineEdit:enabled{background-color: #515151} QDialog#loginform QToolButton#btnlogin{min-height:100px;max-height:100px; min-width:border:1px solid #505050; border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;} QDialog#loginform QToolButton#btnlogin:hover{background:#505050;} \ No newline at end of file + /*------1.silver-->grey--------------------------*/ *{background-color:#3c3c3c; color:#fcfcfc;margin:0;font-size:16px;} QWidget#need_border{border:1px solid white} QTabBar::tab { height:60px; width:300px; font-size: 25px; background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #505050, stop: 1.0 #333333); border: 2px solid #505050; border-bottom-left-radius: 50%; border-bottom-right-radius: 50%; min-width: 8ex; padding: 2px; } QTabBar::tab:selected, QTabBar::tab:hover { border-top:5px solid #4a88c7; background: #505050;} QTabWidget::pane{margin:0} QPlainTextEdit{border:0px} QGroupBox{border:0px} QLabel{color:#fcfcfc; font-weight:bold; font-size:16px;} QLineEdit{min-height:36px;max-height:36px; border:none;border-bottom:1px solid #505050;color:grey;} QLineEdit:enabled{background-color: #505050;border-bottom-color:#4a88c7;color:#fcfcfc;} QDateEdit{min-height:36px;max-height:36px; border:none;border-bottom:1px solid #505050;color:grey;border-radius:3px;} QDateEdit:enabled{background-color: #505050;border-bottom-color:#4a88c7;color:#fcfcfc;} QTextEdit{ border:1px solid #505050;color:grey;border-radius:3px;} QTextEdit:enabled{background-color: #505050; border:1px solid #4a88c7;color:#fcfcfc;} QComboBox{text-align:center;min-height:36px;max-height:36px; border:1px solid #505050} QComboBox:enabled{background-color: #505050} QComboBox::drop-down{width:20px} QComboBox QAbstractItemView{min-width:120px;} QComboBox QAbstractItemView::item {min-height:60px;max-height:60px; border:1px solid white;} QWidget QToolButton#editvalBtn{font-size:20px;font-weight:normal;border:1px solid darkgray;background: #505050;} QWidget QToolButton#showeditBtn{border-top:1px solid darkgray; border-bottom:1px solid darkgray; border-left:1px solid darkgray; border-radius: 0; border-bottom-left-radius:10px; font-size:20px; font-weight:normal; background: #505050; } QWidget QToolButton#hideeditBtn{border-top:1px solid darkgray; border-bottom:1px solid darkgray; border-left:1px solid darkgray; border-radius: 0; border-top-left-radius:10px; border-bottom-left-radius:10px; font-size:20px; font-weight:normal;background: #505050; } QWidget QToolButton{border:none;border-radius:10%;font-size:26px; /*background: #505050;*/ background: qlineargradient(spread:pad,x1: 0.5, y1: 0, x2: 0.5, y2: 1.0,stop:0 #404040, stop:0.5 #505050,stop:1.0 #404040); font-weight:Bold;padding:5px;} QWidget QToolButton:disabled{border:none;color:#606060;background:#3c3c3c} QWidget QToolButton:hover{background:#505050;} QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;} QPushButton{border:1px solid #505050 ;padding-left:50px;padding-right:50px; border-radius:5px; min-height:28px; max-height:28px; background:qlineargradient(spread:pad, x1:0.50, y1:0, x2:0.5, y2:1, stop:0 #505050, stop:1 #606060);} QListView{border:none;margin:5px; font-weight:bold} QListView::item{ /*background:#4d4d4d;*/ background: qlineargradient(spread:pad,x1: 0.5, y1: 0, x2: 0.5, y2: 1.0,stop:0 #404040, stop:0.5 #505050,stop:1.0 #404040); min-height:30px; border:1px solid #505050; border-radius:5px} QListView::item:selected{background:#365880;font-weight:bold;color:#fcfcfc;} /*QListView::item:selected{ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ABAFE5, stop: 1 #8588B2); border:1px solid #505050; }*/ QHeaderView::down-arrow { subcontrol-position: center right; image: url(":/icons/arrow-down.png"); padding-right: 8px; } QHeaderView::up-arrow { subcontrol-position: center right; image: url(":/icons/arrow-up.png"); padding-right: 8px; } QHeaderView::section{background-color:#595959;min-height:50px;max-height:50px;font-weight:Bold; font-size:16px; border:1px solid #323232;} QHeaderView::section:horizontal{border-bottom: 1px solid rgb(0,170,255);} QHeaderView::section:vertical{min-height:36px;max-height:36px;} QTableView{border:none;alternate-background-color: #595959;selection-color:#fcfcfc;selection-background-color:#0078d8} /*-----------Specific---------------*/ QLabel#sliderPickerLabel{color:grey;padding:0;background:#505050;font-weight:normal;font-size:50px;} QWidget#topbarWidget{min-height:36px;max-height:36px;} QWidget#contentWidget{border-top:1px solid #505050;} QWidget#contentWidgetWithBBorder{border-top:1px solid #505050; border-bottom:1px solid #323232;} QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #505050; border-bottom:1px solid #323232;} QWidget#commandWidgetnoBBorder{min-height:123px;max-height:123px;border-top:1px solid #505050; } QLabel#logo{min-width:30px;max-width:30px} QLabel#company{min-width:150px;max-width:150px; } QLabel#systemMsgBar{min-width:500px;} QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;} QWidget QWidget#statusBarWidget{min-width:300px;} QToolButton#btn_main{border:2px solid #0078d8;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;} QWidget#editcmdWidget{min-height:83px;max-height:83px;} QWidget#verSpaceLine{ border-right:1px solid #0078d8;} QWidget#topBottomLine{ border-top:2px solid #0078d8;border-bottom:2px solid #0078d8;background:transparent;} /*-----Settings*/ QPushButton#BigBtn{ padding-left:0px; padding-right:0px; min-height:60px; max-height:60px; min-width:140px; max-width:140px; font-size: 20px; font-weight:bold; } /*-----蒙版Dialog-----*/ QDialog QWidget#innerWidget{background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);border-radius:20px;border:5px solid #0078d8; } QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8;} QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px} #spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;} /*-----FormDialog-----*/ QPushButton#btnOK{background:#365880; font-weight:bold} QDialog#formDialog{border:3px solid grey; border-radius:8px} QWidget#slider_one{border:1px solid #505050; border-radius:8px} QWidget#formWidget QLabel#endline{border-bottom:1px solid grey} QWidget#formWidget{font-size:30px;} QLabel#title{font-size:30px; border-bottom:1px solid #3078d8 } QWidget#edit_patient{min-width:300px;max-width:300px;} QToolButton#sexBtn{min-width:120px;max-width:120px;font-size:20px;padding:2px;} QToolButton#sexBtn:disabled{color:grey} QWidget#sexpanelwidget{border:1px solid #505050;} QWidget#sexpanelwidget:enabled{background-color: #505050;} QToolButton#sexBtn:checked{border:2px solid darkorange;padding:0px;} /*---------Abount----------*/ QLabel#normal{color:#fcfcfc; font-weight:normal; font-size:16px;} QDialog#loginform{background-color:#3c3c3c; color:white;margin:0;font-size:16px;} QDialog#loginform QLabel#title{font-Size:98px;color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);} QLabel#warn{color:#930000;background:transparent;font-size:20px;} QFrame#login_frame_username{min-width:700px;max-width:700px;max-height:500px;min-height:500px; border:1px solid #0078d8;border-radius:20px; background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 darkgray, stop: 0.5 gray, stop: 1.0 darkgray);} QDialog#loginform QLineEdit{min-height:100px;max-height:100px; border:1px solid silver;border-radius:10px;font-size:26px;} QDialog#loginform QLineEdit:enabled{background-color: #515151} QDialog#loginform QToolButton#btnlogin{min-height:100px;max-height:100px; min-width:border:1px solid #505050; border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;} QDialog#loginform QToolButton#btnlogin:hover{background:#505050;} \ No newline at end of file diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index 7a9caf5..aa609e7 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -15,10 +15,6 @@ Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed - - GUI Software V1.3 - - Embedded Software V1.5 @@ -55,6 +51,10 @@ Loading... + + GUI Software V%1 + + AccountFormDialog @@ -587,6 +587,10 @@ parameters Comment + + Delete Patient "%1" ? + + TabFormWidget diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index 2651393..a179c8f 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -4,74 +4,74 @@ AboutWidget - - + + HJ-USCT-01 V1.0 - - + + ? - + cJSON - + Copyright © 2017-2020 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed - - - GUI Software V1.3 - - - - + Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed - + + GUI Software V%1 + + + + + Embedded Software V1.5 - - + + Reconstruction Software V1.2 - - + + FEB Information - + Qt 5.12.0 - - + + Loading... 正在加载 - + Copyright (c) 1994-2021, OFFIS e.V. - + Copyright (c) 2009-2017 Dave Gamble @@ -145,18 +145,18 @@ 医生 - + Reset password to "123456" ? 密码重置为"123456"? - + Inner error, can't find reference user! 内部错误! - - + + Submit change to database fail! 修改提交至数据库失败! @@ -166,34 +166,34 @@ 备注 - - - + + + User Name can't be empty! 用户名不能为空! - + User ID can't be empty! 用户ID不能为空! - + Password can't be empty! 密码不能为空! - + Inner error ,unset data model! 内部错误! - + User Id exists! 用户ID已存在! - + Submit to data base fail! 提交至数据库失败! @@ -207,47 +207,47 @@ - + Name 姓名 - + Role 角色 - + Comment 备注 - - + + Add 新增 - - + + Edit 编辑 - - + + Delete 删除 - + Can't delete current log in account! 当前用户无法删除日志! - + Delete account with ID:"%1"! 删除账户ID:"%1"! @@ -255,20 +255,20 @@ AdminSettingForm - - + + General 通用 - - + + Account 用户 - - + + System 系统 @@ -297,8 +297,8 @@ 操作日志 - - + + About 关于 @@ -362,37 +362,37 @@ EditPatientForm - + Form - + ... DICOM - + ID - + Name 姓名 - + Date Of Birth 出生日期 - + Comment 备注 - + Gender 性别 @@ -442,12 +442,12 @@ GUIMessageDialog - + Dialog - + ... @@ -555,7 +555,7 @@ InputObject - + Form @@ -590,7 +590,7 @@ MainWindow - + MainWindow @@ -626,47 +626,47 @@ PatientInformationForm - + Form - + Patient Information 患者信息 - + <html><head/><body><p>PatientID:</p></body></html> <html><head/><body><p>患者ID:</p></body></html> - + Someone Somebody XXX - + 2021/11/11 - + Female - + Acc# 27812398 - + Current Protocol 当前协议 - + LEFT ONLY 左侧 @@ -769,75 +769,80 @@ parameters SelectFormWidget - - + + Account 账户 - + Worklist - - + + Add 新增 - - + + Edit 编辑 - - + + Delete 删除 - - + + Select 选择 - - + + Name 姓名 - - + + Birth Date 出生日期 - - + + Gender 性别 - - + + Add Date 添加日期 - - + + Comment 备注 + + + Delete Patient "%1" ? + + TabFormWidget - + Form @@ -894,7 +899,7 @@ parameters dicomCfgDialog - + Dialog @@ -903,57 +908,57 @@ parameters DICOM 设置 - + DICOM Settings DICOM 配置 - - - + + + Name - - - + + + IP - - - + + + Port - - - + + + AE - + Worklist - - - + + + ... DICOM - + PACS - + 3D Recon @@ -971,18 +976,18 @@ parameters networkCfgDialog - - + + Network Settings 网络配置 - + Address IP配置 - + IP Address IP地址 @@ -996,85 +1001,85 @@ parameters 动态地址 - + Dev 设备 - + Subnet Mask 子网掩码 - + Additional Address 额外地址 - - + + Add 新增 - - + + Edit 编辑 - - + + Delete 删除 - + Routing 路由配置 - + Default IPv4 Gateway 默认网关 - + DHCP - + Routing Table 路由表 - + Name - + Port - + AE - + IP - + DICOM - + Result 结果 @@ -1108,7 +1113,7 @@ parameters systemSettingForm - + Form @@ -1117,17 +1122,17 @@ parameters 网络配置 - + Protocal 默认扫描协议 - + Worklist Filter Worklist过滤器 - + Disk Storage 磁盘存储 @@ -1136,7 +1141,7 @@ parameters DICOM - + Auto Verify 自动验证 @@ -1145,7 +1150,7 @@ parameters 配置 - + IP @@ -1162,7 +1167,7 @@ parameters 接受 - + DICOM