]> Creatis software - bbtk.git/blobdiff - packages/vtk/src/bbvtkImagePlanes.cxx
#3194 BBTK Feature New Normal - Update surfaceTexture box with new lookuptables
[bbtk.git] / packages / vtk / src / bbvtkImagePlanes.cxx
index 45de5378260954a0400cde25205c4f8f5ca2471a..d3cd9d4040fca938bd84fa6ed9446927fb706c20 100644 (file)
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbvtkImagePlanes.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/06/24 07:56:02 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.38 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file 
  *  \brief 
@@ -38,6 +43,7 @@
 #include "bbvtkPackage.h"
 #include "vtkCellPicker.h"
 #include "vtkProperty.h"
+#include "vtkPolyData.h"
 
 
 #include "vtkMetaImageWriter.h"
 #include "bbstdRelay.h"
 
 #include "vtkObjectFactory.h"
+#include "vtkImageFlip.h"
 
+#include "vtkImageReslice.h"
+#include "vtkImageChangeInformation.h"
 
 namespace bbstd
 {
@@ -91,7 +100,6 @@ namespace bbtk
 namespace bbvtk
 {
 
-
   //====================================================================
   // Add the specialized adaptors to the package
   typedef vtkImagePlaneWidget* I;
@@ -136,48 +144,47 @@ namespace bbvtk
  };
   //================================================================
 
-  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.28 $");
+  //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.38 $");
 
   //================================================================
 
    BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,ImagePlanes)
    BBTK_BLACK_BOX_IMPLEMENTATION(ImagePlanes,bbtk::AtomicBlackBox);
 
-       
-       
    void ImagePlanes::bbUserSetDefaultValues() 
    { 
-     bbSetOutputPlaneX(0);
-     bbSetOutputPlaneY(0);
-     bbSetOutputPlaneZ(0);
-     bbSetOutputImageX(0);
-     bbSetOutputImageY(0);
-     bbSetOutputImageZ(0);
-     bbSetInputIn(0);
+     bbSetOutputPlaneX(NULL);
+     bbSetOutputPlaneY(NULL);
+     bbSetOutputPlaneZ(NULL);
+     bbSetOutputImageX(NULL);
+     bbSetOutputImageY(NULL);
+     bbSetOutputImageZ(NULL);
+     bbSetInputIn(NULL);
      std::vector<double> vect;
      vect.push_back(0);
      vect.push_back(0);
      bbSetInputWindowLevel (vect);  
      mVtkCallback = 0;
 
-
-        std::vector<int> vectpoints;
+     std::vector<int> vectpoints;
 
      bbSetOutputPlane3Pts(0);
-        bbSetOutputImage3Pts(0);
-        bbSetInputPointsX(vectpoints);
-        bbSetInputPointsY(vectpoints);
-        bbSetInputPointsZ(vectpoints);
-
-        _imageReslicer = NULL;
-        image=NULL;
+     bbSetOutputImage3Pts(0);
+     bbSetInputPointsX(vectpoints);
+     bbSetInputPointsY(vectpoints);
+     bbSetInputPointsZ(vectpoints);
+
+     _imageReslicer = NULL;
+     image          = NULL;
+     _transform     = NULL;
+     _matrix        = NULL;
+          
+          bbSetInputInterpolation(1);     
    }
-   
 
        
    void ImagePlanes::bbUserInitializeProcessing() 
    {  
-
      /// CREATION DES WIDGETS
      if (bbGetOutputPlaneX() != 0) return;
        
@@ -187,70 +194,78 @@ 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());
 
