From d6733694b1ec6c5d105e4d9a4256607aa9dcc308 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Mon, 21 Nov 2022 13:45:59 +0800
Subject: [PATCH] Legend render bug fix.

---
 src/src/Rendering/Viewer/DICOMImageViewer.cxx | 14 +++++++-------
 src/src/Rendering/Viewer/DICOMImageViewer.h   |  7 -------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/src/Rendering/Viewer/DICOMImageViewer.cxx b/src/src/Rendering/Viewer/DICOMImageViewer.cxx
index 308787f..dc619f1 100644
--- a/src/src/Rendering/Viewer/DICOMImageViewer.cxx
+++ b/src/src/Rendering/Viewer/DICOMImageViewer.cxx
@@ -210,7 +210,6 @@ void DICOMImageViewer::SetRenderWindow(vtkRenderWindow *arg) {
         this->RenderWindow->Register(this);
     }
     //add legend to render
-    this->RenderWindow->AddObserver(vtkCommand::EventIds::RenderEvent, this, &DICOMImageViewer::RenderLegend);
     this->InstallPipeline();
 }
 
@@ -740,7 +739,7 @@ void DICOMImageViewer::SetFusionInputData(vtkImageData *data, vtkMatrix4x4* matr
         prop->SetLookupTable(table);
         firstFusion = false;
     }
-#ifdef IN_TEST_MODE
+
     //vtkTextProperty* vtkTextProperty = vtkTextProperty::New();
     vtkNew<vtkTextProperty> LabelTextProperty;
     LabelTextProperty->SetFontSize(16);
@@ -776,10 +775,7 @@ void DICOMImageViewer::SetFusionInputData(vtkImageData *data, vtkMatrix4x4* matr
     OpacityActor->SetTextProperty(LabelTextProperty);
     SetScalarBarTitle(FusionOpacity);
 
-
     this->Renderer->AddActor(OpacityActor);
-#endif
-
 }
 
 void DICOMImageViewer::SetFusionColorLeveL(double level) {
@@ -858,9 +854,7 @@ void DICOMImageViewer::SetFusionColorTable(vtkScalarsToColors *table) {
     if (!FusionActor) return;
     PrepareFusionColorTable(table, true);
     FusionActor->GetProperty()->SetLookupTable(table);
-#ifdef IN_TEST_MODE
     bar->SetLookupTable(table);
-#endif
 }
 
 void DICOMImageViewer::SetFusionColorPreset(const char *preset) {
@@ -1364,18 +1358,24 @@ void DICOMImageViewer::UpdateOrientationInfo() {
 // ruler legend----------------------------------------------------------------
 void DICOMImageViewer::ActiveRuler() {
     rulerActive = true;
+    ruler->SetVisibility(1);
+    Renderer->AddActor2D(ruler);
 }
 
 void DICOMImageViewer::UnActiveRuler() {
     rulerActive = false;
+    ruler->SetVisibility(0);
+    Renderer->RemoveViewProp(ruler);
 }
 
 void DICOMImageViewer::ActiveReferenceLine() {
     referenceLine->SetVisibility(true);
+    Renderer->AddActor2D(referenceLine);
 }
 
 void DICOMImageViewer::UnActiveReferenceLine() {
     referenceLine->SetVisibility(false);
+    Renderer->RemoveViewProp(referenceLine);
 }
 
 void DICOMImageViewer::RenderLegend() {
diff --git a/src/src/Rendering/Viewer/DICOMImageViewer.h b/src/src/Rendering/Viewer/DICOMImageViewer.h
index 600a389..654ae7f 100644
--- a/src/src/Rendering/Viewer/DICOMImageViewer.h
+++ b/src/src/Rendering/Viewer/DICOMImageViewer.h
@@ -44,15 +44,8 @@ class ExtendMedicalImageProperties;
 
 class MeasureStore;
 
-#define  IN_TEST_MODE
-
-
-#ifdef IN_TEST_MODE
-
 class vtkScalarBarActor;
 
-#endif
-
 class vtkCornerAnnotation;
 
 class Measure;