diff --git a/src/include/base/infinitiViewer.h b/src/include/base/infinitiViewer.h index f887a80..07ca0fa 100644 --- a/src/include/base/infinitiViewer.h +++ b/src/include/base/infinitiViewer.h @@ -309,6 +309,9 @@ public: void ActiveMeasure(Measure* m); void UnActiveMeasure(); + void ActiveRuler(); + void UnActiveRuler(); + //for convert vtkEvent to Qt signal vtkSignalRaiser* GetSignalRaiser(){ return &raiser; @@ -380,6 +383,7 @@ private: void ReloadCurrentSliceMeasure(); vtkNew ruler; + bool rulerActive = false; void RenderRuler(); int currentPresetIndex=1; diff --git a/src/src/base/infinitiViewer.cxx b/src/src/base/infinitiViewer.cxx index 2c92889..9138809 100644 --- a/src/src/base/infinitiViewer.cxx +++ b/src/src/base/infinitiViewer.cxx @@ -1022,6 +1022,7 @@ void infinitiViewer::SetInputData(vtkImageData* in) #endif this->ImageActor->GetMapper()->SetInputData(in); this->RemoveFusionData(); + this->ActiveRuler(); // this->UpdateDisplayExtent(); } @@ -1337,3 +1338,11 @@ void infinitiViewer::setUpImageViewer() updateCornerInfoAll(); } +void infinitiViewer::ActiveRuler() { + rulerActive = true; +} + +void infinitiViewer::UnActiveRuler() { + rulerActive = false; +} + diff --git a/src/src/view/dicomimageview.cpp b/src/src/view/dicomimageview.cpp index 10bfdca..4b7c7c9 100644 --- a/src/src/view/dicomimageview.cpp +++ b/src/src/view/dicomimageview.cpp @@ -812,6 +812,7 @@ void DicomImageView::ResetView() //_glWidt->update(); //_scrollBar = nullptr; + _ImageViewer->Delete(); _ImageViewer = nullptr; _Series = nullptr;