@jax-data-science/sci-image-visualizer 0.2.12 → 0.2.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/index.mjs +2 -1
- package/esm2022/lib/contracts/instance-segmenter.contract.mjs +1 -1
- package/esm2022/lib/toolbar/segmentation/yolo-detect-tool.service.mjs +180 -0
- package/esm2022/lib/toolbar/toolbar.component.mjs +31 -3
- package/esm2022/lib/visualizer.component.mjs +78 -20
- package/fesm2022/{jax-data-science-sci-image-visualizer-onnx-sam-session-ci1q0xnJ.mjs → jax-data-science-sci-image-visualizer-onnx-sam-session-iPNL2JyC.mjs} +2 -2
- package/fesm2022/{jax-data-science-sci-image-visualizer-onnx-sam-session-ci1q0xnJ.mjs.map → jax-data-science-sci-image-visualizer-onnx-sam-session-iPNL2JyC.mjs.map} +1 -1
- package/fesm2022/jax-data-science-sci-image-visualizer.mjs +485 -230
- package/fesm2022/jax-data-science-sci-image-visualizer.mjs.map +1 -1
- package/index.d.ts +1 -0
- package/lib/contracts/instance-segmenter.contract.d.ts +11 -0
- package/lib/toolbar/segmentation/yolo-detect-tool.service.d.ts +49 -0
- package/lib/toolbar/toolbar.component.d.ts +15 -1
- package/lib/visualizer.component.d.ts +27 -2
- package/package.json +1 -1
package/esm2022/index.mjs
CHANGED
|
@@ -25,6 +25,7 @@ export * from './lib/contracts/cell-segmenter.contract';
|
|
|
25
25
|
export { CellposeSegmenterService } from './lib/toolbar/segmentation/cellpose-segmenter.service';
|
|
26
26
|
export * from './lib/contracts/instance-segmenter.contract';
|
|
27
27
|
export { YoloSegmenterService } from './lib/toolbar/segmentation/yolo-segmenter.service';
|
|
28
|
+
export { YoloDetectToolService } from './lib/toolbar/segmentation/yolo-detect-tool.service';
|
|
28
29
|
// ── Generic client-side image utilities (shared with the host's pipeline) ──
|
|
29
30
|
export { ProcessingImage } from './lib/processing/processing-image';
|
|
30
31
|
export { cropImage } from './lib/processing/image-crop';
|
|
@@ -53,4 +54,4 @@ export { VisualizerComponent } from './lib/visualizer.component';
|
|
|
53
54
|
export { RegionEditorComponent } from './lib/region-editor/region-editor.component';
|
|
54
55
|
export { HexColorPickerComponent } from './lib/hex-color-picker/hex-color-picker.component';
|
|
55
56
|
export { ChannelHistogramComponent } from './lib/channel-histogram/channel-histogram.component';
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,4EAA4E;AAC5E,cAAc,qCAAqC,CAAC;AACpD,cAAc,4CAA4C,CAAC;AAC3D,cAAc,wCAAwC,CAAC;AACvD,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AACrD,cAAc,wCAAwC,CAAC;AACvD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,uCAAuC,CAAC;AACtD,cAAc,yCAAyC,CAAC;AACxD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yCAAyC,CAAC;AACxD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAC;AACjG,cAAc,6CAA6C,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAE5F,8EAA8E;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAoB,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,6EAA6E;AAC7E,OAAO,EACL,UAAU,EAAE,oBAAoB,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAC/E,kBAAkB,EAAE,oBAAoB,GACzC,MAAM,+CAA+C,CAAC;AAEvD,6EAA6E;AAC7E,OAAO,EACL,WAAW,EAAE,qBAAqB,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EACpF,mBAAmB,EAAE,qBAAqB,GAC3C,MAAM,gDAAgD,CAAC;AAExD,8EAA8E;AAC9E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAE/F,4EAA4E;AAC5E,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,4EAA4E;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,6EAA6E;AAC7E,mEAAmE;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,6EAA6E;AAC7E,0EAA0E;AAC1E,8EAA8E;AAC9E,6DAA6D;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAC5F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qDAAqD,CAAC","sourcesContent":["/**\n * Public API of the jax-image-visualization library. External consumers import\n * ONLY from here (`@jax-data-science/sci-image-visualizer`); everything else under `lib/` is\n * internal. The surface is contracts + tokens + neutral models + the Angular\n * module, plus the routing service the host's composition root binds the tokens\n * to (`useExisting`).\n */\n\n// ── Contracts & DI tokens ────────────────────────────────────────────────\nexport * from './lib/contracts/visualizer.contract';\nexport * from './lib/contracts/region-editor-api.contract';\nexport * from './lib/contracts/ports/image-state.port';\nexport * from './lib/contracts/ports/tile-access.port';\nexport * from './lib/contracts/ports/region-io.port';\nexport * from './lib/contracts/ports/preferences.port';\nexport * from './lib/contracts/channel-histogram-api.contract';\nexport * from './lib/contracts/viz-config';\nexport * from './lib/contracts/image.contract';\nexport * from './lib/contracts/plot-type';\nexport * from './lib/contracts/toolbar-config';\nexport * from './lib/contracts/capabilities.contract';\nexport * from './lib/contracts/region-overlay.contract';\nexport * from './lib/contracts/display-types';\nexport * from './lib/contracts/sam.contract';\nexport * from './lib/contracts/cell-segmenter.contract';\nexport { CellposeSegmenterService } from './lib/toolbar/segmentation/cellpose-segmenter.service';\nexport * from './lib/contracts/instance-segmenter.contract';\nexport { YoloSegmenterService } from './lib/toolbar/segmentation/yolo-segmenter.service';\nexport { YoloDetectToolService } from './lib/toolbar/segmentation/yolo-detect-tool.service';\n\n// ── Generic client-side image utilities (shared with the host's pipeline) ──\nexport { ProcessingImage } from './lib/processing/processing-image';\nexport { cropImage, CropImageOptions } from './lib/processing/image-crop';\nexport { ImageConverterService } from './lib/processing/image-converter.service';\n\n// ── SAM model registry (host configures hosted ONNX URLs once available) ──\nexport {\n  SAM_MODELS, DEFAULT_SAM_MODEL_ID, getSamModel, isSamModelReady, setSamModelUrls,\n  setDefaultSamModel, getDefaultSamModelId,\n} from './lib/toolbar/segmentation/sam-model-registry';\n\n// ── YOLO instance-segmentation model registry (same repointing story) ─────\nexport {\n  YOLO_MODELS, DEFAULT_YOLO_MODEL_ID, getYoloModel, isYoloModelReady, setYoloModelUrls,\n  setDefaultYoloModel, getDefaultYoloModelId, YoloModelDef,\n} from './lib/toolbar/segmentation/yolo-model-registry';\n\n// ── onnxruntime-web WASM location (host overrides once, at app init) ───────\nexport { setOrtWasmBase, getOrtWasmBase } from './lib/toolbar/segmentation/ort-runtime-config';\n\n// ── Neutral data models ──────────────────────────────────────────────────\nexport * from './lib/models/region';\nexport * from './lib/models/class-preset';\nexport { ShapeSelection } from './lib/models/shape';\n\n// ── Angular module + composition-root service ────────────────────────────\nexport { VisualizationModule } from './lib/visualization.module';\nexport { RoutingVisualizerService } from './lib/routing-visualizer.service';\n// Provider factory for an isolated, component-scoped viewer instance (e.g. a\n// modal that must not share the main viewer's region/image state).\nexport { provideVisualization } from './lib/provide-visualization';\n\n// ── Public components (exported by VisualizationModule) ───────────────────\n// ng-packagr requires module-exported components to be reachable from the\n// entry point so consumers get their types; these are the embeddable elements\n// (`<visualizer>`, `<region-editor>`, `<hex-color-picker>`).\nexport { VisualizerComponent } from './lib/visualizer.component';\nexport { RegionEditorComponent } from './lib/region-editor/region-editor.component';\nexport { HexColorPickerComponent } from './lib/hex-color-picker/hex-color-picker.component';\nexport { ChannelHistogramComponent } from './lib/channel-histogram/channel-histogram.component';\n"]}
|
|
@@ -9,4 +9,4 @@ export const INSTANCE_SEGMENTER = new InjectionToken('INSTANCE_SEGMENTER', {
|
|
|
9
9
|
providedIn: 'root',
|
|
10
10
|
factory: () => inject(YoloSegmenterService),
|
|
11
11
|
});
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"instance-segmenter.contract.js","sourceRoot":"","sources":["../../../../src/lib/contracts/instance-segmenter.contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AA0ItF;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,cAAc,CAAqB,oBAAoB,EAAE;IAC7F,UAAU,EAAE,MAAM;IAClB,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC;CAC5C,CAAC,CAAC","sourcesContent":["import { InjectionToken, inject } from '@angular/core';\n\nimport { YoloSegmenterService } from '../toolbar/segmentation/yolo-segmenter.service';\n\n/**\n * Port for an automatic **instance** segmenter — one that returns discrete,\n * classified objects rather than a per-pixel label map.\n *\n * This is a sibling of {@link ICellSegmenter}, not a replacement. Cellpose-style\n * segmenters produce one exclusive label per pixel, which is exactly right for\n * densely packed cells; a detector like YOLO produces overlapping instances,\n * each with its own class and confidence, and flattening those into a label map\n * would silently discard both the overlap and the classification. The two\n * outputs are genuinely different shapes, so they get different ports.\n *\n * Geometry is returned as polygon rings in **image pixels**, ready to become\n * {@link Region}s without a second conversion step.\n */\n\n/** A closed ring; the last point is NOT a repeat of the first. */\nexport type InstanceRing = Array<[number, number]>;\n\n/** One polygon with optional interior rings (donut holes). */\nexport interface InstancePolygon {\n  exterior: InstanceRing;\n  holes: InstanceRing[];\n}\n\n/** One detected object. */\nexport interface InstanceDetection {\n  /**\n   * Outline(s) of this instance. Usually one, but a mask that splits under\n   * thresholding yields several — they all belong to the same detection.\n   */\n  polygons: InstancePolygon[];\n  /** `[x1, y1, x2, y2]` in image pixels. */\n  box: [number, number, number, number];\n  /** Model confidence, 0..1. */\n  score: number;\n  classId: number;\n  className: string;\n}\n\nexport interface InstanceSegmentation {\n  detections: InstanceDetection[];\n  width: number;\n  height: number;\n  /** Class names indexed by class id, from the model's own metadata. */\n  classNames: string[];\n}\n\n/**\n * Tunables for one run.\n *\n * Three separate thresholds are in play and they are easy to conflate:\n * `confidence` and `iouThreshold` act per tile, while `mergeThreshold` governs\n * the cross-tile reconciliation. They come from different stages of the\n * pipeline and are not interchangeable.\n */\nexport interface InstanceSegmentOptions {\n  /** Which registered model to run. Defaults to the registry's default. */\n  modelId?: string;\n  /**\n   * Scale to run at, as a divisor of full resolution — the same meaning the\n   * server gives it.\n   *\n   * This is what puts objects at the size the checkpoint was trained on, and it\n   * matters more than any threshold: run a detector at the wrong object scale\n   * and it finds nothing. A caller that can re-crop the source (a tile-backed\n   * viewer) should honour it rather than accepting whatever the display happens\n   * to show.\n   */\n  downsamplingFactor?: number;\n  /** Minimum detection confidence, per tile. */\n  confidence?: number;\n  /** NMS IoU within a single tile. */\n  iouThreshold?: number;\n  /** Intersection-over-smaller threshold for merging across tile seams. */\n  mergeThreshold?: number;\n  /** Tile overlap, percent. */\n  overlapX?: number;\n  overlapY?: number;\n  /** Probability at which a mask pixel counts as inside. */\n  maskThreshold?: number;\n  /** Cap on detections per tile. */\n  maxDetections?: number;\n  /** Keep only these class ids; omit for all classes the model declares. */\n  classFilter?: number[];\n  /** Douglas-Peucker tolerance in pixels for outline simplification; 0 disables. */\n  simplifyTolerance?: number;\n  /** Drop instances whose outline area is below this, in square pixels. */\n  minArea?: number;\n  /**\n   * Set false to detect boxes without assembling masks — substantially faster,\n   * since mask assembly dominates the cost of a run. Detections then carry a\n   * box and class but no outline, so nothing can be committed as a region.\n   */\n  withMasks?: boolean;\n  /**\n   * Abort an in-progress run.\n   *\n   * Cancellation is cooperative and checked at tile boundaries, so it takes\n   * effect within roughly one tile rather than instantly — a `session.run()`\n   * already in flight cannot be interrupted.\n   */\n  signal?: AbortSignal;\n}\n\n/**\n * Progress/status callbacks (all optional).\n *\n * Deliberately mirrors {@link CellSegmentProgress} in shape rather than importing\n * it — the two contracts stay independently versionable.\n */\nexport interface InstanceSegmentProgress {\n  /** Model-download progress, 0..1 (first run only). */\n  onProgress?: (fraction: number) => void;\n  /**\n   * Raw download byte counts, for hosts that render a size (\"142 / 287 MB\")\n   * rather than a bare percentage. `total` is null when the response carried no\n   * Content-Length.\n   *\n   * A fraction alone cannot be turned back into bytes, so a host given only\n   * {@link onProgress} has to invent the numbers — which reads as \"0 MB / 0 MB\"\n   * the moment it does.\n   */\n  onBytes?: (loaded: number, total: number | null) => void;\n  /** Human-readable phase, e.g. 'Running inference (tile 3/8)…'. */\n  onStatus?: (status: string) => void;\n}\n\nexport interface IInstanceSegmenter {\n  /** Detect and outline all instances in an RGBA image. */\n  segmentInstances(\n    image: { data: Uint8ClampedArray; width: number; height: number },\n    opts?: InstanceSegmentOptions,\n    progress?: InstanceSegmentProgress,\n  ): Promise<InstanceSegmentation>;\n}\n\n/**\n * DI token for the automatic instance segmenter. Defaults to the in-library\n * {@link YoloSegmenterService} (yolo-segdetect-js, lazy-loaded); override it in\n * the host to swap implementations — for example to delegate to the server.\n */\nexport const INSTANCE_SEGMENTER = new InjectionToken<IInstanceSegmenter>('INSTANCE_SEGMENTER', {\n  providedIn: 'root',\n  factory: () => inject(YoloSegmenterService),\n});\n"]}
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
import { Inject, Injectable, Optional } from '@angular/core';
|
|
2
|
+
import { BehaviorSubject, firstValueFrom } from 'rxjs';
|
|
3
|
+
import { Region, Polygon } from '../../models/region';
|
|
4
|
+
import { TILE_ACCESS_PORT } from '../../contracts/ports/tile-access.port';
|
|
5
|
+
import * as i0 from "@angular/core";
|
|
6
|
+
/**
|
|
7
|
+
* YOLO object detection over the current view.
|
|
8
|
+
*
|
|
9
|
+
* The complement to {@link CellSegmentToolService}: cellpose auto-segments cells
|
|
10
|
+
* inside a box you draw, whereas a detector is meant to find objects across a
|
|
11
|
+
* field. So this takes no prompt — it runs on whatever is on screen and turns
|
|
12
|
+
* every detection into a region.
|
|
13
|
+
*
|
|
14
|
+
* Detections come back in the displayed image's pixels; they are mapped onto
|
|
15
|
+
* the full-resolution image through the viewer's own source rect, so the regions
|
|
16
|
+
* land where the objects actually are rather than at view-local coordinates.
|
|
17
|
+
*
|
|
18
|
+
* Exposes the same `status$` / `busy$` / `progress$` surface as the cellpose
|
|
19
|
+
* tool so the host's shared segmentation toast drives it unchanged.
|
|
20
|
+
*/
|
|
21
|
+
export class YoloDetectToolService {
|
|
22
|
+
constructor(
|
|
23
|
+
/** Server-side crop, so detection can run at the model's scale rather than
|
|
24
|
+
* the viewer's. Optional: without it the tool falls back to the displayed
|
|
25
|
+
* pixels, which is correct but scale-dependent. */
|
|
26
|
+
tileAccess = null) {
|
|
27
|
+
this.tileAccess = tileAccess;
|
|
28
|
+
this.status$ = new BehaviorSubject('');
|
|
29
|
+
this.busy$ = new BehaviorSubject(false);
|
|
30
|
+
this.progress$ = new BehaviorSubject(-1);
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Detect in the current view and append the results as regions.
|
|
34
|
+
*
|
|
35
|
+
* @returns the number of regions added.
|
|
36
|
+
*/
|
|
37
|
+
async detectInView(viz, segmenter, opts = {}) {
|
|
38
|
+
const pixels = viz.getDisplayedPixelData?.();
|
|
39
|
+
if (!pixels || pixels.width === 0 || pixels.height === 0) {
|
|
40
|
+
this.status$.next('No image on screen to detect in.');
|
|
41
|
+
return 0;
|
|
42
|
+
}
|
|
43
|
+
this.busy$.next(true);
|
|
44
|
+
this.progress$.next(-1);
|
|
45
|
+
try {
|
|
46
|
+
const rect = viz.getDisplayedSourceRect?.() ?? null;
|
|
47
|
+
const target = Number(opts.downsamplingFactor ?? 0) || 0;
|
|
48
|
+
const viewFactor = rect && pixels.width > 0 ? rect.width / pixels.width : 1;
|
|
49
|
+
// Re-crop at the model's scale when the view is coarser than it wants.
|
|
50
|
+
// The image is tile-backed, so that detail exists server-side even though
|
|
51
|
+
// the displayed pixels have discarded it.
|
|
52
|
+
let source = { data: pixels.data, width: pixels.width, height: pixels.height };
|
|
53
|
+
if (rect && target > 0 && target < viewFactor * 0.98) {
|
|
54
|
+
this.status$.next('Fetching image at model resolution…');
|
|
55
|
+
const hi = await this.fetchCropAtScale(rect, target);
|
|
56
|
+
if (hi)
|
|
57
|
+
source = hi;
|
|
58
|
+
}
|
|
59
|
+
const result = await segmenter.segmentInstances(source, opts, {
|
|
60
|
+
onProgress: (f) => this.progress$.next(f),
|
|
61
|
+
onStatus: (s) => this.status$.next(s),
|
|
62
|
+
});
|
|
63
|
+
// View pixels -> full-resolution image pixels. Without this every region
|
|
64
|
+
// would sit at view-local coordinates, i.e. the wrong place on the slide
|
|
65
|
+
// for any zoomed or panned view.
|
|
66
|
+
const offsetX = rect ? rect.x : 0;
|
|
67
|
+
const offsetY = rect ? rect.y : 0;
|
|
68
|
+
// Against the pixels actually inferred on, which may be the re-crop.
|
|
69
|
+
const ratioX = rect && source.width > 0 ? rect.width / source.width : 1;
|
|
70
|
+
const ratioY = rect && source.height > 0 ? rect.height / source.height : 1;
|
|
71
|
+
const added = [];
|
|
72
|
+
for (const det of result.detections) {
|
|
73
|
+
if (det.polygons.length > 0) {
|
|
74
|
+
for (const poly of det.polygons) {
|
|
75
|
+
if (poly.exterior.length < 3)
|
|
76
|
+
continue;
|
|
77
|
+
added.push(this.makeRegion(poly.exterior.map(([x]) => Math.round(offsetX + x * ratioX)), poly.exterior.map(([, y]) => Math.round(offsetY + y * ratioY)), det.className));
|
|
78
|
+
}
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
// Detection mode yields no outline; the box is still the result, and
|
|
82
|
+
// matches what the server writes as a "detection" feature.
|
|
83
|
+
const [x1, y1, x2, y2] = det.box;
|
|
84
|
+
if (x2 - x1 <= 0 || y2 - y1 <= 0)
|
|
85
|
+
continue;
|
|
86
|
+
added.push(this.makeRegion([x1, x2, x2, x1].map((x) => Math.round(offsetX + x * ratioX)), [y1, y1, y2, y2].map((y) => Math.round(offsetY + y * ratioY)), det.className));
|
|
87
|
+
}
|
|
88
|
+
if (added.length === 0) {
|
|
89
|
+
this.status$.next('No objects detected.');
|
|
90
|
+
return 0;
|
|
91
|
+
}
|
|
92
|
+
// Append. A detection run must not discard annotations drawn by hand or
|
|
93
|
+
// produced by another tool.
|
|
94
|
+
viz.setRegions([...(viz.getRegions() ?? []), ...added]);
|
|
95
|
+
this.status$.next(`Added ${added.length} region(s).`);
|
|
96
|
+
return added.length;
|
|
97
|
+
}
|
|
98
|
+
catch (err) {
|
|
99
|
+
this.status$.next(err instanceof Error ? err.message : 'YOLO detection failed.');
|
|
100
|
+
return 0;
|
|
101
|
+
}
|
|
102
|
+
finally {
|
|
103
|
+
this.busy$.next(false);
|
|
104
|
+
this.progress$.next(-1);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
/**
|
|
108
|
+
* Re-crop `rect` at `1/target` of full resolution. Returns null on any
|
|
109
|
+
* failure, so the caller falls back to the displayed pixels — a coarser crop
|
|
110
|
+
* beats a failed run.
|
|
111
|
+
*/
|
|
112
|
+
async fetchCropAtScale(rect, target) {
|
|
113
|
+
if (!this.tileAccess)
|
|
114
|
+
return null;
|
|
115
|
+
let w = Math.round(rect.width / target);
|
|
116
|
+
let h = Math.round(rect.height / target);
|
|
117
|
+
// A factor of 1 over a whole-slide ROI would ask for hundreds of megapixels.
|
|
118
|
+
const MAX_PIXELS = 16_777_216; // 4096²
|
|
119
|
+
const pixels = w * h;
|
|
120
|
+
if (pixels > MAX_PIXELS) {
|
|
121
|
+
const k = Math.sqrt(MAX_PIXELS / pixels);
|
|
122
|
+
w = Math.round(w * k);
|
|
123
|
+
h = Math.round(h * k);
|
|
124
|
+
}
|
|
125
|
+
if (w < 64 || h < 64)
|
|
126
|
+
return null;
|
|
127
|
+
try {
|
|
128
|
+
const roi = {
|
|
129
|
+
x: Math.round(rect.x),
|
|
130
|
+
y: Math.round(rect.y),
|
|
131
|
+
width: Math.round(rect.width),
|
|
132
|
+
height: Math.round(rect.height),
|
|
133
|
+
};
|
|
134
|
+
const screen = { x: 0, y: 0, width: w, height: h };
|
|
135
|
+
const bytes = await firstValueFrom(this.tileAccess.zoomOnRegion(roi, screen, 0));
|
|
136
|
+
if (!bytes || bytes.byteLength === 0)
|
|
137
|
+
return null;
|
|
138
|
+
const bitmap = await createImageBitmap(new Blob([bytes]));
|
|
139
|
+
const canvas = document.createElement('canvas');
|
|
140
|
+
canvas.width = bitmap.width;
|
|
141
|
+
canvas.height = bitmap.height;
|
|
142
|
+
const ctx = canvas.getContext('2d');
|
|
143
|
+
if (!ctx)
|
|
144
|
+
return null;
|
|
145
|
+
ctx.drawImage(bitmap, 0, 0);
|
|
146
|
+
const out = ctx.getImageData(0, 0, bitmap.width, bitmap.height);
|
|
147
|
+
bitmap.close?.();
|
|
148
|
+
return { data: out.data, width: bitmap.width, height: bitmap.height };
|
|
149
|
+
}
|
|
150
|
+
catch {
|
|
151
|
+
return null;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
makeRegion(xs, ys, className) {
|
|
155
|
+
const poly = new Polygon();
|
|
156
|
+
poly.npoints = xs.length;
|
|
157
|
+
poly.xpoints = xs;
|
|
158
|
+
poly.ypoints = ys;
|
|
159
|
+
poly.coordinates = xs.map((x, i) => [x, ys[i]]);
|
|
160
|
+
poly.closed = true;
|
|
161
|
+
const region = new Region();
|
|
162
|
+
region.bounds = poly;
|
|
163
|
+
// The class name drives preset colour resolution; leaving `color` unset lets
|
|
164
|
+
// an existing preset for this class win.
|
|
165
|
+
region.label = className;
|
|
166
|
+
return region;
|
|
167
|
+
}
|
|
168
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.9", ngImport: i0, type: YoloDetectToolService, deps: [{ token: TILE_ACCESS_PORT, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
169
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.9", ngImport: i0, type: YoloDetectToolService, providedIn: 'root' }); }
|
|
170
|
+
}
|
|
171
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.9", ngImport: i0, type: YoloDetectToolService, decorators: [{
|
|
172
|
+
type: Injectable,
|
|
173
|
+
args: [{ providedIn: 'root' }]
|
|
174
|
+
}], ctorParameters: () => [{ type: undefined, decorators: [{
|
|
175
|
+
type: Optional
|
|
176
|
+
}, {
|
|
177
|
+
type: Inject,
|
|
178
|
+
args: [TILE_ACCESS_PORT]
|
|
179
|
+
}] }] });
|
|
180
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"yolo-detect-tool.service.js","sourceRoot":"","sources":["../../../../../src/lib/toolbar/segmentation/yolo-detect-tool.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable, Optional } from '@angular/core';\nimport { BehaviorSubject, firstValueFrom } from 'rxjs';\n\nimport { Region, Polygon, Rectangle } from '../../models/region';\nimport { TILE_ACCESS_PORT, type TileAccessPort } from '../../contracts/ports/tile-access.port';\nimport type { IVisualizer } from '../../contracts/visualizer.contract';\nimport type { IInstanceSegmenter, InstanceSegmentOptions } from '../../contracts/instance-segmenter.contract';\n\n/**\n * YOLO object detection over the current view.\n *\n * The complement to {@link CellSegmentToolService}: cellpose auto-segments cells\n * inside a box you draw, whereas a detector is meant to find objects across a\n * field. So this takes no prompt — it runs on whatever is on screen and turns\n * every detection into a region.\n *\n * Detections come back in the displayed image's pixels; they are mapped onto\n * the full-resolution image through the viewer's own source rect, so the regions\n * land where the objects actually are rather than at view-local coordinates.\n *\n * Exposes the same `status$` / `busy$` / `progress$` surface as the cellpose\n * tool so the host's shared segmentation toast drives it unchanged.\n */\n@Injectable({ providedIn: 'root' })\nexport class YoloDetectToolService {\n  readonly status$ = new BehaviorSubject<string>('');\n  readonly busy$ = new BehaviorSubject<boolean>(false);\n  readonly progress$ = new BehaviorSubject<number>(-1);\n\n  constructor(\n    /** Server-side crop, so detection can run at the model's scale rather than\n     *  the viewer's. Optional: without it the tool falls back to the displayed\n     *  pixels, which is correct but scale-dependent. */\n    @Optional() @Inject(TILE_ACCESS_PORT) private tileAccess: TileAccessPort | null = null,\n  ) {}\n\n  /**\n   * Detect in the current view and append the results as regions.\n   *\n   * @returns the number of regions added.\n   */\n  async detectInView(\n    viz: IVisualizer,\n    segmenter: IInstanceSegmenter,\n    opts: InstanceSegmentOptions = {},\n  ): Promise<number> {\n    const pixels = viz.getDisplayedPixelData?.();\n    if (!pixels || pixels.width === 0 || pixels.height === 0) {\n      this.status$.next('No image on screen to detect in.');\n      return 0;\n    }\n\n    this.busy$.next(true);\n    this.progress$.next(-1);\n    try {\n      const rect = viz.getDisplayedSourceRect?.() ?? null;\n      const target = Number(opts.downsamplingFactor ?? 0) || 0;\n      const viewFactor = rect && pixels.width > 0 ? rect.width / pixels.width : 1;\n\n      // Re-crop at the model's scale when the view is coarser than it wants.\n      // The image is tile-backed, so that detail exists server-side even though\n      // the displayed pixels have discarded it.\n      let source = { data: pixels.data, width: pixels.width, height: pixels.height };\n      if (rect && target > 0 && target < viewFactor * 0.98) {\n        this.status$.next('Fetching image at model resolution…');\n        const hi = await this.fetchCropAtScale(rect, target);\n        if (hi) source = hi;\n      }\n\n      const result = await segmenter.segmentInstances(source, opts, {\n        onProgress: (f) => this.progress$.next(f),\n        onStatus: (s) => this.status$.next(s),\n      });\n\n      // View pixels -> full-resolution image pixels. Without this every region\n      // would sit at view-local coordinates, i.e. the wrong place on the slide\n      // for any zoomed or panned view.\n      const offsetX = rect ? rect.x : 0;\n      const offsetY = rect ? rect.y : 0;\n      // Against the pixels actually inferred on, which may be the re-crop.\n      const ratioX = rect && source.width > 0 ? rect.width / source.width : 1;\n      const ratioY = rect && source.height > 0 ? rect.height / source.height : 1;\n\n      const added: Region[] = [];\n      for (const det of result.detections) {\n        if (det.polygons.length > 0) {\n          for (const poly of det.polygons) {\n            if (poly.exterior.length < 3) continue;\n            added.push(\n              this.makeRegion(\n                poly.exterior.map(([x]) => Math.round(offsetX + x * ratioX)),\n                poly.exterior.map(([, y]) => Math.round(offsetY + y * ratioY)),\n                det.className,\n              ),\n            );\n          }\n          continue;\n        }\n        // Detection mode yields no outline; the box is still the result, and\n        // matches what the server writes as a \"detection\" feature.\n        const [x1, y1, x2, y2] = det.box;\n        if (x2 - x1 <= 0 || y2 - y1 <= 0) continue;\n        added.push(\n          this.makeRegion(\n            [x1, x2, x2, x1].map((x) => Math.round(offsetX + x * ratioX)),\n            [y1, y1, y2, y2].map((y) => Math.round(offsetY + y * ratioY)),\n            det.className,\n          ),\n        );\n      }\n\n      if (added.length === 0) {\n        this.status$.next('No objects detected.');\n        return 0;\n      }\n\n      // Append. A detection run must not discard annotations drawn by hand or\n      // produced by another tool.\n      viz.setRegions([...(viz.getRegions() ?? []), ...added]);\n      this.status$.next(`Added ${added.length} region(s).`);\n      return added.length;\n    } catch (err) {\n      this.status$.next(err instanceof Error ? err.message : 'YOLO detection failed.');\n      return 0;\n    } finally {\n      this.busy$.next(false);\n      this.progress$.next(-1);\n    }\n  }\n\n  /**\n   * Re-crop `rect` at `1/target` of full resolution. Returns null on any\n   * failure, so the caller falls back to the displayed pixels — a coarser crop\n   * beats a failed run.\n   */\n  private async fetchCropAtScale(\n    rect: { x: number; y: number; width: number; height: number },\n    target: number,\n  ): Promise<{ data: Uint8ClampedArray; width: number; height: number } | null> {\n    if (!this.tileAccess) return null;\n    let w = Math.round(rect.width / target);\n    let h = Math.round(rect.height / target);\n\n    // A factor of 1 over a whole-slide ROI would ask for hundreds of megapixels.\n    const MAX_PIXELS = 16_777_216; // 4096²\n    const pixels = w * h;\n    if (pixels > MAX_PIXELS) {\n      const k = Math.sqrt(MAX_PIXELS / pixels);\n      w = Math.round(w * k);\n      h = Math.round(h * k);\n    }\n    if (w < 64 || h < 64) return null;\n\n    try {\n      const roi = {\n        x: Math.round(rect.x),\n        y: Math.round(rect.y),\n        width: Math.round(rect.width),\n        height: Math.round(rect.height),\n      } as Rectangle;\n      const screen = { x: 0, y: 0, width: w, height: h } as Rectangle;\n      const bytes = await firstValueFrom(this.tileAccess.zoomOnRegion(roi, screen, 0));\n      if (!bytes || bytes.byteLength === 0) return null;\n\n      const bitmap = await createImageBitmap(new Blob([bytes]));\n      const canvas = document.createElement('canvas');\n      canvas.width = bitmap.width;\n      canvas.height = bitmap.height;\n      const ctx = canvas.getContext('2d');\n      if (!ctx) return null;\n      ctx.drawImage(bitmap, 0, 0);\n      const out = ctx.getImageData(0, 0, bitmap.width, bitmap.height);\n      bitmap.close?.();\n      return { data: out.data, width: bitmap.width, height: bitmap.height };\n    } catch {\n      return null;\n    }\n  }\n\n  private makeRegion(xs: number[], ys: number[], className: string): Region {\n    const poly = new Polygon();\n    poly.npoints = xs.length;\n    poly.xpoints = xs;\n    poly.ypoints = ys;\n    poly.coordinates = xs.map((x, i) => [x, ys[i]]);\n    poly.closed = true;\n\n    const region = new Region();\n    region.bounds = poly;\n    // The class name drives preset colour resolution; leaving `color` unset lets\n    // an existing preset for this class win.\n    region.label = className;\n    return region;\n  }\n}\n"]}
|