X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderImageTransformation.cpp;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderImageTransformation.cpp;h=1960caa2c9def3d9f4370af4af815ee51ce1da0d;hb=9d26ebb4f85437ab11c7b762dddb318d21217de0;hp=ada5c497fd1ba52f027fe948549444ad747509ae;hpb=87b6a1645b4dd6293e9c6ed9b33731d82a8623af;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
index ada5c49..1960caa 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderImageTransformation.cpp
@@ -25,6 +25,10 @@ wxMaracasRenderImageTransformation::wxMaracasRenderImageTransformation(wxMaracas
 **/
 wxMaracasRenderImageTransformation::~wxMaracasRenderImageTransformation()
 {	
+	transformV->Identity();
+	transformS1->Identity();
+	transformS2->Identity();
+	transformS3->Identity();
 }
 
 /**
@@ -32,11 +36,6 @@ wxMaracasRenderImageTransformation::~wxMaracasRenderImageTransformation()
 **/
 void wxMaracasRenderImageTransformation::Translate(int x, int y, int z)
 {
-	transformV->Identity();
-	transformS1->Identity();
-	transformS2->Identity();
-	transformS3->Identity();
-
 	transformV->Translate( x, y, z );
 	transformS1->Translate( x, y, z );
 	transformS2->Translate( x, y, z );
@@ -50,11 +49,6 @@ void wxMaracasRenderImageTransformation::Translate(int x, int y, int z)
 **/
 void wxMaracasRenderImageTransformation::Rotate(int x, int y, int z)
 {
-	transformV->Identity();
-	transformS1->Identity();
-	transformS2->Identity();
-	transformS3->Identity();
-	
 	transformV->RotateX( x );
 	transformS1->RotateX( x );
 	transformS2->RotateX( x );
@@ -90,11 +84,6 @@ void wxMaracasRenderImageTransformation::Scale(int x, int y, int z)
 	//printf("wxMaracasRenderImageManagementPanel::Rotate float:scaleY = %f \n", resultY);
 	//printf("wxMaracasRenderImageManagementPanel::Rotate float:scaleZ = %f \n", resultZ);
 
-	transformV->Identity();
-	transformS1->Identity();
-	transformS2->Identity();
-	transformS3->Identity();
-
 	transformV->Scale( (x/100.0), (y/100.0), (z/100.0) );
 	transformS1->Scale( (x/100.0), (y/100.0), (z/100.0) );
 	transformS2->Scale( (x/100.0), (y/100.0), (z/100.0) );
@@ -123,5 +112,5 @@ void wxMaracasRenderImageTransformation::Refresh()throw(char*)
 	//surface2->getRenderer()->Render();
 
 	surface3->getViewData(propID)->getProp3D()->SetUserMatrix(transformV->GetMatrix());
-	surface3->getRenderer()->Render();
+	//surface3->getRenderer()->Render();
 }