*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / CutModule / kernel / CutModelData.cxx

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.cxx
index 7396cc2c7104622e5a568fdb32b59e765c1c39ab..d340ec69b3c1adc1aa56c70d5bd7114a3c746638 100644 (file)
--- 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/08/31 08:46:11 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/09/01 14:01:36 $
+  Version:   $Revision: 1.2 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -43,7 +43,9 @@ CutModelData::~CutModelData(){
        currentmatrix->Delete();
        inversModel->Delete();
 }
-
+void CutModelData::RefreshViewBox(){
+               
+}
 void CutModelData::createBoxWidget(vtkRenderWindowInteractor* interactor, vtkCommand* observer){
 
        _boxWidgetVolume = vtkBoxWidget::New();
@@ -57,6 +59,8 @@ void CutModelData::createBoxWidget(vtkRenderWindowInteractor* interactor, vtkCom
        
        _boxWidgetVolume->HandlesOn ();
        _boxWidgetVolume->On();
+       //_boxWidgetVolume->GetHandleProperty()->SetOpacity(0.5);       
+       //_boxWidgetVolume->GetOutlineProperty()->SetOpacity(0.5);      
 }
 void CutModelData::setTransform(vtkImageData* img)throw( CutModelException){
        
@@ -86,7 +90,7 @@ void CutModelData::createActor(){
        _Actor  = vtkActor::New();
        _Actor->SetMapper(_Mapper);     
        _Actor->GetProperty()->SetColor(1, 0, 0);
-       _Actor->GetProperty()->SetOpacity(0.4); 
+       _Actor->GetProperty()->SetOpacity(0.5); 
        
 }
 void CutModelData::udapteActorDirection()throw( CutModelException){
@@ -232,7 +236,18 @@ vtkTransform* CutModelData::getModelTransform(vtkImageData* copyimage){
 
        double *spc = copyimage->GetSpacing();
 
-       matrixmodel->Identity();        
+       modeltransform->Identity();
+
+       double* orient = currentmatrix->GetOrientationWXYZ();
+       modeltransform->RotateWXYZ(orient[0],orient[1],orient[2],orient[3]);    
+
+       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]);
+
+       /*matrixmodel->Identity();      
        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]);
@@ -244,7 +259,9 @@ 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);
 
 
        modeltransform->Update();