+          // EED MPR view orientation correction..
+     vtkImageFlip  *flipYFilter = vtkImageFlip::New();
+     flipYFilter->SetFilteredAxis(1); // flip y axis
+     flipYFilter->SetInput( planeWidgetX->GetResliceOutput() );
+     flipYFilter->Update();
+
+          vtkImageChangeInformation *image = vtkImageChangeInformation::New();
+          image->SetInput(  planeWidgetY->GetResliceOutput()  );
+          image->SetOutputSpacing( 1,1,1 );       
+          image->CenterImageOn();
+          image->Update();
+          _imageTransform = vtkTransform::New();
+          vtkImageReslice *slicer =vtkImageReslice::New();
+          slicer->SetInput( image->GetOutput() );
+          slicer->SetInformationInput( image->GetOutput() );
+          slicer->SetResliceTransform( _imageTransform );
+          slicer->SetOutputOrigin(0 , 0 , 0 );
+          slicer->SetInterpolationModeToNearestNeighbor();
+          slicer->Update();       
+          vtkImageChangeInformation *imageResult = vtkImageChangeInformation::New();
+          imageResult->SetInput( slicer->GetOutput() );
+          double spc[3];
+           planeWidgetY->GetResliceOutput()->GetSpacing(spc);
+          imageResult->SetOutputSpacing( spc[1], spc[0], spc[2] ); 
+          imageResult->SetOutputOrigin( 0,0,0 ); 
+                  
+          
      bbSetOutputPlaneX(planeWidgetX);
      bbSetOutputPlaneY(planeWidgetY);
      bbSetOutputPlaneZ(planeWidgetZ);
-        bbSetOutputPlane3Pts(planeWidget3Pts);  
-     bbSetOutputImageX(planeWidgetX->GetResliceOutput());
-     bbSetOutputImageY(planeWidgetY->GetResliceOutput());
+     bbSetOutputPlane3Pts(planeWidget3Pts);     
+     bbSetOutputImageX( flipYFilter->GetOutput() );            // EED MPR view orientation correction..
+     bbSetOutputImageY( imageResult->GetOutput() );                    // EED MPR view orientation correction..
      bbSetOutputImageZ(planeWidgetZ->GetResliceOutput());
-        //bbSetOutputImage3Pts(planeWidget3Pts->GetResliceOutput());
+     bbSetInputInteractor(0);
+     //bbSetOutputImage3Pts(planeWidget3Pts->GetResliceOutput());
+
+        if(picker != 0)
+     {
+               picker->UnRegister(NULL);
+        }
 
-     picker->UnRegister(NULL);
-     
      mVtkCallback = VtkCallbackType::New();
      mVtkCallback->SetBlackBox(this);
      planeWidgetX->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);
      planeWidgetY->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);
