asp-plot 1.5.0__tar.gz → 1.6.0__tar.gz

{asp_plot-1.5.0 → asp_plot-1.6.0}/.claude/settings.local.json

@@ -16,7 +16,17 @@
       "WebFetch(domain:dg-cms-uploads-production.s3.amazonaws.com)",
       "WebFetch(domain:engineering.purdue.edu)",
       "Bash(gh api:*)",
-      "Bash(gh run view:*)"
+      "Bash(gh run view:*)",
+      "Bash(gh issue view:*)",
+      "WebFetch(domain:github.com)",
+      "WebFetch(domain:pypi.org)",
+      "Bash(find:*)",
+      "WebFetch(domain:py-pdf.github.io)",
+      "Bash(conda install:*)",
+      "Bash(mamba install:*)",
+      "Bash(python:*)",
+      "Bash(pip install:*)",
+      "Bash(pre-commit run:*)"
     ],
     "deny": [],
     "ask": []

{asp_plot-1.5.0 → asp_plot-1.6.0}/CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.6.0] - 2026-02-16
+
+### Added
+- Structured PDF report generation with title page, section headings, figure captions, DEM metadata summary table, and runtime summary table
+- New `report.py` module containing `ReportSection` and `ReportMetadata` dataclasses, `ASPReportPDF` class, and `compile_report()` function
+- DEM metadata (dimensions, GSD, CRS, nodata %, elevation range) automatically collected and displayed on the report title page
+- Figure captions describing each plot in the generated PDF report
+- Page headers (report title) and footers (page numbers) throughout the report
+- Tests for report dataclasses and PDF compilation (8 new tests)
+
+### Changed
+- Replaced `markdown-pdf` dependency with `fpdf2` (available on conda-forge, enabling conda-only installation)
+- Reordered report sections: Input Scenes and Stereo Geometry now appear before DEM results, matching the logical processing flow
+- Report generation moved from `utils.py` to dedicated `report.py` module
+- PNG images are now embedded directly in the PDF (eliminated intermediate PNG-to-JPEG conversion step)
+
+### Removed
+- Dependency on `markdown-pdf` (pip-only package that blocked conda-forge packaging)
+
 ## [1.5.0] - 2026-02-13
 
 ### Added

