Update app.py

app.py

@@ -1,94 +1,73 @@
 import streamlit as st
-import json
 import os
+import json
+
+st.set_page_config(page_title="DCM Assembly Visualizer", layout="wide")
+st.title("DCM Assembly Visualizer")
 
-# ---- Optional: define parser directly here or import from module ----
+# === Parser Function ===
 def parse_dcm_assembly(uploaded_file):
-    lines = uploaded_file.read().decode("utf-8").splitlines()
+    lines = uploaded_file.read().decode().splitlines()
+
     geometry = {}
-    constraints = []
     parts = []
-    set_geom_map = {}
-    current = {}
-    label = None
+    constraints = []
+    current_class = None
+    current_id = None
+    tag_to_label = {}
+
+    temp_geom = {}
+    temp_part = {}
+    temp_constraint = {}
 
     for line in lines:
         line = line.strip()
-        if line.startswith("CLASS "):
-            if current:
-                if current["type"] == "SET":
-                    parts.append({
-                        "name": current.get("label", ""),
-                        "member_tags": current.get("member_tags", [])
-                    })
-                elif current["type"] == "PLANE":
-                    geometry[current["id"]] = {
-                        "base_point": current.get("base_point"),
-                        "normal": current.get("normal"),
-                        "label": current.get("label", "")
-                    }
-                elif current["type"] == "WORK_PLANE":
-                    tag = current.get("tag")
-                    if tag in geometry:
-                        geometry[tag]["label"] = current.get("label", "")
-                elif current["type"] == "CONSTRAINT":
-                    constraints.append({
-                        "from": current.get("end_1"),
-                        "to": current.get("end_2"),
-                        "label": current.get("label", "")
-                    })
-            parts_of_line = line.split()
-            current = {
-                "type": parts_of_line[1],
-                "id": int(parts_of_line[2])
-            }
+        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":
+                temp_geom["tag"] = current_id
+            elif current_class == "SET":
+                temp_part = {"member_tags": []}
+            elif current_class == "CONSTRAINT":
+                temp_constraint = {}
         elif line.startswith("FBASE_POINT"):
-            current["base_point"] = tuple(map(float, line.split()[1:]))
+            temp_geom["base_point"] = tuple(map(float, line.split()[1:]))
         elif line.startswith("FNORMAL"):
-            current["normal"] = tuple(map(float, line.split()[1:]))
-        elif line.startswith("FMY_PLANE TAG"):
-            current["tag"] = int(line.split()[-1])
-        elif line.startswith("DCM3_TEXT_LABEL"):
-            current["label"] = line.split("DCM3_TEXT_LABEL", 1)[-1].strip()
+            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"):
-            current["member_tags"] = list(map(int, line.split()[2:]))
+            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"):
-            current["end_1"] = int(line.split()[-1])
+            temp_constraint["from"] = int(line.split()[-1])
         elif line.startswith("FEND_2 TAG"):
-            current["end_2"] = int(line.split()[-1])
-    if current:
-        if current["type"] == "SET":
-            parts.append({
-                "name": current.get("label", ""),
-                "member_tags": current.get("member_tags", [])
-            })
-        elif current["type"] == "PLANE":
-            geometry[current["id"]] = {
-                "base_point": current.get("base_point"),
-                "normal": current.get("normal"),
-                "label": current.get("label", "")
-            }
-        elif current["type"] == "WORK_PLANE":
-            tag = current.get("tag")
-            if tag in geometry:
-                geometry[tag]["label"] = current.get("label", "")
-        elif current["type"] == "CONSTRAINT":
-            constraints.append({
-                "from": current.get("end_1"),
-                "to": current.get("end_2"),
-                "label": current.get("label", "")
-            })
+            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)
 
     return {
         "geometry": geometry,
-        "constraints": constraints,
-        "parts": parts
+        "parts": parts,
+        "constraints": constraints
     }
 
-# ---- Streamlit UI and file handling ----
-st.set_page_config(layout="wide")
-st.title("DCM Assembly Visualizer")
-
+# === File Upload ===
 file1 = st.file_uploader("Upload File A", type=["txt"])
 file2 = st.file_uploader("Upload File B", type=["txt"])
 
@@ -99,12 +78,14 @@ if file1:
 if file2:
     parsed_files.append(("purple", "orange", parse_dcm_assembly(file2)))
 
+# === Draw Button + Iframe Viewer ===
 if parsed_files:
-    os.makedirs("static", exist_ok=True)
-    with open("static/parsed_data.json", "w") as f:
-        json.dump({"files": parsed_files}, f, indent=2)
+    if st.button("🎯 Visualize"):
+        os.makedirs("static", exist_ok=True)
+        with open("static/parsed_data.json", "w") as f:
+            json.dump({"files": parsed_files}, f, indent=2)
 
-    st.components.v1.html(
-        '<iframe src="static/index.html" width="100%" height="800" style="border:none;"></iframe>',
-        height=800,
-    )
+        st.components.v1.html(
+            '<iframe src="static/index.html" width="100%" height="800" style="border:none;"></iframe>',
+            height=800,
+        )