pyarchinit-photogrammetry 1.3.1__tar.gz → 1.3.2__tar.gz

{pyarchinit_photogrammetry-1.3.1/src/pyarchinit_photogrammetry.egg-info → pyarchinit_photogrammetry-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-photogrammetry
-Version: 1.3.1
+Version: 1.3.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
@@ -32,6 +32,7 @@ Requires-Dist: sqlalchemy>=2.0
 Requires-Dist: typer>=0.9
 Requires-Dist: fpdf2>=2.8
 Requires-Dist: openpyxl>=3.1
+Requires-Dist: threadpoolctl>=3.1
 Provides-Extra: mesh
 Requires-Dist: open3d!=0.20.0,>=0.18; extra == "mesh"
 Provides-Extra: bim

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyarchinit-photogrammetry"
-version = "1.3.1"
+version = "1.3.2"
 description = "Open-source photogrammetry engine for archaeology and BIM, integrated with PyArchInit"
 readme = "README.md"
 license = "GPL-2.0-or-later"
@@ -37,6 +37,7 @@ dependencies = [
     "typer>=0.9",
     "fpdf2>=2.8",  # the processing report as PDF (io.pdf_report)
     "openpyxl>=3.1",  # the tables as Excel workbooks (io.tables)
+    "threadpoolctl>=3.1",  # BLAS on one thread where results must not depend on the threads (engine.ortho)
 ]
 
 [project.optional-dependencies]

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/__init__.py

@@ -35,7 +35,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.3.1"
+__version__ = "1.3.2"
 
 __all__ = ["app", "Document", "Chunk", "Camera", "Sensor", "Marker", "Projection", "Reference", "ScaleBar",
            "PointCloud", "ASPRS_CLASSES", "ARCHAEO_CLASSES", "Progress", "Cancelled", "print_progress", "__version__"]

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/engine/ortho.py

@@ -1203,11 +1203,27 @@ def build_orthomosaic(chunk: Chunk, resolution: float | None = None, surface: st
     return out_path
 
 
+def _one_blas_thread():
+    """BLAS on one thread while the tiles are made: OpenBLAS (numpy on Linux and Windows) splits a
+    product among its threads in a way that depends on how many calls run at once, and a row that
+    lands in a remainder block is rounded by another kernel: one bit in a cell's coordinates was
+    enough to pick another photo, so one worker and four gave different pixels. The tiles are
+    already in parallel: one BLAS thread each is also the faster way."""
+    try:
+        from threadpoolctl import threadpool_limits
+    except ImportError:  # pragma: no cover - a dependency of the program
+        import contextlib
+
+        return contextlib.nullcontext()
+    return threadpool_limits(limits=1, user_api="blas")
+
+
 def _run_tiles(ctx, tiles, workers: int, progress: Progress, put, start: float = 0.03, span: float = 0.9) -> None:
     """Make the tiles in parallel (at most twice the workers waiting) and hand each one to
-    ``put(r0, c0, block)`` in this thread as soon as it is ready."""
+    ``put(r0, c0, block)`` in this thread as soon as it is ready; the same pixels with any number
+    of workers (:func:`_one_blas_thread`)."""
     done = 0
-    with ThreadPoolExecutor(workers) as pool:
+    with _one_blas_thread(), ThreadPoolExecutor(workers) as pool:
         queue = iter(tiles)
         running = {}
         try:

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/gui/image_views.py

@@ -391,8 +391,10 @@ class RasterView(_ZoomView):
     file) so that it opens at once; zooming in further, the visible part is read again from the
     file at the resolution of the screen, up to the full one (``detail``), in a thread."""
 
-    DRAW_MODES = ("polygon", "line", "measure", "quota", "marker", "crop", "patch", "dem_edit", "probe")
-    AREA_MODES = ("crop", "patch", "dem_edit", "area", "chart")  # drag a box or click a polygon
+    DRAW_MODES = ("polygon", "line", "measure", "quota", "marker", "crop", "patch", "dem_edit", "probe",
+                  "req_polygon", "req_line", "req_point")
+    AREA_MODES = ("crop", "patch", "dem_edit", "area", "chart", "req_polygon")  # drag a box or click a polygon
+    REQUEST_MODES = ("req_polygon", "req_line", "req_point")  # the drawing lent to a plugin (request_geometry)
     SAM_TOOLS = ("tap", "box", "area")
 
     mouse_world = Signal(float, float, object)  # x, y, z or None
@@ -410,6 +412,9 @@ class RasterView(_ZoomView):
     quota_clicked = Signal(float, float)  # spot height at world x, y
     marker_clicked = Signal(float, float)  # a marker at world x, y (the height from the DEM)
     probe_clicked = Signal(float, float)  # a measuring point at world x, y (elevation, temperature, bands)
+    request_finished = Signal(object)  # (N,2) world XY drawn for a request: polygon, line or one point
+    request_cancelled = Signal()  # Esc during a request
+    raster_loaded = Signal()  # a raster, an empty frame or nothing is now shown: layers must be drawn again
     photos_at_point = Signal(float, float)  # filter the photos that see world x, y
     photos_in_area_requested = Signal()  # filter the photos that frame the selected polygon
     sam_click = Signal(float, float, int, bool)  # x, y, label (1 add / 0 remove), True = a new object
@@ -521,6 +526,33 @@ class RasterView(_ZoomView):
         self.tr = None
         if text:
             self.scene().addText(text)
+        self.raster_loaded.emit()
+
+    def show_frame(self, bounds, resolution: float, text: str = "") -> None:
+        """An empty frame in world coordinates instead of a raster (``bounds`` = xmin, ymin, xmax,
+        ymax; ``resolution`` = metres per pixel of the view): layers and overlays of plugins can be
+        drawn on it with no orthophoto or DEM (a geophysical grid before the survey has one)."""
+        from rasterio.transform import from_origin
+
+        x0, y0, x1, y1 = (float(v) for v in bounds)
+        if not (x1 > x0 and y1 > y0) or not resolution > 0:
+            raise ValueError("an empty frame needs xmin < xmax, ymin < ymax and a positive resolution")
+        self._empty_scene()
+        w = max(1, int(np.ceil((x1 - x0) / resolution)))
+        h = max(1, int(np.ceil((y1 - y0) / resolution)))
+        self.path, self.kind, self.z = None, "frame", None
+        self.tr = from_origin(x0, y1, resolution, resolution)
+        self._src_size = self._base_size = (w, h)
+        self._dem_lookup = None
+        self.pixmap_item = None
+        frame = self.scene().addRect(QRectF(0, 0, w, h), self._pen("#9aa0a6", 1))
+        frame.setZValue(-2)
+        if text:
+            label = self.scene().addText(text)
+            label.setPos(4, 4)
+        self.setSceneRect(QRectF(0, 0, w, h))
+        self.fit()
+        self.raster_loaded.emit()
 
     def load(self, path: str | Path, kind: str, max_side: int = 6000, bands=None) -> None:
         import rasterio
@@ -589,6 +621,7 @@ class RasterView(_ZoomView):
         self.setSceneRect(QRectF(0, 0, w, h))
         self.fit()
         self._view_changed()
+        self.raster_loaded.emit()
 
     # ----------------------------------------------------------- full-resolution detail
     def _view_changed(self, *_args) -> None:
@@ -1201,6 +1234,23 @@ class RasterView(_ZoomView):
             self.clear_selection()
 
     def keyPressEvent(self, ev) -> None:
+        if self.mode in self.REQUEST_MODES:
+            if ev.key() == Qt.Key.Key_Escape:
+                self.set_mode(self.mode)
+                self.request_cancelled.emit()
+                return
+            if ev.key() in (Qt.Key.Key_Return, Qt.Key.Key_Enter):
+                self._finish_request()
+                return
+            if ev.key() == Qt.Key.Key_Backspace and self._clicks:  # the last vertex away
+                self._clicks.pop()
+                self._click_xy.pop()
+                if self._clicks:
+                    self._update_rubber()
+                elif self._rubber is not None:
+                    self.scene().removeItem(self._rubber)
+                    self._rubber = None
+                return
         if self.mode == "sam":
             if ev.key() in (Qt.Key.Key_Return, Qt.Key.Key_Enter):
                 self.sam_key.emit("accept")
@@ -1372,6 +1422,9 @@ class RasterView(_ZoomView):
         self._clicks.append(sp)
         self._click_xy.append(xy)
         self._update_rubber()
+        if self.mode == "req_point":
+            self._finish_request()
+            return
         if self.mode in ("line", "measure") and len(self._clicks) == 2:
             a, b = (np.array(p) for p in self._click_xy)
             if self.mode == "line":
@@ -1388,6 +1441,9 @@ class RasterView(_ZoomView):
     def mouseDoubleClickEvent(self, ev) -> None:
         if self.mode == "sam":  # a second press: nothing more (Enter accepts the mask)
             return
+        if self.mode == "req_line":
+            self._finish_request()
+            return
         if self.mode in ("polygon", *self.AREA_MODES) and len(self._click_xy) >= 3:
             xy = np.array(self._click_xy)
             mode = self.mode
@@ -1397,8 +1453,18 @@ class RasterView(_ZoomView):
             super().mouseDoubleClickEvent(ev)
 
     def _area_signal(self, mode: str):
-        return {"patch": self.patch_finished, "dem_edit": self.dem_edit_finished,
-                "area": self.area_finished, "chart": self.chart_finished}.get(mode, self.crop_finished)
+        return {"patch": self.patch_finished, "dem_edit": self.dem_edit_finished, "area": self.area_finished,
+                "chart": self.chart_finished, "req_polygon": self.request_finished}.get(mode, self.crop_finished)
+
+    def _finish_request(self) -> None:
+        """The geometry of a request, when it has enough vertices (polygon 3, line 2, point 1)."""
+        need = {"req_polygon": 3, "req_line": 2, "req_point": 1}[self.mode]
+        xy = [p for i, p in enumerate(self._click_xy) if i == 0 or not np.allclose(p, self._click_xy[i - 1])]
+        if len(xy) < need:
+            return
+        mode = self.mode
+        self.set_mode(mode)
+        self.request_finished.emit(np.array(xy, float))
 
 
 class PhotoView(_ZoomView):

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/gui/main_window.py

@@ -11,7 +11,7 @@ import traceback
 from pathlib import Path
 
 import numpy as np
-from PySide6.QtCore import QRectF, QSize, Qt, QTimer, QUrl
+from PySide6.QtCore import QObject, QRectF, QSize, Qt, QTimer, QUrl, Signal
 from PySide6.QtGui import QAction, QActionGroup, QDesktopServices, QKeySequence
 from PySide6.QtWidgets import (QApplication, QDialog, QDialogButtonBox, QDockWidget, QFileDialog, QFrame,
                                QInputDialog, QLabel, QMainWindow, QMenu, QMessageBox, QPlainTextEdit, QPushButton,
@@ -76,6 +76,24 @@ def _it(value: float, decimals: int = 0) -> str:
     return number(value, decimals)
 
 
+class _GuiCalls(QObject):
+    """Runs functions in the interface thread: emitted from any thread, received there (queued)."""
+
+    call = Signal(object)
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.call.connect(self._run, Qt.ConnectionType.QueuedConnection)
+
+    @staticmethod
+    def _run(job) -> None:
+        function, args, kwargs = job
+        try:
+            function(*args, **kwargs)
+        except Exception:  # a plugin's function never stops the window
+            log.exception("function run in the interface thread failed")
+
+
 class _StatusBar(QStatusBar):
     """The status bar: its messages in the language of the interface (also those of the engine)."""
 
@@ -193,6 +211,10 @@ class MainWindow(QMainWindow):
         self.ortho_view.area_requested.connect(self._area_selected)
         self.ortho_view.patch_requested.connect(self.patch_with_selection)
         self.ortho_view.line_finished.connect(self._section_drawn)
+        self._request = None  # the drawing lent by request_geometry: (on_finished, on_cancelled)
+        self._gui_calls = _GuiCalls(self)
+        self.ortho_view.request_finished.connect(self._request_drawn)
+        self.ortho_view.request_cancelled.connect(lambda: self._end_request(cancelled=True))
         self.ortho_view.measured.connect(lambda t: (self.statusBar().showMessage(t, 30000),
                                                     self.log_pane.info(t)))
         self.ortho_view.quota_clicked.connect(self._quota_clicked)
@@ -567,6 +589,7 @@ class MainWindow(QMainWindow):
         self._act(km, tr("Rimuovi tutte le maschere"), lambda: self.masks_remove(selected=False))
         dm = m.addMenu(icon("polygon"), tr("Disegno su ortofoto"))
         self.draw_group = QActionGroup(self)
+        self.draw_group.triggered.connect(lambda _a: self._end_request(cancelled=True))
         self.draw_actions: dict[str, QAction] = {}
         for mode, label, ic in (("pan", "Sposta / interroga", "pan"), ("select", "Seleziona", "select"),
                                 ("polygon", "Disegna unita' stratigrafica", "polygon"),
@@ -1086,6 +1109,75 @@ class MainWindow(QMainWindow):
         if flag and self.history is not None and not self._task_done:
             self.history.record()
 
+    def mark_modified(self) -> None:
+        """The project has changes to save (a plugin changed ``chunk.meta`` or its files): the title
+        shows it, *Salva* and the question at closing take it into account, Modifica > Annulla can
+        take it back."""
+        self._dirty(True)
+
+    def call_in_gui(self, function, *args, **kwargs) -> None:
+        """``function(*args, **kwargs)`` in the interface thread, soon: from a background step or an
+        exporter, for whatever touches the window."""
+        self._gui_calls.call.emit((function, args, kwargs))
+
+    # ---------------------------------------------------------------- drawing lent to plugins
+    def request_geometry(self, kind: str, on_finished, on_cancelled=None, hint: str = "") -> bool:
+        """Lend the drawing of the 2D view: ``kind`` "polygon" (drag a box, or click the vertices and
+        double click or Enter), "line" (click the vertices, double click or Enter to end) or "point"
+        (one click). ``on_finished(xy)`` gets the vertices, ``(N, 2)`` in the coordinates of the chunk,
+        in the interface thread; ``on_cancelled()`` when Esc, another tool of the drawing bar or another
+        request ends it. Backspace drops the last vertex. Returns False when there is nothing to draw
+        on (no orthophoto, DEM or frame)."""
+        if kind not in ("polygon", "line", "point"):
+            raise ValueError("kind: 'polygon', 'line' or 'point'")
+        self._end_request(cancelled=True)
+        view = self.ortho_view
+        if view.tr is None and self.chunk is not None and (self.chunk.orthomosaic_path or self.chunk.dem_path):
+            self._show_raster("ortho" if self.chunk.orthomosaic_path else "dem")
+        if view.tr is None:
+            self._warn("Costruisci prima l'ortofoto o il DEM.")
+            if on_cancelled is not None:
+                on_cancelled()
+            return False
+        self._request = (on_finished, on_cancelled)
+        for action in self.draw_group.actions():  # no tool of the bar is the one drawing now
+            action.setChecked(False)
+        view.set_mode("req_" + kind)
+        self.show_view(view)
+        default = {"polygon": "Trascina un riquadro, oppure clic per i vertici e doppio clic o Invio per chiudere; "
+                              "Esc annulla",
+                   "line": "Clic per i vertici, doppio clic o Invio per finire; Backspace toglie l'ultimo, Esc annulla",
+                   "point": "Clic sul punto; Esc annulla"}[kind]
+        self.statusBar().showMessage(hint or tr(default), 0)
+        return True
+
+    def _request_drawn(self, xy) -> None:
+        request, self._request = self._request, None
+        self.ortho_view.set_mode("pan")
+        self.draw_actions["pan"].setChecked(True)
+        self.statusBar().clearMessage()
+        if request is not None:
+            try:
+                request[0](np.asarray(xy, float))
+            except Exception as exc:
+                log.exception("the function of a drawing request failed")
+                self._warn(tr("Il disegno non e' stato accettato: {0}", str(exc)))
+
+    def _end_request(self, cancelled: bool = False) -> None:
+        """A pending request ends (another tool, another request, Esc): its ``on_cancelled``."""
+        request, self._request = self._request, None
+        if request is None:
+            return
+        if self.ortho_view.mode in self.ortho_view.REQUEST_MODES:
+            self.ortho_view.set_mode("pan")
+            self.draw_actions["pan"].setChecked(True)
+        self.statusBar().clearMessage()
+        if cancelled and request[1] is not None:
+            try:
+                request[1]()
+            except Exception:
+                log.exception("the cancel function of a drawing request failed")
+
     def _update_title(self) -> None:
         name = self.doc.path.name if self.doc.path else tr("senza nome")
         site = self.project_site()

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/gui/translations/en.json

@@ -364,6 +364,7 @@
   "Classificazione automatica (regole)": "Automatic classification (rules)",
   "Classificazione con il classificatore": "Classification with the classifier",
   "Classificazione della nuvola": "Classification of the cloud",
+  "Clic per i vertici, doppio clic o Invio per finire; Backspace toglie l'ultimo, Esc annulla": "Click the vertices, double click or Enter to end; Backspace drops the last one, Esc cancels",
   "Clic per i vertici, doppio clic per chiudere, tasto destro per annullare": "Click for the vertices, double click to close, right click to cancel",
   "Clic per selezionare, Maiusc/Cmd+clic per aggiungere o togliere, trascina per un riquadro; Canc elimina, Unisci fonde le unita', Esc deseleziona": "Click to select, Shift/Cmd+click to add or remove, drag for a box; Delete deletes, Merge merges the units, Esc deselects",
   "Clic su un punto del modello o della nuvola: le foto che lo vedono, come Filter Photos by Point di Metashape": "Click a point of the model or the cloud: the photos that see it, as Metashape's Filter Photos by Point",
@@ -372,6 +373,7 @@
   "Clic su un punto: un marker con la quota del DEM, proiettato sulle foto che lo vedono (come Aggiungi marker in Metashape); con due marker si fa una barra di scala": "Click a point: a marker with the height of the DEM, projected on the photos that see it (as Add marker in Metashape); two markers make a scale bar",
   "Clic su un punto: un punto di misura con coordinate, quota del DEM, temperatura, bande e indici letti lì a piena risoluzione (layer Punti di misura, esportabile e in QGIS)": "Click on a point: a measuring point with coordinates, DEM elevation, temperature, bands and indices read there at full resolution (layer Measuring points, exportable and in QGIS)",
   "Clic sui vertici dell'area, doppio clic (o Invio) chiude, Esc annulla": "Click the vertices of the area, double click (or Enter) closes, Esc cancels",
+  "Clic sul punto; Esc annulla": "Click the point; Esc cancels",
   "Clic sull'ortofoto, termica o multispettrale: un punto con coordinate, quota del DEM, temperatura, bande e indici letti lì a piena risoluzione": "Click on the orthomosaic, thermal or multispectral: a point with coordinates, DEM elevation, temperature, bands and indices read there at full resolution",
   "Codici": "Codes",
   "Collega alle US (selezione multipla):": "Link to the US (multiple selection):",
@@ -1840,6 +1842,7 @@
   "Traccia una sezione: Disegno > Traccia sezione, poi due clic sull'ortofoto.": "Trace a section: Drawing > Trace section, then two clicks on the orthophoto.",
   "Trascina per spostare, rotella per lo zoom, clic su un elemento per i suoi attributi": "Drag to pan, wheel to zoom, click on a feature for its attributes",
   "Trascina un riquadro attorno alla tabella colori (ColorChecker da 24 colori), oppure clic per i vertici e doppio clic per chiudere": "Drag a box around the colour chart (24-patch ColorChecker), or click the vertices and double click to close",
+  "Trascina un riquadro, oppure clic per i vertici e doppio clic o Invio per chiudere; Esc annulla": "Drag a box, or click the vertices and double click or Enter to close; Esc cancels",
   "Trascina un riquadro, oppure clic per i vertici e doppio clic per chiudere il poligono: poi scegli i prodotti da esportare ritagliati o da ritagliare nel progetto": "Drag a box, or click for the vertices and double click to close the polygon: then choose the products to export cropped or to crop in the project",
   "Trascina un riquadro, oppure clic per i vertici e doppio clic per chiudere: area in pianta e superficie 3D (dal DEM e dal modello), pendenza media, quote": "Drag a box, or click for the vertices and double click to close: plan area and 3D surface (from the DEM and from the model), mean slope, heights",
   "Trascina un riquadro, oppure clic per i vertici e doppio clic per chiudere: poi scegli da quali foto prendere i colori dell'area (alberi, veicoli, persone, cuciture)": "Drag a box, or click for the vertices and double click to close: then choose from which photos to take the colours of the area (trees, vehicles, people, seams)",
@@ -2325,6 +2328,7 @@
   "Il chunk {0} e' stato prima messo in bolla (come per il DEM).": "The chunk {0} was levelled first (as for the DEM).",
   "Il classificatore impara dai punti di cui conosci la classe: con il lazo (vista 3D) assegna la classe giusta ad alcuni gruppi di punti di ogni tipo (almeno due classi), poi addestralo. Usa la geometria attorno a ogni punto a tre scale, l'altezza sul terreno e il colore.\n\nClassi corrette a mano: {0}.\nClassi presenti: {1}.": "The classifier learns from the points whose class you know: with the lasso (3D view) assign the right class to a few groups of points of every kind (at least two classes), then train it. It uses the geometry around every point at three scales, the height above the ground and the colour.\n\nClasses corrected by hand: {0}.\nClasses present: {1}.",
   "Il database contiene {0} siti (scavi).": "The database holds {0} sites (excavations).",
+  "Il disegno non e' stato accettato: {0}": "The drawing was not accepted: {0}",
   "Il modello importato e' a {0} m dai dati del chunk: controlla il sistema di riferimento, lo spostamento, la scala e l'asse verticale del file. Il modello di prima e' tra le versioni (tasto destro sul modello nell'area di lavoro).": "The imported model lies {0} m from the data of the chunk: check the coordinate system, the shift, the scale and the vertical axis of the file. The previous model is among the versions (right click on the model in the workspace).",
   "Il piano a quota {0} m non taglia il modello: nessuna pianta": "The plane at height {0} m does not cut the model: no plan",
   "Il prospetto «{0}» non ha piu' i suoi file.": "The elevation «{0}» no longer has its files.",

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/io/gpkg.py

@@ -68,6 +68,14 @@ def is_geopackage(path: str | Path) -> bool:
         return False
 
 
+def refuse_foreign(path: str | Path) -> None:
+    """:class:`FileExistsError` when ``path`` is a file with content that is not a GeoPackage: the
+    program never deletes or rewrites a file it did not make."""
+    path = Path(path)
+    if path.exists() and (path.is_dir() or path.stat().st_size) and not is_geopackage(path):
+        raise FileExistsError(f"{path} exists and is not a GeoPackage: it was left as it is, choose another file")
+
+
 def connect(path: str | Path) -> sqlite3.Connection:
     """Connection in autocommit mode (transactions are explicit), waiting for other writers."""
     Path(path).parent.mkdir(parents=True, exist_ok=True)
@@ -136,12 +144,15 @@ def replace_rows(con: sqlite3.Connection, table: str, columns: list[str], featur
 
 def write_table(path: str | Path, table: str, geometry_type: str, columns: dict[str, str], features,
                 crs: str | None, identifier: str | None = None) -> Path:
-    """Write one feature table into a GeoPackage (created when missing; other tables kept)."""
+    """Write one feature table into a GeoPackage (created when missing; other tables kept). A file
+    that exists and is not a GeoPackage - another database, a document chosen by mistake - is never
+    touched: :class:`FileExistsError`. An empty file (left by a save dialog) is used."""
     path = Path(path)
     srs = srs_of(crs)
     new = not is_geopackage(path)
     if new and path.exists():
-        path.unlink()  # not a GeoPackage (an empty or foreign file chosen as output)
+        refuse_foreign(path)
+        path.unlink()  # empty: nothing to lose
     con = connect(path)
     try:
         con.execute("BEGIN IMMEDIATE")
@@ -188,5 +199,5 @@ def read_table(path: str | Path, table: str) -> list[tuple[object, dict]]:
         con.close()
 
 
-__all__ = ["write_table", "is_geopackage", "srs_of", "blob", "create", "ensure_table", "replace_rows", "connect",
+__all__ = ["write_table", "is_geopackage", "refuse_foreign", "srs_of", "blob", "create", "ensure_table", "replace_rows", "connect",
            "quote", "geometry", "read_table"]

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/io/qfield.py

@@ -175,6 +175,7 @@ def export_package(chunk, folder: str | os.PathLike, resolution: float | None =
     crs = None if crs_mod.is_local(chunk.crs) else chunk.crs
     gp = folder / GPKG
     if gp.exists():
+        gpkg.refuse_foreign(gp)  # an earlier package is written again, a file of something else stays
         gp.unlink()
     progress(0.05, "QField: layers")
     units = [(wkt.loads(u["wkt"]), _unit_row(u)) for u in d["units"]]

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/io/qgis_link.py

@@ -181,6 +181,8 @@ class LiveLink:
 
         groups = self._group(layers)
         new = not gpkg.is_geopackage(self.path)
+        if new:
+            gpkg.refuse_foreign(self.path)  # never write the drawings into another file of that name
         if new:
             self._signatures = {}
         todo = {t: f for t, f in groups.items() if force or new or self._signatures.get(t) != self._signature(f)}

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/plugins/api.py

@@ -77,6 +77,7 @@ class Contributions:
     actions: list = field(default_factory=list)
     commands: dict = field(default_factory=dict)
     exporters: list = field(default_factory=list)
+    connections: list = field(default_factory=list)  # (signal, slot) disconnected when the plugin goes away
 
 
 class Context:
@@ -154,6 +155,75 @@ class Context:
             if method is not None:
                 method()
 
+    # ------------------------------------------------------------------ the window (since 1.3.2)
+    def request_polygon(self, on_finished: Callable, on_cancelled: Callable | None = None, hint: str = "") -> bool:
+        """Let the user draw a polygon on the 2D view with the program's own tool (drag a box, or click
+        the vertices and double click or Enter; Backspace drops the last vertex, Esc cancels):
+        ``on_finished(xy)`` gets the vertices, an ``(N, 2)`` array in the coordinates of the chunk, in the
+        interface thread; ``on_cancelled()`` when the user picks another tool or another request comes.
+        ``hint``: the text of the status bar. False (and ``on_cancelled``) when there is nothing to draw
+        on; in the command line there is no drawing (``RuntimeError``)."""
+        return self._request("polygon", on_finished, on_cancelled, hint)
+
+    def request_line(self, on_finished: Callable, on_cancelled: Callable | None = None, hint: str = "") -> bool:
+        """As :meth:`request_polygon` for a line of two or more vertices (double click or Enter ends)."""
+        return self._request("line", on_finished, on_cancelled, hint)
+
+    def request_point(self, on_finished: Callable, on_cancelled: Callable | None = None, hint: str = "") -> bool:
+        """As :meth:`request_polygon` for one point: ``on_finished`` gets a ``(1, 2)`` array."""
+        return self._request("point", on_finished, on_cancelled, hint)
+
+    def _request(self, kind, on_finished, on_cancelled, hint) -> bool:
+        if self.window is None:
+            raise RuntimeError("drawing on the view needs the window: not in the command line")
+        return self.window.request_geometry(kind, on_finished, on_cancelled, hint)
+
+    def on_raster_loaded(self, callback: Callable[[], object]) -> None:
+        """``callback()`` each time the 2D view shows another raster, an empty frame or nothing: the
+        layers and overlays of a plugin are gone with the old one and are drawn again there.
+        Disconnected by itself when the plugin is disabled. Nothing in the command line."""
+        view = getattr(self.window, "ortho_view", None)
+        if view is None:
+            return
+        view.raster_loaded.connect(callback)
+        self.contributions.connections.append((view.raster_loaded, callback))
+
+    def show_frame(self, bounds, resolution: float, text: str = "") -> None:
+        """An empty frame on the 2D view (``bounds`` = xmin, ymin, xmax, ymax in the coordinates of the
+        chunk, ``resolution`` metres per pixel of the view) when the chunk has no orthophoto or DEM to
+        draw on: then layers and overlays can be added as usual."""
+        view = getattr(self.window, "ortho_view", None)
+        if view is None:
+            raise RuntimeError("the 2D view needs the window: not in the command line")
+        view.show_frame(bounds, resolution, text)
+
+    def mark_modified(self) -> None:
+        """The project has changes to save (``chunk.meta`` or files of the plugin changed): the window
+        shows it and asks to save at closing. Nothing in the command line, where the plugin saves."""
+        method = getattr(self.window, "mark_modified", None)
+        if method is not None:
+            method()
+
+    def call_in_gui(self, function: Callable, *args, **kwargs) -> None:
+        """``function(*args, **kwargs)`` in the interface thread, soon: from the function given to
+        :meth:`run` or from an exporter, for anything that touches the window. At once in the command
+        line."""
+        method = getattr(self.window, "call_in_gui", None)
+        if method is None:
+            function(*args, **kwargs)
+        else:
+            method(function, *args, **kwargs)
+
+    def release(self) -> None:
+        """What the plugin connected through the context, disconnected (the manager calls it after
+        :meth:`Plugin.deactivate`)."""
+        for signal, slot in self.contributions.connections:
+            try:
+                signal.disconnect(slot)
+            except (RuntimeError, TypeError):
+                pass
+        self.contributions.connections.clear()
+
     def run(self, title: str, function: Callable, done: Callable | None = None) -> object:
         """``function(progress)`` with a progress bar: in the background in the window (``done(result)``
         afterwards, in the interface thread), at once in the command line (``done`` too)."""

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry/plugins/manager.py

@@ -187,6 +187,8 @@ class Manager:
                     info.plugin.deactivate()
                 except Exception as exc:
                     log.warning("plugin %s: deactivate failed: %s", info.name, exc)
+            if info.context is not None:
+                info.context.release()
             info.active, info.plugin, info.context = False, None, None
 
     def remove(self, name: str) -> None:
@@ -199,6 +201,8 @@ class Manager:
                 info.plugin.deactivate()
             except Exception:
                 pass
+        if info.context is not None:
+            info.context.release()
         shutil.rmtree(info.location)
         self.plugins = [i for i in self.plugins if i.name != name]
 

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2/src/pyarchinit_photogrammetry.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-photogrammetry
-Version: 1.3.1
+Version: 1.3.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
@@ -32,6 +32,7 @@ Requires-Dist: sqlalchemy>=2.0
 Requires-Dist: typer>=0.9
 Requires-Dist: fpdf2>=2.8
 Requires-Dist: openpyxl>=3.1
+Requires-Dist: threadpoolctl>=3.1
 Provides-Extra: mesh
 Requires-Dist: open3d!=0.20.0,>=0.18; extra == "mesh"
 Provides-Extra: bim

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/src/pyarchinit_photogrammetry.egg-info/requires.txt

@@ -15,6 +15,7 @@ sqlalchemy>=2.0
 typer>=0.9
 fpdf2>=2.8
 openpyxl>=3.1
+threadpoolctl>=3.1
 
 [all]
 open3d!=0.20.0,>=0.18

{pyarchinit_photogrammetry-1.3.1 → pyarchinit_photogrammetry-1.3.2}/tests/test_ortho.py

@@ -44,7 +44,12 @@ def test_surfaces_and_workers(processed, scene, tmp_path):
         assert src.overviews(1)  # pyramids for a quick display
     many = ch.build_orthomosaic(resolution=0.004, workers=4)
     with rasterio.open(many) as src:
-        assert np.array_equal(src.read(), a)  # the same pixels, tile by tile in any order
+        b = src.read()
+    differ = np.any(a != b, axis=0)
+    if differ.any():  # say where, if it ever happens again (it did with OpenBLAS splitting products)
+        rows, cols = np.nonzero(differ)
+        raise AssertionError(f"1 and 4 workers: {int(differ.sum())} pixels differ, rows {rows.min()}-{rows.max()}, "
+                             f"columns {cols.min()}-{cols.max()}, up to {int(np.abs(a.astype(int) - b).max())}")
     worst = _targets_error(many, scene)
     assert worst < 0.005, f"targets in the orthomosaic off by up to {worst * 1000:.2f} mm"
     # a true orthophoto on the mesh (vertical rays), and from the dense cloud alone