*** empty log message ***

[bbtk.git] / packages / vtk / src / bbvtkImagePlanes.cxx

diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx
index 9f61f6ea0efc81d02221ef80ab3d25cd10549369..b62cd077c4d8223d1deb2509503f0a4024e31532 100644 (file)
--- a/packages/vtk/src/bbvtkImagePlanes.cxx
+++ b/packages/vtk/src/bbvtkImagePlanes.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkImagePlanes.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/09/01 13:59:48 $
-  Version:   $Revision: 1.30 $
+  Date:      $Date: 2010/01/21 16:03:19 $
+  Version:   $Revision: 1.31 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -137,7 +137,7 @@ namespace bbvtk
  };
   //================================================================
 
-  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.30 $");
+  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.31 $");
 
   //================================================================
 
@@ -190,36 +190,14 @@ namespace bbvtk
      picker->SetTolerance(0.005);
   
      // The 3 image plane widgets 
-     vtkImagePlaneWidget* planeWidgetX = vtkImagePlaneWidget::New();
-     planeWidgetX->DisplayTextOn();
-     planeWidgetX->SetPicker(picker);
-     planeWidgetX->SetKeyPressActivationValue('x');
-     vtkProperty* prop1 = planeWidgetX->GetPlaneProperty();
-     prop1->SetColor(1, 0, 0);
-
-     vtkImagePlaneWidget* planeWidgetY = vtkImagePlaneWidget::New();
-     planeWidgetY->DisplayTextOn();
-     planeWidgetY->SetPicker(picker);
-     planeWidgetY->SetKeyPressActivationValue('y');
-     vtkProperty* prop2 = planeWidgetY->GetPlaneProperty();
-     prop2->SetColor(1, 1, 0);
+     vtkImagePlaneWidget* planeWidgetX = GetPlaneWidget('x', 1, 0, 0, picker);
+        vtkImagePlaneWidget* planeWidgetY = GetPlaneWidget('y', 1, 1, 0, picker);
      planeWidgetY->SetLookupTable(planeWidgetX->GetLookupTable());
 
-     vtkImagePlaneWidget* planeWidgetZ = vtkImagePlaneWidget::New();
-     planeWidgetZ->DisplayTextOn();
-     planeWidgetZ->SetPicker(picker);
-     planeWidgetZ->SetKeyPressActivationValue('z');
-     vtkProperty* prop3 = planeWidgetZ->GetPlaneProperty();
-     prop3->SetColor(0, 0, 1);
+     vtkImagePlaneWidget* planeWidgetZ = GetPlaneWidget('z', 0, 0, 1, picker);     
      planeWidgetZ->SetLookupTable(planeWidgetX->GetLookupTable());
 
-        vtkImagePlaneWidget* planeWidget3Pts = vtkImagePlaneWidget::New();
-        //vtkPlaneWidget* planeWidget3Pts = vtkPlaneWidget::New();
-     planeWidget3Pts->DisplayTextOn();
-     planeWidget3Pts->SetPicker(picker);
-     planeWidget3Pts->SetKeyPressActivationValue('3');
-     vtkProperty* prop3Pts = planeWidget3Pts->GetPlaneProperty();
-     prop3Pts->SetColor(0, 1, 1);
+        vtkImagePlaneWidget* planeWidget3Pts = GetPlaneWidget('3', 0, 1, 1, picker);    
      planeWidget3Pts->SetLookupTable(planeWidgetX->GetLookupTable());
 
      bbSetOutputPlaneX(planeWidgetX);
@@ -229,6 +207,7 @@ namespace bbvtk
      bbSetOutputImageX(planeWidgetX->GetResliceOutput());
      bbSetOutputImageY(planeWidgetY->GetResliceOutput());
      bbSetOutputImageZ(planeWidgetZ->GetResliceOutput());
+        bbSetInputInteractor(0);
         //bbSetOutputImage3Pts(planeWidget3Pts->GetResliceOutput());
 
      picker->UnRegister(NULL);
@@ -315,6 +294,8 @@ void ImagePlanes::Process()
                                                                0.5*(range[1]+range[0]));
                        }               
 
+                       updateInteractor();
+
           }
                        // UPDATE DES SORTIES 
                bbGetOutputPlaneX()->GetResliceOutput()->Update();
@@ -325,7 +306,7 @@ void ImagePlanes::Process()
                std::vector<int> pointsy = bbGetInputPointsY();
                std::vector<int> pointsz = bbGetInputPointsZ();
 
-               std::cout<<pointsx.size()<<pointsy.size()<<pointsz.size()<<std::endl;
+               //std::cout<<pointsx.size()<<pointsy.size()<<pointsz.size()<<std::endl;
 
                if(pointsx.size()==pointsy.size() && pointsx.size()==pointsz.size()&&pointsx.size()>=3){
 
@@ -421,10 +402,25 @@ void ImagePlanes::Process()
        }
 }
        
-       
+void ImagePlanes::updateInteractor(){
+
+       vtkRenderWindowInteractor* interactor = bbGetInputInteractor();
+
+       if(interactor){
+               bbGetOutputPlaneX()->SetInteractor(interactor);
+               bbGetOutputPlaneX()->EnabledOn();
+               bbGetOutputPlaneY()->SetInteractor(interactor);
+               bbGetOutputPlaneY()->EnabledOn();
+               bbGetOutputPlaneZ()->SetInteractor(interactor);
+               bbGetOutputPlaneZ()->EnabledOn();
+               bbGetOutputPlane3Pts()->SetInteractor(interactor);
+               bbGetOutputPlane3Pts()->EnabledOn();
+       }
+}
        //-----------------------------------------------------------------     
        void vtkImageDataPointerRelay::bbUserSetDefaultValues()
        {
+               
        }
        
        //-----------------------------------------------------------------     
@@ -437,7 +433,20 @@ void ImagePlanes::Process()
        {
        }
        
-       
+       vtkImagePlaneWidget* ImagePlanes::GetPlaneWidget(unsigned char activationkey, double r, double g, double b, vtkCellPicker* picker){
+
+               vtkProperty* prop1 = 0;         
+               vtkImagePlaneWidget* planeWidget = 0;
+
+               planeWidget = vtkImagePlaneWidget::New();
+               planeWidget->DisplayTextOn();
+               planeWidget->SetPicker(picker);
+               planeWidget->SetKeyPressActivationValue(activationkey);
+               prop1 = planeWidget->GetPlaneProperty();
+               prop1->SetColor(r, g, b);
+
+               return planeWidget;
+       }
 
 double* ImagePlanes::getCrossProduct(double* vect0,double* vect1){
        double* vectCross;