sunwen/DCMV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Legend render bug fix.

Browse Source
This commit is contained in:
Krad
2022-11-21 13:45:59 +08:00
parent 91b6228f48
commit d6733694b1
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/src/Rendering/Viewer/DICOMImageViewer.cxx
View File

@@ -210,7 +210,6 @@ void DICOMImageViewer::SetRenderWindow(vtkRenderWindow *arg) {
this->RenderWindow->Register(this); this->RenderWindow->Register(this);
} }
//add legend to render //add legend to render
this->RenderWindow->AddObserver(vtkCommand::EventIds::RenderEvent, this, &DICOMImageViewer::RenderLegend);
this->InstallPipeline(); this->InstallPipeline();
} }
@@ -740,7 +739,7 @@ void DICOMImageViewer::SetFusionInputData(vtkImageData *data, vtkMatrix4x4* matr
prop->SetLookupTable(table); prop->SetLookupTable(table);
firstFusion = false; firstFusion = false;
} }
#ifdef IN_TEST_MODE
//vtkTextProperty* vtkTextProperty = vtkTextProperty::New(); //vtkTextProperty* vtkTextProperty = vtkTextProperty::New();
vtkNew<vtkTextProperty> LabelTextProperty; vtkNew<vtkTextProperty> LabelTextProperty;
LabelTextProperty->SetFontSize(16); LabelTextProperty->SetFontSize(16);
@@ -776,10 +775,7 @@ void DICOMImageViewer::SetFusionInputData(vtkImageData *data, vtkMatrix4x4* matr
OpacityActor->SetTextProperty(LabelTextProperty); OpacityActor->SetTextProperty(LabelTextProperty);
SetScalarBarTitle(FusionOpacity); SetScalarBarTitle(FusionOpacity);
this->Renderer->AddActor(OpacityActor); this->Renderer->AddActor(OpacityActor);
#endif
} }
void DICOMImageViewer::SetFusionColorLeveL(double level) { void DICOMImageViewer::SetFusionColorLeveL(double level) {
@@ -858,9 +854,7 @@ void DICOMImageViewer::SetFusionColorTable(vtkScalarsToColors *table) {
if (!FusionActor) return; if (!FusionActor) return;
PrepareFusionColorTable(table, true); PrepareFusionColorTable(table, true);
FusionActor->GetProperty()->SetLookupTable(table); FusionActor->GetProperty()->SetLookupTable(table);
#ifdef IN_TEST_MODE
bar->SetLookupTable(table); bar->SetLookupTable(table);
#endif
} }
void DICOMImageViewer::SetFusionColorPreset(const char *preset) { void DICOMImageViewer::SetFusionColorPreset(const char *preset) {
@@ -1364,18 +1358,24 @@ void DICOMImageViewer::UpdateOrientationInfo() {
// ruler legend---------------------------------------------------------------- // ruler legend----------------------------------------------------------------
void DICOMImageViewer::ActiveRuler() { void DICOMImageViewer::ActiveRuler() {
rulerActive = true; rulerActive = true;
ruler->SetVisibility(1);
Renderer->AddActor2D(ruler);
} }
void DICOMImageViewer::UnActiveRuler() { void DICOMImageViewer::UnActiveRuler() {
rulerActive = false; rulerActive = false;
ruler->SetVisibility(0);
Renderer->RemoveViewProp(ruler);
} }
void DICOMImageViewer::ActiveReferenceLine() { void DICOMImageViewer::ActiveReferenceLine() {
referenceLine->SetVisibility(true); referenceLine->SetVisibility(true);
Renderer->AddActor2D(referenceLine);
} }
void DICOMImageViewer::UnActiveReferenceLine() { void DICOMImageViewer::UnActiveReferenceLine() {
referenceLine->SetVisibility(false); referenceLine->SetVisibility(false);
Renderer->RemoveViewProp(referenceLine);
} }
void DICOMImageViewer::RenderLegend() { void DICOMImageViewer::RenderLegend() {

7
src/src/Rendering/Viewer/DICOMImageViewer.h
View File

@@ -44,15 +44,8 @@ class ExtendMedicalImageProperties;
class MeasureStore; class MeasureStore;
#define IN_TEST_MODE
#ifdef IN_TEST_MODE
class vtkScalarBarActor; class vtkScalarBarActor;
#endif
class vtkCornerAnnotation; class vtkCornerAnnotation;
class Measure; class Measure;