Update app.py

app.py

@@ -5,27 +5,30 @@ import json
 st.set_page_config(page_title="DCM Assembly Visualizer", layout="wide")
 st.title("DCM Assembly Visualizer")
 
-# === Parser Function ===
 def parse_dcm_assembly(uploaded_file):
-    lines = uploaded_file.read().decode().splitlines()
+    lines = uploaded_file.read().decode("utf-8").splitlines()
 
     geometry = {}
     parts = []
-    constraints = []
-    current_class = None
-    current_id = None
-    tag_to_label = {}
+    constraints = {}
 
     temp_geom = {}
     temp_part = {}
     temp_constraint = {}
+    current_class = None
+    current_id = None
+
+    plane_label_map = {}   # tag → label (from WORK_PLANE)
+    plane_point_map = {}   # tag → base point + normal
 
     for line in lines:
         line = line.strip()
+
         if line.startswith("CLASS"):
             parts_line = line.split()
             current_class = parts_line[1]
             current_id = int(parts_line[2])
+
             if current_class == "PLANE":
                 temp_geom = {"tag": current_id}
             elif current_class == "WORK_PLANE":
@@ -34,39 +37,60 @@ def parse_dcm_assembly(uploaded_file):
                 temp_part = {"member_tags": []}
             elif current_class == "CONSTRAINT":
                 temp_constraint = {}
-        elif line.startswith("FBASE_POINT"):
-            temp_geom["base_point"] = tuple(map(float, line.split()[1:]))
-        elif line.startswith("FNORMAL"):
-            temp_geom["normal"] = tuple(map(float, line.split()[1:]))
-        elif line.startswith("DCM3_TEXT_LABEL") and current_class == "WORK_PLANE":
-            temp_geom["label"] = line.split(" ", 1)[1].strip()
-        elif line.startswith("FMEMBER TAGS"):
-            tags = list(map(int, line.split()[2:]))
-            temp_part["member_tags"].extend(tags)
-        elif line.startswith("DCM3_TEXT_LABEL") and current_class == "SET":
-            temp_part["name"] = line.split(" ", 1)[1].strip()
-        elif line.startswith("FSET_GEOM TAG"):
-            temp_part["geom_tag"] = int(line.split()[-1])
-        elif line.startswith("FMY_PLANE TAG"):
-            plane_tag = int(line.split()[-1])
-            geometry[temp_geom["tag"]] = temp_geom
-            tag_to_label[plane_tag] = temp_geom["label"]
-        elif line.startswith("FEND_1 TAG"):
-            temp_constraint["from"] = int(line.split()[-1])
-        elif line.startswith("FEND_2 TAG"):
-            temp_constraint["to"] = int(line.split()[-1])
-        elif line.startswith("DCM3_TEXT_LABEL") and current_class == "CONSTRAINT":
-            temp_constraint["label"] = line.split(" ", 1)[1].strip()
-            constraints.append(temp_constraint)
-        elif line == "#" and current_class == "SET":
-            parts.append(temp_part)
+        elif current_class == "PLANE":
+            if line.startswith("FBASE_POINT"):
+                temp_geom["base_point"] = tuple(map(float, line.split()[1:]))
+            elif line.startswith("FNORMAL"):
+                temp_geom["normal"] = tuple(map(float, line.split()[1:]))
+            elif line.startswith("FIN_SET"):
+                plane_point_map[temp_geom["tag"]] = temp_geom
+        elif current_class == "WORK_PLANE":
+            if line.startswith("FMY_PLANE TAG"):
+                temp_geom["plane_tag"] = int(line.split()[-1])
+            elif line.startswith("DCM3_TEXT_LABEL"):
+                temp_geom["label"] = line.split(" ", 1)[1].strip()
+            elif line == "#":
+                tag = temp_geom.get("plane_tag")
+                if tag is not None:
+                    plane_label_map[tag] = temp_geom.get("label", "")
+        elif current_class == "SET":
+            if line.startswith("DCM3_TEXT_LABEL"):
+                temp_part["name"] = line.split(" ", 1)[1].strip()
+            elif line.startswith("FMEMBER TAGS"):
+                tags = list(map(int, line.split()[2:]))
+                temp_part["member_tags"].extend(tags)
+            elif line == "#":
+                parts.append(temp_part)
+        elif current_class == "CONSTRAINT":
+            if line.startswith("FEND_1 TAG"):
+                temp_constraint["from"] = int(line.split()[-1])
+            elif line.startswith("FEND_2 TAG"):
+                temp_constraint["to"] = int(line.split()[-1])
+            elif line.startswith("DCM3_TEXT_LABEL"):
+                temp_constraint["label"] = line.split(" ", 1)[1].strip()
+            elif line == "#":
+                if "from" in temp_constraint and "to" in temp_constraint:
+                    constraints[(temp_constraint["from"], temp_constraint["to"])] = temp_constraint["label"]
+
+    # Build final geometry dict
+    final_geometry = {}
+    for tag, data in plane_point_map.items():
+        final_geometry[tag] = {
+            "base_point": data["base_point"],
+            "normal": data["normal"],
+            "label": plane_label_map.get(tag, "")
+        }
+
+    # Build final constraint list
+    constraint_list = [{"from": f, "to": t, "label": lbl} for (f, t), lbl in constraints.items()]
 
     return {
-        "geometry": geometry,
+        "geometry": final_geometry,
         "parts": parts,
-        "constraints": constraints
+        "constraints": constraint_list
     }
 
+
 # === File Upload ===
 file1 = st.file_uploader("Upload File A", type=["txt"])
 file2 = st.file_uploader("Upload File B", type=["txt"])