X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkTransform.cxx;h=fd0d369cde740fa8a3318d603806dec4422732cf;hb=a061a18c9335da6145bd87cc17f2572dce7ccab5;hp=7923cb586c8c7733e430ebdf0cc884ea89051e74;hpb=0dde94ea04d1505b73e3b57bb3d736363104642f;p=bbtk.git diff --git a/packages/vtk/src/bbvtkTransform.cxx b/packages/vtk/src/bbvtkTransform.cxx index 7923cb5..fd0d369 100644 --- a/packages/vtk/src/bbvtkTransform.cxx +++ b/packages/vtk/src/bbvtkTransform.cxx @@ -67,6 +67,7 @@ namespace bbvtk { bbUserFinalizeProcessing(); result = vtkTransform::New(); + result->Update(); } // -------------------------------------------------------------- @@ -79,6 +80,7 @@ namespace bbvtk } } + // -------------------------------------------------------------- void Transform::Process() { @@ -88,11 +90,6 @@ namespace bbvtk result->Concatenate( bbGetInputIn()->GetMatrix() ); } - if (bbGetInputScale().size()>=3) - { - result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]); - } - if ((bbGetInputTranslate().size()>=3) && (bbGetInputSpacing().size()>=3)) { double tx = bbGetInputTranslate()[0] * bbGetInputSpacing()[0]; @@ -101,12 +98,15 @@ namespace bbvtk result->Translate(tx,ty,tz); } + if (bbGetInputScale().size()>=3) + { + result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]); + } + if (bbGetInputRotateWXYZ().size()>=4) { result->RotateWXYZ(bbGetInputRotateWXYZ()[0],bbGetInputRotateWXYZ()[1], bbGetInputRotateWXYZ()[2], bbGetInputRotateWXYZ()[3]); } - - result->Update(); bbSetOutputOut(result); }