From 5ca2704d9b67ed0bd451e86c0ff2e47ec4cf425c Mon Sep 17 00:00:00 2001 From: kradchen Date: Fri, 23 May 2025 09:17:27 +0800 Subject: [PATCH] fix: fix corner annotation bug --- .../ActorDraggableInteractorStyle.cpp | 2 ++ src/src/Rendering/Viewer/DICOMImageViewer.cxx | 24 +++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/src/Interaction/ActorDraggableInteractorStyle.cpp b/src/src/Interaction/ActorDraggableInteractorStyle.cpp index d8751b5..e212cc4 100644 --- a/src/src/Interaction/ActorDraggableInteractorStyle.cpp +++ b/src/src/Interaction/ActorDraggableInteractorStyle.cpp @@ -268,6 +268,8 @@ void ActorDraggableInteractorStyle::NoneStatePick() { message += vtkVariant(ijk[0]).ToString(); message += " Y:"; message += vtkVariant(ijk[1]).ToString(); + message += " Z:"; + message += vtkVariant(ijk[2]).ToString(); message += ", "; message += vtkVariant(ijk[2]).ToString(); message += " Val:"; diff --git a/src/src/Rendering/Viewer/DICOMImageViewer.cxx b/src/src/Rendering/Viewer/DICOMImageViewer.cxx index d0b841c..daf3751 100644 --- a/src/src/Rendering/Viewer/DICOMImageViewer.cxx +++ b/src/src/Rendering/Viewer/DICOMImageViewer.cxx @@ -1118,22 +1118,38 @@ void DICOMImageViewer::InitCornerInfo(ExtendMedicalImageProperties *pSeries) { m_cornerInfo.ConstAnno[TOP_RIGHT].clear(); m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetPatientName()); m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetPatientID()); + m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetPatientBirthDate()); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(" "); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetPatientSex()); + m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetInstitutionName()); + m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); + m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetStudyID()); + m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetStudyDescription()); m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetSeriesDescription()); m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); - m_cornerInfo.ConstAnno[TOP_RIGHT].append(pSeries->GetInstitutionName()); - m_cornerInfo.ConstAnno[TOP_RIGHT].append("\n"); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].clear(); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("****"); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("****"); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("****"); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("****"); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append(pSeries->GetStudyID()); + m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append(pSeries->GetStudyDescription()); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append(pSeries->GetSeriesDescription()); m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); - m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("****"); - m_cornerInfo.ConstAnno[TOP_RIGHT_PRIVACY].append("\n"); + } void DICOMImageViewer::SetCoordsTransformMatrix(ExtendMedicalImageProperties *pSeries) {