v1.0.3 BUG 1404

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasRenderImageTransformation.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
index 587ace66686c7d1cdcad2e3c1c222427d227b50d..42e0619af26e84b24f6b7b21223a13d52bd240d4 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
@@ -1,10 +1,11 @@
 #include "wxMaracasRenderImageTransformation.h"
+#include "wxMaracasRendererView.h"
 
 /**
 ** Class constructor
 **/
-wxMaracasRenderImageTransformation::wxMaracasRenderImageTransformation(wxMaracasMultipleVolumeRendererManager* _vol, wxMaracasSurfaceRenderingManager* _surface1, 
-                                                                                                                                                wxMaracasSurfaceRenderingManager* _surface2, wxMaracasSurfaceRenderingManager* _surface3, int id)
+wxMaracasRenderImageTransformation::wxMaracasRenderImageTransformation(VolumeRendererManager* _vol, wxMaracasSurfaceRenderingManager* _surface1,
+                                                                       wxMaracasSurfaceRenderingManager* _surface2, wxMaracasSurfaceRenderingManager* _surface3, int id)
 {
        vol = _vol;
        surface1 = _surface1;
@@ -16,7 +17,6 @@ wxMaracasRenderImageTransformation::wxMaracasRenderImageTransformation(wxMaracas
        transformS1 = vtkTransform::New();
        transformS2 = vtkTransform::New();
        transformS3 = vtkTransform::New();
-
 }
 
 /**
@@ -40,61 +40,61 @@ void wxMaracasRenderImageTransformation::Translate(int tx, int ty, int tz, int r
        double volspY;
        double volspZ;
        vol->getImageData()->GetSpacing(volspX, volspY, volspZ);
-
+       
        double surfspX;
        double surfspY;
        double surfspZ;
        surface1->getImageData()->GetSpacing(surfspX, surfspY, surfspZ);
 
+       int ext[6];
+       vol->getImageData()->GetExtent(ext);
+
        transformV->Identity();
        transformS1->Identity();
        transformS2->Identity();
        transformS3->Identity();
 
-       transformV->Translate( tx/*volspX*/, ty/*volspY*/, tz/*volspZ*/ );
-       transformS1->Translate( tx/*surfspX*/, ty/*surfspY*/, tz/*surfspZ*/ );
-       transformS2->Translate( tx/*surfspX*/, ty/*surfspY*/, tz/*surfspZ*/ );
-       transformS3->Translate( tx/*surfspX*/, ty/*surfspY*/, tz/*surfspZ*/ );
-
-       transformV->RotateX( rx/*volspX*/ );
-       transformS1->RotateX( rx/*surfspX*/ );
-       transformS2->RotateX( rx/*surfspX*/ );
-       transformS3->RotateX( rx/*surfspX*/ );
-
-       transformV->RotateY( ry/*volspY*/ );
-       transformS1->RotateY( ry/*surfspY*/ );
-       transformS2->RotateY( ry/*surfspY*/ );
-       transformS3->RotateY( ry/*surfspY*/ );
+       transformV->PostMultiply();
+       transformS1->PostMultiply();
+       transformS2->PostMultiply();
+       transformS3->PostMultiply();
+       
+       printf("CPR: wxMaracasRenderImageTransformation::Translate-> %f\n", -(ext[1]-ext[0])*volspX );
+       printf("CPR: wxMaracasRenderImageTransformation::Translate-> %f\n", -(ext[3]-ext[2])*surfspY);
+       printf("CPR: wxMaracasRenderImageTransformation::Translate-> %f\n", -(ext[5]-ext[4])*surfspZ);
 
-       transformV->RotateZ( rz/*volspZ*/ );
-       transformS1->RotateZ( rz/*surfspZ*/ );
-       transformS2->RotateZ( rz/*surfspZ*/ );
-       transformS3->RotateZ( rz/*surfspZ*/ );
+       transformV ->Translate( -(ext[1]-ext[0])*volspX/2,  -(ext[3]-ext[2])*volspY/2,  -(ext[5]-ext[4])*volspZ/2  );
+       transformS1->Translate( -(ext[1]-ext[0])*surfspX/2, -(ext[3]-ext[2])*surfspY/2, -(ext[5]-ext[4])*surfspZ/2 );
+       transformS2->Translate( -(ext[1]-ext[0])*surfspX/2, -(ext[3]-ext[2])*surfspY/2, -(ext[5]-ext[4])*surfspZ/2 );
+       transformS3->Translate( -(ext[1]-ext[0])*surfspX/2, -(ext[3]-ext[2])*surfspY/2, -(ext[5]-ext[4])*surfspZ/2 );
 
-       transformV->Scale( (sx/100.0), (sy/100.0), (sz/100.0) );
+       transformV ->Scale( (sx/100.0), (sy/100.0), (sz/100.0) );
        transformS1->Scale( (sx/100.0), (sy/100.0), (sz/100.0) );
        transformS2->Scale( (sx/100.0), (sy/100.0), (sz/100.0) );
        transformS3->Scale( (sx/100.0), (sy/100.0), (sz/100.0) );
 
-       Refresh();
-}
+       transformV ->RotateX( rx );
+       transformS1->RotateX( rx );
+       transformS2->RotateX( rx );
+       transformS3->RotateX( rx );
 
+       transformV ->RotateY( ry );
+       transformS1->RotateY( ry );
+       transformS2->RotateY( ry );
+       transformS3->RotateY( ry );
 
-/**
-** Scales a volume by the given value for the X axis
-*
-void wxMaracasRenderImageTransformation::Scale(int x, int y, int z)
-{
-       float resultX = x/100.0;
-       float resultY = y/100.0;
-       float resultZ = z/100.0;
+       transformV ->RotateZ( rz );
+       transformS1->RotateZ( rz );
+       transformS2->RotateZ( rz );
+       transformS3->RotateZ( rz );
 
-       //printf("wxMaracasRenderImageManagementPanel::Rotate int:scaleX = %d \n",x);
-       //printf("wxMaracasRenderImageManagementPanel::Rotate int:scaleY = %d \n", y);
-       //printf("wxMaracasRenderImageManagementPanel::Rotate int:scaleZ = %d \n", z);
+       transformV ->Translate( tx*volspX + (ext[1]-ext[0])*volspX/2,  ty*volspY + (ext[3]-ext[2])*volspY/2,  tz*volspZ + (ext[5]-ext[4])*volspZ/2 );
+       transformS1->Translate( tx*surfspX + (ext[1]-ext[0])*volspX/2, ty*surfspY + (ext[3]-ext[2])*volspY/2, tz*surfspZ + (ext[5]-ext[4])*volspZ/2 );
+       transformS2->Translate( tx*surfspX + (ext[1]-ext[0])*volspX/2, ty*surfspY + (ext[3]-ext[2])*volspY/2, tz*surfspZ + (ext[5]-ext[4])*volspZ/2 );
+       transformS3->Translate( tx*surfspX + (ext[1]-ext[0])*volspX/2, ty*surfspY + (ext[3]-ext[2])*volspY/2, tz*surfspZ + (ext[5]-ext[4])*volspZ/2 );
 
        Refresh();
-}*/
+}
 
 /**
 ** Updates each Matrix
@@ -107,10 +107,10 @@ void wxMaracasRenderImageTransformation::Refresh()throw(char*)
        transformS3->Update();
 
        vol->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
-       //vol->getRenderer()->Render();
+       //vol->Update(propID);
 
        surface1->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
-       //surface1->getRenderer()->Render();
+       //surface1->Update(propID);
 
        surface2->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
        //surface2->getRenderer()->Render();