]> Creatis software - creaMaracasVisu.git/commitdiff
Bug Interaction color layer
authordavila <eduardo.davila@creatis.insa-lyon.fr>
Fri, 4 Jul 2014 12:58:45 +0000 (14:58 +0200)
committerdavila <eduardo.davila@creatis.insa-lyon.fr>
Fri, 4 Jul 2014 12:58:45 +0000 (14:58 +0200)
lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.h
lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pHistogram.cxx

index a90e7348b627ad847a9c3895c11f0db14977ff9e..c963498c24fd30d45e39f2460f0d868ec6897483 100644 (file)
@@ -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();
index d118348c03d6fe043dd4fa0025c517d4cda47305..4bacccb51346142dfec9db5dadc8b72d5ce3d9de 100644 (file)
@@ -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);
 
 
index 5a02215ca5eed0f5382924878d690c83aa31b020..1c5aa115d4a39cb0af5cc3a43f35e56df6003635 100644 (file)
@@ -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