pyarchinit-mini 2.8.0__tar.gz → 2.9.0__tar.gz

{pyarchinit_mini-2.8.0 → pyarchinit_mini-2.9.0}/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.9.0 — 2026-05-19
+
+### Fixed — Swimlane UI/UX cleanup (post-2.8.0 feedback)
+- **Toolbar consolidated**: removed duplicate `swimlane-toolbar` block. Single `Esporta` dropdown now contains yEd GraphML (.graphml), Heriverse/ATON JSON (.json), Graphviz DOT, PNG. `Importa` button accepts both .graphml and .json. The existing `group-by-selector` now uses the new vocabulary: Nessun raggruppamento / Area / Settore / Quadrato / Attività / Strutture (was: Period+Phase / Struttura / Attivita / Settore / Area / Ambient / Saggio / Quad-Par / No grouping).
+- **Edge labels italianized**: swimlane web + GraphML export now show `Copre`/`Coperto da`/`Taglia`/`Tagliato da`/`Riempie`/`Riempito da`/`Si appoggia a`/`Gli si appoggia`/`Uguale a`/`Si lega a`/`Anteriore a` (locale `it`) or `Covers`/`Covered by`/etc (locale `en`) instead of canonical `overlies`/`is_after`/`cuts`/etc. Canonical kept in `data.canonical` for JS class hooks.
+- **Inverse-edge dedup**: when both `A overlies B` and `B is_after A` exist (data redundancy), draw only the forward direction — no more overlapping labels at the same midpoint.
+- **Transitive reduction**: if A→B→C exists, A→C is no longer drawn (per-canonical, only for DAGs). Applied via `networkx.transitive_reduction`. Adarte fixture: 516 → 343 edges (clean Harris Matrix layout).
+- **Palette-driven frontend rendering**: cytoscape selectors `node[style]` and `edge[style]` now read `data.style.{shape,backgroundColor,borderColor,borderWidth,lineColor,…}` from the `/api/load` payload and apply them. US nodes finally appear with their palette colors/shapes (USM red border, USV octagonal, …) instead of default gray.
+- **GraphML export rewritten**: now produces the proper Harris Matrix Creator format via `pyarchinit_mini.graphml_io.yed_writer.write_extended_matrix_graphml` — TableNode wrapper with `<y:Rows>` per period/fase (colored backgrounds, rotated labels like "Periodo 1 - Fase 1"), nodes positioned inside their period row, palette styles, italianized edge labels. Previously the writer just appended nodes to the palette template without TableNode rows.
+
+### Internals
+- New `rapporti_codec.CANONICAL_TO_ITALIAN`/`CANONICAL_TO_ENGLISH`/`display_label(canonical, locale)` (moved from `graph_to_db.py`).
+- `s3d_projector._load_edges` post-process: inverse dedup + per-canonical `nx.transitive_reduction` (skipped for SYMMETRIC and cyclic graphs).
+- `s3d_to_cytoscape` edges now carry `data.label` (italian display) AND `data.canonical` (English canonical for JS hooks).
+- `graphml_writer.write_graphml` now bridges to the existing `yed_writer.write_extended_matrix_graphml` via a temp file.
+- `harris_creator_editor.js`: 2 new cytoscape selectors (`node[style]`, `edge[style]`) read palette properties from element data.
+- `editor.html`: removed `swimlane-toolbar` div + duplicate `group-by-select` + standalone `export-graphml-btn`/`export-dot-btn`/`export-png-btn` + `exportYedGraphml()` button; replaced with one unified `Esporta` dropdown + `Importa` button.
+
 ## 2.8.0 — 2026-05-19
 
 ### Added — EM Palette + Multi-Format Swimlane Round-Trip