{asp_plot-1.5.0 → asp_plot-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: asp_plot
-Version: 1.5.0
+Version: 1.6.0
 Summary: Package for plotting outputs Ames Stereo Pipeline processing
 Project-URL: Homepage, https://github.com/uw-cryo/asp_plot
 Project-URL: Issues, https://github.com/uw-cryo/asp_plot/issues
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 Scripts and notebooks to visualize output from the [NASA Ames Stereo Pipeline (ASP)](https://github.com/NeoGeographyToolkit/StereoPipeline).
 
 > [!IMPORTANT]
-> [View an example WorldView-3 report here](https://www.bendirt.com/assets/documents/asp_plot_example_report.pdf).
+> [View an example WorldView report here](notebooks/WorldView/asp_plot_report_atlanta_tile.pdf).
 >
 
 ## Motivation

{asp_plot-1.5.0 → asp_plot-1.6.0}/README.md

@@ -5,7 +5,7 @@
 Scripts and notebooks to visualize output from the [NASA Ames Stereo Pipeline (ASP)](https://github.com/NeoGeographyToolkit/StereoPipeline).
 
 > [!IMPORTANT]
-> [View an example WorldView-3 report here](https://www.bendirt.com/assets/documents/asp_plot_example_report.pdf).
+> [View an example WorldView report here](notebooks/WorldView/asp_plot_report_atlanta_tile.pdf).
 >
 
 ## Motivation

{asp_plot-1.5.0 → asp_plot-1.6.0}/asp_plot/cli/asp_plot.py

@@ -9,10 +9,11 @@ import contextily as ctx
 from asp_plot.altimetry import Altimetry
 from asp_plot.bundle_adjust import PlotBundleAdjustFiles, ReadBundleAdjustFiles
 from asp_plot.processing_parameters import ProcessingParameters
+from asp_plot.report import ReportMetadata, ReportSection, compile_report
 from asp_plot.scenes import ScenePlotter
 from asp_plot.stereo import StereoPlotter
 from asp_plot.stereo_geometry import StereoGeometryPlotter
-from asp_plot.utils import Raster, compile_report
+from asp_plot.utils import Raster
 
 
 @click.command()
@@ -140,17 +141,21 @@ def main(
         directory, os.path.join(stereo_directory, report_filename)
     )
 
+    sections = []
     figure_counter = count(0)
 
-    asp_dem = StereoPlotter(
+    # Initialize StereoPlotter early (needed for DEM info and multiple plot types)
+    stereo_plotter = StereoPlotter(
         directory,
         stereo_directory,
         reference_dem=reference_dem,
         dem_fn=dem_filename,
         dem_gsd=dem_gsd,
-    ).dem_fn
+    )
+    asp_dem = stereo_plotter.dem_fn
 
-    # Set map CRS from output DEM
+    # Set map CRS from output DEM and collect DEM metadata
+    report_metadata = None
     if map_crs is None:
         if asp_dem and os.path.exists(asp_dem):
             try:
@@ -164,6 +169,30 @@ def main(
                 )
                 map_crs = "EPSG:4326"
 
+    # Collect DEM metadata for the report title page
+    if asp_dem and os.path.exists(asp_dem):
+        try:
+            dem_raster = Raster(asp_dem)
+            dem_data = dem_raster.read_array()
+            total_pixels = dem_data.size
+            nodata_pixels = dem_data.mask.sum() if hasattr(dem_data.mask, "sum") else 0
+            nodata_pct = (nodata_pixels / total_pixels * 100) if total_pixels else 0.0
+            valid = dem_data.compressed()
+            elev_range = (
+                (float(valid.min()), float(valid.max())) if valid.size else (0, 0)
+            )
+            report_metadata = ReportMetadata(
+                dem_dimensions=(dem_raster.ds.width, dem_raster.ds.height),
+                dem_gsd_m=dem_raster.get_gsd(),
+                dem_crs=map_crs or "",
+                dem_nodata_percent=nodata_pct,
+                dem_elevation_range=elev_range,
+                dem_filename=os.path.basename(asp_dem),
+                reference_dem=reference_dem or "",
+            )
+        except Exception as e:
+            print(f"\nCould not collect DEM metadata: {e}\n")
+
     # TODO: Centralize this in plotting utils, should not need ctx import in the CLI wrapper
     if add_basemap:
         ctx_kwargs = {
@@ -175,56 +204,84 @@ def main(
     else:
         ctx_kwargs = {}
 
-    # Stereo plots
-    plotter = StereoPlotter(
-        directory,
-        stereo_directory,
-        reference_dem=reference_dem,
-        dem_fn=dem_filename,
-        dem_gsd=dem_gsd,
-        title="Hillshade with details",
+    # ---- Section 1: Input Scenes ----
+    fig_fn = f"{next(figure_counter):02}.png"
+    scene_plotter = ScenePlotter(directory, stereo_directory, title="Input Scenes")
+    scene_plotter.plot_scenes(save_dir=plots_directory, fig_fn=fig_fn)
+    sections.append(
+        ReportSection(
+            title="Input Scenes",
+            image_path=os.path.join(plots_directory, fig_fn),
+            caption="Left and right input scenes used for stereo processing.",
+        )
     )
 
-    plotter.plot_detailed_hillshade(
-        subset_km=subset_km,
-        save_dir=plots_directory,
-        fig_fn=f"{next(figure_counter):02}.png",
-    )
+    # ---- Section 2: Stereo Geometry (conditional) ----
+    if plot_geometry:
+        fig_fn = f"{next(figure_counter):02}.png"
+        geom_plotter = StereoGeometryPlotter(directory, add_basemap=add_basemap)
+        geom_plotter.dg_geom_plot(save_dir=plots_directory, fig_fn=fig_fn)
+        sections.append(
+            ReportSection(
+                title="Stereo Geometry",
+                image_path=os.path.join(plots_directory, fig_fn),
+                caption="Stereo acquisition geometry skyplot and map view showing satellite viewing angles and scene footprints.",
+            )
+        )
 
-    plotter.title = "Stereo DEM Results"
-    plotter.plot_dem_results(
-        save_dir=plots_directory,
-        fig_fn=f"{next(figure_counter):02}.png",
+    # ---- Section 3: Match Points ----
+    fig_fn = f"{next(figure_counter):02}.png"
+    stereo_plotter.title = "Stereo Match Points"
+    stereo_plotter.plot_match_points(save_dir=plots_directory, fig_fn=fig_fn)
+    sections.append(
+        ReportSection(
+            title="Match Points",
+            image_path=os.path.join(plots_directory, fig_fn),
+            caption="Interest point matches between left and right images identified during stereo correlation.",
+        )
     )
 
-    plotter.title = "Disparity (pixels)"
-    plotter.plot_disparity(
-        unit="pixels",
-        quiver=True,
-        save_dir=plots_directory,
-        fig_fn=f"{next(figure_counter):02}.png",
+    # ---- Section 4: Detailed Hillshade ----
+    fig_fn = f"{next(figure_counter):02}.png"
+    stereo_plotter.title = "Hillshade with details"
+    stereo_plotter.plot_detailed_hillshade(
+        subset_km=subset_km, save_dir=plots_directory, fig_fn=fig_fn
     )
-
-    plotter.title = "Stereo Match Points"
-    plotter.plot_match_points(
-        save_dir=plots_directory,
-        fig_fn=f"{next(figure_counter):02}.png",
+    sections.append(
+        ReportSection(
+            title="Detailed Hillshade",
+            image_path=os.path.join(plots_directory, fig_fn),
+            caption=f"DEM hillshade with {subset_km} km detail subset in second row. If available, corresponding mapprojected ortho image subsets are displayed in the bottom row.",
+        )
     )
 
-    # Scene plot
-    plotter = ScenePlotter(directory, stereo_directory, title="Stereo Scenes")
-    plotter.plot_scenes(
-        save_dir=plots_directory, fig_fn=f"{next(figure_counter):02}.png"
+    # ---- Section 5: DEM Results ----
+    fig_fn = f"{next(figure_counter):02}.png"
+    stereo_plotter.title = "Stereo DEM Results"
+    stereo_plotter.plot_dem_results(save_dir=plots_directory, fig_fn=fig_fn)
+    sections.append(
+        ReportSection(
+            title="DEM Results",
+            image_path=os.path.join(plots_directory, fig_fn),
+            caption="Output DEM with intersection error map and difference relative to the reference DEM used in processing.",
+        )
     )
 
-    # Geometry plot
-    if plot_geometry:
-        plotter = StereoGeometryPlotter(directory, add_basemap=add_basemap)
-        plotter.dg_geom_plot(
-            save_dir=plots_directory, fig_fn=f"{next(figure_counter):02}.png"
+    # ---- Section 6: Disparity ----
+    fig_fn = f"{next(figure_counter):02}.png"
+    stereo_plotter.title = "Disparity (pixels)"
+    stereo_plotter.plot_disparity(
+        unit="pixels", quiver=True, save_dir=plots_directory, fig_fn=fig_fn
+    )
+    sections.append(
+        ReportSection(
+            title="Disparity",
+            image_path=os.path.join(plots_directory, fig_fn),
+            caption="Horizontal and vertical disparity maps in pixels with quiver overlay.",
         )
+    )
 
-    # ICESat-2 comparison
+    # ---- Sections 7-10: ICESat-2 (conditional) ----
     if plot_icesat:
         icesat = Altimetry(directory=directory, dem_fn=asp_dem)
 
@@ -242,37 +299,69 @@ def main(
 
         icesat.predefined_temporal_filter_atl06sr(date=icesat_filter_date)
 
+        fig_fn = f"{next(figure_counter):02}.png"
         icesat.mapview_plot_atl06sr_to_dem(
             key="all",
             save_dir=plots_directory,
-            fig_fn=f"{next(figure_counter):02}.png",
+            fig_fn=fig_fn,
             map_crs=map_crs,
             **ctx_kwargs,
         )
+        sections.append(
+            ReportSection(
+                title="ICESat-2 ATL06-SR Map (All)",
+                image_path=os.path.join(plots_directory, fig_fn),
+                caption="ICESat-2 ATL06-SR elevation differences (all processing levels) vs. ASP DEM.",
+            )
+        )
 
+        fig_fn = f"{next(figure_counter):02}.png"
         icesat.histogram(
             key="all",
             plot_aligned=False,
             save_dir=plots_directory,
-            fig_fn=f"{next(figure_counter):02}.png",
+            fig_fn=fig_fn,
+        )
+        sections.append(
+            ReportSection(
+                title="ICESat-2 ATL06-SR Histogram (All)",
+                image_path=os.path.join(plots_directory, fig_fn),
+                caption="Distribution of elevation differences between ICESat-2 ATL06-SR (all) and ASP DEM.",
+            )
         )
 
+        fig_fn = f"{next(figure_counter):02}.png"
         icesat.mapview_plot_atl06sr_to_dem(
             key="ground_seasonal",
             save_dir=plots_directory,
-            fig_fn=f"{next(figure_counter):02}.png",
+            fig_fn=fig_fn,
             map_crs=map_crs,
             **ctx_kwargs,
         )
+        sections.append(
+            ReportSection(
+                title="ICESat-2 ATL06-SR Map (Ground, Seasonal)",
+                image_path=os.path.join(plots_directory, fig_fn),
+                caption="ICESat-2 ATL06-SR elevation differences (ground, seasonally filtered) vs. ASP DEM.",
+            )
+        )
 
+        fig_fn = f"{next(figure_counter):02}.png"
         icesat.histogram(
             key="ground_seasonal",
             plot_aligned=False,
             save_dir=plots_directory,
-            fig_fn=f"{next(figure_counter):02}.png",
+            fig_fn=fig_fn,
+        )
+        sections.append(
+            ReportSection(
+                title="ICESat-2 ATL06-SR Histogram (Ground, Seasonal)",
+                image_path=os.path.join(plots_directory, fig_fn),
+                caption="Distribution of elevation differences between ICESat-2 ATL06-SR (ground, seasonal) and ASP DEM.",
+            )
         )
 
-    # Bundle adjustment plots
+    # ---- Sections 11+: Bundle Adjustment (conditional) ----
     if bundle_adjust_directory:
         try:
             ba_files = ReadBundleAdjustFiles(directory, bundle_adjust_directory)
@@ -286,27 +375,43 @@ def main(
                 title="Bundle Adjust Initial and Final Residuals (Log Scale)",
             )
 
+            fig_fn = f"{next(figure_counter):02}.png"
             plotter.plot_n_gdfs(
                 column_name="mean_residual",
                 cbar_label="Mean residual (px)",
                 map_crs=map_crs,
                 save_dir=plots_directory,
-                fig_fn=f"{next(figure_counter):02}.png",
+                fig_fn=fig_fn,
                 **ctx_kwargs,
             )
+            sections.append(
+                ReportSection(
+                    title="Bundle Adjust Residuals (Log Scale)",
+                    image_path=os.path.join(plots_directory, fig_fn),
+                    caption="Initial and final bundle adjustment residuals on a logarithmic scale.",
+                )
+            )
 
             plotter.lognorm = False
             plotter.title = "Bundle Adjust Initial and Final Residuals (Linear Scale)"
 
+            fig_fn = f"{next(figure_counter):02}.png"
             plotter.plot_n_gdfs(
                 column_name="mean_residual",
                 cbar_label="Mean residual (px)",
                 common_clim=False,
                 map_crs=map_crs,
                 save_dir=plots_directory,
-                fig_fn=f"{next(figure_counter):02}.png",
+                fig_fn=fig_fn,
                 **ctx_kwargs,
             )
+            sections.append(
+                ReportSection(
+                    title="Bundle Adjust Residuals (Linear Scale)",
+                    image_path=os.path.join(plots_directory, fig_fn),
+                    caption="Initial and final bundle adjustment residuals on a linear scale.",
+                )
+            )
 
             # Map-projected residuals (requires reference DEM in bundle_adjust)
             try:
@@ -317,14 +422,22 @@ def main(
                     title="Bundle Adjust Midpoint distance between\nfinal interest points projected onto reference DEM",
                 )
 
+                fig_fn = f"{next(figure_counter):02}.png"
                 plotter.plot_n_gdfs(
                     column_name="mapproj_ip_dist_meters",
                     cbar_label="Interest point distance (m)",
                     map_crs=map_crs,
                     save_dir=plots_directory,
-                    fig_fn=f"{next(figure_counter):02}.png",
+                    fig_fn=fig_fn,
                     **ctx_kwargs,
                 )
+                sections.append(
+                    ReportSection(
+                        title="Map-Projected Residuals",
+                        image_path=os.path.join(plots_directory, fig_fn),
+                        caption="Midpoint distance between final interest points projected onto the reference DEM used in processing.",
+                    )
+                )
             except ValueError as e:
                 print(f"\n\nSkipping map-projected residuals plot: {e}\n\n")
 
@@ -340,6 +453,7 @@ def main(
                     title="Bundle Adjust Initial and Final Geodiff vs. Reference DEM",
                 )
 
+                fig_fn = f"{next(figure_counter):02}.png"
                 plotter.plot_n_gdfs(
                     column_name="height_diff_meters",
                     cbar_label="Height difference (m)",
@@ -347,9 +461,16 @@ def main(
                     cmap="RdBu",
                     symm_clim=True,
                     save_dir=plots_directory,
-                    fig_fn=f"{next(figure_counter):02}.png",
+                    fig_fn=fig_fn,
                     **ctx_kwargs,
                 )
+                sections.append(
+                    ReportSection(
+                        title="Geodiff vs. Reference DEM",
+                        image_path=os.path.join(plots_directory, fig_fn),
+                        caption="Initial and final geodiff height differences compared to the reference DEM used in processing.",
+                    )
+                )
             except ValueError as e:
                 print(
                     f"\n\nSkipping geodiff plots (requires --mapproj-dem flag in bundle_adjust): {e}\n\n"
@@ -369,10 +490,11 @@ def main(
     processing_parameters_dict = processing_parameters.from_log_files()
 
     compile_report(
-        plots_directory,
+        sections,
         processing_parameters_dict,
         report_pdf_path,
         report_title=report_title,
+        report_metadata=report_metadata,
     )
 
     shutil.rmtree(plots_directory)

asp_plot-1.6.0/asp_plot/report.py

@@ -0,0 +1,296 @@
+import logging
+import os
+import textwrap
+from dataclasses import dataclass
+
+from fpdf import FPDF
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class ReportSection:
+    """A section of the PDF report containing a figure with title and caption.
+
+    Attributes
+    ----------
+    title : str
+        Section heading displayed above the figure.
+    image_path : str
+        Absolute path to the PNG image file.
+    caption : str
+        Caption text displayed below the figure.
+    figure_number : int
+        Auto-assigned by compile_report().
+    """
+
+    title: str
+    image_path: str
+    caption: str = ""
+    figure_number: int = 0
+
+
+@dataclass
+class ReportMetadata:
+    """Metadata about the output DEM for the report title page.
+
+    Attributes
+    ----------
+    dem_dimensions : tuple
+        (width, height) in pixels.
+    dem_gsd_m : float
+        Ground sample distance in meters.
+    dem_crs : str
+        Coordinate reference system string (e.g. "EPSG:32616").
+    dem_nodata_percent : float
+        Percentage of nodata pixels.
+    dem_elevation_range : tuple
+        (min, max) elevation in meters.
+    dem_filename : str
+        DEM filename.
+    reference_dem : str
+        Reference DEM path or description.
+    """
+
+    dem_dimensions: tuple = (0, 0)
+    dem_gsd_m: float = 0.0
+    dem_crs: str = ""
+    dem_nodata_percent: float = 0.0
+    dem_elevation_range: tuple = (0, 0)
+    dem_filename: str = ""
+    reference_dem: str = ""
+
+
+class ASPReportPDF(FPDF):
+    """FPDF subclass with custom header and footer for ASP reports."""
+
+    def __init__(self, report_title="ASP Output Quality Report"):
+        super().__init__(orientation="P", unit="mm", format="Letter")
+        self.report_title = report_title
+        self.set_auto_page_break(auto=True, margin=20)
+        self.set_margins(15, 15, 15)
+
+    def header(self):
+        if self.page_no() > 1:
+            self.set_font("Helvetica", "I", 8)
+            self.set_text_color(128, 128, 128)
+            self.cell(0, 6, self.report_title, align="L")
+            self.ln(2)
+            self.set_draw_color(200, 200, 200)
+            self.line(15, self.get_y(), self.w - 15, self.get_y())
+            self.ln(4)
+            self.set_text_color(0, 0, 0)
+
+    def footer(self):
+        self.set_y(-15)
+        self.set_font("Helvetica", "I", 8)
+        self.set_text_color(128, 128, 128)
+        self.cell(0, 10, f"Page {self.page_no()} of {{nb}}", align="C")
+        self.set_text_color(0, 0, 0)
+
+
+def compile_report(
+    sections,
+    processing_parameters_dict,
+    report_pdf_path,
+    report_title="ASP Output Quality Report",
+    report_metadata=None,
+):
+    """
+    Compile a PDF report with ASP processing results and plots.
+
+    Creates a structured PDF report with a title page, figure sections
+    with captions, and a processing parameters appendix.
+
+    Parameters
+    ----------
+    sections : list of ReportSection
+        Ordered list of report sections, each containing a title,
+        image path, and optional caption.
+    processing_parameters_dict : dict
+        Dictionary containing processing parameters from ASP logs.
+    report_pdf_path : str
+        Output path for the PDF report.
+    report_title : str, optional
+        Title for the report. Default is "ASP Output Quality Report".
+    report_metadata : ReportMetadata, optional
+        DEM metadata for the title page summary table. Default is None.
+
+    Returns
+    -------
+    None
+        Generates a PDF report at the specified path.
+
+    Notes
+    -----
+    Required keys in processing_parameters_dict:
+    - processing_timestamp: When the processing was performed
+    - reference_dem: Path to reference DEM used
+    - bundle_adjust: Bundle adjustment command
+    - bundle_adjust_run_time: Time to run bundle adjustment
+    - stereo: Stereo command
+    - stereo_run_time: Time to run stereo
+    - point2dem: Point2dem command
+    - point2dem_run_time: Time to run point2dem
+    """
+    pdf = ASPReportPDF(report_title=report_title)
+    pdf.alias_nb_pages()
+
+    # ---- Title page ----
+    pdf.add_page()
+    pdf.ln(30)
+    pdf.set_font("Helvetica", "B", 22)
+    pdf.multi_cell(0, 12, report_title, align="C")
+    pdf.ln(8)
+    pdf.set_font("Helvetica", "", 11)
+    processing_date = processing_parameters_dict.get("processing_timestamp", "")
+    pdf.cell(
+        0,
+        8,
+        f"Processed on: {processing_date}",
+        align="C",
+        new_x="LMARGIN",
+        new_y="NEXT",
+    )
+    pdf.ln(10)
+
+    if report_metadata is not None:
+        _add_metadata_table(pdf, report_metadata)
+
+    # ---- Figure sections ----
+    for i, section in enumerate(sections, start=1):
+        section.figure_number = i
+        if not os.path.exists(section.image_path):
+            logger.warning(f"Image not found, skipping: {section.image_path}")
+            continue
+
+        pdf.add_page()
+        pdf.set_font("Helvetica", "B", 14)
+        pdf.cell(0, 10, section.title, new_x="LMARGIN", new_y="NEXT")
+        pdf.ln(2)
+
+        usable_width = pdf.w - pdf.l_margin - pdf.r_margin
+        pdf.image(section.image_path, x=pdf.l_margin, w=usable_width)
+
+        if section.caption:
+            pdf.ln(3)
+            pdf.set_font("Helvetica", "I", 9)
+            pdf.multi_cell(0, 5, f"Figure {section.figure_number}: {section.caption}")
+
+    # ---- Processing Parameters page ----
+    pdf.add_page()
+    pdf.set_font("Helvetica", "B", 16)
+    pdf.cell(0, 10, "Processing Parameters", new_x="LMARGIN", new_y="NEXT")
+    pdf.ln(4)
+
+    _add_runtime_table(pdf, processing_parameters_dict)
+    pdf.ln(6)
+
+    ref_dem = processing_parameters_dict.get("reference_dem", "")
+    if ref_dem:
+        pdf.set_font("Helvetica", "B", 10)
+        pdf.cell(0, 7, "Reference DEM:", new_x="LMARGIN", new_y="NEXT")
+        pdf.set_font("Courier", "", 7)
+        pdf.multi_cell(0, 4, ref_dem)
+        pdf.ln(4)
+
+    for key, label in [
+        ("bundle_adjust", "Bundle Adjust"),
+        ("stereo", "Stereo"),
+        ("point2dem", "point2dem"),
+    ]:
+        cmd = processing_parameters_dict.get(key, "")
+        if cmd:
+            pdf.set_font("Helvetica", "B", 10)
+            pdf.cell(0, 7, f"{label} Command:", new_x="LMARGIN", new_y="NEXT")
+            pdf.set_font("Courier", "", 7)
+            wrapped = textwrap.fill(cmd, width=120)
+            pdf.multi_cell(0, 4, wrapped)
+            pdf.ln(4)
+
+    pdf.output(report_pdf_path)
+
+
+def _add_metadata_table(pdf, metadata):
+    """Add DEM metadata summary table to the PDF.
+
+    Parameters
+    ----------
+    pdf : ASPReportPDF
+        The PDF document.
+    metadata : ReportMetadata
+        DEM metadata to display.
+    """
+    pdf.set_font("Helvetica", "B", 12)
+    pdf.cell(0, 10, "DEM Summary", align="C", new_x="LMARGIN", new_y="NEXT")
+    pdf.ln(2)
+
+    rows = []
+    if metadata.dem_filename:
+        rows.append(("DEM File", metadata.dem_filename))
+    if metadata.dem_dimensions != (0, 0):
+        w, h = metadata.dem_dimensions
+        rows.append(("Dimensions (px)", f"{w} x {h}"))
+    if metadata.dem_gsd_m:
+        rows.append(("GSD (m)", f"{metadata.dem_gsd_m:.2f}"))
+    if metadata.dem_crs:
+        rows.append(("CRS", metadata.dem_crs))
+    if metadata.dem_nodata_percent:
+        rows.append(("Nodata (%)", f"{metadata.dem_nodata_percent:.1f}"))
+    if metadata.dem_elevation_range != (0, 0):
+        lo, hi = metadata.dem_elevation_range
+        rows.append(("Elevation Range (m)", f"{lo:.1f} to {hi:.1f}"))
+    if metadata.reference_dem:
+        rows.append(("Reference DEM", metadata.reference_dem))
+
+    if not rows:
+        return
+
+    col_w = (pdf.w - pdf.l_margin - pdf.r_margin) / 2
+    table_x = pdf.l_margin
+
+    pdf.set_font("Helvetica", "B", 9)
+    pdf.set_fill_color(220, 220, 220)
+    pdf.set_x(table_x)
+    pdf.cell(col_w, 7, "Property", border=1, fill=True)
+    pdf.cell(col_w, 7, "Value", border=1, fill=True, new_x="LMARGIN", new_y="NEXT")
+
+    pdf.set_font("Helvetica", "", 9)
+    for prop, val in rows:
+        pdf.set_x(table_x)
+        pdf.cell(col_w, 7, prop, border=1)
+        pdf.cell(col_w, 7, str(val), border=1, new_x="LMARGIN", new_y="NEXT")
+
+    pdf.ln(4)
+
+
+def _add_runtime_table(pdf, params):
+    """Add runtime summary table to the PDF.
+
+    Parameters
+    ----------
+    pdf : ASPReportPDF
+        The PDF document.
+    params : dict
+        Processing parameters dictionary.
+    """
+    pdf.set_font("Helvetica", "B", 11)
+    pdf.cell(0, 8, "Runtime Summary", new_x="LMARGIN", new_y="NEXT")
+    pdf.ln(2)
+
+    col_w = (pdf.w - pdf.l_margin - pdf.r_margin) / 2
+
+    pdf.set_font("Helvetica", "B", 9)
+    pdf.set_fill_color(220, 220, 220)
+    pdf.cell(col_w, 7, "Step", border=1, fill=True)
+    pdf.cell(col_w, 7, "Runtime", border=1, fill=True, new_x="LMARGIN", new_y="NEXT")
+
+    pdf.set_font("Helvetica", "", 9)
+    for key, label in [
+        ("bundle_adjust_run_time", "Bundle Adjust"),
+        ("stereo_run_time", "Stereo"),
+        ("point2dem_run_time", "point2dem"),
+    ]:
+        runtime = params.get(key, "N/A")
+        pdf.cell(col_w, 7, label, border=1)
+        pdf.cell(col_w, 7, str(runtime), border=1, new_x="LMARGIN", new_y="NEXT")

{asp_plot-1.5.0 → asp_plot-1.6.0}/asp_plot/utils.py

@@ -11,7 +11,6 @@ import matplotlib.pyplot as plt
 import numpy as np
 import rasterio as rio
 import rioxarray
-from markdown_pdf import MarkdownPdf, Section
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 from osgeo import gdal
 from rasterio.errors import NotGeoreferencedWarning
@@ -134,99 +133,6 @@ def save_figure(fig, save_dir=None, fig_fn=None, dpi=150):
         raise ValueError("\n\nPlease provide a save directory and figure filename.\n\n")
 
 
-def compile_report(
-    plots_directory, processing_parameters_dict, report_pdf_path, report_title=None
-):
-    """
-    Compile a PDF report with ASP processing results and plots.
-
-    Creates a structured PDF report containing processing parameters and
-    generated plots from ASP processing. The plots are converted from PNG
-    to JPEG for better compression in the PDF.
-
-    Parameters
-    ----------
-    plots_directory : str
-        Directory containing plot files (PNG format)
-    processing_parameters_dict : dict
-        Dictionary containing processing parameters from ASP logs
-    report_pdf_path : str
-        Output path for the PDF report
-    report_title : str, optional
-        Title for the report. If None, uses the parent directory name
-
-    Returns
-    -------
-    None
-        Generates a PDF report at the specified path
-
-    Notes
-    -----
-    Required keys in processing_parameters_dict:
-    - processing_timestamp: When the processing was performed
-    - reference_dem: Path to reference DEM used
-    - bundle_adjust: Bundle adjustment command
-    - bundle_adjust_run_time: Time to run bundle adjustment
-    - stereo: Stereo command
-    - stereo_run_time: Time to run stereo
-    - point2dem: Point2dem command
-    - point2dem_run_time: Time to run point2dem
-
-    The function converts PNG files to temporary JPG files for the report,
-    then deletes the temporary files afterward.
-    """
-    from PIL import Image
-
-    files = [f for f in os.listdir(plots_directory) if f.endswith(".png")]
-    files.sort()
-
-    # Convert .png files to .jpg with 95% quality
-    compressed_files = []
-    for file in files:
-        png_path = os.path.join(plots_directory, file)
-        jpg_file = file.replace(".png", ".jpg")
-        jpg_path = os.path.join(plots_directory, jpg_file)
-
-        with Image.open(png_path) as img:
-            img = img.convert("RGB")
-            img.save(jpg_path, "JPEG", quality=95)
-
-        compressed_files.append(jpg_file)
-
-    processing_date = processing_parameters_dict["processing_timestamp"]
-
-    if report_title is None:
-        report_title = os.path.basename(os.path.dirname(report_pdf_path))
-
-    report_title = (
-        f"# ASP Report\n\n## {report_title:}\n\nProcessed on: {processing_date:}"
-    )
-    reference_dem_string = (
-        f"### Reference DEM:\n\n`{processing_parameters_dict['reference_dem']:}`"
-    )
-    ba_string = f"### Bundle Adjust ({processing_parameters_dict['bundle_adjust_run_time']:}):\n\n`{processing_parameters_dict['bundle_adjust']:}`"
-    stereo_string = f"### Stereo ({processing_parameters_dict['stereo_run_time']:}):\n\n`{processing_parameters_dict['stereo']:}`"
-    point2dem_string = f"### point2dem ({processing_parameters_dict['point2dem_run_time']}):\n\n`{processing_parameters_dict['point2dem']:}`"
-
-    pdf = MarkdownPdf()
-
-    pdf.add_section(Section(f"{report_title:}\n\n"))
-    pdf.add_section(
-        Section(
-            f"## Processing Parameters\n\n{reference_dem_string:}\n\n{ba_string:}\n\n{stereo_string}\n\n{point2dem_string}\n\n"
-        )
-    )
-    plots = "".join([f"![]({file})\n\n" for file in compressed_files])
-    pdf.add_section(Section(f"## Plots\n\n{plots:}", root=plots_directory))
-
-    pdf.save(report_pdf_path)
-
-    # cleanup temporary JPEG files
-    for file in compressed_files:
-        jpg_path = os.path.join(plots_directory, file)
-        os.remove(jpg_path)
-
-
 def get_xml_tag(xml, tag, all=False):
     """
     Extract value(s) from XML tag(s).

{asp_plot-1.5.0 → asp_plot-1.6.0}/environment.yml

@@ -19,5 +19,4 @@ dependencies:
   - matplotlib-scalebar
   - click
   - sliderule
-  - pip:
-    - markdown-pdf
+  - fpdf2

{asp_plot-1.5.0 → asp_plot-1.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "asp_plot"
-version = "1.5.0"
+version = "1.6.0"
 license = {text = "BSD-3-Clause"}
 authors = [
   { name="Ben Purinton", email="purinton@uw.edu" },