From 2c6bf2f8443530b38fe96e148f0137712c975ffb Mon Sep 17 00:00:00 2001
From: Sunil Shetye
Date: Mon, 9 Jun 2025 17:25:09 +0530
Subject: use template for x and y positions

---
 blocks/eda-frontend/public/geometry.xsl | 176 +++++++++++++-------------------
 1 file changed, 72 insertions(+), 104 deletions(-)

diff --git a/blocks/eda-frontend/public/geometry.xsl b/blocks/eda-frontend/public/geometry.xsl
index 196702e7..d36ebc34 100644
--- a/blocks/eda-frontend/public/geometry.xsl
+++ b/blocks/eda-frontend/public/geometry.xsl
@@ -123,19 +123,15 @@
               </xsl:call-template>
             </xsl:variable>
 
-            <xsl:for-each select="mxGeometry">
-              <xsl:choose>
-                <xsl:when test="$port = 'ExplicitInputPort' or $port = 'ImplicitInputPort'">
-                  <xsl:value-of select="@x" />
-                </xsl:when>
-                <xsl:when test="$port = 'ExplicitOutputPort' or $port = 'ImplicitOutputPort'">
-                  <xsl:value-of select="@x + @width" />
-                </xsl:when>
-                <xsl:when test="$port = 'ControlPort' or $port = 'CommandPort'">
-                  <xsl:value-of select="@x + @width * (2 * $ordering - 1) div (2 * $noofport)" />
-                </xsl:when>
-              </xsl:choose>
-            </xsl:for-each>
+            <xsl:variable name="x-pos">
+              <xsl:call-template name="get-x-position">
+                <xsl:with-param name="port" select="$port" />
+                <xsl:with-param name="ordering" select="$ordering" />
+                <xsl:with-param name="noofport" select="$noofport" />
+                <xsl:with-param name="geometry" select="mxGeometry" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$x-pos" />
           </xsl:for-each>
         </xsl:for-each>
       </xsl:variable>
@@ -178,19 +174,15 @@
               </xsl:call-template>
             </xsl:variable>
 
-            <xsl:for-each select="mxGeometry">
-              <xsl:choose>
-                <xsl:when test="($port = 'ExplicitInputPort' or $port = 'ImplicitInputPort') or ($port = 'ExplicitOutputPort' or $port = 'ImplicitOutputPort')">
-                  <xsl:value-of select="@y + @height * (2 * $ordering - 1) div (2 * $noofport)" />
-                </xsl:when>
-                <xsl:when test="$port = 'ControlPort'">
-                  <xsl:value-of select="@y" />
-                </xsl:when>
-                <xsl:when test="$port = 'CommandPort'">
-                  <xsl:value-of select="@y + @height" />
-                </xsl:when>
-              </xsl:choose>
-            </xsl:for-each>
+            <xsl:variable name="y-pos">
+              <xsl:call-template name="get-y-position">
+                <xsl:with-param name="port" select="$port" />
+                <xsl:with-param name="ordering" select="$ordering" />
+                <xsl:with-param name="noofport" select="$noofport" />
+                <xsl:with-param name="geometry" select="mxGeometry" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$y-pos" />
           </xsl:for-each>
         </xsl:for-each>
       </xsl:variable>
@@ -243,19 +235,15 @@
               </xsl:call-template>
             </xsl:variable>
 
-            <xsl:for-each select="mxGeometry">
-              <xsl:choose>
-                <xsl:when test="$port = 'ExplicitInputPort' or $port = 'ImplicitInputPort'">
-                  <xsl:value-of select="@x" />
-                </xsl:when>
-                <xsl:when test="$port = 'ExplicitOutputPort' or $port = 'ImplicitOutputPort'">
-                  <xsl:value-of select="@x + @width" />
-                </xsl:when>
-                <xsl:when test="$port = 'ControlPort' or $port = 'CommandPort'">
-                  <xsl:value-of select="@x + @width * (2 * $ordering - 1) div (2 * $noofport)" />
-                </xsl:when>
-              </xsl:choose>
-            </xsl:for-each>
+            <xsl:variable name="x-pos">
+              <xsl:call-template name="get-x-position">
+                <xsl:with-param name="port" select="$port" />
+                <xsl:with-param name="ordering" select="$ordering" />
+                <xsl:with-param name="noofport" select="$noofport" />
+                <xsl:with-param name="geometry" select="mxGeometry" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$x-pos" />
           </xsl:for-each>
         </xsl:for-each>
       </xsl:variable>
@@ -298,19 +286,15 @@
               </xsl:call-template>
             </xsl:variable>
 
-            <xsl:for-each select="mxGeometry">
-              <xsl:choose>
-                <xsl:when test="($port = 'ExplicitInputPort' or $port = 'ImplicitInputPort') or ($port = 'ExplicitOutputPort' or $port = 'ImplicitOutputPort')">
-                  <xsl:value-of select="@y + @height * (2 * $ordering - 1) div (2 * $noofport)" />
-                </xsl:when>
-                <xsl:when test="$port = 'ControlPort'">
-                  <xsl:value-of select="@y" />
-                </xsl:when>
-                <xsl:when test="$port = 'CommandPort'">
-                  <xsl:value-of select="@y + @height" />
-                </xsl:when>
-              </xsl:choose>
-            </xsl:for-each>
+            <xsl:variable name="y-pos">
+              <xsl:call-template name="get-y-position">
+                <xsl:with-param name="port" select="$port" />
+                <xsl:with-param name="ordering" select="$ordering" />
+                <xsl:with-param name="noofport" select="$noofport" />
+                <xsl:with-param name="geometry" select="mxGeometry" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$y-pos" />
           </xsl:for-each>
         </xsl:for-each>
       </xsl:variable>
