pyarchinit-photogrammetry 1.2.1__tar.gz → 1.2.2__tar.gz

{pyarchinit_photogrammetry-1.2.1/src/pyarchinit_photogrammetry.egg-info → pyarchinit_photogrammetry-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-photogrammetry
-Version: 1.2.1
+Version: 1.2.2
 Summary: Open-source photogrammetry engine for archaeology and BIM, integrated with PyArchInit
 Author-email: Enzo Cocca <enzo.ccc@gmail.com>
 License-Expression: GPL-2.0-or-later

{pyarchinit_photogrammetry-1.2.1 → pyarchinit_photogrammetry-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyarchinit-photogrammetry"
-version = "1.2.1"
+version = "1.2.2"
 description = "Open-source photogrammetry engine for archaeology and BIM, integrated with PyArchInit"
 readme = "README.md"
 license = "GPL-2.0-or-later"

{pyarchinit_photogrammetry-1.2.1 → pyarchinit_photogrammetry-1.2.2}/src/pyarchinit_photogrammetry/__init__.py

@@ -32,7 +32,7 @@ from .core import (ARCHAEO_CLASSES, ASPRS_CLASSES, Camera, Chunk, Document, Mark
 from .core.progress import Cancelled, Progress, print_progress
 from . import demo  # noqa: E402  (ppg.demo.create_demo)
 
-__version__ = "1.2.1"
+__version__ = "1.2.2"
 
 __all__ = ["app", "Document", "Chunk", "Camera", "Sensor", "Marker", "Projection", "Reference", "ScaleBar",
            "PointCloud", "ASPRS_CLASSES", "ARCHAEO_CLASSES", "Progress", "Cancelled", "print_progress", "__version__"]

{pyarchinit_photogrammetry-1.2.1 → pyarchinit_photogrammetry-1.2.2}/src/pyarchinit_photogrammetry/engine/multispectral.py

@@ -607,8 +607,35 @@ def build_reflectance(chunk: Chunk, bands: list[str] | None = None, resolution:
 
 
 # ------------------------------------------------------------------------------ indices and zoning
+def formula_bands(formula: str) -> set[str]:
+    """The band names a formula uses (``np`` and the numbers left out)."""
+    import ast
+
+    try:
+        tree = ast.parse(formula, mode="eval")
+    except SyntaxError as exc:
+        raise ValueError(f"formula {formula!r}: {exc.msg}") from None
+    return {n.id for n in ast.walk(tree) if isinstance(n, ast.Name) and n.id != "np"}
+
+
+def missing_bands(formula: str, available) -> list[str]:
+    """The bands a formula needs that ``available`` has not got (sorted)."""
+    return sorted(formula_bands(formula) - set(available))
+
+
+def available_indices(bands) -> list[str]:
+    """The indices of :data:`INDICES` whose bands are all among ``bands``."""
+    return [name for name, (formula, _) in INDICES.items() if not missing_bands(formula, bands)]
+
+
 def index_values(formula: str, bands: dict[str, np.ndarray]) -> np.ndarray:
-    """``formula`` over the band arrays (names as in :data:`INDICES`); NaN where undefined."""
+    """``formula`` over the band arrays (names as in :data:`INDICES`); NaN where undefined. A
+    band the captures have not got (the thermal LWIR of a camera without it) is an error that
+    names it, not a crash."""
+    missing = missing_bands(formula, bands)
+    if missing:
+        raise ValueError(f"the formula needs the band(s) {', '.join(missing)}, which these captures have not got "
+                         f"(bands: {', '.join(bands)})")
     names = {k: np.asarray(v, np.float32) for k, v in bands.items()}
     with np.errstate(divide="ignore", invalid="ignore"):
         out = eval(formula, {"__builtins__": {}, "np": np}, names)  # noqa: S307 - our own formulas

{pyarchinit_photogrammetry-1.2.1 → pyarchinit_photogrammetry-1.2.2}/src/pyarchinit_photogrammetry/gui/main_window.py

@@ -1326,6 +1326,17 @@ class MainWindow(QMainWindow):
                 return
             name = "".join(c for c in label.strip() if c.isalnum() or c in "_-") or "Indice"
         formula = formula or None
+        used = formula or ms_mod.INDICES.get(name, ("", ""))[0]
+        bands = self._ms_meta().get("reflectance_bands") or self._ms_meta().get("bands") or []
+        try:
+            missing = ms_mod.missing_bands(used, bands) if used else []
+        except ValueError as exc:
+            self._warn(tr("Formula non valida: {0}", exc))
+            return
+        if missing:
+            self._warn(tr("L'indice {0} usa le bande {1}, che queste riprese non hanno (bande: {2}).", name,
+                          ", ".join(missing), ", ".join(bands)))
+            return
         self.run_task(tr("Indice {0}", name), lambda p: ms_mod.index_raster(self.chunk, name, formula),
                       lambda path: self.ms_show("index", name))
 
@@ -6405,6 +6416,14 @@ class MainWindow(QMainWindow):
                     extra_vectors.append({"name": f"Zone {zname}", "path": z["file"], "table": "zone",
                                           "geometry": "POLYGON", "color": "#1a9850", "label": "classe"})
 
+        for provider in getattr(self, "qgis_providers", []):  # plugins: their rasters and GeoPackage layers
+            try:
+                more_rasters, more_vectors = provider()
+                rasters += list(more_rasters or [])
+                extra_vectors += list(more_vectors or [])
+            except Exception as exc:  # noqa: BLE001 - a plugin must not stop the export
+                log.warning("QGIS: layer di un plugin saltati: %s", exc)
+
         def job(p):
             p(0.2, "Creazione del progetto QGIS")
             rep = qgis_link.build_project(project, ch.crs if ch else "", files, rasters, title=name, qgis=q,

{pyarchinit_photogrammetry-1.2.1 → pyarchinit_photogrammetry-1.2.2}/src/pyarchinit_photogrammetry/gui/multispectral_pane.py

@@ -122,6 +122,21 @@ class MultispectralPane(QWidget):
     def _show_reflectance(self) -> None:
         self.show_requested.emit("reflectance", FALSE_COLOUR if self.c_show.currentData() == "false" else TRUE_COLOUR)
 
+    def _offer_indices(self, bands) -> None:
+        """Only the indices the bands allow (no Thermal without a LWIR band), the choice kept."""
+        from ..engine.multispectral import available_indices
+
+        current = self.c_index.currentData()
+        wanted = available_indices(bands) if bands else list(INDICES)
+        self.c_index.blockSignals(True)
+        self.c_index.clear()
+        for name in wanted:
+            self.c_index.addItem(f"{name}: {INDICES[name][1]}", name)
+        self.c_index.addItem(tr("Formula propria..."), "formula")
+        k = self.c_index.findData(current)
+        self.c_index.setCurrentIndex(k if k >= 0 else 0)
+        self.c_index.blockSignals(False)
+
     # --------------------------------------------------------------- state
     def set_state(self, chunk) -> None:
         """What every step has: read from the chunk (captures, alignment, DEM, panel, the
@@ -164,6 +179,7 @@ class MultispectralPane(QWidget):
             self.states["reflectance"].setText(tr("Da fare dopo il DEM: un GeoTIFF a virgola mobile con una banda per banda."))
         self.b_index.setEnabled(has_refl)
         self.c_index.setEnabled(has_refl)
+        self._offer_indices(ms.get("reflectance_bands") or ms.get("bands") or [])
         if indices:
             self.states["index"].setText(tr("Calcolati: {0}", ", ".join(sorted(indices))))
         else:

{pyarchinit_photogrammetry-1.2.1 → pyarchinit_photogrammetry-1.2.2}/src/pyarchinit_photogrammetry/gui/translations/en.json

@@ -2117,6 +2117,7 @@
   "File non valido: {0}": "Invalid file: {0}",
   "File scritti in {0}:\n": "Files written in {0}:\n",
   "Filtra le foto di {0}": "Filter the photos of {0}",
+  "Formula non valida: {0}": "Invalid formula: {0}",
   "Formula sui nomi delle bande ({0}):": "Formula over the band names ({0}):",
   "Foto del punto X {0:.2f} Y {1:.2f} Z {2:.2f}": "Photos of the point X {0:.2f} Y {1:.2f} Z {2:.2f}",
   "Foto del punto X {0} Y {1} Z {2}": "Photos of the point X {0} Y {1} Z {2}",
@@ -2141,6 +2142,7 @@
   "Impossibile leggere {0}": "Cannot read {0}",
   "Indice {0}": "Index {0}",
   "Installazione Python: aggiorna con <code>{0}</code> (o con uv).": "Python installation: update with <code>{0}</code> (or with uv).",
+  "L'indice {0} usa le bande {1}, che queste riprese non hanno (bande: {2}).": "The index {0} uses the bands {1}, which these captures have not got (bands: {2}).",
   "L'ortofoto ({0:.0f} m di lato, pixel di {1:.1f} cm) viene esaminata a tasselli di 1024 pixel che si sovrappongono: alla risoluzione proposta sono circa {2} tasselli. Con la GPU del Mac (MPS) un tassello richiede circa 10 s in scansione normale, 40-90 s in alta o massima. Le unita' trovate vanno nel layer «Unita' da SAM», senza numero di US.": "The orthophoto ({0:.0f} m per side, {1:.1f} cm pixels) is examined in overlapping tiles of 1024 pixels: at the proposed resolution they are about {2} tiles. With the Mac GPU (MPS) a tile takes about 10 s at normal thoroughness, 40-90 s at high or maximum. The units found go into the layer «Units from SAM», without a US number.",
   "L'ortofoto ({0} m di lato, pixel di {1} cm) viene esaminata a tasselli di 1024 pixel che si sovrappongono: alla risoluzione proposta sono circa {2} tasselli. Con la GPU del Mac (MPS) un tassello richiede circa 10 s in scansione normale, 40-90 s in alta o massima. Le unita' trovate vanno nel layer «Unita' da SAM», senza numero di US.": "The orthophoto ({0} m per side, {1} cm pixels) is examined in overlapping tiles of 1024 pixels: at the proposed resolution they are about {2} tiles. With the Mac GPU (MPS) a tile takes about 10 s at normal thoroughness, 40-90 s at high or maximum. The units found go into the layer «Units from SAM», without a US number.",
   "La scala del rilievo e' cambiata del {0:+.3f} %: {1} sono ancora nella scala di prima, ricostruiscili (Flusso di lavoro).": "The scale of the survey changed by {0:+.3f} %: {1} are still at the previous scale, rebuild them (Workflow).",

{pyarchinit_photogrammetry-1.2.1 → pyarchinit_photogrammetry-1.2.2}/src/pyarchinit_photogrammetry/io/qgis_link.py

@@ -331,6 +331,21 @@ for r in cfg["rasters"]:
         lyr.setRenderer(index_renderer(lyr, float(lo), float(hi)))
     elif r.get("ramp") == "zones" and lyr.isValid():
         lyr.setRenderer(zones_renderer(lyr, int(r.get("classes") or 3)))
+    elif r.get("ramp") in ("grey", "grey_inverted", "diverging") and lyr.isValid():  # a geophysical grid
+        lo, hi = r.get("limits") or lyr.dataProvider().cumulativeCut(1, 0.02, 0.98)
+        lo, hi = float(lo), float(hi)
+        if r["ramp"] == "diverging":
+            stops = [(0.0, "#2166ac"), (0.5, "#f7f7f7"), (1.0, "#b2182b")]
+        elif r["ramp"] == "grey_inverted":
+            stops = [(0.0, "#ffffff"), (1.0, "#000000")]
+        else:
+            stops = [(0.0, "#000000"), (1.0, "#ffffff")]
+        ramp = QgsColorRampShader(lo, hi, None, QgsColorRampShader.Interpolated)
+        ramp.setColorRampItemList([QgsColorRampShader.ColorRampItem(lo + t * (hi - lo), QColor(c), f"{lo + t * (hi - lo):.3g}")
+                                   for t, c in stops])
+        shader = QgsRasterShader()
+        shader.setRasterShaderFunction(ramp)
+        lyr.setRenderer(QgsSingleBandPseudoColorRenderer(lyr.dataProvider(), int(r.get("band") or 1), shader))
     if r.get("opacity") is not None:
         lyr.setOpacity(float(r["opacity"]))
     proj.addMapLayer(lyr, False)

{pyarchinit_photogrammetry-1.2.1 → pyarchinit_photogrammetry-1.2.2/src/pyarchinit_photogrammetry.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-photogrammetry
-Version: 1.2.1
+Version: 1.2.2
 Summary: Open-source photogrammetry engine for archaeology and BIM, integrated with PyArchInit
 Author-email: Enzo Cocca <enzo.ccc@gmail.com>
 License-Expression: GPL-2.0-or-later

{pyarchinit_photogrammetry-1.2.1 → pyarchinit_photogrammetry-1.2.2}/tests/test_multispectral.py

@@ -338,3 +338,15 @@ def test_pane_tree_and_views_show_the_products(scene_dir, tmp_path, monkeypatch)
     finally:
         w_.setWindowModified(False)
         w_.close()
+
+
+def test_an_index_without_its_band_is_refused_with_its_name():
+    """Thermal needs LWIR: without it the error names the band (a crash in 1.2.1)."""
+    bands = {"Red": np.ones((2, 2), np.float32), "NIR": np.ones((2, 2), np.float32)}
+    assert ms.available_indices(bands) == [n for n in ms.INDICES if n not in ("NDRE", "GNDVI", "NDWI", "CIRE", "Thermal")]
+    assert ms.missing_bands(ms.INDICES["Thermal"][0], bands) == ["LWIR"]
+    with pytest.raises(ValueError, match="LWIR"):
+        ms.index_values("LWIR", bands)
+    with pytest.raises(ValueError, match="formula"):
+        ms.index_values("NIR +", bands)
+    assert ms.index_values("(NIR - Red) / (NIR + Red)", bands).shape == (2, 2)