diff --git a/cdcrop_resize.py b/cdcrop_resize.py index 77d002a..3d44489 100644 --- a/cdcrop_resize.py +++ b/cdcrop_resize.py @@ -36,28 +36,39 @@ from PIL import Image, ImageFilter RESIZE_GAP = 3.0 # >=3.0: Pillow's box-reduce pre-pass is indistinguishable from a fair resample +def resize_image(im, long_edge, pre_blur=0.0): + """Core resize, usable on an in-memory image (no file I/O). Returns (image, was_resized).""" + w, h = im.size + scale = long_edge / max(w, h) + if scale >= 1.0: + return im, False + new_w, new_h = round(w * scale), round(h * scale) + if pre_blur > 0: + im = im.filter(ImageFilter.GaussianBlur(pre_blur)) + im = im.resize((new_w, new_h), resample=Image.LANCZOS, reducing_gap=RESIZE_GAP) + return im, True + + +def sharpen_image(im, radius, percent, threshold): + return im.filter(ImageFilter.UnsharpMask(radius=radius, percent=percent, threshold=threshold)) + + def resize_one(path, outdir, long_edge, pre_blur, sharpen, sharpen_radius, sharpen_percent, sharpen_threshold): im = Image.open(path) mode = im.mode w, h = im.size - scale = long_edge / max(w, h) - if scale >= 1.0: - print(f" {os.path.basename(path)} {w}x{h} already <= {long_edge}px, copied as-is") - new_w, new_h = w, h - else: - new_w, new_h = round(w * scale), round(h * scale) - if pre_blur > 0: - im = im.filter(ImageFilter.GaussianBlur(pre_blur)) - im = im.resize((new_w, new_h), resample=Image.LANCZOS, reducing_gap=RESIZE_GAP) - print(f" {os.path.basename(path)} {w}x{h} -> {new_w}x{new_h}" + out, resized = resize_image(im, long_edge, pre_blur) + if resized: + print(f" {os.path.basename(path)} {w}x{h} -> {out.size[0]}x{out.size[1]}" + (f" (pre-blur {pre_blur:g})" if pre_blur > 0 else "")) + else: + print(f" {os.path.basename(path)} {w}x{h} already <= {long_edge}px, copied as-is") if sharpen: - im = im.filter(ImageFilter.UnsharpMask(radius=sharpen_radius, percent=sharpen_percent, - threshold=sharpen_threshold)) - if im.mode != mode: - im = im.convert(mode) + out = sharpen_image(out, sharpen_radius, sharpen_percent, sharpen_threshold) + if out.mode != mode: + out = out.convert(mode) out_path = os.path.join(outdir, os.path.basename(path)) - im.save(out_path, format="PNG") + out.save(out_path, format="PNG") def main(): diff --git a/cdcrop_ui.py b/cdcrop_ui.py index 6960b60..9d2f20e 100644 --- a/cdcrop_ui.py +++ b/cdcrop_ui.py @@ -42,9 +42,12 @@ from urllib.parse import parse_qs, urlparse import cv2 import numpy as np +from PIL import Image sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) import cdcrop # noqa: E402 +import cdcrop_levels # noqa: E402 +import cdcrop_resize # noqa: E402 PREVIEW_SHRINK = 3 # cached preview source is 1/3 scale REGION_MARGIN = 120 # px of scan kept around each cover (for re-rendering) @@ -109,7 +112,7 @@ def _cover_entry(arr, gray, cov, base, idx, path, outdir, mode, dpi, inset, alig "edges": {k: (None if k in cov["soft"] else float(cdcrop.edge_theta(k, cov["edges"][k][1]))) for k in ("left", "right", "top", "bottom")}, "flagged": flagged, "notes": notes, "size": [fr["W"], fr["H"]], - "chosen": None, "status": "auto", "edge_adj": {}, + "chosen": None, "status": "auto", "edge_adj": {}, "finish": {}, } @@ -156,7 +159,7 @@ def _disc_entry(arr, gray, rect, base, idx, path, outdir, mode, dpi, scan_px=Non "auto": float(theta), "alt": None, "alt_why": None, "named": {k: float(v) for k, v in ori["candidates"].items()}, "soft": [], "edges": {}, "flagged": ori["flagged"], "notes": notes, "size": [fr["W"], fr["H"]], - "chosen": None, "status": "auto"} + "chosen": None, "status": "auto", "finish": {}} def process_scan(job): @@ -195,7 +198,8 @@ class Session: self.entries = {} # id -> entry self.order = [] # ids in scan order self.progress = {"running": False, "done": 0, "total": 0, "current": "", "errors": []} - self.settings = {"count": 2, "inset": 1.0, "jobs": 2, "align": "auto"} + self.settings = {"count": 2, "inset": 1.0, "jobs": 2, "align": "auto", + "long_edge": 800, "gamma": 1.2, "jpeg_quality": 60} self._cache = {} # id -> (region, small, meta) small LRU # -- persistence @@ -256,6 +260,7 @@ class Session: if old and old.get("status") == "reviewed": e["chosen"], e["status"] = old["chosen"], "reviewed" e["edge_adj"] = old.get("edge_adj", {}) + e["finish"] = old.get("finish", {}) self.entries[e["id"]] = e if e["id"] not in self.order: self.order.append(e["id"]) @@ -268,7 +273,8 @@ class Session: ids = [e["id"] for e in res["entries"]] chosen = [self.entries[i] for i in ids if self.entries[i]["status"] == "reviewed"] for e in chosen: # keep an earlier manual choice after re-processing - self.render_full(e["id"], e["chosen"], e.get("edge_adj")) + _, _, out, mode = self.render_full(e["id"], e["chosen"], e.get("edge_adj")) + self.render_finished(e["id"], out, mode, e.get("finish")) self.save() try: @@ -322,7 +328,40 @@ class Session: A = meta.get("A") return cdcrop.frame_to_scan(fr, None if A is None else np.array(A)), meta - def preview(self, cid, theta, width, margin=0.0, edge_adj=None): + # -- finishing (resize + levels, applied on top of a rendered crop) + def resolved_finish(self, finish=None): + f = {"gamma": float(self.settings.get("gamma", 1.2)), "black_point": 0.0, "pre_blur": 0.0} + f.update(finish or {}) + f["gamma"] = min(max(f["gamma"], 0.2), 5.0) + f["black_point"] = min(max(f["black_point"], 0.0), 254.0) + f["pre_blur"] = min(max(f["pre_blur"], 0.0), 10.0) + return f + + def finish_preview(self, arr, finish): + """Apply the live finish settings to a rendered RGB array, for preview only (no resize).""" + f = self.resolved_finish(finish) + if f["pre_blur"] > 0: + arr = cv2.GaussianBlur(arr.astype(np.float32), (0, 0), f["pre_blur"]) + arr = np.clip(arr, 0, 255).astype(np.uint8) + im = Image.fromarray(arr) + if im.mode != "RGB": + im = im.convert("RGB") + im = cdcrop_levels.apply_levels(im, f["gamma"], int(round(f["black_point"]))) + return np.asarray(im) + + def render_finished(self, cid, out_arr, mode, finish): + """Resize + levels the just-rendered crop, saved as OUTDIR/finished/{cid}.jpg.""" + f = self.resolved_finish(finish) + im = Image.fromarray(out_arr, mode=mode) + if im.mode != "RGB": + im = im.convert("RGB") + im, _ = cdcrop_resize.resize_image(im, int(self.settings.get("long_edge", 800)), f["pre_blur"]) + im = cdcrop_levels.apply_levels(im, f["gamma"], int(round(f["black_point"]))) + fdir = os.path.join(self.outdir, "finished") + os.makedirs(fdir, exist_ok=True) + im.save(os.path.join(fdir, cid + ".jpg"), format="JPEG", quality=int(self.settings.get("jpeg_quality", 60))) + + def preview(self, cid, theta, width, margin=0.0, edge_adj=None, finish=None): """margin: extra context shown around the crop, in crop px - clamped to CTX_MARGIN so it never reaches past the cached region.""" region, small, meta = self.load(cid) @@ -342,8 +381,9 @@ class Session: else: o = (o_full - [ox, oy]) M = np.array([[ex[0] / s, ey[0] / s, o[0]], [ex[1] / s, ey[1] / s, o[1]]]) - return cv2.warpAffine(src, M, size, flags=cv2.INTER_LINEAR | cv2.WARP_INVERSE_MAP, - borderMode=cv2.BORDER_REPLICATE) + out = cv2.warpAffine(src, M, size, flags=cv2.INTER_LINEAR | cv2.WARP_INVERSE_MAP, + borderMode=cv2.BORDER_REPLICATE) + return self.finish_preview(out, finish) def patch(self, cid, theta, cx, cy, n, edge_adj=None): """n x n patch of the crop at 1:1 (Lanczos), top-left at crop coords (cx, cy).""" @@ -384,16 +424,19 @@ class Session: f2["origin"] = fr["origin"] - [ox, oy] out = cdcrop.render(np.asarray(region).astype(np.float32), f2) cdcrop.save_png(out, meta["mode"], meta["dpi"], os.path.join(self.outdir, cid + ".png")) - return fr["W"], fr["H"] + return fr["W"], fr["H"], out, meta["mode"] - def accept(self, cid, theta, how, edge_adj=None): + def accept(self, cid, theta, how, edge_adj=None, finish=None): edge_adj = edge_adj or {} with self.lock: e = self.entries[cid] - W, H = self.render_full(cid, theta, edge_adj) + W, H, out, mode = self.render_full(cid, theta, edge_adj) + f = self.resolved_finish(finish) + self.render_finished(cid, out, mode, f) with self.lock: e["chosen"], e["status"], e["size"], e["how"] = float(theta), "reviewed", [W, H], how e["edge_adj"] = edge_adj + e["finish"] = f log = os.path.join(self.outdir, "cdcrop_decisions.csv") new = not os.path.exists(log) with open(log, "a", newline="") as fh: @@ -467,6 +510,15 @@ def _edge_adj(q): return {} +def _finish_adj(q): + """Parse the optional ?finish={"gamma":1.3,...} query param into a plain dict.""" + try: + f = json.loads(q.get("finish") or "{}") + return {k: float(v) for k, v in f.items() if k in ("gamma", "black_point", "pre_blur")} + except (ValueError, TypeError): + return {} + + class Handler(BaseHTTPRequestHandler): def log_message(self, *a): pass @@ -519,7 +571,7 @@ class Handler(BaseHTTPRequestHandler): return self._send(200, S.info(q["id"], float(q["theta"]), _edge_adj(q))) if u.path == "/img/preview": img = S.preview(q["id"], float(q["theta"]), int(q.get("w", 900)), float(q.get("margin", 0)), - _edge_adj(q)) + _edge_adj(q), _finish_adj(q)) return self._send(200, jpeg(img, 90), "image/jpeg", cache=True) if u.path == "/img/corner": fr, _ = S.frame(q["id"], float(q["theta"]), _edge_adj(q)) @@ -560,11 +612,16 @@ class Handler(BaseHTTPRequestHandler): if u.path == "/api/usecal": S.settings["use_cal"] = bool(body.get("on", True)); S.save() return self._send(200, {"ok": True}) + if u.path == "/api/settings": + S.settings.update({k: body[k] for k in ("long_edge", "gamma", "jpeg_quality") if k in body}) + S.save() + return self._send(200, {"ok": True}) if u.path == "/api/open": S.open(body["outdir"]) return self._send(200, {"ok": True}) if u.path == "/api/accept": - W, H = S.accept(body["id"], float(body["theta"]), body.get("how", "manual"), body.get("edge")) + W, H = S.accept(body["id"], float(body["theta"]), body.get("how", "manual"), body.get("edge"), + body.get("finish")) return self._send(200, {"ok": True, "size": [W, H]}) return self._send(404, {"error": "not found"}) except Exception as ex: @@ -646,6 +703,10 @@ main{padding:16px}