{pyarchinit_mini-2.8.0/pyarchinit_mini.egg-info → pyarchinit_mini-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-mini
-Version: 2.8.0
+Version: 2.9.0
 Summary: Lightweight archaeological data management system with REST API, Web UI, Desktop GUI, CLI, multi-user authentication, real-time collaboration, analytics dashboard, PyArchInit import/export, Heriverse/ATON export integration, and 3D CRUD viewer
 Home-page: https://github.com/enzococca/pyarchinit-mini
 Author: PyArchInit Team

{pyarchinit_mini-2.8.0 → pyarchinit_mini-2.9.0}/pyarchinit_mini/__init__.py

@@ -23,7 +23,7 @@ Features:
 - Scalable and modular architecture
 """
 
-__version__ = "2.8.0"
+__version__ = "2.9.0"
 __author__ = "PyArchInit Team"
 __email__ = "enzo.ccc@gmail.com"
 

{pyarchinit_mini-2.8.0 → pyarchinit_mini-2.9.0}/pyarchinit_mini/graphproj/graph_to_db.py

@@ -15,6 +15,7 @@ from pyarchinit_mini.graphproj.rapporti_codec import (
     INVERSE_PAIRS,
     SYMMETRIC,
     Rapporto,
+    CANONICAL_TO_ITALIAN,
 )
 from pyarchinit_mini.graphproj.s3d_projector import ProjectedGraph, Node
 
@@ -22,22 +23,6 @@ from pyarchinit_mini.graphproj.s3d_projector import ProjectedGraph, Node
 logger = logging.getLogger(__name__)
 
 
-# Canonical → italian display label (used when serializing).
-CANONICAL_TO_ITALIAN: Dict[str, str] = {
-    "overlies": "Copre",
-    "is_after": "Coperto da",
-    "cuts": "Taglia",
-    "is_cut_by": "Tagliato da",
-    "fills": "Riempie",
-    "is_filled_by": "Riempito da",
-    "abuts": "Si appoggia a",
-    "is_abutted_by": "Gli si appoggia",
-    "has_same_time": "Uguale a",
-    "is_bonded_to": "Si lega a",
-    "is_before": "Anteriore a",
-}
-
-
 @dataclass
 class WriteResult:
     imported_us: int = 0

pyarchinit_mini-2.9.0/pyarchinit_mini/graphproj/graphml_writer.py

@@ -0,0 +1,143 @@
+"""yEd-flavoured GraphML writer producing the EM Harris Matrix Creator format.
+
+Strategy (Approach A): thin bridge from ProjectedGraph to the canonical
+graphml_io.yed_writer.write_extended_matrix_graphml which already produces the
+proper TableNode / swimlane format consumed by yEd Desktop.
+
+Output:
+  - Standalone GraphML (no palette template merging)
+  - ONE group node with <y:TableNode YED_TABLE_NODE> containing one <y:Row>
+    per period row from the ProjectedGraph
+  - US nodes positioned inside their row's y-range
+  - Edges with italianized labels (Copre, Taglia, …) via rapporti_codec
+"""
+from __future__ import annotations
+
+import tempfile
+import os
+from pathlib import Path
+from typing import Optional
+
+from pyarchinit_mini.graphproj.s3d_projector import ProjectedGraph
+from pyarchinit_mini.graphproj.rapporti_codec import display_label, CANONICAL_TO_ITALIAN
+
+
+def write_graphml(graph: ProjectedGraph, *, palette_path: Optional[Path] = None) -> bytes:
+    """Render the projected graph as yEd-compatible GraphML bytes.
+
+    palette_path is accepted for backward-compatible call-sites but is ignored —
+    the new output is a standalone TableNode document, not a palette extension.
+    """
+    from pyarchinit_mini.harris_swimlane.swimlane_state import CytoscapeElement
+    from pyarchinit_mini.harris_swimlane.row_provider import Row as LegacyRow, PERIOD_COLORS
+
+    # ------------------------------------------------------------------
+    # 1. Convert ProjectedGraph.rows → legacy Row objects
+    # ------------------------------------------------------------------
+    rows: list[LegacyRow] = []
+    for i, r in enumerate(graph.rows):
+        rows.append(LegacyRow(
+            row_id=r.row_id,
+            period_name=r.periodo or r.label,
+            phase_name=r.fase,
+            start_date=None,
+            end_date=None,
+            color=PERIOD_COLORS[i % len(PERIOD_COLORS)],
+            source="period_table" if not r.is_fallback else "fallback",
+        ))
+
+    # ------------------------------------------------------------------
+    # 2. Convert ProjectedGraph.nodes → CytoscapeElement list
+    # ------------------------------------------------------------------
+    # Build a lookup: row_id → index so we can calculate y positions
+    row_index = {r.row_id: i for i, r in enumerate(graph.rows)}
+    row_height = 200
+    node_h, node_w = 30.0, 80.0
+    # Track column (x) per row so nodes in the same row are spread horizontally
+    col_counter: dict[str, int] = {}
+
+    nodes: list[CytoscapeElement] = []
+    for n in graph.nodes:
+        ri = row_index.get(n.row_id, 0)
+        col = col_counter.get(n.row_id, 0)
+        col_counter[n.row_id] = col + 1
+        x = col * (node_w + 20) + 30
+        y = ri * row_height + (row_height / 2 - node_h / 2)
+
+        nodes.append(CytoscapeElement(
+            data={
+                "id": n.node_id,
+                "us": n.us,
+                "us_number": n.us,
+                "area": n.area or "",
+                "unit_type": n.unit_type or "US",
+                "description": n.description or "",
+                "row": n.row_id,
+                "label": str(n.us),
+            },
+            position={"x": x, "y": y},
+        ))
+
+    # ------------------------------------------------------------------
+    # 3. Convert ProjectedGraph.edges → CytoscapeElement list with italian labels
+    # ------------------------------------------------------------------
+    edges: list[CytoscapeElement] = []
+    for e in graph.edges:
+        italian = display_label(e.canonical, locale="it")
+        edges.append(CytoscapeElement(
+            data={
+                "id": f"{e.source_id}__{e.canonical}__{e.target_id}",
+                "source": e.source_id,
+                "target": e.target_id,
+                "label": italian,
+                "canonical": e.canonical,
+                "relationship": CANONICAL_TO_ITALIAN.get(e.canonical, e.canonical),
+            },
+        ))
+
+    # ------------------------------------------------------------------
+    # 4. Build a minimal state-like object the legacy writer accepts
+    # ------------------------------------------------------------------
+    class _State:
+        def __init__(self):
+            self.site = graph.site
+            self.group_by = graph.group_by
+            self.rows = rows
+            self.nodes = nodes
+            self.edges = edges
+            self.pending_changes = {}
+
+    state = _State()
+
+    # ------------------------------------------------------------------
+    # 5. Call the canonical writer and return bytes
+    # ------------------------------------------------------------------
+    from pyarchinit_mini.graphml_io.yed_writer import write_extended_matrix_graphml
+
+    epochs: list[dict] = []
+    # Populate epochs from rows that have dating information
+    for r in graph.rows:
+        if r.datazione:
+            epochs.append({
+                "row_id": r.row_id,
+                "periodo": r.periodo,
+                "fase": r.fase,
+                "datazione": r.datazione,
+            })
+
+    with tempfile.NamedTemporaryFile(suffix=".graphml", delete=False) as tmp:
+        tmp_path = tmp.name
+    try:
+        write_extended_matrix_graphml(
+            state,
+            site_meta={"sito": graph.site},
+            epochs=epochs,
+            out=Path(tmp_path),
+        )
+        with open(tmp_path, "rb") as f:
+            return f.read()
+    finally:
+        try:
+            os.unlink(tmp_path)
+        except OSError:
+            pass

{pyarchinit_mini-2.8.0 → pyarchinit_mini-2.9.0}/pyarchinit_mini/graphproj/rapporti_codec.py

@@ -46,6 +46,44 @@ _IT_EXTRAS: Dict[str, str] = {
     "gli si appoggia": "is_before",
 }
 
+# Canonical → italian display label (for swimlane web + GraphML edge labels).
+CANONICAL_TO_ITALIAN: Dict[str, str] = {
+    "overlies": "Copre",
+    "is_after": "Coperto da",
+    "cuts": "Taglia",
+    "is_cut_by": "Tagliato da",
+    "fills": "Riempie",
+    "is_filled_by": "Riempito da",
+    "abuts": "Si appoggia a",
+    "is_abutted_by": "Gli si appoggia",
+    "has_same_time": "Uguale a",
+    "is_bonded_to": "Si lega a",
+    "is_before": "Anteriore a",
+}
+
+# Canonical → english display label.
+CANONICAL_TO_ENGLISH: Dict[str, str] = {
+    "overlies": "Covers",
+    "is_after": "Covered by",
+    "cuts": "Cuts",
+    "is_cut_by": "Cut by",
+    "fills": "Fills",
+    "is_filled_by": "Filled by",
+    "abuts": "Leans on",
+    "is_abutted_by": "Leant on by",
+    "has_same_time": "Same as",
+    "is_bonded_to": "Bonded to",
+    "is_before": "Before",
+}
+
+
+def display_label(canonical: str, locale: str = "it") -> str:
+    """Return the localized display label for a canonical relation name."""
+    if locale.lower().startswith("en"):
+        return CANONICAL_TO_ENGLISH.get(canonical, canonical)
+    return CANONICAL_TO_ITALIAN.get(canonical, canonical)
+
+
 # English fallbacks (Al-Khutm-style data).
 _EN_TO_CANONICAL: Dict[str, str] = {
     "covers": "overlies",

{pyarchinit_mini-2.8.0 → pyarchinit_mini-2.9.0}/pyarchinit_mini/graphproj/s3d_projector.py

@@ -18,7 +18,7 @@ from typing import Dict, List, Optional
 from sqlalchemy import text
 from sqlalchemy.orm import Session
 
-from pyarchinit_mini.graphproj.rapporti_codec import parse_rapporti, SYMMETRIC
+from pyarchinit_mini.graphproj.rapporti_codec import parse_rapporti, SYMMETRIC, INVERSE_PAIRS
 
 
 logger = logging.getLogger(__name__)
@@ -228,3 +228,50 @@ class S3DProjector:
                     continue
                 seen.add(key)
                 graph.edges.append(Edge(source_id=src_id, target_id=tgt_id, canonical=rap.canonical))
+
+        # === Step A: Inverse dedup — drop the redundant inverse direction ===
+        # E.g., if (overlies, A→B) exists, drop (is_after, B→A).
+        forward_keys: set = set()
+        for e in graph.edges:
+            if e.canonical in SYMMETRIC:
+                continue
+            forward_keys.add((e.canonical, e.source_id, e.target_id))
+        kept: List[Edge] = []
+        for e in graph.edges:
+            if e.canonical in SYMMETRIC:
+                kept.append(e)
+                continue
+            inv = INVERSE_PAIRS.get(e.canonical)
+            # If the forward counterpart of this inverse is already in the set, drop it
+            if inv is not None and (inv, e.target_id, e.source_id) in forward_keys:
+                if e.canonical > inv:
+                    continue  # drop; the lexicographically-first orientation wins
+            kept.append(e)
+        graph.edges = kept
+
+        # === Step B: Transitive reduction per canonical type ===
+        # If A→B and B→C exist under the same canonical, drop A→C.
+        try:
+            import networkx as nx
+            reduced: List[Edge] = []
+            by_canon: Dict[str, List[Edge]] = {}
+            for e in graph.edges:
+                by_canon.setdefault(e.canonical, []).append(e)
+            for canon, edges in by_canon.items():
+                if canon in SYMMETRIC:
+                    reduced.extend(edges)
+                    continue
+                dg = nx.DiGraph()
+                for ed in edges:
+                    dg.add_edge(ed.source_id, ed.target_id)
+                try:
+                    tr = nx.transitive_reduction(dg)
+                    keep_set = set(tr.edges())
+                    for ed in edges:
+                        if (ed.source_id, ed.target_id) in keep_set:
+                            reduced.append(ed)
+                except nx.NetworkXError:
+                    reduced.extend(edges)
+            graph.edges = reduced
+        except ImportError:
+            pass  # networkx not available; skip reduction

{pyarchinit_mini-2.8.0 → pyarchinit_mini-2.9.0}/pyarchinit_mini/graphproj/s3d_to_cytoscape.py

@@ -9,6 +9,7 @@ from __future__ import annotations
 from typing import Any, Dict, List, Tuple
 
 from pyarchinit_mini.em_palette import get_palette
+from pyarchinit_mini.graphproj.rapporti_codec import display_label
 from pyarchinit_mini.graphproj.s3d_projector import ProjectedGraph
 
 
@@ -73,7 +74,8 @@ def to_cytoscape(graph: ProjectedGraph) -> Dict[str, Any]:
                 "id": f"{e.source_id}__{e.canonical}__{e.target_id}",
                 "source": e.source_id,
                 "target": e.target_id,
-                "label": e.canonical,
+                "label": display_label(e.canonical, locale="it"),
+                "canonical": e.canonical,
             },
             "style": {
                 "lineColor": es.line_color,

pyarchinit_mini-2.9.0/pyarchinit_mini/web_interface/data/paradata/pompei-regio-vii/stratigraphy.graphml

@@ -0,0 +1,265 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
+  <key attr.name="url" attr.type="string" for="node" id="d4"/>
+  <key attr.name="description" attr.type="string" for="node" id="d5"/>
+  <key xmlns:ns0="http://www.yworks.com/xml/yfiles-common/1.0/java" for="node" id="d6" ns0:type="nodegraphics" yfiles.type="nodegraphics"/>
+  <key attr.name="EMID" attr.type="string" for="node" id="d7"/>
+  <key attr.name="URI" attr.type="string" for="node" id="d8"/>
+  <key xmlns:ns1="http://www.yworks.com/xml/yfiles-common/1.0/java" for="edge" id="d10" ns1:type="edgegraphics" yfiles.type="edgegraphics"/>
+  <key attr.name="EMID" attr.type="string" for="edge" id="d11"/>
+  <key attr.name="URI" attr.type="string" for="edge" id="d12"/>
+  <key for="graphml" id="d9" yfiles.type="resources"/>
+  <graph id="G" edgedefault="directed">
+    <node id="n0" yfiles.foldertype="group">
+      <data key="d7">simple_swimlane</data>
+      <data key="d6">
+        <y:GroupNode>
+          <y:Geometry height="1000.0" width="2000.0" x="0" y="0"/>
+        </y:GroupNode>
+      </data>
+      <graph edgedefault="directed" id="n0:"/>
+    </node>
+  </graph>
+  <data key="d9">
+    <y:Resources>
+      <y:Resource id="1">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;
+
+&lt;svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg4050"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 13"&gt;
+  &lt;defs
+     id="defs4052" /&gt;
+  &lt;sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.8994949"
+     inkscape:cx="18.095997"
+     inkscape:cy="17.278115"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" /&gt;
+  &lt;metadata
+     id="metadata4055"&gt;
+    &lt;rdf:RDF&gt;
+      &lt;cc:Work
+         rdf:about=""&gt;
+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;
+        &lt;dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;
+        &lt;dc:title&gt;&lt;/dc:title&gt;
+      &lt;/cc:Work&gt;
+    &lt;/rdf:RDF&gt;
+  &lt;/metadata&gt;
+  &lt;g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"&gt;
+    &lt;g
+       transform="matrix(0.41470954,0,0,0.41438764,-58.075087,96.197996)"
+       id="g3932"&gt;
+      &lt;path
+         transform="translate(-176.7767,-1080.8632)"
+         d="m 430.32499,906.90021 c 0,30.68405 -24.87434,55.55839 -55.55839,55.55839 -30.68405,0 -55.55839,-24.87434 -55.55839,-55.55839 0,-30.68405 24.87434,-55.55839 55.55839,-55.55839 30.68405,0 55.55839,24.87434 55.55839,55.55839 z"
+         sodipodi:ry="55.558392"
+         sodipodi:rx="55.558392"
+         sodipodi:cy="906.90021"
+         sodipodi:cx="374.7666"
+         id="path2996-3"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" /&gt;
+      &lt;path
+         inkscape:connector-curvature="0"
+         id="path3795"
+         d="m 195.82737,-229.48049 c -29.75104,1.0602 -53.53125,25.52148 -53.53125,55.53125 0,30.00977 23.78021,54.4398 53.53125,55.5 l 0,-38.875 -18.1875,0 0,-32.8125 18.1875,0 0,-39.34375 z"
+         style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;
+      &lt;rect
+         y="-187.49332"
+         x="212.49696"
+         height="27.142857"
+         width="26.071428"
+         id="rect3805"
+         style="fill:#7d7d7d;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;
+      &lt;path
+         inkscape:connector-curvature="0"
+         id="path3807"
+         d="m 180.35416,-173.20759 c 29.28571,0 29.28571,0 29.28571,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /&gt;
+    &lt;/g&gt;
+  &lt;/g&gt;
+&lt;/svg&gt;</y:Resource>
+      <y:Resource id="2">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;
+
+&lt;svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg4192"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 20"&gt;
+  &lt;defs
+     id="defs4194" /&gt;
+  &lt;sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14"
+     inkscape:cx="24.612064"
+     inkscape:cy="28.768962"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" /&gt;
+  &lt;metadata
+     id="metadata4197"&gt;
+    &lt;rdf:RDF&gt;
+      &lt;cc:Work
+         rdf:about=""&gt;
+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;
+        &lt;dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;
+        &lt;dc:title&gt;&lt;/dc:title&gt;
+      &lt;/cc:Work&gt;
+    &lt;/rdf:RDF&gt;
+  &lt;/metadata&gt;
+  &lt;g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"&gt;
+    &lt;g
+       transform="matrix(0.40828104,0,0,0.41346794,-201.56174,97.998396)"
+       id="g3922"&gt;
+      &lt;path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="path3912"
+         sodipodi:cx="374.7666"
+         sodipodi:cy="906.90021"
+         sodipodi:rx="55.558392"
+         sodipodi:ry="55.558392"
+         d="m 430.32499,906.90021 c 0,30.68405 -24.87434,55.55839 -55.55839,55.55839 -30.68405,0 -55.55839,-24.87434 -55.55839,-55.55839 0,-30.68405 24.87434,-55.55839 55.55839,-55.55839 30.68405,0 55.55839,24.87434 55.55839,55.55839 z"
+         transform="translate(177.55723,-1085.7479)" /&gt;
+      &lt;path
+         sodipodi:nodetypes="ccsccc"
+         inkscape:connector-curvature="0"
+         id="path3914"
+         d="m 543.53146,-169.98986 63.36579,-17.50001 c 0,0 0.71429,3.97312 0.71429,11.68875 0,7.71563 -2.93748,15.70661 -2.93748,15.70661 l -61.1426,17.05358 z"
+         style="fill:#7b7b7b;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;
+      &lt;path
+         sodipodi:nodetypes="ccccsc"
+         inkscape:connector-curvature="0"
+         id="path3916"
+         d="m 501.52478,-201.54471 54.88091,-14.27148 0,26.94893 -59.23348,15.97426 c 0,0 -0.15898,-6.266 0.10274,-12.48413 0.34368,-8.16509 4.24983,-16.16758 4.24983,-16.16758 z"
+         style="fill:#7b7b7b;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /&gt;
+    &lt;/g&gt;
+  &lt;/g&gt;
+&lt;/svg&gt;</y:Resource>
+      <y:Resource id="3">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;!-- Created with Inkscape (http://www.inkscape.org/) --&gt;
+
+&lt;svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="7mm"
+   height="7mm"
+   viewBox="0 0 7 7"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   sodipodi:docname="continuity.svg"&gt;
+  &lt;defs
+     id="defs2" /&gt;
+  &lt;sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.8181416"
+     inkscape:cx="-10.002405"
+     inkscape:cy="-64.860066"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1440"
+     inkscape:window-height="800"
+     inkscape:window-x="0"
+     inkscape:window-y="1"
+     inkscape:window-maximized="1" /&gt;
+  &lt;metadata
+     id="metadata5"&gt;
+    &lt;rdf:RDF&gt;
+      &lt;cc:Work
+         rdf:about=""&gt;
+        &lt;dc:format&gt;image/svg+xml&lt;/dc:format&gt;
+        &lt;dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /&gt;
+        &lt;dc:title&gt;&lt;/dc:title&gt;
+      &lt;/cc:Work&gt;
+    &lt;/rdf:RDF&gt;
+  &lt;/metadata&gt;
+  &lt;g
+     inkscape:label="Livello 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-82.089519,-139.87478)"&gt;
+    &lt;rect
+       id="rect12"
+       width="4.9497476"
+       height="4.9497476"
+       x="159.42734"
+       y="38.385479"
+       style="stroke-width:0.01220008"
+       transform="rotate(45)" /&gt;
+  &lt;/g&gt;
+&lt;/svg&gt;</y:Resource>
+    </y:Resources>
+  </data>
+</graphml>

{pyarchinit_mini-2.8.0 → pyarchinit_mini-2.9.0}/pyarchinit_mini/web_interface/static/js/harris_creator_editor.js

@@ -319,6 +319,31 @@ function initCytoscape() {
                     'target-arrow-color': '#2E86AB',
                     'target-arrow-shape': 'none'
                 }
+            },
+            // Palette-driven styles: applied when node/edge carries a `style` data object
+            // from the /api/load response (overrides defaults above).
+            {
+                selector: 'node[style]',
+                style: {
+                    'shape': 'data(style.shape)',
+                    'background-color': 'data(style.backgroundColor)',
+                    'border-color': 'data(style.borderColor)',
+                    'border-width': 'data(style.borderWidth)',
+                    'border-style': 'data(style.lineStyle)',
+                    'color': 'data(style.fontColor)',
+                    'font-size': 'data(style.fontSize)',
+                }
+            },
+            {
+                selector: 'edge[style]',
+                style: {
+                    'line-color': 'data(style.lineColor)',
+                    'width': 'data(style.lineWidth)',
+                    'line-style': 'data(style.lineStyle)',
+                    'target-arrow-shape': 'data(style.targetArrowShape)',
+                    'source-arrow-shape': 'data(style.sourceArrowShape)',
+                    'target-arrow-color': 'data(style.lineColor)',
+                }
             }
         ],
 
@@ -858,15 +883,10 @@ function setupEventListeners() {
     // Save button
     document.getElementById('save-btn').addEventListener('click', saveMatrix);
 
-    // Export buttons
-    document.getElementById('export-graphml-btn').addEventListener('click', () => exportMatrix('graphml'));
-    document.getElementById('export-dot-btn').addEventListener('click', () => exportMatrix('dot'));
-
-    // Export PNG button
-    const exportPngBtn = document.getElementById('export-png-btn');
-    if (exportPngBtn) {
-        exportPngBtn.addEventListener('click', exportPNG);
-    }
+    // Export buttons (legacy standalone buttons — null-safe; new dropdown items bound in template)
+    document.getElementById('export-graphml-btn')?.addEventListener('click', () => exportMatrix('graphml'));
+    document.getElementById('export-dot-btn')?.addEventListener('click', () => exportMatrix('dot'));
+    document.getElementById('export-png-btn')?.addEventListener('click', exportPNG);
 
     // Resize Cytoscape on window resize (e.g., sidebar toggle)
     window.addEventListener('resize', function() {