@@ -362,19 +346,15 @@
               </xsl:call-template>
             </xsl:variable>
 
-            <xsl:for-each select="mxGeometry">
-              <xsl:choose>
-                <xsl:when test="$port = 'ExplicitInputPort' or $port = 'ImplicitInputPort'">
-                  <xsl:value-of select="@x" />
-                </xsl:when>
-                <xsl:when test="$port = 'ExplicitOutputPort' or $port = 'ImplicitOutputPort'">
-                  <xsl:value-of select="@x + @width" />
-                </xsl:when>
-                <xsl:when test="$port = 'ControlPort' or $port = 'CommandPort'">
-                  <xsl:value-of select="@x + @width * (2 * $ordering - 1) div (2 * $noofport)" />
-                </xsl:when>
-              </xsl:choose>
-            </xsl:for-each>
+            <xsl:variable name="x-pos">
+              <xsl:call-template name="get-x-position">
+                <xsl:with-param name="port" select="$port" />
+                <xsl:with-param name="ordering" select="$ordering" />
+                <xsl:with-param name="noofport" select="$noofport" />
+                <xsl:with-param name="geometry" select="mxGeometry" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$x-pos" />
           </xsl:for-each>
         </xsl:for-each>
       </xsl:variable>
@@ -413,19 +393,15 @@
               </xsl:call-template>
             </xsl:variable>
 
-            <xsl:for-each select="mxGeometry">
-              <xsl:choose>
-                <xsl:when test="($port = 'ExplicitInputPort' or $port = 'ImplicitInputPort') or ($port = 'ExplicitOutputPort' or $port = 'ImplicitOutputPort')">
-                  <xsl:value-of select="@y + @height * (2 * $ordering - 1) div (2 * $noofport)" />
-                </xsl:when>
-                <xsl:when test="$port = 'ControlPort'">
-                  <xsl:value-of select="@y" />
-                </xsl:when>
-                <xsl:when test="$port = 'CommandPort'">
-                  <xsl:value-of select="@y + @height" />
-                </xsl:when>
-              </xsl:choose>
-            </xsl:for-each>
+            <xsl:variable name="y-pos">
+              <xsl:call-template name="get-y-position">
+                <xsl:with-param name="port" select="$port" />
+                <xsl:with-param name="ordering" select="$ordering" />
+                <xsl:with-param name="noofport" select="$noofport" />
+                <xsl:with-param name="geometry" select="mxGeometry" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$y-pos" />
           </xsl:for-each>
         </xsl:for-each>
       </xsl:variable>
@@ -465,19 +441,15 @@
               </xsl:call-template>
             </xsl:variable>
 
-            <xsl:for-each select="mxGeometry">
-              <xsl:choose>
-                <xsl:when test="$port = 'ExplicitInputPort' or $port = 'ImplicitInputPort'">
-                  <xsl:value-of select="@x" />
-                </xsl:when>
-                <xsl:when test="$port = 'ExplicitOutputPort' or $port = 'ImplicitOutputPort'">
-                  <xsl:value-of select="@x + @width" />
-                </xsl:when>
-                <xsl:when test="$port = 'ControlPort' or $port = 'CommandPort'">
-                  <xsl:value-of select="@x + @width * (2 * $ordering - 1) div (2 * $noofport)" />
-                </xsl:when>
-              </xsl:choose>
-            </xsl:for-each>
+            <xsl:variable name="x-pos">
+              <xsl:call-template name="get-x-position">
+                <xsl:with-param name="port" select="$port" />
+                <xsl:with-param name="ordering" select="$ordering" />
+                <xsl:with-param name="noofport" select="$noofport" />
+                <xsl:with-param name="geometry" select="mxGeometry" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$x-pos" />
           </xsl:for-each>
         </xsl:for-each>
       </xsl:variable>
@@ -516,19 +488,15 @@
               </xsl:call-template>
             </xsl:variable>
 
-            <xsl:for-each select="mxGeometry">
-              <xsl:choose>
-                <xsl:when test="($port = 'ExplicitInputPort' or $port = 'ImplicitInputPort') or ($port = 'ExplicitOutputPort' or $port = 'ImplicitOutputPort')">
-                  <xsl:value-of select="@y + @height * (2 * $ordering - 1) div (2 * $noofport)" />
-                </xsl:when>
-                <xsl:when test="$port = 'ControlPort'">
-                  <xsl:value-of select="@y" />
-                </xsl:when>
-                <xsl:when test="$port = 'CommandPort'">
-                  <xsl:value-of select="@y + @height" />
-                </xsl:when>
-              </xsl:choose>
-            </xsl:for-each>
+            <xsl:variable name="y-pos">
+              <xsl:call-template name="get-y-position">
+                <xsl:with-param name="port" select="$port" />
+                <xsl:with-param name="ordering" select="$ordering" />
+                <xsl:with-param name="noofport" select="$noofport" />
+                <xsl:with-param name="geometry" select="mxGeometry" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:value-of select="$y-pos" />
           </xsl:for-each>
         </xsl:for-each>
       </xsl:variable>
-- 
cgit