From 360b67503f11f6a5785059a039bc5b093cfdbc7e Mon Sep 17 00:00:00 2001
From: Suchita Lad
Date: Thu, 16 Jan 2025 17:39:59 +0530
Subject: Updated file for simulation

---
 blocks/Xcos/MxGraphParser.py          | 5 ++++-
 blocks/Xcos/XmlToXcos.sh              | 2 +-
 blocks/xcos2xml/replacesplitblocks.sh | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/blocks/Xcos/MxGraphParser.py b/blocks/Xcos/MxGraphParser.py
index a80145ff..ced75756 100755
--- a/blocks/Xcos/MxGraphParser.py
+++ b/blocks/Xcos/MxGraphParser.py
@@ -46,6 +46,9 @@ outmodel = ET.SubElement(outdiagram, 'mxGraphModel')
 outmodel.set('as', 'model')
 
 
+def remove_hyphen_number(s):
+    return re.sub(r'-\d+$', '', s)
+
 def check_point_on_array(array, point, left_right_direction=True):
     if array is None:
         return False, array, []
@@ -513,6 +516,6 @@ outnode.set('parent', rootattribid)
 
 outtree = ET.ElementTree(outdiagram)
 ET.indent(outtree)
-outfile = basename + '.xcos'
+outfile = remove_hyphen_number(basename) + '.xcos'
 outtree.write(outfile, encoding='UTF-8', xml_declaration=True)
 sys.exit(0)
diff --git a/blocks/Xcos/XmlToXcos.sh b/blocks/Xcos/XmlToXcos.sh
index 8eab026b..b6f539e2 100755
--- a/blocks/Xcos/XmlToXcos.sh
+++ b/blocks/Xcos/XmlToXcos.sh
@@ -61,7 +61,7 @@ cp -f "$TMPFILE2" "$INPUT1"
 
 echo "Running Xcos/MxGraphParser.py $INPUT1" >&2
 Xcos/MxGraphParser.py "$INPUT1" >&2
-INPUT1="$BASE-$rv.xcos"
+INPUT1="$BASE.xcos"
 echo "Created $INPUT1" >&2
 
 exit 0
diff --git a/blocks/xcos2xml/replacesplitblocks.sh b/blocks/xcos2xml/replacesplitblocks.sh
index 50f57c7f..89fbee8b 100755
--- a/blocks/xcos2xml/replacesplitblocks.sh
+++ b/blocks/xcos2xml/replacesplitblocks.sh
@@ -147,7 +147,7 @@ cp -f "$TMPFILE2" "$INPUT1"
 
 echo "Running Xcos/MxGraphParser.py $INPUT1" >&2
 Xcos/MxGraphParser.py "$INPUT1" >&2
-INPUT1="$BASE-$rv.xcos"
+INPUT1="$BASE.xcos"
 echo "Created $INPUT1" >&2
 
 exit 0
-- 
cgit