@mlightcad/cad-simple-viewer 1.5.0 → 1.5.2
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/README.md +2 -1
- package/dist/index.js +25678 -48997
- package/dist/index.umd.cjs +571 -603
- package/dist/libredwg-parser-worker.js +3955 -7422
- package/dist/mtext-renderer-worker.js +2727 -2539
- package/lib/app/AcApAnnotation.js +4 -4
- package/lib/app/AcApAnnotation.js.map +1 -1
- package/lib/app/AcApDocManager.d.ts +56 -2
- package/lib/app/AcApDocManager.d.ts.map +1 -1
- package/lib/app/AcApDocManager.js +182 -31
- package/lib/app/AcApDocManager.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/app/openFileProgress.d.ts +10 -0
- package/lib/app/openFileProgress.d.ts.map +1 -0
- package/lib/app/openFileProgress.js +20 -0
- package/lib/app/openFileProgress.js.map +1 -0
- package/lib/command/AcApSwitchBgCmd.d.ts +3 -0
- package/lib/command/AcApSwitchBgCmd.d.ts.map +1 -1
- package/lib/command/AcApSwitchBgCmd.js +14 -7
- package/lib/command/AcApSwitchBgCmd.js.map +1 -1
- package/lib/command/AcApZoomCmd.d.ts.map +1 -1
- package/lib/command/AcApZoomCmd.js +3 -3
- package/lib/command/AcApZoomCmd.js.map +1 -1
- package/lib/command/convert/index.d.ts +0 -1
- package/lib/command/convert/index.d.ts.map +1 -1
- package/lib/command/convert/index.js +0 -1
- package/lib/command/convert/index.js.map +1 -1
- package/lib/command/draw/AcApArcCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApArcCmd.js +47 -20
- 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 +5 -6
- package/lib/command/draw/AcApCircleCmd.js.map +1 -1
- package/lib/command/draw/AcApEllipseCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApEllipseCmd.js +4 -6
- package/lib/command/draw/AcApEllipseCmd.js.map +1 -1
- package/lib/command/draw/AcApMLineCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApMLineCmd.js +4 -7
- package/lib/command/draw/AcApMLineCmd.js.map +1 -1
- package/lib/command/draw/AcApMTextCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApMTextCmd.js +3 -1
- package/lib/command/draw/AcApMTextCmd.js.map +1 -1
- package/lib/command/draw/AcApPolygonCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApPolygonCmd.js +4 -5
- package/lib/command/draw/AcApPolygonCmd.js.map +1 -1
- package/lib/command/draw/AcApPolylineCmd.d.ts +49 -0
- package/lib/command/draw/AcApPolylineCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApPolylineCmd.js +200 -18
- package/lib/command/draw/AcApPolylineCmd.js.map +1 -1
- package/lib/command/draw/AcApRayCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApRayCmd.js +2 -3
- package/lib/command/draw/AcApRayCmd.js.map +1 -1
- package/lib/command/draw/AcApRectCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApRectCmd.js +10 -10
- package/lib/command/draw/AcApRectCmd.js.map +1 -1
- package/lib/command/draw/AcApSplineCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApSplineCmd.js +3 -6
- package/lib/command/draw/AcApSplineCmd.js.map +1 -1
- package/lib/command/draw/AcApXLineCmd.d.ts.map +1 -1
- package/lib/command/draw/AcApXLineCmd.js +2 -3
- package/lib/command/draw/AcApXLineCmd.js.map +1 -1
- package/lib/command/measure/AcApClearMeasurementsCmd.d.ts +11 -0
- package/lib/command/measure/AcApClearMeasurementsCmd.d.ts.map +1 -1
- package/lib/command/measure/AcApClearMeasurementsCmd.js +15 -4
- package/lib/command/measure/AcApClearMeasurementsCmd.js.map +1 -1
- package/lib/command/measure/AcApMeasureAngleCmd.d.ts.map +1 -1
- package/lib/command/measure/AcApMeasureAngleCmd.js +15 -6
- package/lib/command/measure/AcApMeasureAngleCmd.js.map +1 -1
- package/lib/command/measure/AcApMeasureArcCmd.d.ts.map +1 -1
- package/lib/command/measure/AcApMeasureArcCmd.js +11 -4
- package/lib/command/measure/AcApMeasureArcCmd.js.map +1 -1
- package/lib/command/measure/AcApMeasureAreaCmd.d.ts.map +1 -1
- package/lib/command/measure/AcApMeasureAreaCmd.js +11 -4
- package/lib/command/measure/AcApMeasureAreaCmd.js.map +1 -1
- package/lib/command/measure/AcApMeasureDistanceCmd.d.ts +3 -2
- package/lib/command/measure/AcApMeasureDistanceCmd.d.ts.map +1 -1
- package/lib/command/measure/AcApMeasureDistanceCmd.js +14 -6
- package/lib/command/measure/AcApMeasureDistanceCmd.js.map +1 -1
- package/lib/command/modify/AcApOffsetCmd.d.ts +30 -0
- package/lib/command/modify/AcApOffsetCmd.d.ts.map +1 -0
- package/lib/command/modify/AcApOffsetCmd.js +425 -0
- package/lib/command/modify/AcApOffsetCmd.js.map +1 -0
- package/lib/command/modify/AcApRotateCmd.d.ts.map +1 -1
- package/lib/command/modify/AcApRotateCmd.js +3 -4
- package/lib/command/modify/AcApRotateCmd.js.map +1 -1
- package/lib/command/modify/index.d.ts +1 -0
- package/lib/command/modify/index.d.ts.map +1 -1
- package/lib/command/modify/index.js +1 -0
- package/lib/command/modify/index.js.map +1 -1
- package/lib/command/review/AcApRevCircleCmd.d.ts.map +1 -1
- package/lib/command/review/AcApRevCircleCmd.js +4 -1
- package/lib/command/review/AcApRevCircleCmd.js.map +1 -1
- package/lib/editor/global/AcEdUiColor.d.ts +183 -0
- package/lib/editor/global/AcEdUiColor.d.ts.map +1 -0
- package/lib/editor/global/AcEdUiColor.js +224 -0
- package/lib/editor/global/AcEdUiColor.js.map +1 -0
- package/lib/editor/global/AcEdUiTheme.d.ts +0 -1
- package/lib/editor/global/AcEdUiTheme.d.ts.map +1 -1
- package/lib/editor/global/AcEdUiTheme.js +0 -5
- package/lib/editor/global/AcEdUiTheme.js.map +1 -1
- package/lib/editor/global/eventBus.d.ts +3 -0
- package/lib/editor/global/eventBus.d.ts.map +1 -1
- package/lib/editor/global/eventBus.js.map +1 -1
- package/lib/editor/global/index.d.ts +1 -0
- package/lib/editor/global/index.d.ts.map +1 -1
- package/lib/editor/global/index.js +1 -0
- package/lib/editor/global/index.js.map +1 -1
- package/lib/editor/input/AcEdCursorManager.d.ts +4 -0
- package/lib/editor/input/AcEdCursorManager.d.ts.map +1 -1
- package/lib/editor/input/AcEdCursorManager.js +11 -8
- package/lib/editor/input/AcEdCursorManager.js.map +1 -1
- package/lib/editor/input/AcEdOrthoMode.d.ts +11 -0
- package/lib/editor/input/AcEdOrthoMode.d.ts.map +1 -0
- package/lib/editor/input/AcEdOrthoMode.js +22 -0
- package/lib/editor/input/AcEdOrthoMode.js.map +1 -0
- package/lib/editor/input/AcEdPolarTracking.d.ts +107 -0
- package/lib/editor/input/AcEdPolarTracking.d.ts.map +1 -0
- package/lib/editor/input/AcEdPolarTracking.js +398 -0
- package/lib/editor/input/AcEdPolarTracking.js.map +1 -0
- package/lib/editor/input/AcEdSelectionFilter.js +7 -6
- package/lib/editor/input/AcEdSelectionFilter.js.map +1 -1
- package/lib/editor/input/AcEditor.d.ts +4 -0
- package/lib/editor/input/AcEditor.d.ts.map +1 -1
- package/lib/editor/input/AcEditor.js +6 -0
- package/lib/editor/input/AcEditor.js.map +1 -1
- package/lib/editor/input/index.d.ts +2 -0
- package/lib/editor/input/index.d.ts.map +1 -1
- package/lib/editor/input/index.js +2 -0
- package/lib/editor/input/index.js.map +1 -1
- package/lib/editor/input/marker/AcEdMarker.d.ts.map +1 -1
- package/lib/editor/input/marker/AcEdMarker.js +3 -2
- package/lib/editor/input/marker/AcEdMarker.js.map +1 -1
- package/lib/editor/input/marker/AcEdOSnapMarkerManager.d.ts +4 -0
- package/lib/editor/input/marker/AcEdOSnapMarkerManager.d.ts.map +1 -1
- package/lib/editor/input/marker/AcEdOSnapMarkerManager.js +11 -0
- package/lib/editor/input/marker/AcEdOSnapMarkerManager.js.map +1 -1
- package/lib/editor/input/prompt/AcEdPromptDistanceOptions.d.ts.map +1 -1
- package/lib/editor/input/prompt/AcEdPromptDistanceOptions.js +1 -1
- package/lib/editor/input/prompt/AcEdPromptDistanceOptions.js.map +1 -1
- package/lib/editor/input/ui/AcEdCommandLine.d.ts.map +1 -1
- package/lib/editor/input/ui/AcEdCommandLine.js +1 -1
- package/lib/editor/input/ui/AcEdCommandLine.js.map +1 -1
- package/lib/editor/input/ui/AcEdFloatingInput.d.ts +13 -0
- package/lib/editor/input/ui/AcEdFloatingInput.d.ts.map +1 -1
- package/lib/editor/input/ui/AcEdFloatingInput.js +48 -3
- package/lib/editor/input/ui/AcEdFloatingInput.js.map +1 -1
- package/lib/editor/input/ui/AcEdFloatingInputTypes.d.ts +5 -0
- package/lib/editor/input/ui/AcEdFloatingInputTypes.d.ts.map +1 -1
- package/lib/editor/input/ui/AcEdFloatingMessage.js +1 -1
- package/lib/editor/input/ui/AcEdFloatingMessage.js.map +1 -1
- package/lib/editor/input/ui/AcEdInputManager.d.ts +25 -6
- package/lib/editor/input/ui/AcEdInputManager.d.ts.map +1 -1
- package/lib/editor/input/ui/AcEdInputManager.js +164 -63
- package/lib/editor/input/ui/AcEdInputManager.js.map +1 -1
- package/lib/editor/input/ui/AcEdMTextEditor.d.ts +67 -2
- package/lib/editor/input/ui/AcEdMTextEditor.d.ts.map +1 -1
- package/lib/editor/input/ui/AcEdMTextEditor.js +213 -21
- package/lib/editor/input/ui/AcEdMTextEditor.js.map +1 -1
- package/lib/editor/input/ui/AcEdRubberBand.d.ts +8 -0
- package/lib/editor/input/ui/AcEdRubberBand.d.ts.map +1 -1
- package/lib/editor/input/ui/AcEdRubberBand.js +62 -37
- package/lib/editor/input/ui/AcEdRubberBand.js.map +1 -1
- package/lib/i18n/en/command.d.ts +71 -11
- package/lib/i18n/en/command.d.ts.map +1 -1
- package/lib/i18n/en/command.js +74 -14
- package/lib/i18n/en/command.js.map +1 -1
- package/lib/i18n/en/jig.d.ts +8 -0
- package/lib/i18n/en/jig.d.ts.map +1 -1
- package/lib/i18n/en/jig.js +8 -0
- package/lib/i18n/en/jig.js.map +1 -1
- package/lib/i18n/zh/command.d.ts +71 -11
- package/lib/i18n/zh/command.d.ts.map +1 -1
- package/lib/i18n/zh/command.js +74 -14
- package/lib/i18n/zh/command.js.map +1 -1
- package/lib/i18n/zh/jig.d.ts +8 -0
- package/lib/i18n/zh/jig.d.ts.map +1 -1
- package/lib/i18n/zh/jig.js +8 -0
- package/lib/i18n/zh/jig.js.map +1 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/plugin/AcApLazyPluginRegistration.d.ts +28 -0
- package/lib/plugin/AcApLazyPluginRegistration.d.ts.map +1 -0
- package/lib/plugin/AcApLazyPluginRegistration.js +2 -0
- package/lib/plugin/AcApLazyPluginRegistration.js.map +1 -0
- package/lib/plugin/AcApPluginManager.d.ts +38 -0
- package/lib/plugin/AcApPluginManager.d.ts.map +1 -1
- package/lib/plugin/AcApPluginManager.js +147 -22
- package/lib/plugin/AcApPluginManager.js.map +1 -1
- package/lib/plugin/index.d.ts +1 -0
- package/lib/plugin/index.d.ts.map +1 -1
- package/lib/plugin/index.js +1 -0
- package/lib/plugin/index.js.map +1 -1
- package/lib/util/AcApExportFileNameUtil.d.ts +22 -0
- package/lib/util/AcApExportFileNameUtil.d.ts.map +1 -0
- package/lib/util/AcApExportFileNameUtil.js +49 -0
- package/lib/util/AcApExportFileNameUtil.js.map +1 -0
- package/lib/util/AcApFontUtil.d.ts +79 -0
- package/lib/util/AcApFontUtil.d.ts.map +1 -0
- package/lib/util/AcApFontUtil.js +173 -0
- package/lib/util/AcApFontUtil.js.map +1 -0
- package/lib/util/index.d.ts +3 -0
- package/lib/util/index.d.ts.map +1 -1
- package/lib/util/index.js +3 -0
- package/lib/util/index.js.map +1 -1
- package/lib/util/yieldToMain.d.ts +5 -0
- package/lib/util/yieldToMain.d.ts.map +1 -0
- package/lib/util/yieldToMain.js +11 -0
- package/lib/util/yieldToMain.js.map +1 -0
- package/lib/view/AcTrLayoutView.d.ts +13 -1
- package/lib/view/AcTrLayoutView.d.ts.map +1 -1
- package/lib/view/AcTrLayoutView.js +20 -1
- package/lib/view/AcTrLayoutView.js.map +1 -1
- package/lib/view/AcTrLayoutViewManager.d.ts +3 -1
- package/lib/view/AcTrLayoutViewManager.d.ts.map +1 -1
- package/lib/view/AcTrLayoutViewManager.js +4 -2
- package/lib/view/AcTrLayoutViewManager.js.map +1 -1
- package/lib/view/AcTrScene.d.ts +38 -6
- package/lib/view/AcTrScene.d.ts.map +1 -1
- package/lib/view/AcTrScene.js +57 -30
- package/lib/view/AcTrScene.js.map +1 -1
- package/lib/view/AcTrView2d.d.ts +184 -1
- package/lib/view/AcTrView2d.d.ts.map +1 -1
- package/lib/view/AcTrView2d.js +657 -104
- package/lib/view/AcTrView2d.js.map +1 -1
- package/lib/view/index.d.ts +1 -0
- package/lib/view/index.d.ts.map +1 -1
- package/lib/view/index.js +1 -0
- package/lib/view/index.js.map +1 -1
- package/package.json +12 -9
- package/lib/command/convert/AcApConvertToSvgCmd.d.ts +0 -32
- package/lib/command/convert/AcApConvertToSvgCmd.d.ts.map +0 -1
- package/lib/command/convert/AcApConvertToSvgCmd.js +0 -98
- package/lib/command/convert/AcApConvertToSvgCmd.js.map +0 -1
- package/lib/command/convert/AcApSvgConvertor.d.ts +0 -53
- package/lib/command/convert/AcApSvgConvertor.d.ts.map +0 -1
- package/lib/command/convert/AcApSvgConvertor.js +0 -103
- package/lib/command/convert/AcApSvgConvertor.js.map +0 -1
package/lib/app/index.js
CHANGED
|
@@ -2,6 +2,7 @@ export * from './AcApAnnotation';
|
|
|
2
2
|
export * from './AcApContext';
|
|
3
3
|
export * from './AcApDocument';
|
|
4
4
|
export * from './AcApDocManager';
|
|
5
|
+
export * from './openFileProgress';
|
|
5
6
|
export * from './AcApSettingManager';
|
|
6
7
|
export * from './AcDbOpenDatabaseOptions';
|
|
7
8
|
//# sourceMappingURL=index.js.map
|
package/lib/app/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,oBAAoB,CAAA;AAClC,cAAc,sBAAsB,CAAA;AACpC,cAAc,2BAA2B,CAAA"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { AcDbProgressdEventArgs } from '@mlightcad/data-model';
|
|
2
|
+
/**
|
|
3
|
+
* Returns whether an open-file progress event represents a terminal state.
|
|
4
|
+
*
|
|
5
|
+
* CONVERSION completes with subStage `END`. After `openUri` finishes parsing,
|
|
6
|
+
* data-model also emits a trailing FETCH_FILE event at 100% with
|
|
7
|
+
* subStageStatus `END` but no subStage — that must hide the overlay too.
|
|
8
|
+
*/
|
|
9
|
+
export declare function isOpenFileProgressComplete(data: AcDbProgressdEventArgs): boolean;
|
|
10
|
+
//# sourceMappingURL=openFileProgress.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openFileProgress.d.ts","sourceRoot":"","sources":["../../src/app/openFileProgress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAE9D;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAcT"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Returns whether an open-file progress event represents a terminal state.
|
|
3
|
+
*
|
|
4
|
+
* CONVERSION completes with subStage `END`. After `openUri` finishes parsing,
|
|
5
|
+
* data-model also emits a trailing FETCH_FILE event at 100% with
|
|
6
|
+
* subStageStatus `END` but no subStage — that must hide the overlay too.
|
|
7
|
+
*/
|
|
8
|
+
export function isOpenFileProgressComplete(data) {
|
|
9
|
+
if (data.percentage < 100) {
|
|
10
|
+
return false;
|
|
11
|
+
}
|
|
12
|
+
if (data.subStageStatus === 'ERROR') {
|
|
13
|
+
return true;
|
|
14
|
+
}
|
|
15
|
+
if (data.subStageStatus !== 'END') {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
return data.stage === 'FETCH_FILE' || data.subStage === 'END';
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=openFileProgress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openFileProgress.js","sourceRoot":"","sources":["../../src/app/openFileProgress.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CACxC,IAA4B;IAE5B,IAAI,IAAI,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,IAAI,CAAC,cAAc,KAAK,OAAO,EAAE,CAAC;QACpC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,IAAI,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC;QAClC,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,KAAK,YAAY,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAA;AAC/D,CAAC"}
|
|
@@ -2,6 +2,9 @@ import { AcApContext } from '../app';
|
|
|
2
2
|
import { AcEdCommand } from '../editor';
|
|
3
3
|
/**
|
|
4
4
|
* Command for switching the drawing background between white and black.
|
|
5
|
+
*
|
|
6
|
+
* Toggles `MODELBKCOLOR` in model space or `PAPERBKCOLOR` in the active
|
|
7
|
+
* paper-space layout.
|
|
5
8
|
*/
|
|
6
9
|
export declare class AcApSwitchBgCmd extends AcEdCommand {
|
|
7
10
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApSwitchBgCmd.d.ts","sourceRoot":"","sources":["../../src/command/AcApSwitchBgCmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"AcApSwitchBgCmd.d.ts","sourceRoot":"","sources":["../../src/command/AcApSwitchBgCmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAOvC;;;;;GAKG;AACH,qBAAa,eAAgB,SAAQ,WAAW;IAC9C;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;CAkBnC"}
|
|
@@ -49,10 +49,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
49
49
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
|
-
import {
|
|
52
|
+
import { AcDbSysVarManager } from '@mlightcad/data-model';
|
|
53
53
|
import { AcEdCommand } from '../editor';
|
|
54
|
+
import { layoutBackgroundSysVar, toggleBlackWhiteBackgroundColor } from '../editor/global/AcEdUiColor';
|
|
54
55
|
/**
|
|
55
56
|
* Command for switching the drawing background between white and black.
|
|
57
|
+
*
|
|
58
|
+
* Toggles `MODELBKCOLOR` in model space or `PAPERBKCOLOR` in the active
|
|
59
|
+
* paper-space layout.
|
|
56
60
|
*/
|
|
57
61
|
var AcApSwitchBgCmd = /** @class */ (function (_super) {
|
|
58
62
|
__extends(AcApSwitchBgCmd, _super);
|
|
@@ -66,16 +70,19 @@ var AcApSwitchBgCmd = /** @class */ (function (_super) {
|
|
|
66
70
|
*/
|
|
67
71
|
AcApSwitchBgCmd.prototype.execute = function (context) {
|
|
68
72
|
return __awaiter(this, void 0, void 0, function () {
|
|
69
|
-
var variableName, sysVarManager, sysVar,
|
|
73
|
+
var db, view, isModelSpace, variableName, sysVarManager, sysVar, currentColor;
|
|
70
74
|
return __generator(this, function (_a) {
|
|
71
|
-
|
|
75
|
+
db = context.doc.database;
|
|
76
|
+
view = context.view;
|
|
77
|
+
isModelSpace = view.activeLayoutBtrId === view.modelSpaceBtrId;
|
|
78
|
+
variableName = layoutBackgroundSysVar(isModelSpace);
|
|
72
79
|
sysVarManager = AcDbSysVarManager.instance();
|
|
73
80
|
sysVar = sysVarManager.getDescriptor(variableName);
|
|
74
|
-
if (sysVar) {
|
|
75
|
-
|
|
76
|
-
useWhiteBackgroundColor = sysVarManager.getVar(variableName, db);
|
|
77
|
-
sysVarManager.setVar(variableName, !useWhiteBackgroundColor, db);
|
|
81
|
+
if (!sysVar) {
|
|
82
|
+
return [2 /*return*/];
|
|
78
83
|
}
|
|
84
|
+
currentColor = sysVarManager.getVar(variableName, db);
|
|
85
|
+
sysVarManager.setVar(variableName, toggleBlackWhiteBackgroundColor(currentColor), db);
|
|
79
86
|
return [2 /*return*/];
|
|
80
87
|
});
|
|
81
88
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApSwitchBgCmd.js","sourceRoot":"","sources":["../../src/command/AcApSwitchBgCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"AcApSwitchBgCmd.js","sourceRoot":"","sources":["../../src/command/AcApSwitchBgCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAa,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAGpE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EACL,sBAAsB,EACtB,+BAA+B,EAChC,MAAM,8BAA8B,CAAA;AAGrC;;;;;GAKG;AACH;IAAqC,mCAAW;IAAhD;;IAwBA,CAAC;IAvBC;;;;OAIG;IACG,iCAAO,GAAb,UAAc,OAAoB;;;;gBAC1B,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAA;gBACzB,IAAI,GAAG,OAAO,CAAC,IAAkB,CAAA;gBACjC,YAAY,GAAG,IAAI,CAAC,iBAAiB,KAAK,IAAI,CAAC,eAAe,CAAA;gBAC9D,YAAY,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAA;gBACnD,aAAa,GAAG,iBAAiB,CAAC,QAAQ,EAAE,CAAA;gBAC5C,MAAM,GAAG,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC,CAAA;gBACxD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,sBAAM;gBACR,CAAC;gBAEK,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAc,CAAA;gBACxE,aAAa,CAAC,MAAM,CAClB,YAAY,EACZ,+BAA+B,CAAC,YAAY,CAAC,EAC7C,EAAE,CACH,CAAA;;;;KACF;IACH,sBAAC;AAAD,CAAC,AAxBD,CAAqC,WAAW,GAwB/C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApZoomCmd.d.ts","sourceRoot":"","sources":["../../src/command/AcApZoomCmd.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AcApZoomCmd.d.ts","sourceRoot":"","sources":["../../src/command/AcApZoomCmd.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAkB,MAAM,QAAQ,CAAA;AACpD,OAAO,EACL,WAAW,EAKZ,MAAM,WAAW,CAAA;AAGlB;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAC1C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAW;IAE1C;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAU7B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAI9B;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAKrB;;;;;;OAMG;IACH,OAAO,CAAC,YAAY;IAUpB;;;;;OAKG;YACW,kCAAkC;IAkBhD;;;;OAIG;YACW,wBAAwB;IAWtC;;;;;;OAMG;YACW,SAAS;IA4CvB;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB;IAkBxB;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IAuB1B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAOnB;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;CAmFnC"}
|
|
@@ -49,7 +49,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
49
49
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
|
-
import { AcGeBox2d, AcGePoint3d } from '@mlightcad/data-model';
|
|
52
|
+
import { AcGeBox2d, AcGePoint3d, FLOAT_TOL } from '@mlightcad/data-model';
|
|
53
53
|
import { AcApDocManager } from '../app';
|
|
54
54
|
import { AcEdCommand, AcEdPromptBoxOptions, AcEdPromptPointOptions, AcEdPromptStatus, AcEdPromptStringOptions } from '../editor';
|
|
55
55
|
import { AcApI18n } from '../i18n';
|
|
@@ -257,8 +257,8 @@ var AcApZoomCmd = /** @class */ (function (_super) {
|
|
|
257
257
|
*/
|
|
258
258
|
AcApZoomCmd.prototype.applyRelativeScale = function (context, factor, centerPoint) {
|
|
259
259
|
var current = this.captureCurrentViewBox(context);
|
|
260
|
-
var width = Math.max(current.max.x - current.min.x,
|
|
261
|
-
var height = Math.max(current.max.y - current.min.y,
|
|
260
|
+
var width = Math.max(current.max.x - current.min.x, FLOAT_TOL);
|
|
261
|
+
var height = Math.max(current.max.y - current.min.y, FLOAT_TOL);
|
|
262
262
|
var halfWidth = width / (2 * factor);
|
|
263
263
|
var halfHeight = height / (2 * factor);
|
|
264
264
|
var center = centerPoint !== null && centerPoint !== void 0 ? centerPoint : {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApZoomCmd.js","sourceRoot":"","sources":["../../src/command/AcApZoomCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"AcApZoomCmd.js","sourceRoot":"","sources":["../../src/command/AcApZoomCmd.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AcApArcCmd.d.ts","sourceRoot":"","sources":["../../../src/command/draw/AcApArcCmd.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AcApArcCmd.d.ts","sourceRoot":"","sources":["../../../src/command/draw/AcApArcCmd.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAkB,MAAM,WAAW,CAAA;AACvD,OAAO,EAEL,WAAW,EASZ,MAAM,cAAc,CAAA;AAswBrB;;;;;;;;GAQG;AACH,qBAAa,UAAW,SAAQ,WAAW;IACzC;;OAEG;;IAMH;;;;;;OAMG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;IA6BlC;;;;;;;;;;;OAWG;YACW,gBAAgB;IA+C9B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,gBAAgB;IAgBxB;;;;;OAKG;IACH,OAAO,CAAC,UAAU;IAclB;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IAMjB;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;;;;;;;OAQG;YACW,gBAAgB;IAM9B;;;;;;;;OAQG;YACW,iBAAiB;IAW/B;;;;;;;;OAQG;YACW,cAAc;IAW5B;;;;;;;;;OASG;YACW,iBAAiB;IAS/B;;;;;;;;OAQG;YACW,sBAAsB;IAUpC;;;;;;;;OAQG;YACW,2BAA2B;IAMzC;;;;;;;;;;OAUG;YACW,uBAAuB;IA4FrC;;;;;;;;;;OAUG;YACW,uBAAuB;IA4FrC;;;;;;;;;;OAUG;YACW,oBAAoB;IA+HlC;;;;;;;;OAQG;YACW,wBAAwB;IAMtC;;;;;;;;OAQG;YACW,0BAA0B;IASxC;;;;;;;;;;OAUG;YACW,yBAAyB;IAqCvC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAK7B;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAI9B;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAK/B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAM9B;;;;;;;;;;OAUG;YACW,YAAY;IA6B1B;;;;;;OAMG;YACW,mBAAmB;IAuCjC;;;;;OAKG;YACW,kBAAkB;IAsBhC;;;;;;OAMG;YACW,kBAAkB;IAiBhC;;;;;;;;;;;OAWG;YACW,qBAAqB;IA6FnC;;;;;;;;;;;OAWG;YACW,eAAe;IA4H7B;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;CAGjB"}
|
|
@@ -49,12 +49,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
49
49
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
50
50
|
}
|
|
51
51
|
};
|
|
52
|
-
import { AcDbArc, AcGePoint3d } from '@mlightcad/data-model';
|
|
52
|
+
import { AcDbArc, AcGePoint3d, AcGeTol, FLOAT_TOL, TAU } from '@mlightcad/data-model';
|
|
53
53
|
import { AcApDocManager } from '../../app';
|
|
54
54
|
import { AcEdCommand, AcEdOpenMode, AcEdPreviewJig, AcEdPromptAngleOptions, AcEdPromptDistanceOptions, AcEdPromptDoubleOptions, AcEdPromptPointOptions, AcEdPromptStatus, eventBus } from '../../editor';
|
|
55
55
|
import { AcApI18n } from '../../i18n';
|
|
56
|
-
var TAU = Math.PI * 2;
|
|
57
|
-
var EPSILON = 1e-9;
|
|
58
56
|
var POSITIVE_NORMAL = { x: 0, y: 0, z: 1 };
|
|
59
57
|
var NEGATIVE_NORMAL = { x: 0, y: 0, z: -1 };
|
|
60
58
|
/**
|
|
@@ -90,7 +88,7 @@ function directionAngleDeg(from, to) {
|
|
|
90
88
|
/**
|
|
91
89
|
* Computes point angle around a center under a given arc orientation.
|
|
92
90
|
*
|
|
93
|
-
* For `normalSign = -1` (clockwise), the
|
|
91
|
+
* For `normalSign = -1` (clockwise), the X component is mirrored so that
|
|
94
92
|
* angle growth still follows the selected arc direction convention.
|
|
95
93
|
*
|
|
96
94
|
* @param center - Arc center.
|
|
@@ -99,10 +97,11 @@ function directionAngleDeg(from, to) {
|
|
|
99
97
|
* @returns Direction-aware normalized angle in radians.
|
|
100
98
|
*/
|
|
101
99
|
function angleByNormalSign(center, point, normalSign) {
|
|
102
|
-
//
|
|
100
|
+
// AcDbArc stores start/end in OCS. For a -Z extrusion, data-model chooses
|
|
101
|
+
// OCS X = -WCS X and OCS Y = WCS Y, so mirror X rather than Y.
|
|
103
102
|
var dx = point.x - center.x;
|
|
104
103
|
var dy = point.y - center.y;
|
|
105
|
-
var raw = normalSign === 1 ? Math.atan2(dy, dx) : Math.atan2(
|
|
104
|
+
var raw = normalSign === 1 ? Math.atan2(dy, dx) : Math.atan2(dy, -dx);
|
|
106
105
|
return normalizeAngle(raw);
|
|
107
106
|
}
|
|
108
107
|
/**
|
|
@@ -114,6 +113,9 @@ function angleByNormalSign(center, point, normalSign) {
|
|
|
114
113
|
function toNormal(sign) {
|
|
115
114
|
return sign === 1 ? POSITIVE_NORMAL : NEGATIVE_NORMAL;
|
|
116
115
|
}
|
|
116
|
+
function normalSignOf(entity) {
|
|
117
|
+
return entity.normal.z >= 0 ? 1 : -1;
|
|
118
|
+
}
|
|
117
119
|
/**
|
|
118
120
|
* Creates one `AcDbArc` entity from normalized arc definition data.
|
|
119
121
|
*
|
|
@@ -166,7 +168,7 @@ function projectPointToCircle(center, radius, point) {
|
|
|
166
168
|
var dx = point.x - center.x;
|
|
167
169
|
var dy = point.y - center.y;
|
|
168
170
|
var distance = Math.hypot(dx, dy);
|
|
169
|
-
if (distance
|
|
171
|
+
if (AcGeTol.isNonPositive(distance))
|
|
170
172
|
return undefined;
|
|
171
173
|
var scale = radius / distance;
|
|
172
174
|
return {
|
|
@@ -240,7 +242,7 @@ function createArcFromThreePoints(start, second, end, reverseDirection) {
|
|
|
240
242
|
var x3 = end.x;
|
|
241
243
|
var y3 = end.y;
|
|
242
244
|
var d = 2 * (x1 * (y2 - y3) + x2 * (y3 - y1) + x3 * (y1 - y2));
|
|
243
|
-
if (
|
|
245
|
+
if (AcGeTol.equalToZero(d))
|
|
244
246
|
return undefined;
|
|
245
247
|
var ux = ((x1 * x1 + y1 * y1) * (y2 - y3) +
|
|
246
248
|
(x2 * x2 + y2 * y2) * (y3 - y1) +
|
|
@@ -252,7 +254,7 @@ function createArcFromThreePoints(start, second, end, reverseDirection) {
|
|
|
252
254
|
d;
|
|
253
255
|
var center = { x: ux, y: uy, z: 0 };
|
|
254
256
|
var radius = distance2d(center, start);
|
|
255
|
-
if (!Number.isFinite(radius) || radius
|
|
257
|
+
if (!Number.isFinite(radius) || AcGeTol.isNonPositive(radius))
|
|
256
258
|
return undefined;
|
|
257
259
|
// By default, choose the arc that actually passes through the second point.
|
|
258
260
|
// Ctrl toggle can reverse this selection to the complementary direction.
|
|
@@ -280,11 +282,12 @@ function createArcFromThreePoints(start, second, end, reverseDirection) {
|
|
|
280
282
|
function createArcFromCenterStartEnd(center, start, end, normalSign) {
|
|
281
283
|
var radiusFromStart = distance2d(center, start);
|
|
282
284
|
var radiusFromEnd = distance2d(center, end);
|
|
283
|
-
if (radiusFromStart
|
|
285
|
+
if (AcGeTol.isNonPositive(radiusFromStart) ||
|
|
286
|
+
AcGeTol.isNonPositive(radiusFromEnd)) {
|
|
284
287
|
return undefined;
|
|
285
288
|
}
|
|
286
289
|
// Start/end must lie on the same circle (small tolerance for picked input).
|
|
287
|
-
var tolerance = Math.max(
|
|
290
|
+
var tolerance = Math.max(FLOAT_TOL, radiusFromStart * FLOAT_TOL);
|
|
288
291
|
if (Math.abs(radiusFromStart - radiusFromEnd) > tolerance) {
|
|
289
292
|
return undefined;
|
|
290
293
|
}
|
|
@@ -310,7 +313,7 @@ function createArcFromCenterStartEnd(center, start, end, normalSign) {
|
|
|
310
313
|
*/
|
|
311
314
|
function createArcFromCenterStartProjectedEnd(center, start, rawEnd, normalSign) {
|
|
312
315
|
var radius = distance2d(center, start);
|
|
313
|
-
if (radius
|
|
316
|
+
if (AcGeTol.isNonPositive(radius))
|
|
314
317
|
return undefined;
|
|
315
318
|
var end = projectPointToCircle(center, radius, rawEnd);
|
|
316
319
|
if (!end)
|
|
@@ -330,7 +333,9 @@ function createArcFromCenterStartProjectedEnd(center, start, rawEnd, normalSign)
|
|
|
330
333
|
function createArcFromCenterStartSweep(center, start, sweepRad) {
|
|
331
334
|
var radius = distance2d(center, start);
|
|
332
335
|
var sweep = Math.abs(sweepRad);
|
|
333
|
-
if (radius
|
|
336
|
+
if (AcGeTol.isNonPositive(radius) ||
|
|
337
|
+
AcGeTol.isNonPositive(sweep) ||
|
|
338
|
+
!AcGeTol.great(TAU - sweep, 0)) {
|
|
334
339
|
return undefined;
|
|
335
340
|
}
|
|
336
341
|
var normalSign = sweepRad >= 0 ? 1 : -1;
|
|
@@ -357,7 +362,9 @@ function createArcFromCenterStartSweep(center, start, sweepRad) {
|
|
|
357
362
|
function createArcFromCenterStartChord(center, start, chordLength) {
|
|
358
363
|
var radius = distance2d(center, start);
|
|
359
364
|
var chord = Math.abs(chordLength);
|
|
360
|
-
if (radius
|
|
365
|
+
if (AcGeTol.isNonPositive(radius) ||
|
|
366
|
+
AcGeTol.isNonPositive(chord) ||
|
|
367
|
+
AcGeTol.great(chord, 2 * radius)) {
|
|
361
368
|
return undefined;
|
|
362
369
|
}
|
|
363
370
|
var ratio = Math.max(-1, Math.min(1, chord / (2 * radius)));
|
|
@@ -376,16 +383,18 @@ function createArcFromCenterStartChord(center, start, chordLength) {
|
|
|
376
383
|
function createArcFromStartEndAngle(start, end, sweepRad) {
|
|
377
384
|
var chord = distance2d(start, end);
|
|
378
385
|
var sweep = Math.abs(sweepRad);
|
|
379
|
-
if (chord
|
|
386
|
+
if (AcGeTol.isNonPositive(chord) ||
|
|
387
|
+
AcGeTol.isNonPositive(sweep) ||
|
|
388
|
+
!AcGeTol.great(TAU - sweep, 0)) {
|
|
380
389
|
return undefined;
|
|
381
390
|
}
|
|
382
391
|
// chord = 2 * r * sin(theta/2) -> r = chord / (2 * sin(theta/2))
|
|
383
392
|
var sinHalf = Math.sin(sweep / 2);
|
|
384
|
-
if (
|
|
393
|
+
if (AcGeTol.equalToZero(sinHalf))
|
|
385
394
|
return undefined;
|
|
386
395
|
var radius = chord / (2 * sinHalf);
|
|
387
396
|
var offsetSquared = radius * radius - (chord * chord) / 4;
|
|
388
|
-
if (offsetSquared
|
|
397
|
+
if (AcGeTol.less(offsetSquared, 0))
|
|
389
398
|
return undefined;
|
|
390
399
|
var offset = Math.sqrt(Math.max(0, offsetSquared));
|
|
391
400
|
var midX = (start.x + end.x) / 2;
|
|
@@ -426,7 +435,7 @@ function createArcFromStartEndDirection(start, end, directionRad) {
|
|
|
426
435
|
var nx = -ty;
|
|
427
436
|
var ny = tx;
|
|
428
437
|
var denominator = 2 * (dx * nx + dy * ny);
|
|
429
|
-
if (
|
|
438
|
+
if (AcGeTol.equalToZero(denominator))
|
|
430
439
|
return undefined;
|
|
431
440
|
// Solve center = start + lambda * n so that |center-start| = |center-end|.
|
|
432
441
|
var lambda = (dx * dx + dy * dy) / denominator;
|
|
@@ -440,7 +449,7 @@ function createArcFromStartEndDirection(start, end, directionRad) {
|
|
|
440
449
|
var radiusVectorX = start.x - center.x;
|
|
441
450
|
var radiusVectorY = start.y - center.y;
|
|
442
451
|
var cross = radiusVectorX * ty - radiusVectorY * tx;
|
|
443
|
-
if (
|
|
452
|
+
if (AcGeTol.equalToZero(cross))
|
|
444
453
|
return undefined;
|
|
445
454
|
var normalSign = cross >= 0 ? 1 : -1;
|
|
446
455
|
return createArcFromCenterStartEnd(center, start, end, normalSign);
|
|
@@ -458,7 +467,9 @@ function createArcFromStartEndDirection(start, end, directionRad) {
|
|
|
458
467
|
function createArcFromStartEndRadius(start, end, radiusInput) {
|
|
459
468
|
var radius = Math.abs(radiusInput);
|
|
460
469
|
var chord = distance2d(start, end);
|
|
461
|
-
if (radius
|
|
470
|
+
if (AcGeTol.isNonPositive(radius) ||
|
|
471
|
+
AcGeTol.isNonPositive(chord) ||
|
|
472
|
+
AcGeTol.great(chord, 2 * radius)) {
|
|
462
473
|
return undefined;
|
|
463
474
|
}
|
|
464
475
|
var midX = (start.x + end.x) / 2;
|
|
@@ -520,6 +531,11 @@ var AcApArcJig = /** @class */ (function (_super) {
|
|
|
520
531
|
var definition = this._builder(point);
|
|
521
532
|
if (!definition)
|
|
522
533
|
return;
|
|
534
|
+
if (definition.normalSign !== normalSignOf(this._arc)) {
|
|
535
|
+
this.end();
|
|
536
|
+
this._arc = createArcEntity(definition);
|
|
537
|
+
return;
|
|
538
|
+
}
|
|
523
539
|
applyArcDefinition(this._arc, definition);
|
|
524
540
|
};
|
|
525
541
|
return AcApArcJig;
|
|
@@ -567,6 +583,11 @@ var AcApArcValueJig = /** @class */ (function (_super) {
|
|
|
567
583
|
var definition = this._builder(value);
|
|
568
584
|
if (!definition)
|
|
569
585
|
return;
|
|
586
|
+
if (definition.normalSign !== normalSignOf(this._arc)) {
|
|
587
|
+
this.end();
|
|
588
|
+
this._arc = createArcEntity(definition);
|
|
589
|
+
return;
|
|
590
|
+
}
|
|
570
591
|
applyArcDefinition(this._arc, definition);
|
|
571
592
|
};
|
|
572
593
|
return AcApArcValueJig;
|
|
@@ -1642,6 +1663,9 @@ var AcApArcCmd = /** @class */ (function (_super) {
|
|
|
1642
1663
|
chordPrompt = new AcEdPromptDistanceOptions(AcApI18n.t('jig.arc.chordLength'));
|
|
1643
1664
|
chordPrompt.allowZero = false;
|
|
1644
1665
|
chordPrompt.allowNegative = true;
|
|
1666
|
+
chordPrompt.useBasePoint = true;
|
|
1667
|
+
chordPrompt.useDashedLine = true;
|
|
1668
|
+
chordPrompt.basePoint = new AcGePoint3d(start);
|
|
1645
1669
|
return [4 /*yield*/, AcApDocManager.instance.editor.getDistance(chordPrompt)];
|
|
1646
1670
|
case 4:
|
|
1647
1671
|
chordResult = _a.sent();
|
|
@@ -1757,6 +1781,9 @@ var AcApArcCmd = /** @class */ (function (_super) {
|
|
|
1757
1781
|
radiusPrompt = new AcEdPromptDistanceOptions(AcApI18n.t('jig.arc.radius'));
|
|
1758
1782
|
radiusPrompt.allowZero = false;
|
|
1759
1783
|
radiusPrompt.allowNegative = true;
|
|
1784
|
+
radiusPrompt.useBasePoint = true;
|
|
1785
|
+
radiusPrompt.useDashedLine = true;
|
|
1786
|
+
radiusPrompt.basePoint = new AcGePoint3d(start);
|
|
1760
1787
|
return [4 /*yield*/, AcApDocManager.instance.editor.getDistance(radiusPrompt)];
|
|
1761
1788
|
case 7:
|
|
1762
1789
|
radiusResult = _a.sent();
|