-     planeWidgetZ->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);  
+     planeWidgetZ->AddObserver(vtkCommand::InteractionEvent,mVtkCallback);      
+
    }
 
 //---------------------------------------------------------------------
   void ImagePlanes::bbUserFinalizeProcessing()
   {
-           
+
     if (bbGetOutputPlaneX()) 
       {
 
        /*
-
          bbGetOutputPlaneX()->RemoveObserver(mVtkCallback);
          bbGetOutputPlaneY()->RemoveObserver(mVtkCallback);
          bbGetOutputPlaneZ()->RemoveObserver(mVtkCallback);
-       
-       
+
        bbGetOutputPlaneX()->Delete();
        bbGetOutputPlaneY()->Delete();
        bbGetOutputPlaneZ()->Delete();
@@ -259,25 +274,35 @@ namespace bbvtk
        //bbGetOutputPlaneX()->SetInput(NULL);
        //bbGetOutputPlaneY()->SetInput(NULL);
        //bbGetOutputPlaneZ()->SetInput(NULL);
-       
+
       }
-    
   }
   
 //---------------------------------------------------------------------  
-void ImagePlanes::Process()
-{
+  void ImagePlanes::Process()
+  {
+         
        if (bbGetInputIn()!=0)
        {
-
+               int dim[3];
+               int ext[6];
+               bbGetOutputPlaneX()->GetResliceOutput()->GetWholeExtent(ext);
+               dim[0] = ext[1]-ext[0]+1;
+               dim[1] = ext[3]-ext[2]+1;
+               dim[2] = ext[5]-ext[4]+1;
+               _imageTransform->Identity();
+               _imageTransform->PostMultiply();
+               _imageTransform->Translate( (int)(-(dim[0]/2)) , (int)(-(dim[1]/2)) ,0);
+               _imageTransform->RotateZ(90);
+               
+               
                if ( image != bbGetInputIn()){//bbGetInputStatus("In") != bbtk::UPTODATE ){
                        // Input image has changed : reinitialize planes
-                       image = bbGetInputIn();
+                       image = bbGetInputIn();                 
 
+                       // Initial values : center of the volume (in real world, not in pixels!)
                        int xMin, xMax, yMin, yMax, zMin, zMax;
                        bbGetInputIn()->GetExtent(xMin, xMax, yMin, yMax, zMin, zMax);
-
-                       // Initial values : center of the volume (in real world, not in pixels!)
                        double xSpacing, ySpacing, zSpacing;
                        bbGetInputIn()->GetSpacing(xSpacing, ySpacing, zSpacing);
 
@@ -285,12 +310,10 @@ void ImagePlanes::Process()
                        bbGetOutputPlaneX()->SetPlaneOrientationToXAxes();       
                        bbGetOutputPlaneX()->SetSlicePosition((xMax+xMin)/2.*xSpacing);
 
-
                        //                 bbGetOutputPlaneX()->SetOrigin( 58*xSpacing , 80*ySpacing , 82*zSpacing );
                        //                 bbGetOutputPlaneX()->SetPoint1( 0*xSpacing, 146*ySpacing, 186*zSpacing);
                        //                 bbGetOutputPlaneX()->SetPoint2( 126*xSpacing, 146*ySpacing, 0*zSpacing);
 
-
                        bbGetOutputPlaneY()->SetInput(bbGetInputIn());
                        bbGetOutputPlaneY()->SetPlaneOrientationToYAxes();
                        bbGetOutputPlaneY()->SetSlicePosition((yMax+yMin)/2.*ySpacing);
@@ -303,114 +326,175 @@ void ImagePlanes::Process()
                        {
                                bbGetOutputPlaneZ()->SetWindowLevel(bbGetInputWindowLevel()[0],
                                                                bbGetInputWindowLevel()[1]);
-                       }
-                       else 
-                       {
+                       } else {
                                double *range = image->GetScalarRange();
-                               bbGetOutputPlaneZ()->SetWindowLevel(range[1] - range[0],
-                                                               0.5*(range[1]+range[0]));
-                       }               
-
-          }
+                               bbGetOutputPlaneZ()->SetWindowLevel(range[1]-range[0],
+                                                              0.5*(range[1]+range[0]));
+                       } // windowlevel
+                       updateInteractor();
+                       
+                       dim[0] = xMax-xMin+1;
+                       dim[1] = yMax-yMin+1;
+                       dim[2] = zMax-zMin+1;
+                       _imageTransform->Identity();
+                       _imageTransform->PostMultiply();
+                       _imageTransform->Translate( (int)(-(dim[0]/2)*(1/xSpacing)) , (int)(-(dim[2]/2)*(1/zSpacing)) ,0);
+                       _imageTransform->RotateZ(90);
+                       
+          } // image
+               
                        // UPDATE DES SORTIES 
+               bbGetOutputPlaneX()->SetResliceInterpolate( bbGetInputInterpolation() );
+               bbGetOutputPlaneY()->SetResliceInterpolate( bbGetInputInterpolation() );
+               bbGetOutputPlaneZ()->SetResliceInterpolate( bbGetInputInterpolation() );
+
+               
                bbGetOutputPlaneX()->GetResliceOutput()->Update();
                bbGetOutputPlaneY()->GetResliceOutput()->Update(); 
                bbGetOutputPlaneZ()->GetResliceOutput()->Update();               
-
+               
                std::vector<int> pointsx = bbGetInputPointsX();
                std::vector<int> pointsy = bbGetInputPointsY();
                std::vector<int> pointsz = bbGetInputPointsZ();
 
-               std::cout<<pointsx.size()<<pointsy.size()<<pointsz.size()<<std::endl;
-
-               if(pointsx.size()==pointsy.size() && pointsx.size()==pointsz.size()&&pointsx.size()>=3){
-                       vtkImagePlaneWidget* plane3pts = (vtkImagePlaneWidget*)bbGetOutputPlane3Pts();
-                       //vtkPlaneWidget* plane3pts = (vtkPlaneWidget*)bbGetOutputPlane3Pts();
-
-                       plane3pts->SetInput(bbGetInputIn());
-
-                       //xSpacing = ySpacing = zSpacing = 1;
-                       double xSpacing, ySpacing, zSpacing;
-                       bbGetInputIn()->GetSpacing(xSpacing, ySpacing, zSpacing);
-
-                       plane3pts->SetOrigin(pointsx[0]*xSpacing,pointsy[0]*ySpacing,pointsz[0]*zSpacing);                              
-                       plane3pts->SetPoint1(pointsx[1]*xSpacing,pointsy[1]*ySpacing,pointsz[1]*zSpacing);
-                       //plane3pts->SetPoint1((pointsx[1]-pointsx[0])*xSpacing,(pointsy[1]-pointsy[0])*ySpacing,(pointsz[1]-pointsz[0])*zSpacing);
-                       plane3pts->SetPoint2(pointsx[2]*xSpacing,pointsy[2]*ySpacing,pointsz[2]*zSpacing);
-                       //plane3pts->SetPoint2((pointsx[2]-pointsx[0])*xSpacing,(pointsy[2]-pointsy[0])*ySpacing,(pointsz[2]-pointsz[0])*zSpacing);
-                       plane3pts->GetResliceOutput()->Update();
-
-
-
-                       if (_imageReslicer==NULL){
-                               _imageReslicer = vtkImageReslice::New();                                        
-                               _imageReslicer->SetOutputDimensionality(2);
-                               _imageReslicer->SetInterpolationModeToLinear();
-                       }
+               //std::cout<<pointsx.size()<<pointsy.size()<<pointsz.size()<<std::endl;
 
-                       _imageReslicer->SetInput( bbGetInputIn() );
-                       _imageReslicer->SetInformationInput(bbGetInputIn());
+               if (pointsx.size()==pointsy.size() && pointsx.size()==pointsz.size()&&pointsx.size()>=3)
+               {
 
+                       //Get the corresponding three points out of the vectors
                        double origin[3];
-                       origin[0] = pointsx[0];
-                       origin[1] = pointsy[0];
-                       origin[2] = pointsz[0];
+                       origin[0]                       = pointsx[0];
+                       origin[1]                       = pointsy[0];
+                       origin[2]                       = pointsz[0];
 
                        double point1[3];
-                       point1[0] = pointsx[1];
-                       point1[1] = pointsy[1];
-                       point1[2] = pointsz[1];
+                       point1[0]                       = pointsx[1];
+                       point1[1]                       = pointsy[1];
+                       point1[2]                       = pointsz[1];
                        double point2[3];
-                       point2[0]= pointsx[2];
-                       point2[1]= pointsy[2];
-                       point2[2]= pointsz[2];                          
+                       point2[0]                       = pointsx[2];
+                       point2[1]                       = pointsy[2];
+                       point2[2]                       = pointsz[2];   
 
-                       double* vect1= getNormal(makeVector(origin, point1));
-                       double* vect2= getNormal(makeVector(origin, point2));                           
-                       double* crossp = getCrossProduct(vect1, vect2);
+                       //With the three points we create the corresponding X, Y and Z vectors all orthogonal to each other
+                       double* vect1           = getNormal(makeVector(origin, point1));
+                       double* vect2           = getNormal(makeVector(origin, point2));                                
+                       double* crossp          = getCrossProduct(vect1, vect2);
 
-                       /*std::cout<<"origin "<<origin[0]<<" "<<origin[1]<<" "<<origin[2]<<" "<<std::endl;
-                       std::cout<<"point1 "<<point1[0]<<" "<<point1[1]<<" "<<point1[2]<<" "<<std::endl;
-                       std::cout<<"point2 "<<point2[0]<<" "<<point2[1]<<" "<<point2[2]<<" "<<std::endl;
-                       std::cout<<"vect1 "<<vect1[0]<<" "<<vect1[1]<<" "<<vect1[2]<<" "<<std::endl;                            
-                       std::cout<<"vect2 "<<vect2[0]<<" "<<vect2[1]<<" "<<vect2[2]<<" "<<std::endl;
-                       std::cout<<"crossp "<<crossp[0]<<" "<<crossp[1]<<" "<<crossp[2]<<" "<<std::endl;*/
+                       double *newx            = getCrossProduct(vect2, crossp);
 
+                       int ext[6],factor       =       0;
+                       bbGetInputIn()->GetExtent(ext);
 
-                       _imageReslicer->SetResliceAxesDirectionCosines(vect1[0],vect1[1],vect1[2],
-                                                                       vect2[0],vect2[1],vect2[2],
-                                                                       crossp[0],crossp[1],crossp[2]);
-                       //_imageReslicer->SetResliceAxesOrigin(0,0,0);
-                       _imageReslicer->SetResliceAxesOrigin(origin[0],origin[1],origin[2]);
+                       factor = ext[0]<ext[3]? ext[3] : ext[0];
+                       factor = factor<ext[5]? ext[5] : factor;
 
+       //for the plane widgets
+                       vtkImagePlaneWidget* plane3pts = (vtkImagePlaneWidget*)bbGetOutputPlane3Pts();
+                       plane3pts->SetInput(bbGetInputIn());                    
+                       double xSpacing, ySpacing, zSpacing;
+                       bbGetInputIn()->GetSpacing(xSpacing, ySpacing, zSpacing);
+                       plane3pts->SetOrigin(pointsx[0]*xSpacing,pointsy[0]*ySpacing,pointsz[0]*zSpacing);      
+                       plane3pts->SetPoint1((origin[0]+newx[0]*factor)*xSpacing,
+                                                                       (origin[1]+newx[1]*factor)*ySpacing,
+                                                                       (origin[2]+newx[2]*factor)*zSpacing);
+                       plane3pts->SetPoint2((origin[0]+vect2[0]*factor)*xSpacing,
+                                                                       (origin[1]+vect2[1]*factor)*ySpacing,
+                                                                       (origin[2]+vect2[2]*factor)*zSpacing);
+                       plane3pts->GetResliceOutput()->Update();
+//To get the slice of image out of the selected volume
+                       if (_imageReslicer==NULL)
+                       {
+                               _imageReslicer = vtkImageReslice::New();                                        
+                               _imageReslicer->SetOutputDimensionality(2);
+                               _transform = vtkTransform::New();
+                               _matrix = vtkMatrix4x4::New();  
+                       } // if
+                       _imageReslicer->SetInterpolationMode( bbGetInputInterpolation() );
+                       _imageReslicer->SetInput( bbGetInputIn() );
+                       _imageReslicer->SetInformationInput(bbGetInputIn());    
+                       //fill out the information with the created vectors and using the spacing of the image
+                       _imageReslicer->SetResliceAxesDirectionCosines(newx[0]*xSpacing,newx[1]*xSpacing,newx[2]*xSpacing,
+                                                                       vect2[0]*ySpacing,vect2[1]*ySpacing,vect2[2]*ySpacing,
+                                                                       crossp[0]*zSpacing,crossp[1]*zSpacing,crossp[2]*zSpacing);                      
+                       _imageReslicer->SetResliceAxesOrigin(origin[0]*xSpacing,origin[1]*ySpacing,origin[2]*zSpacing);
                        _imageReslicer->GetOutput()->Update();
                        _imageReslicer->GetOutput()->UpdateInformation();
 
                        bbSetOutputImage3Pts(_imageReslicer->GetOutput());
-                       
-               }               
-       }
-}
-       
+
+                       _matrix->Identity();    
+
+                       _matrix->SetElement(0,0,newx[0]*xSpacing);
+                       _matrix->SetElement(1,0,newx[1]*xSpacing);
+                       _matrix->SetElement(2,0,newx[2]*xSpacing);
+                       _matrix->SetElement(0,1,vect2[0]*ySpacing);
+                       _matrix->SetElement(1,1,vect2[1]*ySpacing);
+                       _matrix->SetElement(2,1,vect2[2]*ySpacing);
+                       _matrix->SetElement(0,2,crossp[0]*zSpacing);
+                       _matrix->SetElement(1,2,crossp[1]*zSpacing);
+                       _matrix->SetElement(2,2,crossp[2]*zSpacing);
+                       _matrix->SetElement(0,3,origin[0]*xSpacing);
+                       _matrix->SetElement(1,3,origin[1]*ySpacing);
+                       _matrix->SetElement(2,3,origin[2]*zSpacing);
+
+                       _transform->SetMatrix(_matrix);
+
+                       //set the transformation out to be used by other bbBoxes
+                       bbSetOutputTransform3Pts((vtkLinearTransform*)_transform);                      
+               }       // pointsx pointsy  pointsz
+       } // bbGetInputIn
+  }
        
