Merge pull request #50 from blowekamp/fix_regitration_transform

zivy · web-flow · commit 07f19971b5f7 · 2024-05-08T10:37:06.000-04:00
Fix order of transform composition for ITKv4 framework.
diff --git a/05_basic_registration.ipynb b/05_basic_registration.ipynb
@@ -363,7 +363,7 @@
     "</li>\n",
     "</ul>\n",
     "\n",
-    "The transformation that maps points from the fixed to moving image domains is thus: $^M\\mathbf{p}  = T_{opt}(T_m(T_f^{-1}(^F\\mathbf{p})))$\n",
+    "The transformation that maps points from the fixed to moving image domains is thus: $^M\\mathbf{p}  = T_m(T_{opt}(T_f^{-1}(^F\\mathbf{p})))$\n",
     "\n",
     "We now modify the previous example to use $T_{opt}$ and $T_m$."
    ]
diff --git a/figures/registrationFrameworkTransformations.svg b/figures/registrationFrameworkTransformations.svg
@@ -447,7 +447,7 @@
            id="g3583"
            clip-path="url(#clipPath3585)"><path
              d="m 616.02,208.36 0.06,0.06 0.12,0.06 0.24,0.18 0.42,0.24 2.16,1.44 1.14,0.72 1.26,0.9 1.5,0.9 1.68,1.08 1.86,1.14 2.04,1.2 2.1,1.26 4.56,2.52 4.92,2.52 2.52,1.2 2.52,1.14 2.52,1.02 2.58,0.96 2.58,0.84 2.52,0.72 2.58,0.54 2.52,0.42 2.52,0.24 2.52,0 2.46,-0.18 2.46,-0.48 2.46,-0.66 2.4,-1.02 2.4,-1.26 2.28,-1.68 2.22,-1.98 2.1,-2.34 1.98,-2.7 1.56,-2.64 1.38,-2.82 1.26,-3 1.08,-3.18 0.9,-3.24 0.84,-3.36 0.66,-3.48 0.54,-3.48 0.42,-3.54 0.36,-3.6 0.24,-3.6 0.12,-3.66 0.06,-3.72 -0.06,-3.66 -0.06,-3.78 -0.18,-3.72 -0.18,-3.78 -0.6,-7.56 -0.72,-7.56 -0.42,-3.72 -0.48,-3.72 -0.48,-3.6 -0.42,-3.54 -0.48,-3.42 -0.48,-3.3 -0.48,-3.12 -0.48,-3 -0.42,-2.76 -0.42,-2.58 -0.36,-2.34 -0.36,-2.1 -0.3,-1.8 -0.3,-1.62 -0.24,-1.32 -0.18,-1.08 -0.12,-0.84 -0.12,-0.6 -0.18,-0.96"
-             style="fill:none;stroke:#000000;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             style="fill:none;stroke:#000000;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:10.8;stroke-dashoffset:0;stroke-opacity:1"
              id="path3589"
              inkscape:connector-curvature="0" /></g></g></g><g
        id="g3591"><g
@@ -463,7 +463,7 @@
            id="g3609"
            clip-path="url(#clipPath3611)"><path
              d="m 688.92,102.16 0,0.12 0.06,0.18 0.06,0.36 0.18,0.66 0.18,0.84 0.24,1.14 0.66,3.3 0.48,2.1 0.54,2.4 0.6,2.7 0.66,2.94 0.78,3.24 0.78,3.42 0.9,3.66 0.9,3.72 0.96,3.84 2.04,7.92 1.08,4.02 1.14,3.96 1.14,3.9 1.2,3.84 1.26,3.78 1.26,3.66 1.32,3.54 1.32,3.42 1.38,3.3 1.44,3.12 1.5,2.94 1.56,2.7 1.68,2.52 1.68,2.28 1.74,1.98 1.86,1.74 1.92,1.38 1.92,0.96 2.04,0.6 2.04,0.12 1.92,-0.3 1.98,-0.78 1.86,-1.08 1.86,-1.44 1.74,-1.8 1.74,-1.98 1.68,-2.28 1.56,-2.52 1.56,-2.64 1.44,-2.88 1.44,-3.06 1.38,-3.18 1.38,-3.3 1.26,-3.48 1.26,-3.54 1.26,-3.66 1.2,-3.72 2.28,-7.68 2.16,-7.8 1.02,-3.9 1.02,-3.84 0.96,-3.78 0.9,-3.72 0.9,-3.54 0.78,-3.42 0.78,-3.24 0.66,-3 0.66,-2.76 0.54,-2.46 0.54,-2.22 0.42,-1.92 0.36,-1.56 0.24,-1.32 0.24,-1.08 0.18,-0.78 0.24,-1.14"
-             style="fill:none;stroke:#000000;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:10.8;stroke-dashoffset:0;stroke-opacity:1"
+             style="fill:none;stroke:#000000;stroke-width:3.5999999;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
              id="path3615"
              inkscape:connector-curvature="0" /></g></g></g><g
        id="g3617"><g
@@ -510,7 +510,7 @@
              x="0 9.744482 19.922878"
              y="0"
              sodipodi:role="line"
-             id="tspan3645">opt</tspan></text>
+             id="tspan3645">m</tspan></text>
 <text
            transform="matrix(1,0,0,-1,312.3,239.94)"
            style="font-variant:normal;font-weight:normal;font-size:24.78709984px;font-family:CMMI12;-inkscape-font-specification:CMMI12;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
@@ -538,5 +538,5 @@
            id="text3659"><tspan
              x="0"
              y="0"
-             id="tspan3661">m</tspan></text>
+             id="tspan3661">opt</tspan></text>
 </g></g></g></svg>

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@`
`363`	`363`	`"</li>\n",`
`364`	`364`	`"</ul>\n",`
`365`	`365`	`"\n",`
`366`		`- "The transformation that maps points from the fixed to moving image domains is thus: $^M\\mathbf{p} = T_{opt}(T_m(T_f^{-1}(^F\\mathbf{p})))$\n",`
	`366`	`+ "The transformation that maps points from the fixed to moving image domains is thus: $^M\\mathbf{p} = T_m(T_{opt}(T_f^{-1}(^F\\mathbf{p})))$\n",`
`367`	`367`	`"\n",`
`368`	`368`	`"We now modify the previous example to use $T_{opt}$ and $T_m$."`
`369`	`369`	`]`