From a33fd1531f914d4e5dafc22a81e71c4b32bf2b62 Mon Sep 17 00:00:00 2001 From: Stephan Saalfeld Date: Wed, 10 Aug 2011 23:19:42 +0200 Subject: [PATCH] use MovingLeastSquaresTransform2 for warping in multi-layer-montage --- mpicbg/trakem2/align/Align.java | 5 +++-- mpicbg/trakem2/align/AlignTask.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mpicbg/trakem2/align/Align.java b/mpicbg/trakem2/align/Align.java index cea3bbcb..3b86c5ad 100644 --- a/mpicbg/trakem2/align/Align.java +++ b/mpicbg/trakem2/align/Align.java @@ -42,6 +42,7 @@ import mpicbg.models.SimilarityModel2D; import mpicbg.models.Tile; import mpicbg.models.Transforms; import mpicbg.trakem2.transform.MovingLeastSquaresTransform; +import mpicbg.trakem2.transform.MovingLeastSquaresTransform2; import mpicbg.trakem2.transform.RigidModel2D; import mpicbg.trakem2.transform.TranslationModel2D; @@ -1260,9 +1261,9 @@ public class Align * @return * @throws Exception */ - final static public MovingLeastSquaresTransform createMLST( final Collection< PointMatch > matches, final float alpha ) throws Exception + final static public MovingLeastSquaresTransform2 createMLST( final Collection< PointMatch > matches, final float alpha ) throws Exception { - final MovingLeastSquaresTransform mlst = new MovingLeastSquaresTransform(); + final MovingLeastSquaresTransform2 mlst = new MovingLeastSquaresTransform2(); mlst.setAlpha( 1.0f ); Class< ? extends AbstractAffineModel2D< ? > > c = AffineModel2D.class; switch ( matches.size() ) diff --git a/mpicbg/trakem2/align/AlignTask.java b/mpicbg/trakem2/align/AlignTask.java index cbeae410..1f733ef1 100644 --- a/mpicbg/trakem2/align/AlignTask.java +++ b/mpicbg/trakem2/align/AlignTask.java @@ -34,6 +34,7 @@ import mpicbg.models.Transforms; import mpicbg.trakem2.transform.CoordinateTransform; import mpicbg.trakem2.transform.CoordinateTransformList; import mpicbg.trakem2.transform.MovingLeastSquaresTransform; +import mpicbg.trakem2.transform.MovingLeastSquaresTransform2; import mpicbg.trakem2.transform.RigidModel2D; import mpicbg.trakem2.transform.TranslationModel2D; import mpicbg.models.NoninvertibleModelException; @@ -1346,7 +1347,7 @@ final public class AlignTask final mpicbg.trakem2.transform.AffineModel2D toWorld = new mpicbg.trakem2.transform.AffineModel2D(); toWorld.set( pat ); - final MovingLeastSquaresTransform mlst = Align.createMLST( matches, 1.0f ); + final MovingLeastSquaresTransform2 mlst = Align.createMLST( matches, 1.0f ); final CoordinateTransformList< CoordinateTransform > ctl = new CoordinateTransformList< CoordinateTransform >(); ctl.add( toWorld ); -- 2.11.4.GIT