- transformV->RotateX( x );
- transformS1->RotateX( x );
- transformS2->RotateX( x );
- transformS3->RotateX( x );
-
- transformV->RotateY( y );
- transformS1->RotateY( y );
- transformS2->RotateY( y );
- transformS3->RotateY( y );
-
- transformV->RotateZ( z );
- transformS1->RotateZ( z );
- transformS2->RotateZ( z );
- transformS3->RotateZ( z );
-
- Refresh();
-}
-
-/**
-** 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;
-
- //printf("wxMaracasRenderImageManagementPanel::Rotate int:scaleX = %d \n",x);
- //printf("wxMaracasRenderImageManagementPanel::Rotate int:scaleY = %d \n", y);
- //printf("wxMaracasRenderImageManagementPanel::Rotate int:scaleZ = %d \n", z);
-
- //printf("wxMaracasRenderImageManagementPanel::Rotate float:scaleX = %f \n", resultX);
- //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) );
- transformS3->Scale( (x/100.0), (y/100.0), (z/100.0) );
+ 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 ->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 ->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) );
+ 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) );
+
+ transformV ->RotateX( rx );
+ transformS1->RotateX( rx );
+ transformS2->RotateX( rx );
+ transformS3->RotateX( rx );
+
+ transformV ->RotateY( ry );
+ transformS1->RotateY( ry );
+ transformS2->RotateY( ry );
+ transformS3->RotateY( ry );
+
+ transformV ->RotateZ( rz );
+ transformS1->RotateZ( rz );
+ transformS2->RotateZ( rz );
+ transformS3->RotateZ( rz );
+
+ 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 );