X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2FCutModule%2Fkernel%2FCutModelData.cxx;h=63fa92838a5aaab0c95cb70689138450d4ce8e47;hb=c6481486861a91e8ead2033566097c502488670e;hp=d340ec69b3c1adc1aa56c70d5bd7114a3c746638;hpb=0949d9991131d8fde35ab5fdd41a50a43a0dfd7f;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.cxx index d340ec6..63fa928 100644 --- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.cxx +++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: CutModelData.cxx,v $ Language: C++ - Date: $Date: 2009/09/01 14:01:36 $ - Version: $Revision: 1.2 $ + Date: $Date: 2010/03/31 12:41:58 $ + Version: $Revision: 1.6 $ Copyright: (c) 2002, 2003 License: @@ -20,6 +20,14 @@ ** Start of the manager class **/ CutModelData::CutModelData(int id, vtkRenderWindowInteractor* interactor, vtkCommand* observer, vtkImageData* img){ + + initializeData(id, interactor, observer, img); +} + +CutModelData::CutModelData(){ + +} +void CutModelData::initializeData(int id, vtkRenderWindowInteractor* interactor, vtkCommand* observer, vtkImageData* img){ _id = id; _currentshape=0; createBoxWidget(interactor, observer); @@ -28,12 +36,13 @@ CutModelData::CutModelData(int id, vtkRenderWindowInteractor* interactor, vtkCom createShapes(); ChangeShape(0); checkInvariant(); - - } + CutModelData::~CutModelData(){ checkInvariant(); + _boxWidgetVolume->RemoveAllObservers(); _boxWidgetVolume->Off(); + _boxWidgetVolume->SetInteractor(NULL); _boxWidgetVolume->Delete(); _Mapper->Delete(); _Actor->Delete(); @@ -41,18 +50,21 @@ CutModelData::~CutModelData(){ delete _cylinderfigure; delete _spherefigure; currentmatrix->Delete(); + modeltransform->Delete(); inversModel->Delete(); + _id = -1; } + void CutModelData::RefreshViewBox(){ } void CutModelData::createBoxWidget(vtkRenderWindowInteractor* interactor, vtkCommand* observer){ - _boxWidgetVolume = vtkBoxWidget::New(); _boxWidgetVolume->SetInteractor( interactor ); - //_boxWidgetVolume->SetPlaceFactor(2); + //_boxWidgetVolume->SetPlaceFactor(1); //_boxWidgetVolume->SetInput( img ); //_boxWidgetVolume->PlaceWidget(); + _boxWidgetVolume->AddObserver( vtkCommand::InteractionEvent , observer ); _boxWidgetVolume->AddObserver( vtkCommand::StartInteractionEvent , observer ); _boxWidgetVolume->AddObserver( vtkCommand::RightButtonReleaseEvent , observer ); @@ -62,6 +74,7 @@ void CutModelData::createBoxWidget(vtkRenderWindowInteractor* interactor, vtkCom //_boxWidgetVolume->GetHandleProperty()->SetOpacity(0.5); //_boxWidgetVolume->GetOutlineProperty()->SetOpacity(0.5); } + void CutModelData::setTransform(vtkImageData* img)throw( CutModelException){ currentmatrix = vtkTransform::New(); @@ -75,35 +88,42 @@ void CutModelData::setTransform(vtkImageData* img)throw( CutModelException){ matrix->SetElement(0,0,(ext[1]-ext[0])/4*spc[0]); matrix->SetElement(1,1,(ext[3]-ext[2])/4*spc[1]); - matrix->SetElement(2,2,(ext[5]-ext[4])/4*spc[2]); - matrix->SetElement(0,3,(ext[1]-ext[0])/2*spc[0]); - matrix->SetElement(1,3,(ext[3]-ext[2])/2*spc[1]); - matrix->SetElement(2,3,(ext[5]-ext[4])/2*spc[2]); + matrix->SetElement(2,2,(ext[5]-ext[4])/4*spc[2]); + + double orgx = (ext[1]-ext[0])/2*spc[0]; + double orgy = (ext[3]-ext[2])/2*spc[1]; + double orgz = (ext[5]-ext[4])/2*spc[2]; + + matrix->SetElement(0,3,orgx); + matrix->SetElement(1,3,orgy); + matrix->SetElement(2,3,orgz); currentmatrix->SetMatrix(matrix); - _boxWidgetVolume->SetTransform(currentmatrix); - + _boxWidgetVolume->SetTransform(currentmatrix); } + void CutModelData::createActor(){ _Mapper = vtkPolyDataMapper::New(); _Actor = vtkActor::New(); _Actor->SetMapper(_Mapper); _Actor->GetProperty()->SetColor(1, 0, 0); - _Actor->GetProperty()->SetOpacity(0.5); - + _Actor->GetProperty()->SetOpacity(0.5); } + void CutModelData::udapteActorDirection()throw( CutModelException){ checkInvariant(); _boxWidgetVolume->GetTransform(currentmatrix); _Actor->SetUserMatrix(currentmatrix->GetMatrix());//SetUserTransform(currentmatrix ); } + void CutModelData::createShapes(){ _cubefigure = new CutModelFigureCube(); _cylinderfigure = new CutModelFigureCylinder(); _spherefigure = new CutModelFigureSphere(); } + void CutModelData::changeOpacity(int opacity)throw( CutModelException){ checkInvariant(); _Actor->GetProperty()->SetOpacity((double)opacity/100.0); @@ -130,7 +150,6 @@ void CutModelData::ChangeShape(int selection)throw( CutModelException){ }else{ throw CutModelException("Shape type not found"); } - _currentshape=selection; } @@ -152,8 +171,7 @@ void CutModelData::checkInvariant()throw( CutModelException){ } if(_spherefigure==NULL){ throw CutModelException("Sphere not created"); - } - + } } vtkActor* CutModelData::getActor()throw( CutModelException){ @@ -165,6 +183,7 @@ void CutModelData::changeColor(double r,double g,double b)throw( CutModelExcepti checkInvariant(); _Actor->GetProperty()->SetColor( r,g,b ); } + CutModelFigure* CutModelData::getCurentCuttingModel(){ checkInvariant(); @@ -178,30 +197,31 @@ CutModelFigure* CutModelData::getCurentCuttingModel(){ throw CutModelException("Shape type not found"); } } -void CutModelData::ExecuteCut( double* range, bool isinside, vtkImageData* copyimage) -{ +void CutModelData::ExecuteCut( double* range, bool isinside, vtkImageData* copyimage)throw( CutModelException) +{ wxBusyCursor wait; CutModelFigure* actualCuttingModel = getCurentCuttingModel(); + //_boxWidgetVolume->GetTransform(currentmatrix); actualCuttingModel->SetVtkTransform(getModelTransform(copyimage)); + //actualCuttingModel->SetVtkTransform(currentmatrix); actualCuttingModel->SetInversVtkTransform(getModelTransformInvers()); bool inside; - bool volInt, volExt; - int xx,yy,zz; - unsigned short* pOrg; - int ext[6]; - double spc[3]; - long int contAfter = 0; - long int contBefor = 0; + //bool volInt, volExt; // unused + int xx,yy,zz; + unsigned short* pOrg; + int ext[6]; + //double spc[3]; // unused + //long int contAfter = 0; // unused + //long int contBefor = 0; // unused double minvalue = range[0]; double value = range[1]; double maxvalue = range[2]; - - + copyimage->GetExtent(ext); for (xx=ext[0];xxGetMatrix(); - vtkMatrix4x4* matrixmodel = modeltransform->GetMatrix(); + CutModelFigure* actualCuttingModel = getCurentCuttingModel(); - double *spc = copyimage->GetSpacing(); + actualCuttingModel->SetVtkTransform(getModelTransform(copyimage)); - modeltransform->Identity(); + actualCuttingModel->SetInversVtkTransform(getModelTransformInvers()); - double* orient = currentmatrix->GetOrientationWXYZ(); - modeltransform->RotateWXYZ(orient[0],orient[1],orient[2],orient[3]); + bool inside; + // bool volInt, volExt; // unused // JPRx + int xx,yy,zz; + unsigned short* pOrg; + int ext[6]; + //double spc[3]; // unused // JPRx + //long int contAfter = 0; // unused // JPRx + //long int contBefor = 0; // unused // JPRx - double* pos = currentmatrix->GetPosition(); - modeltransform->Translate(pos[0]/spc[0],pos[1]/spc[1],pos[2]/spc[2]); + double value; - double* scal = currentmatrix->GetScale(); - modeltransform->Scale(scal[0]/spc[0],scal[1]/spc[1],scal[2]/spc[2]); + copyimage->GetExtent(ext); + + for (xx=ext[0];xxIfPointInside(xx,yy,zz); + if ( ((inside==true)&&(isinside==true)) || ((!inside==true)&&(!isinside)) ) + { + value = *((unsigned short*)image->GetScalarPointer (xx,yy,zz)); + pOrg=(unsigned short*)copyimage->GetScalarPointer (xx,yy,zz); + //std::cout<<"CutModelData::ExecuteUnCut() "<GetSpacing(); + modeltransform->Identity(); - /*matrixmodel->Identity(); + vtkMatrix4x4* matrix = currentmatrix->GetMatrix(); + vtkMatrix4x4* matrixmodel = modeltransform->GetMatrix(); matrixmodel->SetElement(0,0,matrix->GetElement(0,0)/spc[0]); matrixmodel->SetElement(1,0,matrix->GetElement(1,0)/spc[0]); matrixmodel->SetElement(2,0,matrix->GetElement(2,0)/spc[0]); @@ -259,20 +308,74 @@ vtkTransform* CutModelData::getModelTransform(vtkImageData* copyimage){ matrixmodel->SetElement(2,2,matrix->GetElement(2,2)/spc[2]); matrixmodel->SetElement(0,3,matrix->GetElement(0,3)/spc[0]); matrixmodel->SetElement(1,3,matrix->GetElement(1,3)/spc[1]); - matrixmodel->SetElement(2,3,matrix->GetElement(2,3)/spc[2]);*/ + matrixmodel->SetElement(2,3,matrix->GetElement(2,3)/spc[2]); - //modeltransform->SetMatrix(matrixmodel); + /* + double* pos = currentmatrix->GetPosition(); + modeltransform->Translate(pos[0]/spc[0],pos[1]/spc[1],pos[2]/spc[2]); + double* scal = currentmatrix->GetScale(); + modeltransform->Scale(scal[0]/spc[0],scal[1]/spc[1],scal[2]/spc[2]); + + //double* orient = currentmatrix->GetOrientation(); + //modeltransform->RotateZ(orient[2]); + //modeltransform->RotateY(orient[1]); + //modeltransform->RotateX(orient[0]); + double* orient = currentmatrix->GetOrientationWXYZ(); + modeltransform->RotateWXYZ(orient[0],orient[1],orient[2],orient[3]); + */ modeltransform->Update(); return modeltransform; +} +void CutModelData::setTransform(vtkTransform* transform, vtkImageData* img)throw( CutModelException){ + double *spc = img->GetSpacing(); // spc unused // JPR + + currentmatrix->Identity(); + + /*double* orient = transform->GetOrientationWXYZ(); + currentmatrix->RotateWXYZ(orient[0],orient[1],orient[2],orient[3]); + + double* pos = transform->GetPosition(); + currentmatrix->Translate(pos[0]/spc[0],pos[1]/spc[1],pos[2]/spc[2]); + + double* scal = transform->GetScale(); + currentmatrix->Scale(scal[0]/spc[0],scal[1]/spc[1],scal[2]/spc[2]); + + currentmatrix->Update(); */ + + _boxWidgetVolume->SetTransform(transform); + + /*vtkMatrix4x4* matrix = transform->GetMatrix(); + vtkMatrix4x4* matrixcurrent = currentmatrix->GetMatrix(); + matrixcurrent->SetElement(0,0,matrix->GetElement(0,0)/spc[0]); + matrixcurrent->SetElement(1,0,matrix->GetElement(1,0)/spc[0]); + matrixcurrent->SetElement(2,0,matrix->GetElement(2,0)/spc[0]); + matrixcurrent->SetElement(0,1,matrix->GetElement(0,1)/spc[1]); + matrixcurrent->SetElement(1,1,matrix->GetElement(1,1)/spc[1]); + matrixcurrent->SetElement(2,1,matrix->GetElement(2,1)/spc[1]); + matrixcurrent->SetElement(0,2,matrix->GetElement(0,2)/spc[2]); + matrixcurrent->SetElement(1,2,matrix->GetElement(1,2)/spc[2]); + matrixcurrent->SetElement(2,2,matrix->GetElement(2,2)/spc[2]); + matrixcurrent->SetElement(0,3,matrix->GetElement(0,3)/spc[0]); + matrixcurrent->SetElement(1,3,matrix->GetElement(1,3)/spc[1]); + matrixcurrent->SetElement(2,3,matrix->GetElement(2,3)/spc[2]); */ + + udapteActorDirection(); + getModelTransform(img); } + vtkTransform* CutModelData::getModelTransformInvers(){ inversModel->Identity (); inversModel->Concatenate ( modeltransform ); inversModel->Inverse(); return inversModel; -} \ No newline at end of file +} + +vtkPolyData* CutModelData::getPolyData()throw( CutModelException){ + return _Mapper->GetInput(); +} +