Elemente: BIM Project Browser + Properties-Satellite-Window
Zwei neue Satellite-Windows (analog Kamera/Text-Editor): 1) Projekt-Übersicht (elemente_uebersicht.py + ElementeUebersichtApp.jsx) - Tree Geschoss → Kind → Element-Instanzen - Suche + Kind-Filter-Chips - Klick = selektieren in Rhino, Shift+Klick = zoomen - Erreichbar via account_tree-Button im Elemente-Panel-Header 2) Properties-Satellite (elemente_properties.py + ElementePropertiesApp.jsx) - Eigenes Fenster mit der PropertiesView (gemeinsame Komponente) - Live-Updates: elemente._send_state forwarded zu satellite-bridge via sticky - Erreichbar via open_in_new-Icon oben rechts in der Properties-Karte - Inline-Properties im Panel bleiben — Satellite ist für mehr Platz Plus ElementeApp-Cleanup: - ElementList (alle Elemente-Liste) raus — wird jetzt von Projekt- Übersicht abgedeckt. - Properties springen bei Selektion nach oben, NeuesElement bleibt voll sichtbar darunter (kein Scrollen mehr). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
+23
-2
@@ -4684,6 +4684,20 @@ class ElementeBridge(panel_base.BaseBridge):
|
||||
elif t == "DELETE_WALL": self._delete_wall(p.get("id"))
|
||||
elif t == "DELETE_ELEMENT": self._delete_wall(p.get("id"))
|
||||
elif t == "REGENERATE_ALL": self._regenerate_all()
|
||||
elif t == "OPEN_ELEMENTE_UEBERSICHT":
|
||||
try:
|
||||
import elemente_uebersicht
|
||||
elemente_uebersicht.open_as_window()
|
||||
except Exception as ex:
|
||||
print("[ELEMENTE] open uebersicht:", ex)
|
||||
elif t == "OPEN_ELEMENTE_PROPERTIES":
|
||||
try:
|
||||
import elemente_properties
|
||||
elemente_properties.open_as_window()
|
||||
# Direkt mal pushen damit das Fenster sofort Daten hat
|
||||
self._send_state()
|
||||
except Exception as ex:
|
||||
print("[ELEMENTE] open properties:", ex)
|
||||
|
||||
def _notify_active_geschoss(self):
|
||||
"""Schlanker Partial-Push: nur activeGeschoss + activeGeschossName.
|
||||
@@ -4884,7 +4898,7 @@ class ElementeBridge(panel_base.BaseBridge):
|
||||
})
|
||||
elements.append(base)
|
||||
sel_id = next((e["id"] for e in elements if e["selected"]), None)
|
||||
self.send("STATE", {
|
||||
payload = {
|
||||
"elements": elements,
|
||||
"geschosse": [{"id": g.get("id"), "name": g.get("name")}
|
||||
for g in geschosse if isinstance(g, dict)],
|
||||
@@ -4897,7 +4911,14 @@ class ElementeBridge(panel_base.BaseBridge):
|
||||
{"name": n, "color": m["color"],
|
||||
"hatch": m.get("hatch", ""), "scale": m.get("scale", 1.0)}
|
||||
for n, m in _MATERIAL_LIBRARY.items()],
|
||||
})
|
||||
}
|
||||
self.send("STATE", payload)
|
||||
# An Properties-Satellite-Window forwarden falls offen
|
||||
try:
|
||||
pb = sc.sticky.get("elemente_properties_bridge")
|
||||
if pb is not None and pb is not self:
|
||||
pb.send("STATE", payload)
|
||||
except Exception: pass
|
||||
|
||||
# --- Wand-Befehle -------------------------------------------------------
|
||||
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
#! python 3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
elemente_properties.py
|
||||
Properties-Satellite-Window. Zeigt die Property-Forms (WallProperties,
|
||||
RaumProperties, etc.) in einem eigenen groesseren Fenster — fuer Power-
|
||||
User die mehr Platz beim Editieren wollen ohne dass das Elemente-Panel
|
||||
ueberfrachtet wird. Daten kommen 1:1 vom ElementeBridge (sticky).
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import Rhino
|
||||
import scriptcontext as sc
|
||||
|
||||
_HERE = os.path.dirname(os.path.abspath(__file__))
|
||||
if _HERE not in sys.path:
|
||||
sys.path.insert(0, _HERE)
|
||||
|
||||
import panel_base
|
||||
|
||||
|
||||
class ElementePropertiesBridge(panel_base.BaseBridge):
|
||||
def __init__(self):
|
||||
panel_base.BaseBridge.__init__(self, "elemente_properties")
|
||||
|
||||
def _send_state(self):
|
||||
# Holt sich den aktuellen State vom Haupt-ElementeBridge — der hat
|
||||
# die Element-Enumeration + Selection-Erkennung schon implementiert.
|
||||
elemente_bridge = sc.sticky.get("elemente_bridge")
|
||||
if elemente_bridge is None:
|
||||
self.send("STATE", {"elements": [], "geschosse": [], "selection": None})
|
||||
return
|
||||
try:
|
||||
elemente_bridge._send_state() # broadcast — auch wir bekommen das via sticky-Forward
|
||||
except Exception as ex:
|
||||
print("[ELEMENTE-PROPS] _send_state fail:", ex)
|
||||
|
||||
def _on_ready(self):
|
||||
self._send_state()
|
||||
|
||||
def handle(self, data):
|
||||
if not isinstance(data, dict): return
|
||||
t = data.get("type", "")
|
||||
p = data.get("payload") or {}
|
||||
if not isinstance(p, dict): p = {}
|
||||
|
||||
if t == "READY" or t == "REQUEST_STATE":
|
||||
self._on_ready()
|
||||
elif t == "UPDATE_ELEMENT" or t == "DELETE_ELEMENT":
|
||||
# Forward to main ElementeBridge — same handler
|
||||
eb = sc.sticky.get("elemente_bridge")
|
||||
if eb is not None:
|
||||
try: eb.handle(data)
|
||||
except Exception as ex:
|
||||
print("[ELEMENTE-PROPS] forward:", ex)
|
||||
|
||||
|
||||
def open_as_window():
|
||||
"""Oeffnet die Properties-View als Satellite-Window."""
|
||||
b = ElementePropertiesBridge()
|
||||
sc.sticky["elemente_properties_bridge"] = b
|
||||
panel_base.open_satellite_window(
|
||||
"elemente_properties",
|
||||
title="Element — Eigenschaften",
|
||||
size=(480, 720),
|
||||
bridge=b)
|
||||
@@ -0,0 +1,186 @@
|
||||
#! python 3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
elemente_uebersicht.py
|
||||
BIM-artiger Project Browser: alle Smart-Elemente in einem Tree
|
||||
gruppiert nach Geschoss → Kind → Element. Eigene Satellite-Window
|
||||
(Eto.Form + WebView), liest seine Daten direkt aus dem ActiveDoc
|
||||
via elemente._read_meta. Klick auf eine Zeile selektiert das Objekt
|
||||
in Rhino.
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import Rhino
|
||||
import scriptcontext as sc
|
||||
|
||||
_HERE = os.path.dirname(os.path.abspath(__file__))
|
||||
if _HERE not in sys.path:
|
||||
sys.path.insert(0, _HERE)
|
||||
|
||||
import panel_base
|
||||
import elemente as _elm
|
||||
|
||||
|
||||
_KIND_MAP = {
|
||||
"wand_axis": "wand",
|
||||
"decke_outline": "decke",
|
||||
"dach_outline": "dach",
|
||||
"treppe_axis": "treppe",
|
||||
"stuetze_point": "stuetze",
|
||||
"traeger_axis": "traeger",
|
||||
"raum_outline": "raum",
|
||||
"decke_aussparung_outline": "aussparung",
|
||||
"oeffnung_point": "oeffnung", # wird zu fenster/tuer aufgeloest
|
||||
}
|
||||
|
||||
|
||||
def _safe_float(v, default=None):
|
||||
try: return float(v)
|
||||
except Exception: return default
|
||||
|
||||
|
||||
def _build_overview(doc):
|
||||
"""Sammelt alle Smart-Element-Sources, gruppiert nach Geschoss +
|
||||
Kind. Returns dict mit 'geschosse' (geordnete Liste) + 'items'
|
||||
(Flat-Liste pro Geschoss/Kind). Frontend baut den Tree."""
|
||||
if doc is None:
|
||||
return {"geschosse": [], "items": []}
|
||||
geschosse = _elm._load_geschosse(doc) or []
|
||||
items = []
|
||||
seen = set()
|
||||
for obj in doc.Objects:
|
||||
meta = _elm._read_meta(obj)
|
||||
if meta is None: continue
|
||||
t = meta.get("type")
|
||||
if t not in _elm.SOURCE_TYPES: continue
|
||||
if meta["id"] in seen: continue
|
||||
seen.add(meta["id"])
|
||||
|
||||
kind = _KIND_MAP.get(t, t)
|
||||
if t == "oeffnung_point":
|
||||
kind = meta.get("oeff_typ", "fenster")
|
||||
|
||||
g = _elm._geschoss_by_id(doc, meta.get("geschoss"))
|
||||
g_id = (g.get("id") if g else "") or "__keingeschoss__"
|
||||
g_name = g.get("name") if g else "(kein Geschoss)"
|
||||
|
||||
# Kompakte Property-Zusammenfassung pro Element-Typ
|
||||
info = ""
|
||||
try:
|
||||
if kind == "wand":
|
||||
info = "d {:.2f} m".format(meta.get("dicke", 0) or 0)
|
||||
elif kind == "decke":
|
||||
info = "d {:.2f} m".format(meta.get("dicke", 0) or 0)
|
||||
elif kind == "dach":
|
||||
info = "d {:.2f} m · {:.0f}°".format(
|
||||
meta.get("dicke", 0) or 0, meta.get("neigung", 0) or 0)
|
||||
elif kind in ("fenster", "tuer"):
|
||||
info = "{:.2f}×{:.2f} m".format(
|
||||
meta.get("oeff_breite", 0) or 0,
|
||||
meta.get("oeff_hoehe", 0) or 0)
|
||||
elif kind == "treppe":
|
||||
info = "{} St".format(meta.get("treppe_n_stufen", "?"))
|
||||
elif kind in ("stuetze", "traeger"):
|
||||
profil = meta.get("trag_profil", "?")
|
||||
info = "{}".format(profil)
|
||||
elif kind == "raum":
|
||||
info = meta.get("raum_name", "") or "Raum"
|
||||
elif kind == "aussparung":
|
||||
info = "Aussparung"
|
||||
except Exception: pass
|
||||
|
||||
items.append({
|
||||
"id": meta["id"],
|
||||
"objectId": str(obj.Id),
|
||||
"kind": kind,
|
||||
"geschossId": g_id,
|
||||
"geschossName": g_name,
|
||||
"name": meta.get("raum_name") or "",
|
||||
"info": info,
|
||||
"selected": obj.IsSelected(False) > 0,
|
||||
})
|
||||
|
||||
# Geschoss-Liste (geordnet wie in doc.Strings)
|
||||
out_geschosse = []
|
||||
for g in geschosse:
|
||||
if not isinstance(g, dict): continue
|
||||
out_geschosse.append({
|
||||
"id": g.get("id") or "",
|
||||
"name": g.get("name") or "?",
|
||||
"okff": _safe_float(g.get("okff"), 0.0),
|
||||
})
|
||||
# "(kein Geschoss)" anhaengen wenn es Elemente ohne Geschoss gibt
|
||||
if any(it["geschossId"] == "__keingeschoss__" for it in items):
|
||||
out_geschosse.append({
|
||||
"id": "__keingeschoss__", "name": "(kein Geschoss)", "okff": None,
|
||||
})
|
||||
return {"geschosse": out_geschosse, "items": items}
|
||||
|
||||
|
||||
class ElementeUebersichtBridge(panel_base.BaseBridge):
|
||||
def __init__(self):
|
||||
panel_base.BaseBridge.__init__(self, "elemente_uebersicht")
|
||||
|
||||
def _send_state(self):
|
||||
doc = Rhino.RhinoDoc.ActiveDoc
|
||||
self.send("STATE", _build_overview(doc))
|
||||
|
||||
def _on_ready(self):
|
||||
self._send_state()
|
||||
|
||||
def handle(self, data):
|
||||
if not isinstance(data, dict): return
|
||||
t = data.get("type", "")
|
||||
p = data.get("payload") or {}
|
||||
if not isinstance(p, dict): p = {}
|
||||
doc = Rhino.RhinoDoc.ActiveDoc
|
||||
|
||||
if t == "READY" or t == "REQUEST_STATE":
|
||||
self._on_ready()
|
||||
elif t == "SELECT_ELEMENT":
|
||||
obj_id_str = p.get("objectId") or ""
|
||||
try:
|
||||
import System
|
||||
guid = System.Guid(obj_id_str)
|
||||
obj = doc.Objects.FindId(guid)
|
||||
if obj is not None:
|
||||
doc.Objects.UnselectAll()
|
||||
obj.Select(True)
|
||||
try: doc.Views.Redraw()
|
||||
except Exception: pass
|
||||
except Exception as ex:
|
||||
print("[UEBERSICHT] select:", ex)
|
||||
self._send_state()
|
||||
elif t == "ZOOM_TO_ELEMENT":
|
||||
obj_id_str = p.get("objectId") or ""
|
||||
try:
|
||||
import System
|
||||
guid = System.Guid(obj_id_str)
|
||||
obj = doc.Objects.FindId(guid)
|
||||
if obj is not None:
|
||||
doc.Objects.UnselectAll()
|
||||
obj.Select(True)
|
||||
try:
|
||||
vp = doc.Views.ActiveView.ActiveViewport
|
||||
bb = obj.Geometry.GetBoundingBox(True)
|
||||
if bb.IsValid:
|
||||
bb.Inflate(bb.Diagonal.Length * 0.5,
|
||||
bb.Diagonal.Length * 0.5,
|
||||
bb.Diagonal.Length * 0.5)
|
||||
vp.ZoomBoundingBox(bb)
|
||||
doc.Views.Redraw()
|
||||
except Exception as ex:
|
||||
print("[UEBERSICHT] zoom:", ex)
|
||||
except Exception as ex:
|
||||
print("[UEBERSICHT] zoom find:", ex)
|
||||
|
||||
|
||||
def open_as_window():
|
||||
"""Oeffnet die Element-Uebersicht als Satellite-Window."""
|
||||
b = ElementeUebersichtBridge()
|
||||
sc.sticky["elemente_uebersicht_bridge"] = b
|
||||
panel_base.open_satellite_window(
|
||||
"elemente_uebersicht",
|
||||
title="Elemente — Übersicht",
|
||||
size=(540, 720),
|
||||
bridge=b)
|
||||
Reference in New Issue
Block a user