ENH: Render 2D viewer annotations according to settings. #2153

starviewer-medical · Apr 7, 2022 · 822b3d6 · 822b3d6
1 parent 56c80e6
commit 822b3d6
Show file tree

Hide file tree

Showing 12 changed files with 388 additions and 472 deletions.
diff --git a/starviewer/src/core/annotationflags.h b/starviewer/src/core/annotationflags.h
diff --git a/starviewer/src/core/q2dviewer.cpp b/starviewer/src/core/q2dviewer.cpp
@@ -614,7 +614,7 @@ void Q2DViewer::setNewVolumes(const QList<Volume*> &volumes, bool setViewerStatu
 
  printVolumeInformation();
 
- m_annotationsHandler->updateAnnotations(MainInformationAnnotation | AdditionalInformationAnnotation);
+ m_annotationsHandler->updateAnnotations();
 
  loadOverlays(volumes.first());
 
@@ -788,7 +788,7 @@ void Q2DViewer::resetView(const OrthogonalPlane &view)
  double slabThickness = getSlabThickness();
 
  setCurrentViewPlane(view);
- m_annotationsHandler->updateAnnotations(VoiLutAnnotation);
+ m_annotationsHandler->updateAnnotations();
 
  // Reiniciem valors per defecte de la càmera
  m_rotateFactor = 0;
@@ -994,7 +994,7 @@ void Q2DViewer::updateSliceToDisplay(int value, SliceDimension dimension)
  }
 
  updateCurrentImageDefaultPresetsInAllInputsOnOriginalAcquisitionPlane();
- m_annotationsHandler->updateAnnotations(MainInformationAnnotation | AdditionalInformationAnnotation | SliceAnnotation);
+ m_annotationsHandler->updateAnnotations();
  updatePreferredImageOrientation();
 
  // Finally we emit the signal of the changed value and render the scene
@@ -1406,28 +1406,16 @@ void Q2DViewer::updateImageSlices()
  getRenderer()->ResetCameraClippingRange();
 }
 
-void Q2DViewer::enableAnnotation(AnnotationFlags annotation, bool enable)
+void Q2DViewer::enableAnnotations(bool enable)
 {
- if (enable)
- {
- m_annotationsHandler->enableAnnotations(annotation);
- }
- else
- {
- m_annotationsHandler->disableAnnotations(annotation);
- }
+ m_annotationsHandler->enableAnnotations(enable);
 
  if (hasInput())
  {
  render();
  }
 }
 
-void Q2DViewer::removeAnnotation(AnnotationFlags annotation)
-{
- enableAnnotation(annotation, false);
-}
-
 void Q2DViewer::setVoiLut(const VoiLut &voiLut)
 {
  if (!hasInput())
@@ -1445,7 +1433,7 @@ void Q2DViewer::setVoiLut(const VoiLut &voiLut)
  else
  {
  getMainDisplayUnit()->setVoiLut(voiLut);
- m_annotationsHandler->updateAnnotations(VoiLutAnnotation);
+ m_annotationsHandler->updateAnnotations();
  render();
  }
 }
@@ -1545,7 +1533,7 @@ void Q2DViewer::setSlabThickness(double thickness)
  updateImageSlices();
 
  updateCurrentImageDefaultPresetsInAllInputsOnOriginalAcquisitionPlane();
- m_annotationsHandler->updateAnnotations(MainInformationAnnotation | AdditionalInformationAnnotation | SliceAnnotation);
+ m_annotationsHandler->updateAnnotations();
  render();
 
  if (mainDisplayUnit->getSlabThickness() != oldThickness)
@@ -2064,7 +2052,7 @@ void Q2DViewer::setFusionBalance(int balance)
  this->setVolumeOpacity(1, 1.0);
  }
 
- m_annotationsHandler->updateAnnotations(MainInformationAnnotation | AdditionalInformationAnnotation);
+ m_annotationsHandler->updateAnnotations();
  this->render();
 }
 

diff --git a/starviewer/src/core/q2dviewer.h b/starviewer/src/core/q2dviewer.h
@@ -16,7 +16,6 @@
 #define UDGQ2DVIEWER_H
 
 #include "qviewer.h"
-#include "annotationflags.h"
 #include "anatomicalplane.h"
 #include "volumedisplayunit.h"
 
@@ -328,9 +327,8 @@ public slots:
  /// Indica el tipu de solapament dels volums, per defecte blending
  void setOverlapMethod(OverlapMethod method);
 
- /// Afegir o treure la visibilitat d'una anotació textual/gràfica
- void enableAnnotation(AnnotationFlags annotation, bool enable = true);
- void removeAnnotation(AnnotationFlags annotation);
+ /// Enables or disables annotations in this viewer according to the given boolean.
+ void enableAnnotations(bool enable);
 
  /// Sets the VOI LUT for this viewer.
  virtual void setVoiLut(const VoiLut &voiLut);