Masse-Dropdown in Oberleiste + Satellite-Settings statt Dimensionen-Inline
User-Feedback: Mass-Style passt nicht ins Dimensionen-Panel, und der Name "Mass-Style" gefaellt nicht. Umzug in die Oberleiste (analog Display) + Zahnrad oeffnet eigenes Settings-Fenster. UI-Begriff jetzt "Masse". Frontend: - OberleisteApp: neue Gruppe "Masse" mit Preset-Dropdown + Zahnrad-Button zwischen Display und Massstab - MasseSettingsApp.jsx (neu): Satellite-Fenster mit Name/Raum-Rundung/ Mass-Dezimalstellen/Mass-Einheit + Picker + Add/Delete - DimensionenApp: MassStyleSection raus - rhinoBridge: setMasseActive + openMasseSettings (Topbar); masseSetActive/masseSavePreset/masseDeletePreset (Settings-Fenster) Backend: - rhino/masse_settings.py (neu): Bridge fuer das Satellite-Fenster, Topics SET_ACTIVE / SAVE / DELETE, triggert regen_all_rooms + topbar refresh - mass_style.regen_all_rooms(doc): neue cross-modul-Helper, queued Raum-Regen fuer alle raum_outline-Objekte - oberleiste.py: massePresets + masseActiveId im State, SET_MASSE_ACTIVE + OPEN_MASSE_SETTINGS handler, Signature update - dimensionen.py: Mass-Style-Endpoints + State raus (sind jetzt im OberleisteBridge bzw. MasseSettingsBridge) Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -20,7 +20,6 @@ if _HERE not in sys.path:
|
|||||||
sys.path.insert(0, _HERE)
|
sys.path.insert(0, _HERE)
|
||||||
|
|
||||||
import panel_base
|
import panel_base
|
||||||
import mass_style
|
|
||||||
|
|
||||||
PANEL_GUID_STR = "9e3c8c5d-6d4a-4f3e-b3c5-d4e5f6071a2c"
|
PANEL_GUID_STR = "9e3c8c5d-6d4a-4f3e-b3c5-d4e5f6071a2c"
|
||||||
|
|
||||||
@@ -343,34 +342,6 @@ class DimensionenBridge(panel_base.BaseBridge):
|
|||||||
elif t == "SET_CIRCLE_RADIUS":self._set_circle_radius(p)
|
elif t == "SET_CIRCLE_RADIUS":self._set_circle_radius(p)
|
||||||
elif t == "SET_LINE_LENGTH": self._set_line_length(p)
|
elif t == "SET_LINE_LENGTH": self._set_line_length(p)
|
||||||
elif t == "SET_RECTANGLE": self._set_rectangle(p)
|
elif t == "SET_RECTANGLE": self._set_rectangle(p)
|
||||||
elif t == "MASS_STYLE_SET_ACTIVE":
|
|
||||||
mass_style.set_active_id(Rhino.RhinoDoc.ActiveDoc, p.get("id"))
|
|
||||||
self._send_state(force=True)
|
|
||||||
self._broadcast_raum_regen()
|
|
||||||
elif t == "MASS_STYLE_SAVE":
|
|
||||||
mass_style.save_preset(Rhino.RhinoDoc.ActiveDoc, p.get("preset") or {})
|
|
||||||
self._send_state(force=True)
|
|
||||||
self._broadcast_raum_regen()
|
|
||||||
elif t == "MASS_STYLE_DELETE":
|
|
||||||
mass_style.delete_preset(Rhino.RhinoDoc.ActiveDoc, p.get("id"))
|
|
||||||
self._send_state(force=True)
|
|
||||||
self._broadcast_raum_regen()
|
|
||||||
|
|
||||||
def _broadcast_raum_regen(self):
|
|
||||||
"""Beim Preset-Wechsel: alle Raeume regen damit die Stempel-Flaechen
|
|
||||||
in der neuen Default-Rundung erscheinen. Eingehaengt in elemente."""
|
|
||||||
try:
|
|
||||||
import elemente
|
|
||||||
doc = Rhino.RhinoDoc.ActiveDoc
|
|
||||||
if doc is None: return
|
|
||||||
for obj in doc.Objects:
|
|
||||||
try:
|
|
||||||
m = elemente._read_meta(obj)
|
|
||||||
if m and m.get("type") == "raum_outline":
|
|
||||||
elemente._queue_regen(m["id"])
|
|
||||||
except Exception: pass
|
|
||||||
except Exception as ex:
|
|
||||||
print("[DIMENSIONEN] mass_style raum-regen:", ex)
|
|
||||||
|
|
||||||
# --- State-Snapshot -----------------------------------------------------
|
# --- State-Snapshot -----------------------------------------------------
|
||||||
|
|
||||||
@@ -405,8 +376,6 @@ class DimensionenBridge(panel_base.BaseBridge):
|
|||||||
"refPoint": self._ref,
|
"refPoint": self._ref,
|
||||||
"coordSystem": self._coord_sys,
|
"coordSystem": self._coord_sys,
|
||||||
"planeName": "CPlane" if self._coord_sys == "cplane" else "Welt",
|
"planeName": "CPlane" if self._coord_sys == "cplane" else "Welt",
|
||||||
"massStyles": mass_style.list_presets(doc),
|
|
||||||
"massStyleActive": mass_style.get_active_id(doc),
|
|
||||||
}
|
}
|
||||||
shape = _detect_shape(objs)
|
shape = _detect_shape(objs)
|
||||||
out["shape"] = shape
|
out["shape"] = shape
|
||||||
@@ -445,8 +414,6 @@ class DimensionenBridge(panel_base.BaseBridge):
|
|||||||
tuple(sorted((state.get("position") or {}).items())),
|
tuple(sorted((state.get("position") or {}).items())),
|
||||||
tuple(sorted((state.get("dimensions") or {}).items())),
|
tuple(sorted((state.get("dimensions") or {}).items())),
|
||||||
tuple(sorted((state.get("shape") or {}).items())) if state.get("shape") else None,
|
tuple(sorted((state.get("shape") or {}).items())) if state.get("shape") else None,
|
||||||
state.get("massStyleActive"),
|
|
||||||
len(state.get("massStyles") or []),
|
|
||||||
)
|
)
|
||||||
if not force and sig == self._last_sig:
|
if not force and sig == self._last_sig:
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -186,3 +186,23 @@ def dim_dezimalstellen_default(doc):
|
|||||||
def dim_einheit_default(doc):
|
def dim_einheit_default(doc):
|
||||||
p = get_active(doc)
|
p = get_active(doc)
|
||||||
return p["dimEinheit"] if p else "m"
|
return p["dimEinheit"] if p else "m"
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Cross-Module: Raum-Stempel beim Preset-Wechsel mit-aktualisieren.
|
||||||
|
|
||||||
|
def regen_all_rooms(doc):
|
||||||
|
"""Queued ein Regen fuer ALLE raum_outline-Objekte. Aufruf bei Preset-
|
||||||
|
Wechsel/Save/Delete damit Stempel-Flaechen in der neuen Rundung neu
|
||||||
|
rendern."""
|
||||||
|
if doc is None: return
|
||||||
|
try:
|
||||||
|
import elemente
|
||||||
|
except Exception as ex:
|
||||||
|
print("[MASS_STYLE] elemente import:", ex); return
|
||||||
|
for obj in doc.Objects:
|
||||||
|
try:
|
||||||
|
m = elemente._read_meta(obj)
|
||||||
|
if m and m.get("type") == "raum_outline":
|
||||||
|
elemente._queue_regen(m["id"])
|
||||||
|
except Exception: pass
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
#! python 3
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""
|
||||||
|
masse_settings.py
|
||||||
|
Satellite-Fenster fuer das Bearbeiten der Masse-Presets
|
||||||
|
(rhino/mass_style.py). Vom Oberleiste-Zahnrad geoeffnet.
|
||||||
|
"""
|
||||||
|
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 mass_style
|
||||||
|
|
||||||
|
|
||||||
|
def _payload():
|
||||||
|
doc = Rhino.RhinoDoc.ActiveDoc
|
||||||
|
return {
|
||||||
|
"presets": mass_style.list_presets(doc),
|
||||||
|
"activeId": mass_style.get_active_id(doc),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _notify_oberleiste():
|
||||||
|
"""Topbar nach Aenderung refreshen — die zeigt den aktiven Preset im
|
||||||
|
Dropdown an."""
|
||||||
|
try:
|
||||||
|
b = sc.sticky.get("oberleiste_bridge")
|
||||||
|
if b is not None:
|
||||||
|
b._send_state(force=True)
|
||||||
|
except Exception as ex:
|
||||||
|
print("[MASSE_SETTINGS] notify oberleiste:", ex)
|
||||||
|
|
||||||
|
|
||||||
|
class MasseSettingsBridge(panel_base.BaseBridge):
|
||||||
|
def __init__(self):
|
||||||
|
panel_base.BaseBridge.__init__(self, "masse_settings")
|
||||||
|
|
||||||
|
def _on_ready(self):
|
||||||
|
self._send_state()
|
||||||
|
|
||||||
|
def _send_state(self):
|
||||||
|
self.send("STATE", _payload())
|
||||||
|
|
||||||
|
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 == "SET_ACTIVE":
|
||||||
|
mass_style.set_active_id(doc, p.get("id"))
|
||||||
|
mass_style.regen_all_rooms(doc)
|
||||||
|
self._send_state()
|
||||||
|
_notify_oberleiste()
|
||||||
|
elif t == "SAVE":
|
||||||
|
mass_style.save_preset(doc, p.get("preset") or {})
|
||||||
|
mass_style.regen_all_rooms(doc)
|
||||||
|
self._send_state()
|
||||||
|
_notify_oberleiste()
|
||||||
|
elif t == "DELETE":
|
||||||
|
mass_style.delete_preset(doc, p.get("id"))
|
||||||
|
mass_style.regen_all_rooms(doc)
|
||||||
|
self._send_state()
|
||||||
|
_notify_oberleiste()
|
||||||
|
|
||||||
|
|
||||||
|
def open_as_window():
|
||||||
|
"""Oeffnet das Masse-Settings-Fenster (Eto.Form + WebView).
|
||||||
|
Vom Oberleiste-Zahnrad bei OPEN_MASSE_SETTINGS aufgerufen."""
|
||||||
|
b = MasseSettingsBridge()
|
||||||
|
sc.sticky["masse_settings_bridge"] = b
|
||||||
|
panel_base.open_satellite_window(
|
||||||
|
"masse_settings",
|
||||||
|
title="Masse",
|
||||||
|
size=(440, 520),
|
||||||
|
bridge=b)
|
||||||
@@ -898,6 +898,23 @@ class OberleisteBridge(panel_base.BaseBridge):
|
|||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
print("[OBERLEISTE] open kamera:", ex)
|
print("[OBERLEISTE] open kamera:", ex)
|
||||||
|
|
||||||
|
# --- Masse (Mass-Style) -----------------------------------------
|
||||||
|
elif t == "SET_MASSE_ACTIVE":
|
||||||
|
try:
|
||||||
|
import mass_style
|
||||||
|
doc = Rhino.RhinoDoc.ActiveDoc
|
||||||
|
mass_style.set_active_id(doc, p.get("id"))
|
||||||
|
mass_style.regen_all_rooms(doc)
|
||||||
|
except Exception as ex:
|
||||||
|
print("[OBERLEISTE] masse active:", ex)
|
||||||
|
self._send_state(force=True)
|
||||||
|
elif t == "OPEN_MASSE_SETTINGS":
|
||||||
|
try:
|
||||||
|
import masse_settings
|
||||||
|
masse_settings.open_as_window()
|
||||||
|
except Exception as ex:
|
||||||
|
print("[OBERLEISTE] open masse:", ex)
|
||||||
|
|
||||||
# --- Display-Mode -----------------------------------------------
|
# --- Display-Mode -----------------------------------------------
|
||||||
elif t == "SET_DISPLAY_MODE":
|
elif t == "SET_DISPLAY_MODE":
|
||||||
n = p.get("name")
|
n = p.get("name")
|
||||||
@@ -1119,6 +1136,14 @@ class OberleisteBridge(panel_base.BaseBridge):
|
|||||||
_names_tuple, _active_comb = self._cached_combinations
|
_names_tuple, _active_comb = self._cached_combinations
|
||||||
info["layerCombinations"] = list(_names_tuple)
|
info["layerCombinations"] = list(_names_tuple)
|
||||||
info["layerCombinationActive"] = _active_comb
|
info["layerCombinationActive"] = _active_comb
|
||||||
|
# Masse (Mass-Style Presets) — Liste fuer Topbar-Dropdown + aktive ID
|
||||||
|
try:
|
||||||
|
import mass_style
|
||||||
|
info["massePresets"] = mass_style.list_presets(doc)
|
||||||
|
info["masseActiveId"] = mass_style.get_active_id(doc)
|
||||||
|
except Exception:
|
||||||
|
info["massePresets"] = []
|
||||||
|
info["masseActiveId"] = None
|
||||||
# Command-Line State
|
# Command-Line State
|
||||||
prompt = _get_command_prompt()
|
prompt = _get_command_prompt()
|
||||||
info["cmdPrompt"] = prompt
|
info["cmdPrompt"] = prompt
|
||||||
@@ -1147,6 +1172,8 @@ class OberleisteBridge(panel_base.BaseBridge):
|
|||||||
info.get("overridesActivePreset"),
|
info.get("overridesActivePreset"),
|
||||||
tuple(info.get("overridesPresets") or ()),
|
tuple(info.get("overridesPresets") or ()),
|
||||||
_names_tuple, _active_comb,
|
_names_tuple, _active_comb,
|
||||||
|
info.get("masseActiveId"),
|
||||||
|
tuple((p.get("id"), p.get("name")) for p in (info.get("massePresets") or [])),
|
||||||
prompt,
|
prompt,
|
||||||
)
|
)
|
||||||
if not force and sig == self._last_state_sig:
|
if not force and sig == self._last_state_sig:
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import {
|
|||||||
setRefPoint, setCoordSystem,
|
setRefPoint, setCoordSystem,
|
||||||
setDimPosition, setDimDimension, setDimRotationZ,
|
setDimPosition, setDimDimension, setDimRotationZ,
|
||||||
setCircleRadius, setLineLength, setRectangleDims,
|
setCircleRadius, setLineLength, setRectangleDims,
|
||||||
setMassStyleActive, saveMassStyle, deleteMassStyle,
|
|
||||||
} from './lib/rhinoBridge'
|
} from './lib/rhinoBridge'
|
||||||
|
|
||||||
// ---- Helpers --------------------------------------------------------------
|
// ---- Helpers --------------------------------------------------------------
|
||||||
@@ -141,149 +140,6 @@ function Field({ label, children, style }) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- Mass-Style Section ---------------------------------------------------
|
|
||||||
// Globaler Preset-Picker fuer Raum-Rundung + Mass-Linien-Dezimalstellen.
|
|
||||||
// Hostet hier weil das thematisch zu Dimensionen passt, der Preset wird aber
|
|
||||||
// dokument-weit angewendet (Raum-Stempel lesen ihn auch).
|
|
||||||
|
|
||||||
const RAUM_RUNDUNGS_LABELS = {
|
|
||||||
'exakt': 'Exakt (2 Nachk.)',
|
|
||||||
'0.01': 'auf 0.01 m²',
|
|
||||||
'0.1': 'auf 0.1 m²',
|
|
||||||
'0.5': 'auf 0.5 m²',
|
|
||||||
'1': 'auf 1 m²',
|
|
||||||
}
|
|
||||||
|
|
||||||
function MassStyleSection({ massStyles, activeId }) {
|
|
||||||
const styles = Array.isArray(massStyles) ? massStyles : []
|
|
||||||
const active = styles.find(p => p.id === activeId) || styles[0]
|
|
||||||
const update = (patch) => {
|
|
||||||
if (!active) return
|
|
||||||
saveMassStyle({ ...active, ...patch })
|
|
||||||
}
|
|
||||||
const addNew = () => {
|
|
||||||
const name = (window.prompt('Name für neuen Mass-Style:') || '').trim()
|
|
||||||
if (!name) return
|
|
||||||
// Aktuelle Werte als Vorlage uebernehmen (oder Defaults)
|
|
||||||
const tmpl = active || { raumRundung: '0.1', dimDezimalstellen: 2, dimEinheit: 'm' }
|
|
||||||
saveMassStyle({
|
|
||||||
name,
|
|
||||||
raumRundung: tmpl.raumRundung,
|
|
||||||
dimDezimalstellen: tmpl.dimDezimalstellen,
|
|
||||||
dimEinheit: tmpl.dimEinheit,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
const remove = () => {
|
|
||||||
if (!active) return
|
|
||||||
if (styles.length <= 1) {
|
|
||||||
window.alert('Mindestens ein Mass-Style muss erhalten bleiben.')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!window.confirm(`Mass-Style "${active.name}" löschen?`)) return
|
|
||||||
deleteMassStyle(active.id)
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<div style={{
|
|
||||||
padding: '8px 12px',
|
|
||||||
borderBottom: '1px solid var(--border-light)',
|
|
||||||
background: 'var(--bg-section)',
|
|
||||||
}}>
|
|
||||||
<div style={{
|
|
||||||
display: 'flex', alignItems: 'center', gap: 6, marginBottom: 6,
|
|
||||||
}}>
|
|
||||||
<Icon name="straighten" size={12} style={{ color: 'var(--text-muted)' }} />
|
|
||||||
<span style={{ fontSize: 9, color: 'var(--text-muted)',
|
|
||||||
textTransform: 'uppercase', letterSpacing: '0.06em',
|
|
||||||
fontWeight: 600, flex: 1 }}>
|
|
||||||
Mass-Style
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div style={{ display: 'flex', gap: 4, marginBottom: 6 }}>
|
|
||||||
<select
|
|
||||||
value={activeId || (active?.id || '')}
|
|
||||||
onChange={(e) => setMassStyleActive(e.target.value)}
|
|
||||||
style={{ flex: 1, fontSize: 11 }}
|
|
||||||
>
|
|
||||||
{styles.map(p => (
|
|
||||||
<option key={p.id} value={p.id}>{p.name}</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
<button
|
|
||||||
onClick={addNew}
|
|
||||||
className="btn-outlined"
|
|
||||||
style={{ padding: '3px 6px' }}
|
|
||||||
title="Neuen Mass-Style anlegen (mit aktuellen Werten als Vorlage)"
|
|
||||||
><Icon name="add" size={12} /></button>
|
|
||||||
<button
|
|
||||||
onClick={remove}
|
|
||||||
className="btn-outlined"
|
|
||||||
style={{ padding: '3px 6px' }}
|
|
||||||
title="Aktuellen Mass-Style löschen"
|
|
||||||
disabled={styles.length <= 1}
|
|
||||||
><Icon name="delete" size={12} /></button>
|
|
||||||
</div>
|
|
||||||
{active && (
|
|
||||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
|
|
||||||
<div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
|
|
||||||
<span style={{ fontSize: 9, color: 'var(--text-muted)', width: 90 }}>
|
|
||||||
Name
|
|
||||||
</span>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={active.name}
|
|
||||||
onChange={(e) => update({ name: e.target.value })}
|
|
||||||
style={{ flex: 1, fontSize: 11, padding: '2px 6px' }}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
|
|
||||||
<span style={{ fontSize: 9, color: 'var(--text-muted)', width: 90 }}>
|
|
||||||
Raum-Rundung
|
|
||||||
</span>
|
|
||||||
<select
|
|
||||||
value={active.raumRundung}
|
|
||||||
onChange={(e) => update({ raumRundung: e.target.value })}
|
|
||||||
style={{ flex: 1, fontSize: 11 }}
|
|
||||||
>
|
|
||||||
{Object.entries(RAUM_RUNDUNGS_LABELS).map(([v, l]) => (
|
|
||||||
<option key={v} value={v}>{l}</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
|
|
||||||
<span style={{ fontSize: 9, color: 'var(--text-muted)', width: 90 }}>
|
|
||||||
Mass-Dezimalstellen
|
|
||||||
</span>
|
|
||||||
<select
|
|
||||||
value={active.dimDezimalstellen}
|
|
||||||
onChange={(e) => update({ dimDezimalstellen: parseInt(e.target.value, 10) })}
|
|
||||||
style={{ flex: 1, fontSize: 11 }}
|
|
||||||
>
|
|
||||||
{[0, 1, 2, 3, 4].map(n => (
|
|
||||||
<option key={n} value={n}>{n} {n === 1 ? 'Stelle' : 'Stellen'}</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
|
|
||||||
<span style={{ fontSize: 9, color: 'var(--text-muted)', width: 90 }}>
|
|
||||||
Mass-Einheit
|
|
||||||
</span>
|
|
||||||
<select
|
|
||||||
value={active.dimEinheit}
|
|
||||||
onChange={(e) => update({ dimEinheit: e.target.value })}
|
|
||||||
style={{ flex: 1, fontSize: 11 }}
|
|
||||||
>
|
|
||||||
<option value="m">m (Meter)</option>
|
|
||||||
<option value="cm">cm (Zentimeter)</option>
|
|
||||||
<option value="mm">mm (Millimeter)</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// ---- Hauptkomponente ------------------------------------------------------
|
// ---- Hauptkomponente ------------------------------------------------------
|
||||||
|
|
||||||
export default function DimensionenApp() {
|
export default function DimensionenApp() {
|
||||||
@@ -339,11 +195,6 @@ export default function DimensionenApp() {
|
|||||||
}}>
|
}}>
|
||||||
<div style={{ flex: 1, overflowY: 'auto', overflowX: 'hidden' }}>
|
<div style={{ flex: 1, overflowY: 'auto', overflowX: 'hidden' }}>
|
||||||
|
|
||||||
<MassStyleSection
|
|
||||||
massStyles={state.massStyles}
|
|
||||||
activeId={state.massStyleActive}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{/* Header: Selektions-Info + World/CPlane */}
|
{/* Header: Selektions-Info + World/CPlane */}
|
||||||
<div style={{
|
<div style={{
|
||||||
display: 'flex', alignItems: 'center', gap: 6,
|
display: 'flex', alignItems: 'center', gap: 6,
|
||||||
|
|||||||
@@ -0,0 +1,178 @@
|
|||||||
|
import { useEffect, useState } from 'react'
|
||||||
|
import Icon from './components/Icon'
|
||||||
|
import { onMessage, notifyReady,
|
||||||
|
masseSetActive as setActive,
|
||||||
|
masseSavePreset as savePreset,
|
||||||
|
masseDeletePreset as deletePreset } from './lib/rhinoBridge'
|
||||||
|
|
||||||
|
const RAUM_RUNDUNGS_LABELS = {
|
||||||
|
'exakt': 'Exakt (2 Nachk.)',
|
||||||
|
'0.01': 'auf 0.01 m²',
|
||||||
|
'0.1': 'auf 0.1 m²',
|
||||||
|
'0.5': 'auf 0.5 m²',
|
||||||
|
'1': 'auf 1 m²',
|
||||||
|
}
|
||||||
|
|
||||||
|
const labelXs = {
|
||||||
|
fontSize: 9, color: 'var(--text-muted)',
|
||||||
|
textTransform: 'uppercase', letterSpacing: '0.06em',
|
||||||
|
fontWeight: 600,
|
||||||
|
}
|
||||||
|
|
||||||
|
function Row({ label, children }) {
|
||||||
|
return (
|
||||||
|
<div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
|
||||||
|
<span style={{ ...labelXs, width: 130, flexShrink: 0 }}>{label}</span>
|
||||||
|
<div style={{ flex: 1 }}>{children}</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function MasseSettingsApp() {
|
||||||
|
const [presets, setPresets] = useState([])
|
||||||
|
const [activeId, setActiveId] = useState(null)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
onMessage('STATE', (s) => {
|
||||||
|
setPresets(s.presets || [])
|
||||||
|
setActiveId(s.activeId || null)
|
||||||
|
})
|
||||||
|
notifyReady()
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
const active = presets.find(p => p.id === activeId) || presets[0]
|
||||||
|
const update = (patch) => {
|
||||||
|
if (!active) return
|
||||||
|
savePreset({ ...active, ...patch })
|
||||||
|
}
|
||||||
|
const addNew = () => {
|
||||||
|
const name = (window.prompt('Name für neues Mass:') || '').trim()
|
||||||
|
if (!name) return
|
||||||
|
const tmpl = active || { raumRundung: '0.1', dimDezimalstellen: 2, dimEinheit: 'm' }
|
||||||
|
savePreset({
|
||||||
|
name,
|
||||||
|
raumRundung: tmpl.raumRundung,
|
||||||
|
dimDezimalstellen: tmpl.dimDezimalstellen,
|
||||||
|
dimEinheit: tmpl.dimEinheit,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
const remove = () => {
|
||||||
|
if (!active) return
|
||||||
|
if (presets.length <= 1) {
|
||||||
|
window.alert('Mindestens ein Mass muss erhalten bleiben.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!window.confirm(`Mass "${active.name}" löschen?`)) return
|
||||||
|
deletePreset(active.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div style={{
|
||||||
|
padding: 16,
|
||||||
|
display: 'flex', flexDirection: 'column', gap: 14,
|
||||||
|
fontFamily: 'var(--font)', color: 'var(--text-primary)',
|
||||||
|
background: 'var(--bg-panel)', minHeight: '100vh',
|
||||||
|
boxSizing: 'border-box',
|
||||||
|
}}>
|
||||||
|
{/* Header */}
|
||||||
|
<div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
|
||||||
|
<Icon name="straighten" size={14} style={{ color: 'var(--accent)' }} />
|
||||||
|
<span style={{ fontSize: 13, fontWeight: 600 }}>Masse</span>
|
||||||
|
<span style={{ fontSize: 10, color: 'var(--text-muted)', flex: 1 }}>
|
||||||
|
Globale Vorgaben für Raum-Rundung und Mass-Linien
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Picker + Aktionen */}
|
||||||
|
<Row label="Aktiv">
|
||||||
|
<div style={{ display: 'flex', gap: 4 }}>
|
||||||
|
<select
|
||||||
|
value={activeId || (active?.id || '')}
|
||||||
|
onChange={(e) => setActive(e.target.value)}
|
||||||
|
style={{ flex: 1, fontSize: 12 }}
|
||||||
|
>
|
||||||
|
{presets.map(p => (
|
||||||
|
<option key={p.id} value={p.id}>{p.name}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<button
|
||||||
|
onClick={addNew}
|
||||||
|
className="btn-outlined"
|
||||||
|
style={{ padding: '4px 8px' }}
|
||||||
|
title="Neues Mass anlegen (mit aktuellen Werten als Vorlage)"
|
||||||
|
><Icon name="add" size={13} /></button>
|
||||||
|
<button
|
||||||
|
onClick={remove}
|
||||||
|
className="btn-outlined"
|
||||||
|
style={{ padding: '4px 8px' }}
|
||||||
|
title="Aktives Mass löschen"
|
||||||
|
disabled={presets.length <= 1}
|
||||||
|
><Icon name="delete" size={13} /></button>
|
||||||
|
</div>
|
||||||
|
</Row>
|
||||||
|
|
||||||
|
{active && (
|
||||||
|
<div style={{
|
||||||
|
display: 'flex', flexDirection: 'column', gap: 10,
|
||||||
|
padding: 12, borderRadius: 6,
|
||||||
|
background: 'var(--bg-section)',
|
||||||
|
border: '1px solid var(--border-light)',
|
||||||
|
}}>
|
||||||
|
<Row label="Name">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={active.name}
|
||||||
|
onChange={(e) => update({ name: e.target.value })}
|
||||||
|
style={{ width: '100%', fontSize: 12, padding: '4px 8px' }}
|
||||||
|
/>
|
||||||
|
</Row>
|
||||||
|
|
||||||
|
<Row label="Raum-Rundung">
|
||||||
|
<select
|
||||||
|
value={active.raumRundung}
|
||||||
|
onChange={(e) => update({ raumRundung: e.target.value })}
|
||||||
|
style={{ width: '100%', fontSize: 12 }}
|
||||||
|
>
|
||||||
|
{Object.entries(RAUM_RUNDUNGS_LABELS).map(([v, l]) => (
|
||||||
|
<option key={v} value={v}>{l}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</Row>
|
||||||
|
|
||||||
|
<Row label="Mass-Dezimalstellen">
|
||||||
|
<select
|
||||||
|
value={active.dimDezimalstellen}
|
||||||
|
onChange={(e) => update({ dimDezimalstellen: parseInt(e.target.value, 10) })}
|
||||||
|
style={{ width: '100%', fontSize: 12 }}
|
||||||
|
>
|
||||||
|
{[0, 1, 2, 3, 4].map(n => (
|
||||||
|
<option key={n} value={n}>{n} {n === 1 ? 'Stelle' : 'Stellen'}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</Row>
|
||||||
|
|
||||||
|
<Row label="Mass-Einheit">
|
||||||
|
<select
|
||||||
|
value={active.dimEinheit}
|
||||||
|
onChange={(e) => update({ dimEinheit: e.target.value })}
|
||||||
|
style={{ width: '100%', fontSize: 12 }}
|
||||||
|
>
|
||||||
|
<option value="m">m (Meter)</option>
|
||||||
|
<option value="cm">cm (Zentimeter)</option>
|
||||||
|
<option value="mm">mm (Millimeter)</option>
|
||||||
|
</select>
|
||||||
|
</Row>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div style={{ fontSize: 10, color: 'var(--text-muted)',
|
||||||
|
padding: '6px 8px',
|
||||||
|
background: 'var(--bg-section)',
|
||||||
|
borderRadius: 4, lineHeight: 1.5 }}>
|
||||||
|
Änderungen werden sofort auf alle Räume angewendet. Pro-Raum gesetzte
|
||||||
|
Rundungen (im Element-Panel) haben Vorrang vor dem aktiven Mass.
|
||||||
|
Mass-Linien-Anwendung kommt im nächsten Schritt.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
pickLayerCombination, saveLayerCombination,
|
pickLayerCombination, saveLayerCombination,
|
||||||
deleteLayerCombination, openLayerCombinationsDialog,
|
deleteLayerCombination, openLayerCombinationsDialog,
|
||||||
openDossierSettings, openKameraPanel,
|
openDossierSettings, openKameraPanel,
|
||||||
|
setMasseActive, openMasseSettings,
|
||||||
} from './lib/rhinoBridge'
|
} from './lib/rhinoBridge'
|
||||||
|
|
||||||
const PRESETS = [
|
const PRESETS = [
|
||||||
@@ -129,6 +130,7 @@ export default function OberleisteApp() {
|
|||||||
cmdPrompt: '', cmdOptions: [],
|
cmdPrompt: '', cmdOptions: [],
|
||||||
overridesActivePreset: null, overridesPresets: [],
|
overridesActivePreset: null, overridesPresets: [],
|
||||||
layerCombinations: [], layerCombinationActive: null,
|
layerCombinations: [], layerCombinationActive: null,
|
||||||
|
massePresets: [], masseActiveId: null,
|
||||||
})
|
})
|
||||||
const [appliedScale, setAppliedScale] = useState(null)
|
const [appliedScale, setAppliedScale] = useState(null)
|
||||||
const appliedScaleRef = useRef(null)
|
const appliedScaleRef = useRef(null)
|
||||||
@@ -303,6 +305,31 @@ export default function OberleisteApp() {
|
|||||||
|
|
||||||
<div style={sep} />
|
<div style={sep} />
|
||||||
|
|
||||||
|
{/* ====== GRUPPE: MASSE ====== */}
|
||||||
|
<span style={groupLabel}>Masse</span>
|
||||||
|
<select
|
||||||
|
value={state.masseActiveId || ''}
|
||||||
|
onChange={(e) => setMasseActive(e.target.value)}
|
||||||
|
style={pillSelect}
|
||||||
|
title="Aktives Mass — Raum-Rundung + Mass-Linien-Format"
|
||||||
|
>
|
||||||
|
{(state.massePresets || []).length === 0 && <option value="">—</option>}
|
||||||
|
{(state.massePresets || []).map(p => (
|
||||||
|
<option key={p.id} value={p.id}>{p.name}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<button
|
||||||
|
onClick={() => openMasseSettings()}
|
||||||
|
title="Masse bearbeiten / neues anlegen"
|
||||||
|
className="btn-outlined"
|
||||||
|
style={{ height: PILL_H, padding: '0 6px', boxSizing: 'border-box',
|
||||||
|
fontSize: 9 }}
|
||||||
|
>
|
||||||
|
<Icon name="settings" size={12} />
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div style={sep} />
|
||||||
|
|
||||||
{/* ====== GRUPPE: MASSSTAB ====== */}
|
{/* ====== GRUPPE: MASSSTAB ====== */}
|
||||||
<span style={groupLabel}>Massstab</span>
|
<span style={groupLabel}>Massstab</span>
|
||||||
<span
|
<span
|
||||||
|
|||||||
@@ -171,10 +171,14 @@ export function saveOverridesPreset(name) { send('SAVE_OVERRIDES_PRESET', { name
|
|||||||
export function openOverridesPanel() { send('OPEN_OVERRIDES_PANEL', {}) }
|
export function openOverridesPanel() { send('OPEN_OVERRIDES_PANEL', {}) }
|
||||||
export function openKameraPanel() { send('OPEN_KAMERA_PANEL', {}) }
|
export function openKameraPanel() { send('OPEN_KAMERA_PANEL', {}) }
|
||||||
|
|
||||||
// --- Mass-Style (Dimensionen-Panel hostet) ---
|
// --- Masse (in Oberleiste + Satellite-Fenster MasseSettings) ---
|
||||||
export function setMassStyleActive(id) { send('MASS_STYLE_SET_ACTIVE', { id }) }
|
// Topbar: aktives Mass setzen + Settings-Fenster oeffnen
|
||||||
export function saveMassStyle(preset) { send('MASS_STYLE_SAVE', { preset }) }
|
export function setMasseActive(id) { send('SET_MASSE_ACTIVE', { id }) }
|
||||||
export function deleteMassStyle(id) { send('MASS_STYLE_DELETE', { id }) }
|
export function openMasseSettings() { send('OPEN_MASSE_SETTINGS', {}) }
|
||||||
|
// MasseSettings-Fenster: eigene Bridge (Topics ohne MASSE_ prefix)
|
||||||
|
export function masseSetActive(id) { send('SET_ACTIVE', { id }) }
|
||||||
|
export function masseSavePreset(preset) { send('SAVE', { preset }) }
|
||||||
|
export function masseDeletePreset(id) { send('DELETE', { id }) }
|
||||||
|
|
||||||
// --- Kamera-Panel ---
|
// --- Kamera-Panel ---
|
||||||
export function setKameraViewport(state) { send('SET_VIEWPORT', { ...state }) }
|
export function setKameraViewport(state) { send('SET_VIEWPORT', { ...state }) }
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import LayoutDialogApp from './LayoutDialogApp.jsx'
|
|||||||
import SwisstopoApp from './SwisstopoApp.jsx'
|
import SwisstopoApp from './SwisstopoApp.jsx'
|
||||||
import OsmApp from './OsmApp.jsx'
|
import OsmApp from './OsmApp.jsx'
|
||||||
import KameraApp from './KameraApp.jsx'
|
import KameraApp from './KameraApp.jsx'
|
||||||
|
import MasseSettingsApp from './MasseSettingsApp.jsx'
|
||||||
import GestaltungApp from './GestaltungApp.jsx'
|
import GestaltungApp from './GestaltungApp.jsx'
|
||||||
import AusschnitteApp from './AusschnitteApp.jsx'
|
import AusschnitteApp from './AusschnitteApp.jsx'
|
||||||
import MassstabApp from './MassstabApp.jsx'
|
import MassstabApp from './MassstabApp.jsx'
|
||||||
@@ -42,6 +43,7 @@ const RootApp = mode === 'gestaltung' ? GestaltungApp
|
|||||||
: mode === 'swisstopo' ? SwisstopoApp
|
: mode === 'swisstopo' ? SwisstopoApp
|
||||||
: mode === 'osm' ? OsmApp
|
: mode === 'osm' ? OsmApp
|
||||||
: mode === 'kamera' ? KameraApp
|
: mode === 'kamera' ? KameraApp
|
||||||
|
: mode === 'masse_settings' ? MasseSettingsApp
|
||||||
: App
|
: App
|
||||||
|
|
||||||
window.onerror = function (msg, src, line, col, err) {
|
window.onerror = function (msg, src, line, col, err) {
|
||||||
|
|||||||
Reference in New Issue
Block a user