@mlightcad/cad-simple-viewer 1.6.1 → 1.6.3
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/dist/cad-simple-viewer.js +12123 -8535
- package/dist/cad-simple-viewer.umd.cjs +180 -29
- package/icons.ts +7 -0
- package/lib/app/AcApBusyIndicator.d.ts +6 -0
- package/lib/app/AcApBusyIndicator.d.ts.map +1 -1
- package/lib/app/AcApBusyIndicator.js +8 -0
- package/lib/app/AcApBusyIndicator.js.map +1 -1
- package/lib/app/AcApContext.d.ts +24 -0
- package/lib/app/AcApContext.d.ts.map +1 -1
- package/lib/app/AcApContext.js +103 -18
- package/lib/app/AcApContext.js.map +1 -1
- package/lib/app/AcApDocManager.d.ts +221 -21
- package/lib/app/AcApDocManager.d.ts.map +1 -1
- package/lib/app/AcApDocManager.js +820 -134
- package/lib/app/AcApDocManager.js.map +1 -1
- package/lib/app/AcApDocSession.d.ts +41 -0
- package/lib/app/AcApDocSession.d.ts.map +1 -0
- package/lib/app/AcApDocSession.js +29 -0
- package/lib/app/AcApDocSession.js.map +1 -0
- package/lib/app/AcApDocument.d.ts +5 -0
- package/lib/app/AcApDocument.d.ts.map +1 -1
- package/lib/app/AcApDocument.js +21 -0
- package/lib/app/AcApDocument.js.map +1 -1
- package/lib/app/AcApOpenFileProgressController.d.ts +14 -0
- package/lib/app/AcApOpenFileProgressController.d.ts.map +1 -1
- package/lib/app/AcApOpenFileProgressController.js +18 -0
- package/lib/app/AcApOpenFileProgressController.js.map +1 -1
- package/lib/app/AcApProgress.d.ts +6 -0
- package/lib/app/AcApProgress.d.ts.map +1 -1
- package/lib/app/AcApProgress.js +17 -0
- package/lib/app/AcApProgress.js.map +1 -1
- package/lib/app/AcApSettingManager.d.ts.map +1 -1
- package/lib/app/AcApSettingManager.js +1 -0
- package/lib/app/AcApSettingManager.js.map +1 -1
- package/lib/app/index.d.ts +1 -0
- package/lib/app/index.d.ts.map +1 -1
- package/lib/app/index.js +1 -0
- package/lib/app/index.js.map +1 -1
- package/lib/command/AcApCloseCmd.d.ts +15 -0
- package/lib/command/AcApCloseCmd.d.ts.map +1 -0
- package/lib/command/AcApCloseCmd.js +83 -0
- package/lib/command/AcApCloseCmd.js.map +1 -0
- package/lib/command/draw/AcApArcCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApArcCmd.js +28 -312
- package/lib/command/draw/AcApArcCmd.js.map +1 -1
- package/lib/command/draw/AcApCircleCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApCircleCmd.js +10 -42
- package/lib/command/draw/AcApCircleCmd.js.map +1 -1
- package/lib/command/index.d.ts +1 -0
- package/lib/command/index.d.ts.map +1 -1
- package/lib/command/index.js +1 -0
- package/lib/command/index.js.map +1 -1
- package/lib/command/markup/AcApMarkupCalloutCmd.d.ts.map +1 -1
- package/lib/command/markup/AcApMarkupCalloutCmd.js +29 -10
- package/lib/command/markup/AcApMarkupCalloutCmd.js.map +1 -1
- package/lib/command/markup/AcApMarkupGeometry.d.ts +20 -1
- package/lib/command/markup/AcApMarkupGeometry.d.ts.map +1 -1
- package/lib/command/markup/AcApMarkupGeometry.js +84 -24
- package/lib/command/markup/AcApMarkupGeometry.js.map +1 -1
- package/lib/command/markup/AcApMarkupHistory.d.ts +1 -1
- package/lib/command/markup/AcApMarkupHistory.d.ts.map +1 -1
- package/lib/command/markup/AcApMarkupHistory.js +4 -11
- package/lib/command/markup/AcApMarkupHistory.js.map +1 -1
- package/lib/command/markup/AcApMarkupPresenter.d.ts +8 -2
- package/lib/command/markup/AcApMarkupPresenter.d.ts.map +1 -1
- package/lib/command/markup/AcApMarkupPresenter.js +35 -5
- package/lib/command/markup/AcApMarkupPresenter.js.map +1 -1
- package/lib/command/markup/AcApMarkupSession.d.ts +54 -0
- package/lib/command/markup/AcApMarkupSession.d.ts.map +1 -0
- package/lib/command/markup/AcApMarkupSession.js +85 -0
- package/lib/command/markup/AcApMarkupSession.js.map +1 -0
- package/lib/command/markup/AcApMarkupSessionBootstrap.d.ts +2 -0
- package/lib/command/markup/AcApMarkupSessionBootstrap.d.ts.map +1 -0
- package/lib/command/markup/AcApMarkupSessionBootstrap.js +12 -0
- package/lib/command/markup/AcApMarkupSessionBootstrap.js.map +1 -0
- package/lib/command/markup/AcApMarkupShapeCallout.d.ts +21 -1
- package/lib/command/markup/AcApMarkupShapeCallout.d.ts.map +1 -1
- package/lib/command/markup/AcApMarkupShapeCallout.js +29 -22
- package/lib/command/markup/AcApMarkupShapeCallout.js.map +1 -1
- package/lib/command/markup/AcApMarkupStore.d.ts +1 -1
- package/lib/command/markup/AcApMarkupStore.d.ts.map +1 -1
- package/lib/command/markup/AcApMarkupStore.js +3 -6
- package/lib/command/markup/AcApMarkupStore.js.map +1 -1
- package/lib/command/markup/AcApMarkupTextCmd.d.ts.map +1 -1
- package/lib/command/markup/AcApMarkupTextCmd.js +8 -2
- package/lib/command/markup/AcApMarkupTextCmd.js.map +1 -1
- package/lib/command/markup/AcApMarkupTextEdit.d.ts.map +1 -1
- package/lib/command/markup/AcApMarkupTextEdit.js +3 -1
- package/lib/command/markup/AcApMarkupTextEdit.js.map +1 -1
- package/lib/command/markup/AcApMarkupUtil.d.ts.map +1 -1
- package/lib/command/markup/AcApMarkupUtil.js +3 -2
- package/lib/command/markup/AcApMarkupUtil.js.map +1 -1
- package/lib/command/markup/index.d.ts +2 -0
- package/lib/command/markup/index.d.ts.map +1 -1
- package/lib/command/markup/index.js +3 -0
- package/lib/command/markup/index.js.map +1 -1
- package/lib/command/measure/AcApMeasureArcCmd.d.ts +22 -25
- package/lib/command/measure/AcApMeasureArcCmd.d.ts.map +1 -1
- package/lib/command/measure/AcApMeasureArcCmd.js +480 -256
- package/lib/command/measure/AcApMeasureArcCmd.js.map +1 -1
- package/lib/command/measure/AcApMeasureArcLock.d.ts +40 -0
- package/lib/command/measure/AcApMeasureArcLock.d.ts.map +1 -0
- package/lib/command/measure/AcApMeasureArcLock.js +226 -0
- package/lib/command/measure/AcApMeasureArcLock.js.map +1 -0
- package/lib/command/measure/AcApMeasurementGeometry.d.ts.map +1 -1
- package/lib/command/measure/AcApMeasurementGeometry.js +9 -9
- package/lib/command/measure/AcApMeasurementGeometry.js.map +1 -1
- package/lib/command/measure/AcApMeasurementSidecar.d.ts.map +1 -1
- package/lib/command/measure/AcApMeasurementSidecar.js +12 -7
- package/lib/command/measure/AcApMeasurementSidecar.js.map +1 -1
- package/lib/command/measure/AcApMeasurementStore.d.ts +2 -0
- package/lib/command/measure/AcApMeasurementStore.d.ts.map +1 -1
- package/lib/command/measure/AcApMeasurementStore.js +4 -0
- package/lib/command/measure/AcApMeasurementStore.js.map +1 -1
- package/lib/command/measure/AcApMeasurementTypes.d.ts +6 -0
- package/lib/command/measure/AcApMeasurementTypes.d.ts.map +1 -1
- package/lib/command/measure/entity/AcApMeasureArcEntity.d.ts +24 -22
- package/lib/command/measure/entity/AcApMeasureArcEntity.d.ts.map +1 -1
- package/lib/command/measure/entity/AcApMeasureArcEntity.js +104 -41
- package/lib/command/measure/entity/AcApMeasureArcEntity.js.map +1 -1
- package/lib/command/measure/entity/AcApMeasureDrawUtil.d.ts +35 -38
- package/lib/command/measure/entity/AcApMeasureDrawUtil.d.ts.map +1 -1
- package/lib/command/measure/entity/AcApMeasureDrawUtil.js +42 -53
- package/lib/command/measure/entity/AcApMeasureDrawUtil.js.map +1 -1
- package/lib/command/measure/entity/AcApMeasureEntityFactory.d.ts.map +1 -1
- package/lib/command/measure/entity/AcApMeasureEntityFactory.js +1 -1
- package/lib/command/measure/entity/AcApMeasureEntityFactory.js.map +1 -1
- package/lib/command/modify/AcApEraseCmd.d.ts +1 -0
- package/lib/command/modify/AcApEraseCmd.d.ts.map +1 -1
- package/lib/command/modify/AcApEraseCmd.js +4 -2
- package/lib/command/modify/AcApEraseCmd.js.map +1 -1
- package/lib/editor/grip/AcEdGripEditSession.d.ts.map +1 -1
- package/lib/editor/grip/AcEdGripEditSession.js +2 -0
- package/lib/editor/grip/AcEdGripEditSession.js.map +1 -1
- package/lib/editor/input/AcEdOsnapCenterMarks.d.ts +23 -0
- package/lib/editor/input/AcEdOsnapCenterMarks.d.ts.map +1 -0
- package/lib/editor/input/AcEdOsnapCenterMarks.js +240 -0
- package/lib/editor/input/AcEdOsnapCenterMarks.js.map +1 -0
- package/lib/editor/input/AcEdOsnapResolver.d.ts +18 -0
- package/lib/editor/input/AcEdOsnapResolver.d.ts.map +1 -1
- package/lib/editor/input/AcEdOsnapResolver.js +159 -10
- package/lib/editor/input/AcEdOsnapResolver.js.map +1 -1
- package/lib/editor/input/marker/AcEdMarker.d.ts +1 -1
- package/lib/editor/input/marker/AcEdMarker.d.ts.map +1 -1
- package/lib/editor/input/marker/AcEdMarker.js +11 -1
- package/lib/editor/input/marker/AcEdMarker.js.map +1 -1
- package/lib/editor/input/marker/AcEdOSnapMarkerManager.d.ts +17 -1
- package/lib/editor/input/marker/AcEdOSnapMarkerManager.d.ts.map +1 -1
- package/lib/editor/input/marker/AcEdOSnapMarkerManager.js +71 -10
- package/lib/editor/input/marker/AcEdOSnapMarkerManager.js.map +1 -1
- package/lib/editor/input/ui/AcEdFloatingInput.d.ts.map +1 -1
- package/lib/editor/input/ui/AcEdFloatingInput.js +4 -0
- package/lib/editor/input/ui/AcEdFloatingInput.js.map +1 -1
- package/lib/editor/view/AcEdBaseView.d.ts +12 -0
- package/lib/editor/view/AcEdBaseView.d.ts.map +1 -1
- package/lib/editor/view/AcEdBaseView.js +29 -1
- package/lib/editor/view/AcEdBaseView.js.map +1 -1
- package/lib/i18n/AcApI18n.d.ts +1 -1
- package/lib/i18n/AcApI18n.d.ts.map +1 -1
- package/lib/i18n/AcApI18n.js +2 -1
- package/lib/i18n/AcApI18n.js.map +1 -1
- package/lib/i18n/ar/command.d.ts +456 -0
- package/lib/i18n/ar/command.d.ts.map +1 -0
- package/lib/i18n/ar/command.js +14 -0
- package/lib/i18n/ar/command.js.map +1 -0
- package/lib/i18n/ar/jig.d.ts +1231 -0
- package/lib/i18n/ar/jig.d.ts.map +1 -0
- package/lib/i18n/ar/jig.js +594 -0
- package/lib/i18n/ar/jig.js.map +1 -0
- package/lib/i18n/ar/main.d.ts +64 -0
- package/lib/i18n/ar/main.d.ts.map +1 -0
- package/lib/i18n/ar/main.js +63 -0
- package/lib/i18n/ar/main.js.map +1 -0
- package/lib/i18n/cs/command.d.ts +3 -0
- package/lib/i18n/cs/command.d.ts.map +1 -1
- package/lib/i18n/cs/command.js +3 -0
- package/lib/i18n/cs/command.js.map +1 -1
- package/lib/i18n/cs/jig.d.ts +3 -0
- package/lib/i18n/cs/jig.d.ts.map +1 -1
- package/lib/i18n/cs/jig.js +7 -4
- package/lib/i18n/cs/jig.js.map +1 -1
- package/lib/i18n/en/command.d.ts +3 -0
- package/lib/i18n/en/command.d.ts.map +1 -1
- package/lib/i18n/en/command.js +3 -0
- package/lib/i18n/en/command.js.map +1 -1
- package/lib/i18n/en/jig.d.ts +3 -0
- package/lib/i18n/en/jig.d.ts.map +1 -1
- package/lib/i18n/en/jig.js +7 -4
- package/lib/i18n/en/jig.js.map +1 -1
- package/lib/i18n/index.d.ts.map +1 -1
- package/lib/i18n/index.js +8 -0
- package/lib/i18n/index.js.map +1 -1
- package/lib/i18n/tr/command.d.ts +3 -0
- package/lib/i18n/tr/command.d.ts.map +1 -1
- package/lib/i18n/tr/command.js +3 -0
- package/lib/i18n/tr/command.js.map +1 -1
- package/lib/i18n/tr/jig.d.ts +3 -0
- package/lib/i18n/tr/jig.d.ts.map +1 -1
- package/lib/i18n/tr/jig.js +7 -4
- package/lib/i18n/tr/jig.js.map +1 -1
- package/lib/i18n/zh/command.d.ts +3 -0
- package/lib/i18n/zh/command.d.ts.map +1 -1
- package/lib/i18n/zh/command.js +3 -0
- package/lib/i18n/zh/command.js.map +1 -1
- package/lib/i18n/zh/jig.d.ts +3 -0
- package/lib/i18n/zh/jig.d.ts.map +1 -1
- package/lib/i18n/zh/jig.js +7 -4
- package/lib/i18n/zh/jig.js.map +1 -1
- package/lib/plugin/AcApPluginManager.d.ts +10 -0
- package/lib/plugin/AcApPluginManager.d.ts.map +1 -1
- package/lib/plugin/AcApPluginManager.js +18 -0
- package/lib/plugin/AcApPluginManager.js.map +1 -1
- package/lib/service/AcApEntityService.d.ts +4 -2
- package/lib/service/AcApEntityService.d.ts.map +1 -1
- package/lib/service/AcApEntityService.js +14 -10
- package/lib/service/AcApEntityService.js.map +1 -1
- package/lib/ui/AcApDrawStyle.d.ts +19 -1
- package/lib/ui/AcApDrawStyle.d.ts.map +1 -1
- package/lib/ui/AcApDrawStyle.js +22 -1
- package/lib/ui/AcApDrawStyle.js.map +1 -1
- package/lib/ui/AcApDrawStyleToolbar.d.ts +12 -7
- package/lib/ui/AcApDrawStyleToolbar.d.ts.map +1 -1
- package/lib/ui/AcApDrawStyleToolbar.js +173 -52
- package/lib/ui/AcApDrawStyleToolbar.js.map +1 -1
- package/lib/ui/icons.d.ts +148 -0
- package/lib/ui/icons.d.ts.map +1 -0
- package/lib/ui/icons.js +173 -0
- package/lib/ui/icons.js.map +1 -0
- package/lib/ui/index.d.ts +1 -0
- package/lib/ui/index.d.ts.map +1 -1
- package/lib/ui/index.js +1 -0
- package/lib/ui/index.js.map +1 -1
- package/lib/util/AcApCssColor.d.ts +8 -0
- package/lib/util/AcApCssColor.d.ts.map +1 -0
- package/lib/util/AcApCssColor.js +20 -0
- package/lib/util/AcApCssColor.js.map +1 -0
- package/lib/util/AcApMeasurementUtil.d.ts.map +1 -1
- package/lib/util/AcApMeasurementUtil.js +3 -2
- package/lib/util/AcApMeasurementUtil.js.map +1 -1
- package/lib/util/AcApScreenHitTest.d.ts +5 -1
- package/lib/util/AcApScreenHitTest.d.ts.map +1 -1
- package/lib/util/AcApScreenHitTest.js +9 -3
- package/lib/util/AcApScreenHitTest.js.map +1 -1
- package/lib/util/index.d.ts +1 -0
- package/lib/util/index.d.ts.map +1 -1
- package/lib/util/index.js +1 -0
- package/lib/util/index.js.map +1 -1
- package/lib/view/AcApCompareDisplay.d.ts +37 -0
- package/lib/view/AcApCompareDisplay.d.ts.map +1 -0
- package/lib/view/AcApCompareDisplay.js +8 -0
- package/lib/view/AcApCompareDisplay.js.map +1 -0
- package/lib/view/AcEdReviewOverlayPick.d.ts +9 -0
- package/lib/view/AcEdReviewOverlayPick.d.ts.map +1 -1
- package/lib/view/AcEdReviewOverlayPick.js +30 -1
- package/lib/view/AcEdReviewOverlayPick.js.map +1 -1
- package/lib/view/AcTrLayer.d.ts +6 -0
- package/lib/view/AcTrLayer.d.ts.map +1 -1
- package/lib/view/AcTrLayer.js +8 -0
- package/lib/view/AcTrLayer.js.map +1 -1
- package/lib/view/AcTrLayout.d.ts +12 -0
- package/lib/view/AcTrLayout.d.ts.map +1 -1
- package/lib/view/AcTrLayout.js +12 -0
- package/lib/view/AcTrLayout.js.map +1 -1
- package/lib/view/AcTrScene.d.ts +7 -0
- package/lib/view/AcTrScene.d.ts.map +1 -1
- package/lib/view/AcTrScene.js +13 -0
- package/lib/view/AcTrScene.js.map +1 -1
- package/lib/view/AcTrView2d.d.ts +50 -2
- package/lib/view/AcTrView2d.d.ts.map +1 -1
- package/lib/view/AcTrView2d.js +210 -37
- package/lib/view/AcTrView2d.js.map +1 -1
- package/lib/view/AcTrViewSessionState.d.ts +26 -0
- package/lib/view/AcTrViewSessionState.d.ts.map +1 -0
- package/lib/view/AcTrViewSessionState.js +2 -0
- package/lib/view/AcTrViewSessionState.js.map +1 -0
- package/lib/view/index.d.ts +2 -0
- package/lib/view/index.d.ts.map +1 -1
- package/lib/view/index.js +2 -0
- package/lib/view/index.js.map +1 -1
- package/package.json +12 -5
- package/src/ui/icons.ts +293 -0
|
@@ -170,6 +170,87 @@ export function markupGeometryBounds(geometry) {
|
|
|
170
170
|
}
|
|
171
171
|
return box.isEmpty() ? undefined : box;
|
|
172
172
|
}
|
|
173
|
+
/**
|
|
174
|
+
* Whether geometry is a cloud / rect / circle with no leader + text box yet.
|
|
175
|
+
*/
|
|
176
|
+
export function isAttachableShapeMarkup(geometry) {
|
|
177
|
+
return ((geometry.type === 'cloud' ||
|
|
178
|
+
geometry.type === 'rect' ||
|
|
179
|
+
geometry.type === 'circle') &&
|
|
180
|
+
geometry.callout == null);
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
* Shape outline used to constrain an attached-callout leader tip.
|
|
184
|
+
*/
|
|
185
|
+
export function markupShapeOutlineFromGeometry(geometry) {
|
|
186
|
+
if (geometry.type === 'circle') {
|
|
187
|
+
return {
|
|
188
|
+
kind: 'circle',
|
|
189
|
+
center: geometry.center,
|
|
190
|
+
radius: geometry.radius
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
return {
|
|
194
|
+
kind: geometry.type,
|
|
195
|
+
corner1: geometry.corner1,
|
|
196
|
+
corner2: geometry.corner2
|
|
197
|
+
};
|
|
198
|
+
}
|
|
199
|
+
/**
|
|
200
|
+
* Whether a canvas-space pick hits a cloud / rect / circle outer frame
|
|
201
|
+
* (AABB for cloud/rect, circumference for circle). Does not hit interiors
|
|
202
|
+
* or an already-attached callout leader.
|
|
203
|
+
*/
|
|
204
|
+
export function hitTestMarkupShapeOutline(geometry, canvas, worldToScreen, threshold) {
|
|
205
|
+
switch (geometry.type) {
|
|
206
|
+
case 'rect': {
|
|
207
|
+
var a = worldToScreen(geometry.corner1);
|
|
208
|
+
var b = worldToScreen(geometry.corner2);
|
|
209
|
+
var minX = Math.min(a.x, b.x);
|
|
210
|
+
var maxX = Math.max(a.x, b.x);
|
|
211
|
+
var minY = Math.min(a.y, b.y);
|
|
212
|
+
var maxY = Math.max(a.y, b.y);
|
|
213
|
+
var inside = canvas.x >= minX &&
|
|
214
|
+
canvas.x <= maxX &&
|
|
215
|
+
canvas.y >= minY &&
|
|
216
|
+
canvas.y <= maxY;
|
|
217
|
+
if (!inside) {
|
|
218
|
+
return (distPointToRectOutlinePx(canvas.x, canvas.y, a, b) <= threshold);
|
|
219
|
+
}
|
|
220
|
+
var distEdge = Math.min(Math.abs(canvas.x - minX), Math.abs(canvas.x - maxX), Math.abs(canvas.y - minY), Math.abs(canvas.y - maxY));
|
|
221
|
+
return distEdge <= threshold;
|
|
222
|
+
}
|
|
223
|
+
case 'cloud': {
|
|
224
|
+
var a = worldToScreen(geometry.corner1);
|
|
225
|
+
var b = worldToScreen(geometry.corner2);
|
|
226
|
+
var minX = Math.min(a.x, b.x);
|
|
227
|
+
var maxX = Math.max(a.x, b.x);
|
|
228
|
+
var minY = Math.min(a.y, b.y);
|
|
229
|
+
var maxY = Math.max(a.y, b.y);
|
|
230
|
+
var tol = threshold + CLOUD_HIT_EXTRA_PX;
|
|
231
|
+
var inside = canvas.x >= minX &&
|
|
232
|
+
canvas.x <= maxX &&
|
|
233
|
+
canvas.y >= minY &&
|
|
234
|
+
canvas.y <= maxY;
|
|
235
|
+
if (!inside) {
|
|
236
|
+
return distPointToRectOutlinePx(canvas.x, canvas.y, a, b) <= tol;
|
|
237
|
+
}
|
|
238
|
+
var distEdge = Math.min(Math.abs(canvas.x - minX), Math.abs(canvas.x - maxX), Math.abs(canvas.y - minY), Math.abs(canvas.y - maxY));
|
|
239
|
+
return distEdge <= tol;
|
|
240
|
+
}
|
|
241
|
+
case 'circle': {
|
|
242
|
+
var c = worldToScreen(geometry.center);
|
|
243
|
+
var rim = worldToScreen({
|
|
244
|
+
x: geometry.center.x + geometry.radius,
|
|
245
|
+
y: geometry.center.y
|
|
246
|
+
});
|
|
247
|
+
var radius = Math.hypot(rim.x - c.x, rim.y - c.y);
|
|
248
|
+
return (distPointToCirclePx(canvas.x, canvas.y, c.x, c.y, radius) <= threshold);
|
|
249
|
+
}
|
|
250
|
+
default:
|
|
251
|
+
return false;
|
|
252
|
+
}
|
|
253
|
+
}
|
|
173
254
|
/**
|
|
174
255
|
* Whether a canvas-space pick hits a markup's drawn stroke (not HTML capsules).
|
|
175
256
|
*
|
|
@@ -186,31 +267,10 @@ export function hitTestMarkupGeometry(geometry, canvas, worldToScreen, threshold
|
|
|
186
267
|
return (distPointToSegmentPx(canvas.x, canvas.y, a.x, a.y, b.x, b.y) <=
|
|
187
268
|
threshold);
|
|
188
269
|
}
|
|
189
|
-
case 'rect':
|
|
190
|
-
|
|
191
|
-
return true;
|
|
192
|
-
}
|
|
193
|
-
return geometry.callout
|
|
194
|
-
? hitTestLeader(geometry.callout, canvas, worldToScreen, threshold)
|
|
195
|
-
: false;
|
|
196
|
-
}
|
|
197
|
-
case 'cloud': {
|
|
198
|
-
if (distPointToRectOutlinePx(canvas.x, canvas.y, worldToScreen(geometry.corner1), worldToScreen(geometry.corner2)) <=
|
|
199
|
-
threshold + CLOUD_HIT_EXTRA_PX) {
|
|
200
|
-
return true;
|
|
201
|
-
}
|
|
202
|
-
return geometry.callout
|
|
203
|
-
? hitTestLeader(geometry.callout, canvas, worldToScreen, threshold)
|
|
204
|
-
: false;
|
|
205
|
-
}
|
|
270
|
+
case 'rect':
|
|
271
|
+
case 'cloud':
|
|
206
272
|
case 'circle': {
|
|
207
|
-
|
|
208
|
-
var rim = worldToScreen({
|
|
209
|
-
x: geometry.center.x + geometry.radius,
|
|
210
|
-
y: geometry.center.y
|
|
211
|
-
});
|
|
212
|
-
var radius = Math.hypot(rim.x - c.x, rim.y - c.y);
|
|
213
|
-
if (distPointToCirclePx(canvas.x, canvas.y, c.x, c.y, radius) <= threshold) {
|
|
273
|
+
if (hitTestMarkupShapeOutline(geometry, canvas, worldToScreen, threshold)) {
|
|
214
274
|
return true;
|
|
215
275
|
}
|
|
216
276
|
return geometry.callout
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApMarkupGeometry.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupGeometry.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,EAEL,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,aAAa,EACd,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"AcApMarkupGeometry.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupGeometry.ts"],"names":[],"mappings":"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"}
|
|
@@ -126,7 +126,7 @@ export declare class AcApSessionUndo {
|
|
|
126
126
|
}
|
|
127
127
|
/** Shared markup history for the active session. */
|
|
128
128
|
export declare function getMarkupHistory(): AcApMarkupHistory;
|
|
129
|
-
/**
|
|
129
|
+
/** Session undo coordinator for the active document session. */
|
|
130
130
|
export declare function getSessionUndo(): AcApSessionUndo;
|
|
131
131
|
/**
|
|
132
132
|
* Record an undoable markup edit.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApMarkupHistory.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupHistory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"AcApMarkupHistory.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupHistory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AA+BhD,wEAAwE;AACxE,MAAM,WAAW,yBAAyB;IACxC,oDAAoD;IACpD,OAAO,IAAI,OAAO,CAAA;IAClB,mDAAmD;IACnD,OAAO,IAAI,OAAO,CAAA;IAClB;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAA;IACf;;;OAGG;IACH,IAAI,IAAI,OAAO,CAAA;IACf,8DAA8D;IAC9D,SAAS,IAAI,IAAI,CAAA;IACjB,sDAAsD;IACtD,KAAK,IAAI,IAAI,CAAA;CACd;AAKD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,yBAAyB,GAAG,SAAS,GAC7C,IAAI,CAEN;AAED;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAC5B,2DAA2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,2DAA2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAI;IAEjB,kEAAkE;IAClE,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,sDAAsD;IACtD,OAAO,IAAI,OAAO;IAIlB,sDAAsD;IACtD,OAAO,IAAI,OAAO;IAIlB,oDAAoD;IACpD,SAAS,IAAI,IAAI;IAIjB,qDAAqD;IACrD,KAAK,IAAI,IAAI;IAKb;;;;;;OAMG;IACH,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,IAAI;IA6BjE;;;OAGG;IACH,IAAI,IAAI,OAAO;IAQf;;;OAGG;IACH,IAAI,IAAI,OAAO;IAQf;;;;OAIG;IACH,OAAO,CAAC,KAAK;CAQd;AAED;;;GAGG;AACH,qBAAa,eAAe;IAC1B,mEAAmE;IACnE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAChD,gFAAgF;IAChF,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsB;IAEhD,2DAA2D;IAC3D,QAAQ,IAAI,IAAI;IAOhB,sDAAsD;IACtD,YAAY,IAAI,IAAI;IAMpB,0EAA0E;IAC1E,aAAa,IAAI,IAAI;IAMrB;;;OAGG;IACH,OAAO,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO;IASlC;;;OAGG;IACH,OAAO,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO;IASlC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,EAAE,YAAY,GAAG,QAAQ,GAAG,SAAS,GAAG,IAAI,GAAG,KAAK;IAwC3D;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,EAAE,YAAY,GAAG,QAAQ,GAAG,SAAS,GAAG,IAAI,GAAG,KAAK;IAwC3D,8DAA8D;IAC9D,KAAK,IAAI,IAAI;CAKd;AAED,oDAAoD;AACpD,wBAAgB,gBAAgB,IAAI,iBAAiB,CAEpD;AAED,gEAAgE;AAChE,wBAAgB,cAAc,IAAI,eAAe,CAEhD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,IAAI,GACjB,IAAI,CAEN"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { eventBus } from '../../editor/global/eventBus';
|
|
2
2
|
import { acapNotifyUndoStackChanged } from '../../util/AcApDatabaseEdit';
|
|
3
|
+
import { getActiveMarkupBag } from './AcApMarkupSession';
|
|
3
4
|
import { getMarkupStore } from './AcApMarkupStore';
|
|
4
5
|
/** Bound HTML overlay history consulted by {@link AcApSessionUndo}. */
|
|
5
6
|
var overlayHistory;
|
|
@@ -284,21 +285,13 @@ var AcApSessionUndo = /** @class */ (function () {
|
|
|
284
285
|
return AcApSessionUndo;
|
|
285
286
|
}());
|
|
286
287
|
export { AcApSessionUndo };
|
|
287
|
-
/** Session-wide markup history singleton. */
|
|
288
|
-
var sharedHistory;
|
|
289
|
-
/** Session-wide DB / markup / overlay undo coordinator singleton. */
|
|
290
|
-
var sharedSessionUndo;
|
|
291
288
|
/** Shared markup history for the active session. */
|
|
292
289
|
export function getMarkupHistory() {
|
|
293
|
-
|
|
294
|
-
sharedHistory = new AcApMarkupHistory();
|
|
295
|
-
return sharedHistory;
|
|
290
|
+
return getActiveMarkupBag().history;
|
|
296
291
|
}
|
|
297
|
-
/**
|
|
292
|
+
/** Session undo coordinator for the active document session. */
|
|
298
293
|
export function getSessionUndo() {
|
|
299
|
-
|
|
300
|
-
sharedSessionUndo = new AcApSessionUndo();
|
|
301
|
-
return sharedSessionUndo;
|
|
294
|
+
return getActiveMarkupBag().sessionUndo;
|
|
302
295
|
}
|
|
303
296
|
/**
|
|
304
297
|
* Record an undoable markup edit.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApMarkupHistory.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupHistory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AcApMarkupHistory.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupHistory.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAA;AACvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAA;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAiDlD,uEAAuE;AACvE,IAAI,cAAqD,CAAA;AAEzD;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAA8C;IAE9C,cAAc,GAAG,OAAO,CAAA;AAC1B,CAAC;AAED;;;;;;;GAOG;AACH;IAAA;QACE,2DAA2D;QAC1C,cAAS,GAA6B,EAAE,CAAA;QACzD,2DAA2D;QAC1C,cAAS,GAA6B,EAAE,CAAA;QACzD;;;WAGG;QACK,UAAK,GAAG,CAAC,CAAA;IAqGnB,CAAC;IAlGC,sBAAI,qCAAM;QADV,kEAAkE;aAClE;YACE,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAA;QACvB,CAAC;;;OAAA;IAED,sDAAsD;IACtD,mCAAO,GAAP;QACE,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;IAClC,CAAC;IAED,sDAAsD;IACtD,mCAAO,GAAP;QACE,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;IAClC,CAAC;IAED,oDAAoD;IACpD,qCAAS,GAAT;QACE,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;IAC3B,CAAC;IAED,qDAAqD;IACrD,iCAAK,GAAL;QACE,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;QACzB,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;IAC3B,CAAC;IAED;;;;;;OAMG;IACH,+BAAG,GAAH,UAAI,KAAmB,EAAE,KAAa,EAAE,MAAkB;QACxD,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YACnB,MAAM,EAAE,CAAA;YACR,OAAM;QACR,CAAC;QAED,IAAM,KAAK,GAAG,cAAc,EAAE,CAAA;QAC9B,IAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;QACzC,IAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAA;QAE/B,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,IAAI,CAAC;YACH,MAAM,EAAE,CAAA;QACV,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,KAAK,EAAE,CAAA;QACd,CAAC;QAED,IAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;QACxC,IAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAA;QAC9B,IAAI,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;YAC9D,OAAM;QACR,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,OAAA,EAAE,MAAM,QAAA,EAAE,KAAK,OAAA,EAAE,WAAW,aAAA,EAAE,UAAU,YAAA,EAAE,CAAC,CAAA;QACtE,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;QACzB,cAAc,EAAE,CAAC,YAAY,EAAE,CAAA;QAC/B,0BAA0B,EAAE,CAAA;IAC9B,CAAC;IAED;;;OAGG;IACH,gCAAI,GAAJ;QACE,IAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAA;QAClC,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAA;QACxB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;QAC3C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;OAGG;IACH,gCAAI,GAAJ;QACE,IAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAA;QAClC,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAA;QACxB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;QACzC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;OAIG;IACK,iCAAK,GAAb,UAAc,OAA2B,EAAE,KAAc;QACvD,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,IAAI,CAAC;YACH,cAAc,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,KAAK,OAAA,EAAE,CAAC,CAAA;QAC9C,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,KAAK,EAAE,CAAA;QACd,CAAC;IACH,CAAC;IACH,wBAAC;AAAD,CAAC,AA9GD,IA8GC;;AAED;;;GAGG;AACH;IAAA;QACE,mEAAmE;QAClD,cAAS,GAAoB,EAAE,CAAA;QAChD,gFAAgF;QAC/D,cAAS,GAAoB,EAAE,CAAA;IAsJlD,CAAC;IApJC,2DAA2D;IAC3D,kCAAQ,GAAR;QACE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzB,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;QACzB,gBAAgB,EAAE,CAAC,SAAS,EAAE,CAAA;QAC9B,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,EAAE,CAAA;IAC7B,CAAC;IAED,sDAAsD;IACtD,sCAAY,GAAZ;QACE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC7B,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;QACzB,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,EAAE,CAAA;IAC7B,CAAC;IAED,0EAA0E;IAC1E,uCAAa,GAAb;QACE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;QACzB,gBAAgB,EAAE,CAAC,SAAS,EAAE,CAAA;IAChC,CAAC;IAED;;;OAGG;IACH,iCAAO,GAAP,UAAQ,EAAgB;;QACtB,OAAO,CACL,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YACzB,gBAAgB,EAAE,CAAC,OAAO,EAAE;YAC5B,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,EAAE,mCAAI,KAAK,CAAC;YACpC,CAAC,MAAA,MAAA,EAAE,CAAC,kBAAkB,0CAAE,OAAO,EAAE,mCAAI,KAAK,CAAC,CAC5C,CAAA;IACH,CAAC;IAED;;;OAGG;IACH,iCAAO,GAAP,UAAQ,EAAgB;;QACtB,OAAO,CACL,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YACzB,gBAAgB,EAAE,CAAC,OAAO,EAAE;YAC5B,CAAC,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,EAAE,mCAAI,KAAK,CAAC;YACpC,CAAC,MAAA,MAAA,EAAE,CAAC,kBAAkB,0CAAE,OAAO,EAAE,mCAAI,KAAK,CAAC,CAC5C,CAAA;IACH,CAAC;IAED;;;;;;OAMG;IACH,8BAAI,GAAJ,UAAK,EAAgB;;QACnB,OAAO,IAAI,EAAE,CAAC;YACZ,IAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAA;YACjC,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtB,IAAI,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;oBAC7B,OAAO,QAAQ,CAAA;gBACjB,CAAC;gBACD,SAAQ;YACV,CAAC;YACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAE,EAAE,CAAC;oBAC3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC9B,OAAO,SAAS,CAAA;gBAClB,CAAC;gBACD,SAAQ;YACV,CAAC;YACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC;oBACjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBACzB,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,SAAQ;YACV,CAAC;YACD,IAAI,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAC7B,OAAO,QAAQ,CAAA;YACjB,CAAC;YACD,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAE,EAAE,CAAC;gBAC3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAC9B,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,IAAI,MAAA,EAAE,CAAC,kBAAkB,0CAAE,IAAI,EAAE,EAAE,CAAC;gBAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACzB,OAAO,IAAI,CAAA;YACb,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,8BAAI,GAAJ,UAAK,EAAgB;;QACnB,OAAO,IAAI,EAAE,CAAC;YACZ,IAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAA;YACjC,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtB,IAAI,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;oBAC7B,OAAO,QAAQ,CAAA;gBACjB,CAAC;gBACD,SAAQ;YACV,CAAC;YACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAE,EAAE,CAAC;oBAC3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC9B,OAAO,SAAS,CAAA;gBAClB,CAAC;gBACD,SAAQ;YACV,CAAC;YACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC;oBACjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBACzB,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,SAAQ;YACV,CAAC;YACD,IAAI,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;gBAC7B,OAAO,QAAQ,CAAA;YACjB,CAAC;YACD,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAE,EAAE,CAAC;gBAC3B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAC9B,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,IAAI,MAAA,EAAE,CAAC,kBAAkB,0CAAE,IAAI,EAAE,EAAE,CAAC;gBAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACzB,OAAO,IAAI,CAAA;YACb,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAED,8DAA8D;IAC9D,+BAAK,GAAL;QACE,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;QACzB,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;QACzB,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IACH,sBAAC;AAAD,CAAC,AA1JD,IA0JC;;AAED,oDAAoD;AACpD,MAAM,UAAU,gBAAgB;IAC9B,OAAO,kBAAkB,EAAE,CAAC,OAAO,CAAA;AACrC,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,cAAc;IAC5B,OAAO,kBAAkB,EAAE,CAAC,WAAW,CAAA;AACzC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAkB,EAClB,KAAa,EACb,MAAkB;IAElB,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;AAC7C,CAAC;AAED,gFAAgF;AAChF,QAAQ,CAAC,EAAE,CAAC,2BAA2B,EAAE;IACvC,cAAc,EAAE,CAAC,QAAQ,EAAE,CAAA;AAC7B,CAAC,CAAC,CAAA;AAEF;;;;GAIG;AACH,SAAS,YAAY,CAAC,OAA2B;IAC/C,OAAO,eAAe,CAAC,OAAO,CAAC,CAAA;AACjC,CAAC;AAED;;;;;GAKG;AACH,SAAS,YAAY,CAAC,CAAqB,EAAE,CAAqB;IAChE,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IACvC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;AAChD,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AcEdBaseView } from '../../editor';
|
|
2
|
-
import type { AcApMarkupRecord } from './AcApMarkupTypes';
|
|
2
|
+
import type { AcApMarkupAttachedCallout, AcApMarkupRecord } from './AcApMarkupTypes';
|
|
3
3
|
export { markupCloudVertices, markupRectCorners, strokeMarkupCloud, tessellateMarkupCloud, buildMarkupCloud, buildMarkupRect } from './AcApMarkupShapeBuilder';
|
|
4
4
|
/**
|
|
5
5
|
* Maps markup records to HTML overlay visuals and keeps them in sync
|
|
@@ -46,7 +46,7 @@ export declare class AcApMarkupPresenter {
|
|
|
46
46
|
/** Shared presenter for the active viewer session. */
|
|
47
47
|
export declare function getMarkupPresenter(): AcApMarkupPresenter;
|
|
48
48
|
/**
|
|
49
|
-
* Reset markup store, visuals tracking, and undo history for
|
|
49
|
+
* Reset markup store, visuals tracking, and undo history for the active drawing.
|
|
50
50
|
* Call before {@link AcTrView2d.clear} so overlay dispose does not look like
|
|
51
51
|
* user deletes and leftover undo cannot republish the previous drawing.
|
|
52
52
|
*/
|
|
@@ -55,6 +55,12 @@ export declare function resetMarkupSession(): void;
|
|
|
55
55
|
* Upsert a record into the store and publish its visual (undoable).
|
|
56
56
|
*/
|
|
57
57
|
export declare function commitMarkup(view: AcEdBaseView, record: AcApMarkupRecord): void;
|
|
58
|
+
/**
|
|
59
|
+
* Attach a leader + text box to an existing cloud / rect / circle that has none.
|
|
60
|
+
*
|
|
61
|
+
* @returns true when the record was updated.
|
|
62
|
+
*/
|
|
63
|
+
export declare function attachCalloutToMarkup(view: AcEdBaseView, recordId: string, callout: AcApMarkupAttachedCallout): boolean;
|
|
58
64
|
/**
|
|
59
65
|
* Apply a style patch to the selected markup and republish it.
|
|
60
66
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApMarkupPresenter.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupPresenter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"AcApMarkupPresenter.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupPresenter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAgBhD,OAAO,KAAK,EACV,yBAAyB,EACzB,gBAAgB,EACjB,MAAM,mBAAmB,CAAA;AAI1B,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EAChB,MAAM,0BAA0B,CAAA;AAMjC;;;;;;GAMG;AACH,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,sBAAsB,CAAQ;IAEtC,iEAAiE;IACjE,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAOtC;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI;IA0D3D;;OAEG;IACH,SAAS,CACP,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAClC,IAAI;IAUP,OAAO,CAAC,iBAAiB;IAoBzB,+DAA+D;IAC/D,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAU1E;;OAEG;IACH,WAAW,CACT,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,GACjC,IAAI;IAmBP,OAAO,CAAC,oBAAoB;IAoB5B,qEAAqE;IACrE,eAAe,IAAI,IAAI;IAIvB,6CAA6C;IAC7C,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;IAK5C,sDAAsD;IACtD,KAAK,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI;CAa1D;AAED,sDAAsD;AACtD,wBAAgB,kBAAkB,IAAI,mBAAmB,CAExD;AAMD;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAMzC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,gBAAgB,GACvB,IAAI,CAKN;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAiBT;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,GACxC,IAAI,CAQN"}
|
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
1
12
|
var __values = (this && this.__values) || function(o) {
|
|
2
13
|
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
3
14
|
if (m) return m.call(o);
|
|
@@ -11,8 +22,10 @@ var __values = (this && this.__values) || function(o) {
|
|
|
11
22
|
};
|
|
12
23
|
import { AcGeBox2d } from '@mlightcad/data-model';
|
|
13
24
|
import { acapNotifyUndoStackChanged } from '../../util/AcApDatabaseEdit';
|
|
25
|
+
import { isAttachableShapeMarkup } from './AcApMarkupGeometry';
|
|
14
26
|
import { getMarkupHistory, getSessionUndo, runMarkupEdit } from './AcApMarkupHistory';
|
|
15
27
|
import { registerMarkupPublish } from './AcApMarkupRepublish';
|
|
28
|
+
import { getActiveMarkupBag } from './AcApMarkupSession';
|
|
16
29
|
import { getMarkupStore, MARKUP_LAYER, MARKUP_LIVE_LAYER } from './AcApMarkupStore';
|
|
17
30
|
import { createMarkupEntityFromRecord } from './entity';
|
|
18
31
|
// Re-export shape builders for commands / jigs that imported them from here.
|
|
@@ -240,18 +253,15 @@ var AcApMarkupPresenter = /** @class */ (function () {
|
|
|
240
253
|
return AcApMarkupPresenter;
|
|
241
254
|
}());
|
|
242
255
|
export { AcApMarkupPresenter };
|
|
243
|
-
var sharedPresenter;
|
|
244
256
|
/** Shared presenter for the active viewer session. */
|
|
245
257
|
export function getMarkupPresenter() {
|
|
246
|
-
|
|
247
|
-
sharedPresenter = new AcApMarkupPresenter();
|
|
248
|
-
return sharedPresenter;
|
|
258
|
+
return getActiveMarkupBag().presenter;
|
|
249
259
|
}
|
|
250
260
|
registerMarkupPublish(function (view, record) {
|
|
251
261
|
getMarkupPresenter().publish(view, record);
|
|
252
262
|
});
|
|
253
263
|
/**
|
|
254
|
-
* Reset markup store, visuals tracking, and undo history for
|
|
264
|
+
* Reset markup store, visuals tracking, and undo history for the active drawing.
|
|
255
265
|
* Call before {@link AcTrView2d.clear} so overlay dispose does not look like
|
|
256
266
|
* user deletes and leftover undo cannot republish the previous drawing.
|
|
257
267
|
*/
|
|
@@ -271,6 +281,26 @@ export function commitMarkup(view, record) {
|
|
|
271
281
|
getMarkupPresenter().publish(view, record);
|
|
272
282
|
});
|
|
273
283
|
}
|
|
284
|
+
/**
|
|
285
|
+
* Attach a leader + text box to an existing cloud / rect / circle that has none.
|
|
286
|
+
*
|
|
287
|
+
* @returns true when the record was updated.
|
|
288
|
+
*/
|
|
289
|
+
export function attachCalloutToMarkup(view, recordId, callout) {
|
|
290
|
+
var store = getMarkupStore();
|
|
291
|
+
var existing = store.get(recordId);
|
|
292
|
+
if (!existing || !isAttachableShapeMarkup(existing.geometry))
|
|
293
|
+
return false;
|
|
294
|
+
runMarkupEdit(view, 'Attach Callout', function () {
|
|
295
|
+
var current = store.get(recordId);
|
|
296
|
+
if (!current || !isAttachableShapeMarkup(current.geometry))
|
|
297
|
+
return;
|
|
298
|
+
var updated = __assign(__assign({}, current), { text: callout.text, geometry: __assign(__assign({}, current.geometry), { callout: callout }), updatedAt: new Date().toISOString() });
|
|
299
|
+
store.upsert(updated);
|
|
300
|
+
getMarkupPresenter().publish(view, updated);
|
|
301
|
+
});
|
|
302
|
+
return true;
|
|
303
|
+
}
|
|
274
304
|
/**
|
|
275
305
|
* Apply a style patch to the selected markup and republish it.
|
|
276
306
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApMarkupPresenter.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupPresenter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AcApMarkupPresenter.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupPresenter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import type { AcApMarkupHistory, AcApSessionUndo } from './AcApMarkupHistory';
|
|
2
|
+
import type { AcApMarkupPresenter } from './AcApMarkupPresenter';
|
|
3
|
+
import type { AcApMarkupStore } from './AcApMarkupStore';
|
|
4
|
+
import type { AcApMarkupRecord } from './AcApMarkupTypes';
|
|
5
|
+
/** Per-document markup bags (store + presenter + history). */
|
|
6
|
+
export interface AcApMarkupSessionBag {
|
|
7
|
+
/** Markup records for this session. */
|
|
8
|
+
store: AcApMarkupStore;
|
|
9
|
+
/** Overlay visuals for this session. */
|
|
10
|
+
presenter: AcApMarkupPresenter;
|
|
11
|
+
/** Undo/redo stack for this session. */
|
|
12
|
+
history: AcApMarkupHistory;
|
|
13
|
+
/** DB / markup / overlay undo coordinator for this session. */
|
|
14
|
+
sessionUndo: AcApSessionUndo;
|
|
15
|
+
}
|
|
16
|
+
/** Factory that builds a fresh {@link AcApMarkupSessionBag}. */
|
|
17
|
+
type BagFactory = () => AcApMarkupSessionBag;
|
|
18
|
+
/**
|
|
19
|
+
* Installs the factory used to create per-session markup bags.
|
|
20
|
+
* Called once from the markup module bootstrap to avoid circular imports.
|
|
21
|
+
*
|
|
22
|
+
* @param factory - Creates a store + presenter + history bag.
|
|
23
|
+
*/
|
|
24
|
+
export declare function acapSetMarkupBagFactory(factory: BagFactory): void;
|
|
25
|
+
/** Returns the bag for the active session (or a process fallback). */
|
|
26
|
+
export declare function getActiveMarkupBag(): AcApMarkupSessionBag;
|
|
27
|
+
/**
|
|
28
|
+
* Binds markup APIs to a document session id.
|
|
29
|
+
*
|
|
30
|
+
* @param sessionId - {@link AcApDocSession.id} of the active document.
|
|
31
|
+
*/
|
|
32
|
+
export declare function acapBindMarkupSession(sessionId: string): void;
|
|
33
|
+
/** Returns the currently bound session id, if any. */
|
|
34
|
+
export declare function acapActiveMarkupSessionId(): string | undefined;
|
|
35
|
+
/**
|
|
36
|
+
* Disposes markup state for a closed document session.
|
|
37
|
+
*
|
|
38
|
+
* @param sessionId - Session whose bag should be dropped.
|
|
39
|
+
*/
|
|
40
|
+
export declare function acapDisposeMarkupSession(sessionId: string): void;
|
|
41
|
+
/**
|
|
42
|
+
* Lists markup records for a session without activating it.
|
|
43
|
+
*
|
|
44
|
+
* @param sessionId - Session to inspect.
|
|
45
|
+
*/
|
|
46
|
+
export declare function listMarkupsForSession(sessionId: string): AcApMarkupRecord[];
|
|
47
|
+
/**
|
|
48
|
+
* Returns the store for a session without activating it.
|
|
49
|
+
*
|
|
50
|
+
* @param sessionId - Session to inspect.
|
|
51
|
+
*/
|
|
52
|
+
export declare function getMarkupStoreForSession(sessionId: string): AcApMarkupStore | undefined;
|
|
53
|
+
export {};
|
|
54
|
+
//# sourceMappingURL=AcApMarkupSession.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AcApMarkupSession.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEzD,8DAA8D;AAC9D,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,KAAK,EAAE,eAAe,CAAA;IACtB,wCAAwC;IACxC,SAAS,EAAE,mBAAmB,CAAA;IAC9B,wCAAwC;IACxC,OAAO,EAAE,iBAAiB,CAAA;IAC1B,+DAA+D;IAC/D,WAAW,EAAE,eAAe,CAAA;CAC7B;AAED,gEAAgE;AAChE,KAAK,UAAU,GAAG,MAAM,oBAAoB,CAAA;AAW5C;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAEjE;AAuBD,sEAAsE;AACtE,wBAAgB,kBAAkB,IAAI,oBAAoB,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAG7D;AAED,sDAAsD;AACtD,wBAAgB,yBAAyB,IAAI,MAAM,GAAG,SAAS,CAE9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAKhE;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAE3E;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,GAChB,eAAe,GAAG,SAAS,CAE7B"}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
/** Bags keyed by {@link AcApDocSession.id}. */
|
|
2
|
+
var bags = new Map();
|
|
3
|
+
/** Session currently receiving markup commands. */
|
|
4
|
+
var activeSessionId;
|
|
5
|
+
/** Installed by {@link acapSetMarkupBagFactory}. */
|
|
6
|
+
var bagFactory;
|
|
7
|
+
/** Fallback bag used before any session is bound. */
|
|
8
|
+
var fallbackBag;
|
|
9
|
+
/**
|
|
10
|
+
* Installs the factory used to create per-session markup bags.
|
|
11
|
+
* Called once from the markup module bootstrap to avoid circular imports.
|
|
12
|
+
*
|
|
13
|
+
* @param factory - Creates a store + presenter + history bag.
|
|
14
|
+
*/
|
|
15
|
+
export function acapSetMarkupBagFactory(factory) {
|
|
16
|
+
bagFactory = factory;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Returns the bag for `sessionId`, creating it (or the process fallback) as needed.
|
|
20
|
+
*
|
|
21
|
+
* @param sessionId - Document session id, or omitted for the unbound fallback.
|
|
22
|
+
*/
|
|
23
|
+
function ensureBag(sessionId) {
|
|
24
|
+
if (!bagFactory) {
|
|
25
|
+
throw new Error('Markup session bag factory is not installed');
|
|
26
|
+
}
|
|
27
|
+
if (!sessionId) {
|
|
28
|
+
if (!fallbackBag)
|
|
29
|
+
fallbackBag = bagFactory();
|
|
30
|
+
return fallbackBag;
|
|
31
|
+
}
|
|
32
|
+
var bag = bags.get(sessionId);
|
|
33
|
+
if (!bag) {
|
|
34
|
+
bag = bagFactory();
|
|
35
|
+
bags.set(sessionId, bag);
|
|
36
|
+
}
|
|
37
|
+
return bag;
|
|
38
|
+
}
|
|
39
|
+
/** Returns the bag for the active session (or a process fallback). */
|
|
40
|
+
export function getActiveMarkupBag() {
|
|
41
|
+
return ensureBag(activeSessionId);
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Binds markup APIs to a document session id.
|
|
45
|
+
*
|
|
46
|
+
* @param sessionId - {@link AcApDocSession.id} of the active document.
|
|
47
|
+
*/
|
|
48
|
+
export function acapBindMarkupSession(sessionId) {
|
|
49
|
+
activeSessionId = sessionId;
|
|
50
|
+
ensureBag(sessionId);
|
|
51
|
+
}
|
|
52
|
+
/** Returns the currently bound session id, if any. */
|
|
53
|
+
export function acapActiveMarkupSessionId() {
|
|
54
|
+
return activeSessionId;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Disposes markup state for a closed document session.
|
|
58
|
+
*
|
|
59
|
+
* @param sessionId - Session whose bag should be dropped.
|
|
60
|
+
*/
|
|
61
|
+
export function acapDisposeMarkupSession(sessionId) {
|
|
62
|
+
bags.delete(sessionId);
|
|
63
|
+
if (activeSessionId === sessionId) {
|
|
64
|
+
activeSessionId = undefined;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Lists markup records for a session without activating it.
|
|
69
|
+
*
|
|
70
|
+
* @param sessionId - Session to inspect.
|
|
71
|
+
*/
|
|
72
|
+
export function listMarkupsForSession(sessionId) {
|
|
73
|
+
var _a, _b;
|
|
74
|
+
return (_b = (_a = bags.get(sessionId)) === null || _a === void 0 ? void 0 : _a.store.list()) !== null && _b !== void 0 ? _b : [];
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Returns the store for a session without activating it.
|
|
78
|
+
*
|
|
79
|
+
* @param sessionId - Session to inspect.
|
|
80
|
+
*/
|
|
81
|
+
export function getMarkupStoreForSession(sessionId) {
|
|
82
|
+
var _a;
|
|
83
|
+
return (_a = bags.get(sessionId)) === null || _a === void 0 ? void 0 : _a.store;
|
|
84
|
+
}
|
|
85
|
+
//# sourceMappingURL=AcApMarkupSession.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AcApMarkupSession.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupSession.ts"],"names":[],"mappings":"AAoBA,+CAA+C;AAC/C,IAAM,IAAI,GAAG,IAAI,GAAG,EAAgC,CAAA;AACpD,mDAAmD;AACnD,IAAI,eAAmC,CAAA;AACvC,oDAAoD;AACpD,IAAI,UAAkC,CAAA;AACtC,qDAAqD;AACrD,IAAI,WAA6C,CAAA;AAEjD;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAmB;IACzD,UAAU,GAAG,OAAO,CAAA;AACtB,CAAC;AAED;;;;GAIG;AACH,SAAS,SAAS,CAAC,SAAkB;IACnC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IACD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,IAAI,CAAC,WAAW;YAAE,WAAW,GAAG,UAAU,EAAE,CAAA;QAC5C,OAAO,WAAW,CAAA;IACpB,CAAC;IACD,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAC7B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,GAAG,GAAG,UAAU,EAAE,CAAA;QAClB,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;IAC1B,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,kBAAkB;IAChC,OAAO,SAAS,CAAC,eAAe,CAAC,CAAA;AACnC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,SAAiB;IACrD,eAAe,GAAG,SAAS,CAAA;IAC3B,SAAS,CAAC,SAAS,CAAC,CAAA;AACtB,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,yBAAyB;IACvC,OAAO,eAAe,CAAA;AACxB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,SAAiB;IACxD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACtB,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,eAAe,GAAG,SAAS,CAAA;IAC7B,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,SAAiB;;IACrD,OAAO,MAAA,MAAA,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,0CAAE,KAAK,CAAC,IAAI,EAAE,mCAAI,EAAE,CAAA;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CACtC,SAAiB;;IAEjB,OAAO,MAAA,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,0CAAE,KAAK,CAAA;AACnC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AcApMarkupSessionBootstrap.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupSessionBootstrap.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { AcApMarkupHistory, AcApSessionUndo } from './AcApMarkupHistory';
|
|
2
|
+
import { AcApMarkupPresenter } from './AcApMarkupPresenter';
|
|
3
|
+
import { acapSetMarkupBagFactory } from './AcApMarkupSession';
|
|
4
|
+
import { AcApMarkupStore } from './AcApMarkupStore';
|
|
5
|
+
/** Installs default bag factory (store + presenter + history per session). */
|
|
6
|
+
acapSetMarkupBagFactory(function () { return ({
|
|
7
|
+
store: new AcApMarkupStore(),
|
|
8
|
+
presenter: new AcApMarkupPresenter(),
|
|
9
|
+
history: new AcApMarkupHistory(),
|
|
10
|
+
sessionUndo: new AcApSessionUndo()
|
|
11
|
+
}); });
|
|
12
|
+
//# sourceMappingURL=AcApMarkupSessionBootstrap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AcApMarkupSessionBootstrap.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupSessionBootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,8EAA8E;AAC9E,uBAAuB,CAAC,cAAM,OAAA,CAAC;IAC7B,KAAK,EAAE,IAAI,eAAe,EAAE;IAC5B,SAAS,EAAE,IAAI,mBAAmB,EAAE;IACpC,OAAO,EAAE,IAAI,iBAAiB,EAAE;IAChC,WAAW,EAAE,IAAI,eAAe,EAAE;CACnC,CAAC,EAL4B,CAK5B,CAAC,CAAA"}
|
|
@@ -37,10 +37,30 @@ export declare function promptShapeFirstCorner(context: AcApContext, messageKey:
|
|
|
37
37
|
* rect/cloud, circle perimeter for circle).
|
|
38
38
|
*/
|
|
39
39
|
export declare function computeLeaderTipOnShape(outline: AcApMarkupShapeOutline, toward: AcApMarkupPoint2d): AcApMarkupPoint2d;
|
|
40
|
+
/**
|
|
41
|
+
* Live preview while placing a shape-attached callout:
|
|
42
|
+
* keeps the shape visible, auto-updates leader tip on the outline, and shows
|
|
43
|
+
* leader (no arrow) + text bubble following the cursor.
|
|
44
|
+
*/
|
|
45
|
+
/** Options for {@link promptAttachedCallout}. */
|
|
46
|
+
export interface AcApPromptAttachedCalloutOptions {
|
|
47
|
+
/** Prompt even when the session Callout option is off. */
|
|
48
|
+
force?: boolean;
|
|
49
|
+
/**
|
|
50
|
+
* When false, do not redraw the shape in the live preview (it is already
|
|
51
|
+
* on screen). Default true.
|
|
52
|
+
*/
|
|
53
|
+
previewShape?: boolean;
|
|
54
|
+
/** Initial cursor direction used to place the leader tip on the outline. */
|
|
55
|
+
toward?: AcApMarkupPoint2d;
|
|
56
|
+
}
|
|
40
57
|
/**
|
|
41
58
|
* After a shape is placed, if the callout option is on, prompt for text
|
|
42
59
|
* location (leader tip is auto-computed on the outline). Returns undefined
|
|
43
60
|
* when the option is off or cancelled.
|
|
61
|
+
*
|
|
62
|
+
* Pass {@link AcApPromptAttachedCalloutOptions.force} when attaching a
|
|
63
|
+
* callout to an existing shape from the callout command.
|
|
44
64
|
*/
|
|
45
|
-
export declare function promptAttachedCallout(context: AcApContext, outline: AcApMarkupShapeOutline): Promise<AcApMarkupAttachedCallout | undefined>;
|
|
65
|
+
export declare function promptAttachedCallout(context: AcApContext, outline: AcApMarkupShapeOutline, options?: AcApPromptAttachedCalloutOptions): Promise<AcApMarkupAttachedCallout | undefined>;
|
|
46
66
|
//# sourceMappingURL=AcApMarkupShapeCallout.d.ts.map
|