+       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();
+               } // if
+       }
+
        //-----------------------------------------------------------------     
-       void vtkImageDataPointerRelay::bbUserSetDefaultValues()
+       void vtkImageDataPointerRelay::bbUserSetDefaultValues()
        {
+               
        }
        
        //-----------------------------------------------------------------     
-       void vtkImageDataPointerRelay::bbUserInitializeProcessing()
+  void vtkImageDataPointerRelay::bbUserInitializeProcessing()
        {
        }
        
        //-----------------------------------------------------------------     
-       void vtkImageDataPointerRelay::bbUserFinalizeProcessing()
+  void vtkImageDataPointerRelay::bbUserFinalizeProcessing()
        {
        }
        
-       
+  vtkImagePlaneWidget* ImagePlanes::GetPlaneWidget(unsigned char activationkey, double r, double g, double b, vtkCellPicker* picker)
+  {
+               vtkProperty* prop1 = 0;         
+               vtkImagePlaneWidget* planeWidget = 0;
 
-double* ImagePlanes::getCrossProduct(double* vect0,double* vect1){
+               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;
        vectCross = new double[3];
        vectCross[0] = vect0[1]*vect1[2]-(vect0[2]*vect1[1]);
@@ -418,32 +502,27 @@ double* ImagePlanes::getCrossProduct(double* vect0,double* vect1){
        vectCross[2] = vect0[0]*vect1[1]-(vect0[1]*vect1[0]);
 
        return vectCross;
-}
+  }
 /**
 **     Returns the magnitud of the given vector
 **/
-double ImagePlanes::getMagnitud(double* vect){
+  double ImagePlanes::getMagnitud(double* vect){
 
        double mag;
-
        mag = sqrt(pow(vect[0],2) + pow(vect[1],2) + pow(vect[2],2));
-
-       std::cout<<"mag "<<mag <<std::endl;
-
+       //std::cout<<"mag "<<mag <<std::endl;
        return mag;
-
-}
+  }
 /**
 **     returns the unitary vector of the given vector
 **     u = 1/|vect| . vect
 **/
-double* ImagePlanes::getNormal(double* vect){
+  double* ImagePlanes::getNormal(double* vect){
 
        double* vectnorm;
        double mag = getMagnitud(vect);
 
        vectnorm = new double[3];
-       
 
        if(mag!=0){
                vectnorm[0] = vect[0]/mag;
@@ -456,24 +535,19 @@ double* ImagePlanes::getNormal(double* vect){
        }
 
        return vectnorm;
+  }
 
-
-}
-
-double* ImagePlanes::makeVector(double podouble0[3], double podouble1[3]){
+  double* ImagePlanes::makeVector(double podouble0[3], double podouble1[3]){
        double *vect;
        vect = new double[3];
 
-       vect[0]= podouble0[0]-podouble1[0];
-       vect[1]= podouble0[1]-podouble1[1];
-       vect[2]= podouble0[2]-podouble1[2];
+       vect[0]= podouble1[0]-podouble0[0];
+       vect[1]= podouble1[1]-podouble0[1];
+       vect[2]= podouble1[2]-podouble0[2];
 
        return vect;
-
-}
+  }
        
 }//namespace bbtk
 
 #endif // _USE_VTK_
-
-