X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkImagePlanes.cxx;h=92daa652fad7dca3429fe42ab4b561694f1e2eb4;hb=b3225bf9915c36f8e79d9a328b525cde6eed9247;hp=24d9f36a6243a5d205e6dfe44e76beb7cfc963ad;hpb=5566eb4dec92fe8915fd68824a4ce56ea0529f81;p=bbtk.git diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx index 24d9f36..92daa65 100644 --- 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/07/02 07:17:33 $ - Version: $Revision: 1.29 $ + Date: $Date: 2010/03/07 13:18:41 $ + Version: $Revision: 1.32 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -137,7 +137,7 @@ namespace bbvtk }; //================================================================ - //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.29 $"); + //vtkCxxRevisionMacro(ImagePlanes::VtkCallbackType, "$Revision: 1.32 $"); //================================================================ @@ -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,11 +306,12 @@ void ImagePlanes::Process() std::vector pointsy = bbGetInputPointsY(); std::vector pointsz = bbGetInputPointsZ(); - std::cout<=3){ + //Get the corresponding three points out of the vectors double origin[3]; origin[0] = pointsx[0]; origin[1] = pointsy[0]; @@ -344,6 +326,7 @@ void ImagePlanes::Process() point2[1]= pointsy[2]; point2[2]= pointsz[2]; + //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); @@ -356,7 +339,7 @@ void ImagePlanes::Process() factor = ext[0]SetInput(bbGetInputIn()); double xSpacing, ySpacing, zSpacing; @@ -369,7 +352,7 @@ void ImagePlanes::Process() (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); @@ -379,9 +362,10 @@ void ImagePlanes::Process() } _imageReslicer->SetInput( bbGetInputIn() ); _imageReslicer->SetInformationInput(bbGetInputIn()); - _imageReslicer->SetResliceAxesDirectionCosines(newx[0],newx[1],newx[2], - vect2[0],vect2[1],vect2[2], - crossp[0],crossp[1],crossp[2]); + //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(); @@ -393,22 +377,23 @@ void ImagePlanes::Process() _matrix->Identity(); - _matrix->SetElement(0,0,newx[0]); - _matrix->SetElement(1,0,newx[1]); - _matrix->SetElement(2,0,newx[2]); - _matrix->SetElement(0,1,vect2[0]); - _matrix->SetElement(1,1,vect2[1]); - _matrix->SetElement(2,1,vect2[2]); - _matrix->SetElement(0,2,crossp[0]); - _matrix->SetElement(1,2,crossp[1]); - _matrix->SetElement(2,2,crossp[2]); - _matrix->SetElement(0,3,origin[0]); - _matrix->SetElement(1,3,origin[1]); - _matrix->SetElement(2,3,origin[2]); + _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); @@ -417,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() { + } //----------------------------------------------------------------- @@ -433,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;