From 449536b536a44335dc3b5a7604e34484eb046e62 Mon Sep 17 00:00:00 2001 From: davila Date: Fri, 4 Jul 2014 14:58:45 +0200 Subject: [PATCH] Bug Interaction color layer --- .../wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx | 2 +- .../wxWindows/widgets/ThresholdImageView/LayerImageBase.h | 4 ++-- .../src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx index a90e734..c963498 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx @@ -82,7 +82,7 @@ bool ColorLayerImageBasevtkInteractor::OnMouseMove() // vitual } - if (_state==true) + if ( (_state==true) && (_layerImageBase->GetActorPresent()) ) { wxVtk2DBaseView *wxvtk2Dbaseview = (wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView(); wxVTKRenderWindowInteractor *wxVTKiren = wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h index d118348..4bacccb 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h @@ -99,6 +99,7 @@ class LayerImageBase virtual int GetX(); virtual int GetY(); virtual int GetZ(); + bool GetActorPresent(); private: int _X; @@ -112,8 +113,7 @@ class LayerImageBase vtkImageActor *_thresholdActor; wxVtkBaseView *_baseView; - virtual void ConfigLookupTable() = 0; - bool GetActorPresent(); + virtual void ConfigLookupTable() = 0; void CleanXYZ(double &x, double &y, double &z); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx index 5a02215..1c5aa11 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx @@ -155,6 +155,8 @@ void pHistogram::initializePoints(int xDimension) void pHistogram::setPoints(vtkImageData* imageData) { +printf("EED pHistogram::setPoints Trinng new histogram ..\n"); +/* printf("EED pHistogram::setPoints Test: vtkPComputeHistogram2DOutliers\n"); vtkComputeHistogram2DOutliers *vtkhist = vtkComputeHistogram2DOutliers::New(); vtkhist->SetPreferredNumberOfOutliers(10); @@ -163,6 +165,7 @@ vtkTable *resulttable = vtkhist->GetOutputTable(); printf("EED pHistogram::setPoints rows:%d\n", (int)(resulttable->GetNumberOfRows()) ); printf("EED pHistogram::setPoints colums:%d\n", (int)(resulttable->GetNumberOfColumns()) ); +*/ /* Pointers -- 2.45.1