diff --git a/src/Combinear.css b/src/Combinear.css index b46e6cd..5f3eb74 100644 --- a/src/Combinear.css +++ b/src/Combinear.css @@ -45,11 +45,6 @@ QToolButton:pressed background-color: #646464; } -QToolButton:disabled -{ - background-color: #222222; -} - QToolBar QToolButton{ min-width: 36px; max-width: 36px; @@ -65,6 +60,7 @@ QToolButton#groupButton { QToolBar QToolButton[toolButtonStyle="2"]{ min-width: 42px; max-width: 42px; + } QToolButton#file { @@ -73,30 +69,33 @@ QToolButton#file { QToolButton#import { qproperty-icon: url(":/InfiniteViewer/Icon/import.png") } -QToolButton#save { +/* QToolButton#save { qproperty-icon: url(":/InfiniteViewer/Icon/save.png") +} */ +/* QToolButton#grid{ + qproperty-icon: url(":/InfiniteViewer/Icon/grid.png"); } -QToolButton#grid { - qproperty-icon: url(":/InfiniteViewer/Icon/grid.png") -} -QToolButton#sync { +QToolButton#grid:disabled{ + qproperty-icon: url(":/InfiniteViewer/Icon/save.png"); +} */ +/* QToolButton#sync { qproperty-icon: url(":/InfiniteViewer/Icon/sync/sync_dis.png") -} -QToolButton#anonymize { +} */ +/* QToolButton#anonymize { qproperty-icon: url(":/InfiniteViewer/Icon/anno.png") -} +} */ -QToolButton#slice{qproperty-icon:url(":/InfiniteViewer/Icon/slice.png")} +/* QToolButton#slice{qproperty-icon:url(":/InfiniteViewer/Icon/slice.png")} QToolButton#window{qproperty-icon:url(":/InfiniteViewer/Icon/windowlevel.png")} QToolButton#pan{qproperty-icon:url(":/InfiniteViewer/Icon/pan.png")} QToolButton#zoom{qproperty-icon:url(":/InfiniteViewer/Icon/zoom.png")} -QToolButton#measure{qproperty-icon:url(":/InfiniteViewer/Icon/distance.png")} +QToolButton#measure{qproperty-icon:url(":/InfiniteViewer/Icon/distance.png")} */ QToolButton#clear{qproperty-icon:url(":/InfiniteViewer/Icon/trashbin.png")} -QToolButton#flip{qproperty-icon:url(":/InfiniteViewer/Icon/flip.png")} +/* QToolButton#flip{qproperty-icon:url(":/InfiniteViewer/Icon/flip.png")} */ QToolButton#cine{qproperty-icon:url(":/InfiniteViewer/Icon/cine.png")} QToolButton#fusion{qproperty-icon:url(":/InfiniteViewer/Icon/fusion.png")} -QToolButton#MPR{qproperty-icon:url(":/InfiniteViewer/Icon/MPR.png")} +/* QToolButton#MPR{qproperty-icon:url(":/InfiniteViewer/Icon/MPR.png")} */ QToolButton#VR{qproperty-icon:url(":/InfiniteViewer/Icon/VR.png")} QToolButton#About{qproperty-icon:url(":/InfiniteViewer/Icon/about.png")} diff --git a/src/Icon/annod.png b/src/Icon/annod.png new file mode 100644 index 0000000..be627f3 Binary files /dev/null and b/src/Icon/annod.png differ diff --git a/src/Icon/distanced.png b/src/Icon/distanced.png new file mode 100644 index 0000000..b390f4e Binary files /dev/null and b/src/Icon/distanced.png differ diff --git a/src/Icon/flipd.png b/src/Icon/flipd.png new file mode 100644 index 0000000..bf36cad Binary files /dev/null and b/src/Icon/flipd.png differ diff --git a/src/Icon/gridd.png b/src/Icon/gridd.png new file mode 100644 index 0000000..c78ade8 Binary files /dev/null and b/src/Icon/gridd.png differ diff --git a/src/Icon/pand.png b/src/Icon/pand.png new file mode 100644 index 0000000..df31c35 Binary files /dev/null and b/src/Icon/pand.png differ diff --git a/src/Icon/sliced.png b/src/Icon/sliced.png new file mode 100644 index 0000000..51ab97f Binary files /dev/null and b/src/Icon/sliced.png differ diff --git a/src/Icon/sync/sync_disd.png b/src/Icon/sync/sync_disd.png new file mode 100644 index 0000000..0d59fa0 Binary files /dev/null and b/src/Icon/sync/sync_disd.png differ diff --git a/src/Icon/windowleveld.png b/src/Icon/windowleveld.png new file mode 100644 index 0000000..75a3fd2 Binary files /dev/null and b/src/Icon/windowleveld.png differ diff --git a/src/Icon/zoomd.png b/src/Icon/zoomd.png new file mode 100644 index 0000000..5ec4ff4 Binary files /dev/null and b/src/Icon/zoomd.png differ diff --git a/src/QDicomViewer.qrc b/src/QDicomViewer.qrc index 65a1a32..48e5cc4 100644 --- a/src/QDicomViewer.qrc +++ b/src/QDicomViewer.qrc @@ -15,23 +15,32 @@ Icon/angle.png + Icon/distanced.png Icon/distance.png + Icon/gridd.png Icon/grid.png Icon/hidden.png Icon/openfile.png Icon/pan.png + Icon/windowleveld.png + Icon/zoomd.png + Icon/pand.png Icon/windowlevel.png Icon/zoom.png Icon/sync/sync_auto.png Icon/sync/sync_dis.png + Icon/sync/sync_disd.png Icon/sync/sync_manual.png Icon/save.png Icon/anno.png + Icon/annod.png Icon/flip.png + Icon/flipd.png Icon/cine.png Icon/fusion.png Icon/trashbin.png Icon/slice.png + Icon/sliced.png Icon/import.png Icon/logo.png Icon/close.png diff --git a/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp b/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp index 03ca436..4489b3f 100644 --- a/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp +++ b/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp @@ -113,31 +113,79 @@ void DefaultToolBar::initToolBarButtons() { addButton(mBtnGrid, "grid"); mBtnGrid->setEnabled(false); + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/grid.png"); + icon.addFile(":/InfiniteViewer/Icon/gridd.png", QSize(), QIcon::Disabled); + mBtnGrid->setIcon(icon); + } + addButton(mBtnSync, "sync"); mBtnSync->setEnabled(false); + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/sync/sync_dis.png"); + icon.addFile(":/InfiniteViewer/Icon/sync/sync_disd.png", QSize(), QIcon::Disabled); + mBtnSync->setIcon(icon); + } addButton(mBtnAnonymize, "anonymize"); mBtnAnonymize->setEnabled(false); - + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/anno.png"); + icon.addFile(":/InfiniteViewer/Icon/annod.png", QSize(), QIcon::Disabled); + mBtnAnonymize->setIcon(icon); + } addSeparator(); QButtonGroup *modeGroup = new QButtonGroup(this); addGroupedButton(mBtnSlice, "slice", modeGroup); mBtnSlice->setEnabled(false); + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/slice.png"); + icon.addFile(":/InfiniteViewer/Icon/sliced.png", QSize(), QIcon::Disabled); + mBtnSlice->setIcon(icon); + } addGroupedButton(mBtnWindow, "window", modeGroup); mBtnWindow->setEnabled(false); + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/windowlevel.png"); + icon.addFile(":/InfiniteViewer/Icon/windowleveld.png", QSize(), QIcon::Disabled); + mBtnWindow->setIcon(icon); + } addGroupedButton(mBtnPan, "pan", modeGroup); mBtnPan->setEnabled(false); + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/pan.png"); + icon.addFile(":/InfiniteViewer/Icon/pand.png", QSize(), QIcon::Disabled); + mBtnPan->setIcon(icon); + } addGroupedButton(mBtnZoom, "zoom", modeGroup); mBtnZoom->setEnabled(false); + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/zoom.png"); + icon.addFile(":/InfiniteViewer/Icon/zoomd.png", QSize(), QIcon::Disabled); + mBtnZoom->setIcon(icon); + } addGroupedButton(mBtnMeasure, "measure", modeGroup); mBtnMeasure->setEnabled(false); + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/distance.png"); + icon.addFile(":/InfiniteViewer/Icon/distanced.png", QSize(), QIcon::Disabled); + mBtnMeasure->setIcon(icon); + } auto actionClear= addButton(mBtnClear, "clear"); mBtnClear->setEnabled(false); @@ -148,6 +196,12 @@ void DefaultToolBar::initToolBarButtons() { addButton(mBtnFlip, "flip"); mBtnFlip->setEnabled(false); + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/flip.png"); + icon.addFile(":/InfiniteViewer/Icon/flipd.png", QSize(), QIcon::Disabled); + mBtnFlip->setIcon(icon); + } auto actionCine = addButton(mBtnCine, "cine"); mBtnCine->setEnabled(false); @@ -160,6 +214,12 @@ void DefaultToolBar::initToolBarButtons() { addButton(mBtnMPR, "MPR"); mBtnMPR->setEnabled(false); + { + QIcon icon; + icon.addFile(":/InfiniteViewer/Icon/MPR.png"); + icon.addFile(":/InfiniteViewer/Icon/unMPR.png", QSize(), QIcon::Disabled); + mBtnMPR->setIcon(icon); + } //hide for this version auto actionVR = addButton(mBtnVR, "VR"); @@ -427,6 +487,9 @@ void DefaultToolBar::initMeasureButton() { } m->addAction(tr("Location Point"), this,[=](){ + mBtnMeasure->setChecked(true); + QPixmap map(":/InfiniteViewer/Icon/crosshair.png"); + mBtnMeasure->setIcon(QIcon(map)); emit modeChanged(38); }); m->addSeparator(); diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index 7688141..9770fb7 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -1,18 +1,8 @@ - + ConfigurationDialog - - - Advanced settings - - - - - PACS location - - Listening port: @@ -23,6 +13,16 @@ Local AE title: + + + Advanced settings + + + + + PACS location + + Retrieval Protocol @@ -122,295 +122,311 @@ DefaultToolBar - + Open Dicom series from directory - + Open DICOM folder - + Open DICOM file - + Change Language - 切换为中文界面 + - + Quit - + Search and download studies from PACS locations - + Export images - + Layout - + Toggle series synchronization - + Sychronize slice - + Sychronize zoom & pan - + Sychronize window level & width - + Adjust window level - - - Negative - - - - - Pan image - - - - - Zoom image - - - - - Browse series - - - - - Toggle annotations - - - - - Annotations - - - - - Cross Reference Line - - - - - Hide all measurements - - - Hide patient data - - - - - Show Dicom tags - - - - - Closed polygon - - - - - Open polygon - - - - - Arrow - - - - - Ellipse - - - - - Text - - - - - Location Point - - - - Custom window width and level - + gray - + + Negative + + + + Jet - - - Ruler - - - Angle gauge + Pan image + Zoom image + + + + + Browse series + + + + + Toggle annotations + + + + + Annotations + + + + + Cross Reference Line + + + + + Hide all measurements + + + + + Hide patient data + + + + + Show Dicom tags + + + + + Ruler + + + + + Angle gauge + + + + + Closed polygon + + + + + Open polygon + + + + + Arrow + + + + + Ellipse + + + + Round - - - Measuring tool - - - - - Delete selected - - - - - Delete all in current slice - - - - - Delete all in current series - - - - - Fusion - - - - - Cine - - - - - Delete current series - - - - - Transformations - - - Rotate 90 CCW - - - - - Rotate 90 CW - - - - - Rotate 180 - - - - - Flip horizontal - - - - - Flip vertical - - - - - Clear transformations + Text + Measuring tool + + + + + Location Point + + + + + Delete selected + + + + + Delete all in current slice + + + + + Delete all in current series + + + + + Fusion + + + + + Cine + + + + + Delete current series + + + + + Transformations + + + + + Rotate 90 CCW + + + + + Rotate 90 CW + + + + + Rotate 180 + + + + + Flip horizontal + + + + + Flip vertical + + + + + Clear transformations + + + + MPR - + 3D MPR - + Coronal - + Sagittal - + Axial - + Full screen - + Exit full screen mode - + Minimize - + Close + + + About + + + + + Built with Qt 5.12.0 and VTK 9.2. + + + + + Copyright © %1 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. +All Rights Reserved + + DicomImageView @@ -676,6 +692,11 @@ Avg:%5, SD:%6 ImportWidget + + + PACS Configuration + + Search @@ -686,57 +707,6 @@ Avg:%5, SD:%6 Clear - - - Study date - - - - - - - Patient name - - - - - Date of birth - - - - - - - Patient ID - - - - - Modality - - - - - Study ID - - - - - Study Instance Uid - - - - - - - Accession number - - - - - PACS Configuration - - All modalities @@ -789,12 +759,58 @@ Avg:%5, SD:%6 Custom date range + + + + + Patient name + + + + + + + Patient ID + + + + + + + Accession number + + Device name + + + Study date + + + + + Date of birth + + + + + Modality + + + + + Study ID + + + + + Study Instance Uid + + Referring physician @@ -842,32 +858,32 @@ Avg:%5, SD:%6 OpenPolyAnnotationActor - + mm - + cm - + mm² - + cm² - + Distance - + Area @@ -891,47 +907,47 @@ Avg:%5, SD:%6 QDicomViewer - + Ready - + Open dicom directory - + Open dicom files - + confirm - + Change Language will reload the application, please confirm to do this! - + Ok - + Cancel - + Warning - + open DICOM Images From PACS Fail diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index 7938452..9770fb7 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -1,106 +1,86 @@ - + ConfigurationDialog - - Listener port: - 监听端口: - - - My AE title: - 本地AETitle: - - - - Advanced settings - 高级设置 - - - - PACS location - PACS位置 - - - Retrive Protocol - 检索协议 - Listening port: - 监听端口: + Local AE title: - 本地AETitle + + + + + Advanced settings + + + + + PACS location + Retrieval Protocol - 检索协议 + IP address - IP地址 + Port - 端口 + AE title - + Description - 描述 + Save - 保存 + Cancel - 取消 + Retrieval protocol - 检索协议 + Maximum active downloads Number - 最大可同时下载数 - - - Retrieve protocol - 检索协议 - - - Maximum active downloads - 最大可同时下载数 + Preferred transfer syntax - 首选传输语法 + Character set - 字符集 + @@ -108,7 +88,7 @@ PACS configuration - PACS配置 + @@ -116,340 +96,336 @@ Customwindow - 自定义窗宽窗位 + Window level - 窗位 + Window width - 窗宽 + OK - 确定 + Cancel - 取消 + DefaultToolBar - - Open DICOM folder - 打开文件夹 - - - - Open DICOM file - 打开文件 - - - - Quit - 退出 - - - - Search and download studies from PACS locations - 从PACS获取 - - - - Export images - - - - - Layout - 动态布局 - - - - Toggle series synchronization - 激活图像同步 - - - CUR STATE: %1 - 当前状态: %1 - - - + Open Dicom series from directory - 打开DICOM + - + + Open DICOM folder + + + + + Open DICOM file + + + + Change Language - Language: English + - + + Quit + + + + + Search and download studies from PACS locations + + + + + Export images + + + + + Layout + + + + + Toggle series synchronization + + + + Sychronize slice - 同步翻页 + - + Sychronize zoom & pan - 同步缩放&移动 + - + Sychronize window level & width - 同步窗宽窗位 + - + Adjust window level - 调窗 - - - Custom Window - 自定义窗宽窗位 - - - - Negative - 负相 - - - - Pan image - 移动 - - - - Zoom image - 缩放 - - - - Browse series - 翻页 - - - - Toggle annotations - 四角标记 - - - - Annotations - 四角标记 - - - - Cross Reference Line - 参考线 - - - - Hide all measurements - 隐藏所有测量 + - Hide patient data - 隐藏患者信息 - - - - Show Dicom tags - 显示DICOM标记 - - - Length - 直尺 - - - Angle - 量角器 - - - - Closed polygon - 闭合多边形 - - - - Open polygon - 开放多边形 - - - - Arrow - 箭头 - - - - Ellipse - 椭圆 - - - - Round - 正圆直径测量 - - - - Text - 文字 - - - Measurements - 测量工具 - - - Custom window width and level - 自定义窗宽窗位 + - + gray - + + Negative + + + + Jet - - - Ruler - 直尺 - + Pan image + + + + + Zoom image + + + + + Browse series + + + + + Toggle annotations + + + + + Annotations + + + + + Cross Reference Line + + + + + Hide all measurements + + + + + Hide patient data + + + + + Show Dicom tags + + + + + Ruler + + + + Angle gauge - 量角器 + - - Measuring tool - 测量工具 + + Closed polygon + - - Delete selected - 删除选中 + + Open polygon + - - Delete all in current slice - 删除当前图像中所有测量 + + Arrow + - - Delete all in current series - 删除当前序列所有图像 + + Ellipse + - - Location Point - 病灶定位 - - - - Fusion - - - - - Cine - - - - - Delete current series - 删除当前序列所有测量 - - - - Transformations - 翻页&旋转 + + Round + - Rotate 90 CCW - 逆时针旋转90度 - - - - Rotate 90 CW - 顺时针旋转90度 - - - - Rotate 180 - 旋转180度 - - - - Flip horizontal - 水平翻转 - - - - Flip vertical - 垂直翻转 - - - - Clear transformations - 清除变换 + Text + + Measuring tool + + + + + Location Point + + + + + Delete selected + + + + + Delete all in current slice + + + + + Delete all in current series + + + + + Fusion + + + + + Cine + + + + + Delete current series + + + + + Transformations + + + + + Rotate 90 CCW + + + + + Rotate 90 CW + + + + + Rotate 180 + + + + + Flip horizontal + + + + + Flip vertical + + + + + Clear transformations + + + + MPR - 多平面重建 + - + 3D MPR - + - + Coronal - 冠状面 + - + Sagittal - 矢状面 + - + Axial - 横断面 + - + Full screen - 全屏 + - + Exit full screen mode - 退出全屏 + - + Minimize - 最小化 + - + Close - 关闭 + + + + + About + + + + + Built with Qt 5.12.0 and VTK 9.2. + + + + + Copyright © %1 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. +All Rights Reserved + @@ -457,12 +433,12 @@ Error - 错误 + Unable to read file %1 - 无法读取文件 %1 + @@ -485,12 +461,12 @@ Length - + Description - + @@ -503,26 +479,24 @@ mm² - 平方毫米 + cm² - 平方厘米 + Area - 面积 + Area:%1 %7, Pixel:%2, Max:%3, Min:%4, Avg:%5, SD:%6 - 面积:%1 %7, 像素:%2, -最大值:%3, 最小值:%4, -平均值:%5, 标准差:%6 + @@ -620,7 +594,7 @@ Avg:%5, SD:%6 Annotations - 四角标记 + @@ -645,7 +619,7 @@ Avg:%5, SD:%6 Close - 关闭 + @@ -682,7 +656,7 @@ Avg:%5, SD:%6 Text Property - 文字属性 + @@ -692,16 +666,12 @@ Avg:%5, SD:%6 Apply - 应用 + Cancel - 取消 - - - Delete - 删除 + @@ -717,55 +687,119 @@ Avg:%5, SD:%6 Search and downlod studies from PACS locations - 从PACS查找获取检查 + ImportWidget + + + PACS Configuration + + Search - 搜索 + Clear - 清除 + - - Study date - 检查日期 + + All modalities + + + + + + + + + All dates + + + + + + Today + + + + + + Yesterday + + + + + + This week + + + + + + This month + + + + + + + Custom date + + + + + + + Custom date range + Patient name - 患者姓名 - - - - Date of birth - 出生日期 + Patient ID - 患者编码 + + + + + + + Accession number + Device name - 设备名称 + + + + + Study date + + + + + Date of birth + Modality - 模态 + @@ -777,119 +811,35 @@ Avg:%5, SD:%6 Study Instance Uid - - Study description - 检查描述 - - - - - - Accession number - 检查单号 - - - - PACS Configuration - PACS配置 - - - - All modalities - 所有模态 - - - - - - - - All dates - 所有日期 - - - - - Today - 今天 - - - - - Yesterday - 昨天 - - - - - This week - 本周 - - - - - This month - 本月 - - - - - - Custom date - 自定义日期 - - - - - - Custom date range - 自定义时间段 - - - Exam ID - 检查编码 - Referring physician - 转诊医生 + Performing physician - 检查医生 + Reading physician - 阅片医生 + Institution name - 机构名称 + Images - 图像数量 + Source - 数据源 - - - Number - 序列号 - - - Description - 描述 - - - #Images - 数量 + @@ -897,49 +847,45 @@ Avg:%5, SD:%6 maximize - 最大化 + shut down - 关闭 + OpenPolyAnnotationActor - - - mm - 毫米 - - - - cm - 厘米 - - - - mm² - 平方毫米 - - - - cm² - 平方厘米 - - Distance - 周长 - - - Perimeter - 直径 + mm + + cm + + + + + mm² + + + + + cm² + + + + + Distance + + + + Area - 面积 + @@ -947,7 +893,7 @@ Avg:%5, SD:%6 OK - 确定 + @@ -955,55 +901,55 @@ Avg:%5, SD:%6 Message - 信息 + QDicomViewer - + Ready - 就绪 + - + Open dicom directory - 打开文件夹 + - + Open dicom files - 打开文件 + - + confirm - 确认 + - + Change Language will reload the application, please confirm to do this! - 更改语言会重载整个程序，请确认是否要如此操作！ + - + Ok - 确认 + - + Cancel - 取消 + - + Warning - 警告 + - + open DICOM Images From PACS Fail - 从PACS打开 + @@ -1011,19 +957,12 @@ Avg:%5, SD:%6 QDicomViewer - + toolBar - - - - - QObject - - Perimeter - 直径 + @@ -1046,44 +985,20 @@ Avg:%5, SD:%6 RoundAnnotationActor - - mm² - 平方毫米 - - - cm² - 平方厘米 - - - Area - 面积 - - - cm³ - 立方厘米 - - - mm³ - 立方毫米 - - - Volume - 体积 - mm - 毫米 + cm - 厘米 + Diameter - 直径 + @@ -1091,17 +1006,17 @@ Avg:%5, SD:%6 mm - 毫米 + cm - 厘米 + Distance - 距离 + @@ -1109,7 +1024,7 @@ Avg:%5, SD:%6 Cancel - 取消 + @@ -1195,16 +1110,12 @@ Avg:%5, SD:%6 Ruler - 直尺 + Arrow - 箭头 - - - Measurements - 测量工具 + @@ -1222,17 +1133,17 @@ Avg:%5, SD:%6 mm - 毫米 + OK - 确定 + Cancel - 取消 +