mxcad 1.0.333 → 1.0.335
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 +1 -1
- package/dist/mxcad.d.ts +5 -8
- package/dist/mxcad.es.js +72 -65
- package/dist/mxcad.umd.js +1 -1
- package/dist/wasm/2d/mxdrawassembly_min.js +99 -99
- package/dist/wasm/2d/mxdrawassembly_min.wasm +0 -0
- package/dist/wasm/2d-st/mxdrawassembly_min.js +95 -95
- package/dist/wasm/2d-st/mxdrawassembly_minst.wasm +0 -0
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Quick Start
|
|
2
2
|
|
|
3
|
-
> **mxcad must be used together with mxdraw.** If you are not familiar with the mxdraw library, please refer to: <https://
|
|
3
|
+
> **mxcad must be used together with mxdraw.** If you are not familiar with the mxdraw library, please refer to: <https://github.com/mxcad/mxdraw/>
|
|
4
4
|
|
|
5
5
|
> **Contact:** 710714273@qq.com
|
|
6
6
|
|
package/dist/mxcad.d.ts
CHANGED
|
@@ -4647,8 +4647,7 @@ export declare class McDbEntity extends McDbObject {
|
|
|
4647
4647
|
* ```ts
|
|
4648
4648
|
* import { McGePoint3d, McDbCircle } from "mxcad"
|
|
4649
4649
|
*
|
|
4650
|
-
* const
|
|
4651
|
-
* const circle = new McDbCircle(center, 20);
|
|
4650
|
+
* const circle = new McDbCircle(0,0,0, 20);
|
|
4652
4651
|
* const area = circle.getArea();
|
|
4653
4652
|
* console.log("圆面积:", area)
|
|
4654
4653
|
* ```
|
|
@@ -5028,8 +5027,7 @@ export declare class McDbCurve extends McDbEntity {
|
|
|
5028
5027
|
* ```ts
|
|
5029
5028
|
* import { McGePoint3d, McDbCircle } from "mxcad"
|
|
5030
5029
|
*
|
|
5031
|
-
* const
|
|
5032
|
-
* const circle = new McDbCircle(center, 20);
|
|
5030
|
+
* const circle = new McDbCircle(0,0,0, 20);
|
|
5033
5031
|
* const vec = circle.getFirstDeriv(new McGePoint3d(20,0,0));//目标点切向量
|
|
5034
5032
|
* if(vec.ret){
|
|
5035
5033
|
* const val = vec.val;
|
|
@@ -5049,8 +5047,7 @@ export declare class McDbCurve extends McDbEntity {
|
|
|
5049
5047
|
* ```ts
|
|
5050
5048
|
* import { McGePoint3d, McDbCircle, MxCADUiPrPoint, MxCpp } from "mxcad"
|
|
5051
5049
|
*
|
|
5052
|
-
* const
|
|
5053
|
-
* const circle = new McDbCircle(center, 20);
|
|
5050
|
+
* const circle = new McDbCircle(0,0,0, 20);
|
|
5054
5051
|
* const mxcad = MxCpp.getCurrentMxCAD();
|
|
5055
5052
|
* mxcad.drawEntity(circle);
|
|
5056
5053
|
*
|
|
@@ -12245,7 +12242,7 @@ export declare class McObject {
|
|
|
12245
12242
|
* @param dAng 图片角度,单位是度
|
|
12246
12243
|
* @param imageUrl 图片路径
|
|
12247
12244
|
*/
|
|
12248
|
-
drawImage(dPosX: number, dPosY: number, dWidth: number, dHeight: number, dAng: number,
|
|
12245
|
+
drawImage(dPosX: number, dPosY: number, dWidth: number, dHeight: number, dAng: number, imageName: string, isConvertBase64?: boolean, dwgImageSizeWidth?: number, dwgImageSizeHeight?: number, imageUrl?: string): McObjectId;
|
|
12249
12246
|
/**
|
|
12250
12247
|
* 添加一个图片定义到cad数据库中 。
|
|
12251
12248
|
* @param imageUrl 图片路径
|
|
@@ -12265,7 +12262,7 @@ export declare class McObject {
|
|
|
12265
12262
|
});
|
|
12266
12263
|
* ```
|
|
12267
12264
|
*/
|
|
12268
|
-
addImageDefine(imageUrl: string, sName?: string, isConvertBase64?: boolean): McObjectId;
|
|
12265
|
+
addImageDefine(imageUrl: string, sName?: string, isConvertBase64?: boolean, sourceFileName?: string): McObjectId;
|
|
12269
12266
|
/**
|
|
12270
12267
|
* 显示线重
|
|
12271
12268
|
*/
|
package/dist/mxcad.es.js
CHANGED
|
@@ -15079,7 +15079,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
|
|
|
15079
15079
|
return MxG2312Obj.decodeFromGb2312Imp(hexstr);
|
|
15080
15080
|
};
|
|
15081
15081
|
|
|
15082
|
-
const version$1 = "1.0.
|
|
15082
|
+
const version$1 = "1.0.334";
|
|
15083
15083
|
|
|
15084
15084
|
var isSharedArrayBuffer = "SharedArrayBuffer" in window;
|
|
15085
15085
|
var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
|
|
@@ -22493,18 +22493,20 @@ var McObject = /*#__PURE__*/function () {
|
|
|
22493
22493
|
}
|
|
22494
22494
|
}, {
|
|
22495
22495
|
key: "drawImage",
|
|
22496
|
-
value: function drawImage(dPosX, dPosY, dWidth, dHeight, dAng,
|
|
22496
|
+
value: function drawImage(dPosX, dPosY, dWidth, dHeight, dAng, imageName) {
|
|
22497
22497
|
var isConvertBase64 = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
22498
22498
|
var dwgImageSizeWidth = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
|
|
22499
22499
|
var dwgImageSizeHeight = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : 1;
|
|
22500
|
-
|
|
22500
|
+
var imageUrl = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : "";
|
|
22501
|
+
return new McObjectId(this.imp.DrawImage(dPosX, dPosY, dWidth, dHeight, dAng, MxG2312Obj.encodeToGb2312(imageName), isConvertBase64, dwgImageSizeWidth, dwgImageSizeHeight, MxG2312Obj.encodeToGb2312(imageUrl)));
|
|
22501
22502
|
}
|
|
22502
22503
|
}, {
|
|
22503
22504
|
key: "addImageDefine",
|
|
22504
22505
|
value: function addImageDefine(imageUrl) {
|
|
22505
22506
|
var sName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
|
|
22506
22507
|
var isConvertBase64 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
22507
|
-
|
|
22508
|
+
var sourceFileName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "";
|
|
22509
|
+
return new McObjectId(this.imp.addImageDefine(MxG2312Obj.encodeToGb2312(imageUrl), MxG2312Obj.encodeToGb2312(sName), isConvertBase64, MxG2312Obj.encodeToGb2312(sourceFileName)));
|
|
22508
22510
|
}
|
|
22509
22511
|
}, {
|
|
22510
22512
|
key: "showLineWeight",
|
|
@@ -36124,7 +36126,7 @@ function _drawCircle() {
|
|
|
36124
36126
|
getDist.setUserDraw(function (currentPoint, pWorldDraw) {
|
|
36125
36127
|
if (!center) return;
|
|
36126
36128
|
var circle2 = new McDbCircle(center.x, center.y, center.z, isRadius ? center.distanceTo(currentPoint) : center.distanceTo(currentPoint) / 2);
|
|
36127
|
-
pWorldDraw.drawMcDbEntity(circle2);
|
|
36129
|
+
pWorldDraw.drawMcDbEntity(circle2, true);
|
|
36128
36130
|
pWorldDraw.drawLine(circle2.center.toVector3(), currentPoint.toVector3());
|
|
36129
36131
|
});
|
|
36130
36132
|
_context.next = 27;
|
|
@@ -36230,7 +36232,7 @@ function _drawCircle() {
|
|
|
36230
36232
|
var center3 = threePointsToDetermineTheCenterOfTheCircle([point1, point2, pt]);
|
|
36231
36233
|
if (center3) {
|
|
36232
36234
|
var circle3 = new McDbCircle(center3.x, center3.y, center3.z, center3.distanceTo(point1));
|
|
36233
|
-
pw.drawMcDbEntity(circle3);
|
|
36235
|
+
pw.drawMcDbEntity(circle3, true);
|
|
36234
36236
|
}
|
|
36235
36237
|
});
|
|
36236
36238
|
_context.next = 71;
|
|
@@ -36283,7 +36285,7 @@ function _drawCircle() {
|
|
|
36283
36285
|
if (!endPoint1) return;
|
|
36284
36286
|
center = new McGePoint3d((pt.x + endPoint1.x) / 2, (pt.y + endPoint1.y) / 2, (pt.z + endPoint1.z) / 2);
|
|
36285
36287
|
radius = center.distanceTo(endPoint1);
|
|
36286
|
-
pw.drawMcDbEntity(new McDbCircle(center.x, center.y, center.z, radius));
|
|
36288
|
+
pw.drawMcDbEntity(new McDbCircle(center.x, center.y, center.z, radius), true);
|
|
36287
36289
|
});
|
|
36288
36290
|
_context.next = 92;
|
|
36289
36291
|
return getPoint.go();
|
|
@@ -36500,36 +36502,39 @@ function _drawLine() {
|
|
|
36500
36502
|
} else {
|
|
36501
36503
|
getPoint.setKeyWords("");
|
|
36502
36504
|
}
|
|
36503
|
-
getPoint.
|
|
36504
|
-
|
|
36505
|
+
getPoint.setUseBasePt(false);
|
|
36506
|
+
getPoint.setUserDraw(function (pt2, pw) {
|
|
36507
|
+
pw.drawMcDbEntity(new McDbLine(prvPoint, pt2), true);
|
|
36508
|
+
});
|
|
36509
|
+
_context.next = 19;
|
|
36505
36510
|
return getPoint.go();
|
|
36506
|
-
case
|
|
36511
|
+
case 19:
|
|
36507
36512
|
pt = _context.sent;
|
|
36508
36513
|
if (!getPoint.isKeyWordPicked("C")) {
|
|
36509
|
-
_context.next =
|
|
36514
|
+
_context.next = 27;
|
|
36510
36515
|
break;
|
|
36511
36516
|
}
|
|
36512
36517
|
drawLineLastPoint = prvPoint;
|
|
36513
36518
|
line2 = new McDbLine(ptFirst, prvPoint);
|
|
36514
36519
|
MxCpp.getCurrentMxCAD().drawEntity(line2);
|
|
36515
36520
|
return _context.abrupt("return");
|
|
36516
|
-
case
|
|
36521
|
+
case 27:
|
|
36517
36522
|
if (!getPoint.isKeyWordPicked("E")) {
|
|
36518
|
-
_context.next =
|
|
36523
|
+
_context.next = 31;
|
|
36519
36524
|
break;
|
|
36520
36525
|
}
|
|
36521
36526
|
return _context.abrupt("return");
|
|
36522
|
-
case
|
|
36527
|
+
case 31:
|
|
36523
36528
|
if (!getPoint.isKeyWordPicked("U")) {
|
|
36524
|
-
_context.next =
|
|
36529
|
+
_context.next = 41;
|
|
36525
36530
|
break;
|
|
36526
36531
|
}
|
|
36527
36532
|
if (!(history.length == 0)) {
|
|
36528
|
-
_context.next =
|
|
36533
|
+
_context.next = 34;
|
|
36529
36534
|
break;
|
|
36530
36535
|
}
|
|
36531
36536
|
return _context.abrupt("continue", 13);
|
|
36532
|
-
case
|
|
36537
|
+
case 34:
|
|
36533
36538
|
data = history[history.length - 1];
|
|
36534
36539
|
history.pop();
|
|
36535
36540
|
iLine--;
|
|
@@ -36537,13 +36542,13 @@ function _drawLine() {
|
|
|
36537
36542
|
drawLineLastPoint = prvPoint;
|
|
36538
36543
|
data.id.erase();
|
|
36539
36544
|
return _context.abrupt("continue", 13);
|
|
36540
|
-
case
|
|
36545
|
+
case 41:
|
|
36541
36546
|
if (pt) {
|
|
36542
|
-
_context.next =
|
|
36547
|
+
_context.next = 43;
|
|
36543
36548
|
break;
|
|
36544
36549
|
}
|
|
36545
36550
|
return _context.abrupt("return");
|
|
36546
|
-
case
|
|
36551
|
+
case 43:
|
|
36547
36552
|
line = new McDbLine(prvPoint, pt);
|
|
36548
36553
|
iLine++;
|
|
36549
36554
|
id = MxCpp.getCurrentMxCAD().drawEntity(line);
|
|
@@ -36555,7 +36560,7 @@ function _drawLine() {
|
|
|
36555
36560
|
drawLineLastPoint = pt;
|
|
36556
36561
|
_context.next = 13;
|
|
36557
36562
|
break;
|
|
36558
|
-
case
|
|
36563
|
+
case 51:
|
|
36559
36564
|
case "end":
|
|
36560
36565
|
return _context.stop();
|
|
36561
36566
|
}
|
|
@@ -36640,7 +36645,7 @@ function _MxDb_Spline() {
|
|
|
36640
36645
|
endTangent: McGeVector3d.kIdentity,
|
|
36641
36646
|
fitPoints: tmpFitPoints
|
|
36642
36647
|
});
|
|
36643
|
-
pw.drawMcDbEntity(tmpSPline);
|
|
36648
|
+
pw.drawMcDbEntity(tmpSPline, true);
|
|
36644
36649
|
});
|
|
36645
36650
|
}
|
|
36646
36651
|
_context3.next = 15;
|
|
@@ -36880,7 +36885,7 @@ function _drawPolyLine() {
|
|
|
36880
36885
|
var pl = new McDbPolyline();
|
|
36881
36886
|
pl.addVertexAt(drawData.pt, drawData.dBulge, drawData.dStartWidth, drawData.dEndWidth);
|
|
36882
36887
|
pl.addVertexAt(currendPoint);
|
|
36883
|
-
pWorldDraw.drawMcDbEntity(pl);
|
|
36888
|
+
pWorldDraw.drawMcDbEntity(pl, true);
|
|
36884
36889
|
});
|
|
36885
36890
|
_context.next = 11;
|
|
36886
36891
|
return getNextPoint.go();
|
|
@@ -37101,7 +37106,7 @@ function _drawPolyLine() {
|
|
|
37101
37106
|
var pl = new McDbPolyline();
|
|
37102
37107
|
pl.addVertexAt(userDrawFristData.pt, dBulge, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37103
37108
|
pl.addVertexAt(currendPoint);
|
|
37104
|
-
pWorldDraw.drawMcDbEntity(pl);
|
|
37109
|
+
pWorldDraw.drawMcDbEntity(pl, true);
|
|
37105
37110
|
});
|
|
37106
37111
|
_context.next = 119;
|
|
37107
37112
|
return _getNextPoint.go();
|
|
@@ -37168,7 +37173,7 @@ function _drawPolyLine() {
|
|
|
37168
37173
|
var pl = new McDbPolyline();
|
|
37169
37174
|
pl.addVertexAt(userDrawFristData.pt, dBulge, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37170
37175
|
pl.addVertexAt(currendPoint);
|
|
37171
|
-
pWorldDraw.drawMcDbEntity(pl);
|
|
37176
|
+
pWorldDraw.drawMcDbEntity(pl, true);
|
|
37172
37177
|
});
|
|
37173
37178
|
_context.next = 150;
|
|
37174
37179
|
return _getNextPoint.go();
|
|
@@ -37188,7 +37193,7 @@ function _drawPolyLine() {
|
|
|
37188
37193
|
var pl = new McDbPolyline();
|
|
37189
37194
|
pl.addVertexAt(userDrawFristData.pt, dBulge, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37190
37195
|
pl.addVertexAt(endPoint2);
|
|
37191
|
-
pw.drawMcDbEntity(pl);
|
|
37196
|
+
pw.drawMcDbEntity(pl, true);
|
|
37192
37197
|
});
|
|
37193
37198
|
_context.next = 158;
|
|
37194
37199
|
return _getNextPoint.go();
|
|
@@ -37246,7 +37251,7 @@ function _drawPolyLine() {
|
|
|
37246
37251
|
var pl = new McDbPolyline();
|
|
37247
37252
|
pl.addVertexAt(userDrawFristData.pt, dBulge, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37248
37253
|
pl.addVertexAt(endPoint2);
|
|
37249
|
-
pw.drawMcDbEntity(pl);
|
|
37254
|
+
pw.drawMcDbEntity(pl, true);
|
|
37250
37255
|
});
|
|
37251
37256
|
_context.next = 190;
|
|
37252
37257
|
return _getNextPoint.go();
|
|
@@ -37332,7 +37337,7 @@ function _drawPolyLine() {
|
|
|
37332
37337
|
var pl = new McDbPolyline();
|
|
37333
37338
|
pl.addVertexAt(userDrawFristData.pt, dBulge2, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37334
37339
|
pl.addVertexAt(endPoint2);
|
|
37335
|
-
pw.drawMcDbEntity(pl);
|
|
37340
|
+
pw.drawMcDbEntity(pl, true);
|
|
37336
37341
|
});
|
|
37337
37342
|
_context.next = 233;
|
|
37338
37343
|
return _getNextPoint.go();
|
|
@@ -37357,7 +37362,7 @@ function _drawPolyLine() {
|
|
|
37357
37362
|
var pl = new McDbPolyline();
|
|
37358
37363
|
pl.addVertexAt(userDrawFristData.pt, dBulge3, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37359
37364
|
pl.addVertexAt(endPoint3);
|
|
37360
|
-
pw.drawMcDbEntity(pl);
|
|
37365
|
+
pw.drawMcDbEntity(pl, true);
|
|
37361
37366
|
});
|
|
37362
37367
|
_context.next = 242;
|
|
37363
37368
|
return _getAngle.go();
|
|
@@ -37410,7 +37415,7 @@ function _drawPolyLine() {
|
|
|
37410
37415
|
var pl = new McDbPolyline();
|
|
37411
37416
|
pl.addVertexAt(userDrawFristData.pt, dBulge3, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37412
37417
|
pl.addVertexAt(endPoint3);
|
|
37413
|
-
pw.drawMcDbEntity(pl);
|
|
37418
|
+
pw.drawMcDbEntity(pl, true);
|
|
37414
37419
|
});
|
|
37415
37420
|
_context.next = 269;
|
|
37416
37421
|
return _getDist.go();
|
|
@@ -37515,7 +37520,7 @@ function _drawPolyLine() {
|
|
|
37515
37520
|
var pl = new McDbPolyline();
|
|
37516
37521
|
pl.addVertexAt(userDrawFristData.pt, dBulge2, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37517
37522
|
pl.addVertexAt(pt2);
|
|
37518
|
-
pw.drawMcDbEntity(pl);
|
|
37523
|
+
pw.drawMcDbEntity(pl, true);
|
|
37519
37524
|
});
|
|
37520
37525
|
_context.next = 327;
|
|
37521
37526
|
return _getNextPoint.go();
|
|
@@ -37553,7 +37558,7 @@ function _drawPolyLine() {
|
|
|
37553
37558
|
var pl = new McDbPolyline();
|
|
37554
37559
|
pl.addVertexAt(userDrawFristData.pt, dBulge3, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37555
37560
|
pl.addVertexAt(entPoint2);
|
|
37556
|
-
pw.drawMcDbEntity(pl);
|
|
37561
|
+
pw.drawMcDbEntity(pl, true);
|
|
37557
37562
|
});
|
|
37558
37563
|
_context.next = 345;
|
|
37559
37564
|
return _getNextPoint.go();
|
|
@@ -37685,7 +37690,7 @@ function _drawPolyLine() {
|
|
|
37685
37690
|
var pl = new McDbPolyline();
|
|
37686
37691
|
pl.addVertexAt(userDrawFristData.pt, dBulge, userDrawFristData.dStartWidth, userDrawFristData.dEndWidth);
|
|
37687
37692
|
pl.addVertexAt(pt2);
|
|
37688
|
-
pw.drawMcDbEntity(pl);
|
|
37693
|
+
pw.drawMcDbEntity(pl, true);
|
|
37689
37694
|
});
|
|
37690
37695
|
_context.next = 422;
|
|
37691
37696
|
return _getNextPoint.go();
|
|
@@ -37743,7 +37748,7 @@ function _drawPolyLine() {
|
|
|
37743
37748
|
midPoint = arc.center.clone().addvec(arc.center.clone().sub(midPoint));
|
|
37744
37749
|
arc.computeArc(_pt8.x, _pt8.y, midPoint.x, midPoint.y, currendPoint.x, currendPoint.y);
|
|
37745
37750
|
}
|
|
37746
|
-
pWorldDraw.drawMcDbEntity(arc);
|
|
37751
|
+
pWorldDraw.drawMcDbEntity(arc, true);
|
|
37747
37752
|
});
|
|
37748
37753
|
_context.next = 452;
|
|
37749
37754
|
return getThirdPoint.go();
|
|
@@ -38026,7 +38031,7 @@ function _drawPolygon() {
|
|
|
38026
38031
|
return _context.abrupt("return");
|
|
38027
38032
|
case 9:
|
|
38028
38033
|
getPoint.setUserDraw(function (currentPoint, pWorldDraw) {
|
|
38029
|
-
pWorldDraw.drawMcDbEntity(createStarEndPointPolygon(currentPoint));
|
|
38034
|
+
pWorldDraw.drawMcDbEntity(createStarEndPointPolygon(currentPoint), true);
|
|
38030
38035
|
});
|
|
38031
38036
|
case 10:
|
|
38032
38037
|
if (endPoint) {
|
|
@@ -38126,7 +38131,7 @@ function _drawPolygon() {
|
|
|
38126
38131
|
getDist = new MxCADUiPrDist();
|
|
38127
38132
|
getDist.setBasePt(centerPoint);
|
|
38128
38133
|
getDist.setUserDraw(function (currentPoint, pWorldDraw) {
|
|
38129
|
-
pWorldDraw.drawMcDbEntity(createMcDbPolyline(currentPoint));
|
|
38134
|
+
pWorldDraw.drawMcDbEntity(createMcDbPolyline(currentPoint), true);
|
|
38130
38135
|
if (centerPoint) vec = currentPoint.sub(centerPoint);
|
|
38131
38136
|
});
|
|
38132
38137
|
getDist.setMessage(_ML_String("McDbPolyline_Radius", "\n\u6307\u5B9A\u5706\u7684\u534A\u5F84"));
|
|
@@ -38259,12 +38264,12 @@ function _drawArc() {
|
|
|
38259
38264
|
arc.radius = radius;
|
|
38260
38265
|
arc.center = center;
|
|
38261
38266
|
guideLine.endPoint = currentPoint;
|
|
38262
|
-
pWorldDraw.drawMcDbEntity(arc);
|
|
38267
|
+
pWorldDraw.drawMcDbEntity(arc, true);
|
|
38263
38268
|
pWorldDraw.drawMcDbEntity(guideLine);
|
|
38264
38269
|
};
|
|
38265
38270
|
draw3PArc = function draw3PArc(pWorldDraw) {
|
|
38266
38271
|
arc.computeArc(startPoint.x, startPoint.y, anyPoint.x, anyPoint.y, endPoint.x, endPoint.y);
|
|
38267
|
-
pWorldDraw.drawMcDbEntity(arc);
|
|
38272
|
+
pWorldDraw.drawMcDbEntity(arc, true);
|
|
38268
38273
|
};
|
|
38269
38274
|
_loop = /*#__PURE__*/regenerator.mark(function _loop() {
|
|
38270
38275
|
var point, pt, chordLength, run, _pt, pl, _pt2, length, _pt3;
|
|
@@ -38515,7 +38520,7 @@ function _drawArc() {
|
|
|
38515
38520
|
pl.addVertexAt(startPoint, bulge);
|
|
38516
38521
|
pl.addVertexAt(endPoint);
|
|
38517
38522
|
guideLine.endPoint = currentPoint;
|
|
38518
|
-
pWorldDraw.drawMcDbEntity(pl);
|
|
38523
|
+
pWorldDraw.drawMcDbEntity(pl, true);
|
|
38519
38524
|
pWorldDraw.drawMcDbEntity(guideLine);
|
|
38520
38525
|
});
|
|
38521
38526
|
_context2.next = 93;
|
|
@@ -38822,7 +38827,7 @@ function _drawEllipticalArc() {
|
|
|
38822
38827
|
var yRadius = center.distanceTo(pt) / 2;
|
|
38823
38828
|
radiusRatio = yRadius / xRadius;
|
|
38824
38829
|
var ellipseArc = createEllipse();
|
|
38825
|
-
pw.drawMcDbEntity(ellipseArc);
|
|
38830
|
+
pw.drawMcDbEntity(ellipseArc, true);
|
|
38826
38831
|
});
|
|
38827
38832
|
_context.next = 49;
|
|
38828
38833
|
return getDist.go();
|
|
@@ -38841,7 +38846,7 @@ function _drawEllipticalArc() {
|
|
|
38841
38846
|
var ratio = dx / (dx + dy);
|
|
38842
38847
|
radiusRatio = ratio;
|
|
38843
38848
|
var ellipseArc = createEllipse();
|
|
38844
|
-
pw.drawMcDbEntity(ellipseArc);
|
|
38849
|
+
pw.drawMcDbEntity(ellipseArc, true);
|
|
38845
38850
|
});
|
|
38846
38851
|
_context.next = 57;
|
|
38847
38852
|
return getDist.go();
|
|
@@ -38888,7 +38893,7 @@ function _drawEllipticalArc() {
|
|
|
38888
38893
|
var angle = Math.atan2(pt.y - center.y, pt.x - center.x);
|
|
38889
38894
|
startAngle = (angle - offsetAngle + Math.PI * 2) % (Math.PI * 2);
|
|
38890
38895
|
var ellipseArc = createEllipse();
|
|
38891
|
-
pw.drawMcDbEntity(ellipseArc);
|
|
38896
|
+
pw.drawMcDbEntity(ellipseArc, true);
|
|
38892
38897
|
});
|
|
38893
38898
|
_context.next = 76;
|
|
38894
38899
|
return getDist.go();
|
|
@@ -38916,7 +38921,7 @@ function _drawEllipticalArc() {
|
|
|
38916
38921
|
endAngle += Math.PI * 2;
|
|
38917
38922
|
}
|
|
38918
38923
|
var ellipseArc = createEllipse();
|
|
38919
|
-
pw.drawMcDbEntity(ellipseArc);
|
|
38924
|
+
pw.drawMcDbEntity(ellipseArc, true);
|
|
38920
38925
|
});
|
|
38921
38926
|
_context.next = 87;
|
|
38922
38927
|
return getDist.go();
|
|
@@ -38931,7 +38936,7 @@ function _drawEllipticalArc() {
|
|
|
38931
38936
|
getDist.setUserDraw(function (pt, pw) {
|
|
38932
38937
|
endAngle = angleTo(center.x, center.y, pt.x, pt.y);
|
|
38933
38938
|
var ellipseArc = createEllipse();
|
|
38934
|
-
pw.drawMcDbEntity(ellipseArc);
|
|
38939
|
+
pw.drawMcDbEntity(ellipseArc, true);
|
|
38935
38940
|
});
|
|
38936
38941
|
_context.next = 94;
|
|
38937
38942
|
return getDist.go();
|
|
@@ -39112,7 +39117,7 @@ function _drawMxDbEllipse() {
|
|
|
39112
39117
|
line.trueColor = new McCmColor();
|
|
39113
39118
|
line.trueColor.setRGB(255, 255, 0);
|
|
39114
39119
|
pWorldDraw.drawMcDbEntity(line);
|
|
39115
|
-
pWorldDraw.drawMcDbEntity(ellipse2);
|
|
39120
|
+
pWorldDraw.drawMcDbEntity(ellipse2, true);
|
|
39116
39121
|
};
|
|
39117
39122
|
getDist.setUserDraw(function (currentPoint, pWorldDraw) {
|
|
39118
39123
|
var yRadius = center.distanceTo(currentPoint) / 2;
|
|
@@ -43060,19 +43065,19 @@ function Mx_Trim() {
|
|
|
43060
43065
|
}
|
|
43061
43066
|
function _Mx_Trim() {
|
|
43062
43067
|
_Mx_Trim = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee16() {
|
|
43063
|
-
var
|
|
43068
|
+
var filterInit, getPoint, ss, aryId, aryIdLong, mxcadTrimAssert, filter, isWindowSelect, _loop7, _ret7;
|
|
43064
43069
|
return regenerator.wrap(function _callee16$(_context23) {
|
|
43065
43070
|
while (1) switch (_context23.prev = _context23.next) {
|
|
43066
43071
|
case 0:
|
|
43067
|
-
|
|
43068
|
-
|
|
43069
|
-
aryId = MxCADUtility.getCurrentSelect(
|
|
43072
|
+
filterInit = new MxCADResbuf();
|
|
43073
|
+
filterInit.AddMcDbEntityTypes("LINE,LWPOLYLINE,ELLIPSE,ARC,CIRCLE,SPLINE,XLINE,INSERT");
|
|
43074
|
+
aryId = MxCADUtility.getCurrentSelect(filterInit);
|
|
43070
43075
|
if (!(aryId.length === 0)) {
|
|
43071
43076
|
_context23.next = 12;
|
|
43072
43077
|
break;
|
|
43073
43078
|
}
|
|
43074
43079
|
_context23.next = 6;
|
|
43075
|
-
return MxCADUtility.userSelect("\u9009\u62E9\u5BF9\u8C61\u6216<\u5168\u90E8\u9009\u62E9>",
|
|
43080
|
+
return MxCADUtility.userSelect("\u9009\u62E9\u5BF9\u8C61\u6216<\u5168\u90E8\u9009\u62E9>", filterInit, function (_ss, _getPoint) {
|
|
43076
43081
|
getPoint = _getPoint;
|
|
43077
43082
|
ss = _ss;
|
|
43078
43083
|
});
|
|
@@ -43086,7 +43091,7 @@ function _Mx_Trim() {
|
|
|
43086
43091
|
case 9:
|
|
43087
43092
|
if (getPoint.getStatus() === MrxDbgUiPrBaseReturn.kNone) {
|
|
43088
43093
|
if (aryId.length === 0) {
|
|
43089
|
-
ss.allSelect(
|
|
43094
|
+
ss.allSelect(filterInit);
|
|
43090
43095
|
ss.forEach(function (val) {
|
|
43091
43096
|
aryId.push(val);
|
|
43092
43097
|
});
|
|
@@ -43107,6 +43112,8 @@ function _Mx_Trim() {
|
|
|
43107
43112
|
}
|
|
43108
43113
|
return _context23.abrupt("return");
|
|
43109
43114
|
case 17:
|
|
43115
|
+
filter = new MxCADResbuf();
|
|
43116
|
+
filter.AddMcDbEntityTypes("LINE,LWPOLYLINE,ELLIPSE,ARC,CIRCLE,SPLINE,XLINE");
|
|
43110
43117
|
isWindowSelect = true;
|
|
43111
43118
|
_loop7 = /*#__PURE__*/regenerator.mark(function _loop7() {
|
|
43112
43119
|
var ss2, getPoint2, ids, selPoint;
|
|
@@ -43178,27 +43185,27 @@ function _Mx_Trim() {
|
|
|
43178
43185
|
}
|
|
43179
43186
|
}, _loop7);
|
|
43180
43187
|
});
|
|
43181
|
-
case 19:
|
|
43182
|
-
return _context23.delegateYield(_loop7(), "t0", 21);
|
|
43183
43188
|
case 21:
|
|
43189
|
+
return _context23.delegateYield(_loop7(), "t0", 23);
|
|
43190
|
+
case 23:
|
|
43184
43191
|
_ret7 = _context23.t0;
|
|
43185
43192
|
if (!(_ret7 === 0)) {
|
|
43186
|
-
_context23.next =
|
|
43193
|
+
_context23.next = 26;
|
|
43187
43194
|
break;
|
|
43188
43195
|
}
|
|
43189
|
-
return _context23.abrupt("break",
|
|
43190
|
-
case
|
|
43196
|
+
return _context23.abrupt("break", 30);
|
|
43197
|
+
case 26:
|
|
43191
43198
|
if (!(_ret7 === 1)) {
|
|
43192
|
-
_context23.next =
|
|
43199
|
+
_context23.next = 28;
|
|
43193
43200
|
break;
|
|
43194
43201
|
}
|
|
43195
|
-
return _context23.abrupt("continue",
|
|
43196
|
-
case 26:
|
|
43197
|
-
_context23.next = 19;
|
|
43198
|
-
break;
|
|
43202
|
+
return _context23.abrupt("continue", 21);
|
|
43199
43203
|
case 28:
|
|
43204
|
+
_context23.next = 21;
|
|
43205
|
+
break;
|
|
43206
|
+
case 30:
|
|
43200
43207
|
mxcadTrimAssert.UnInit();
|
|
43201
|
-
case
|
|
43208
|
+
case 31:
|
|
43202
43209
|
case "end":
|
|
43203
43210
|
return _context23.stop();
|
|
43204
43211
|
}
|
|
@@ -44470,7 +44477,7 @@ var drawRectang = /*#__PURE__*/function () {
|
|
|
44470
44477
|
var pt1 = pt1CAD;
|
|
44471
44478
|
var pt3 = currentPoint;
|
|
44472
44479
|
pl = getRect(pt1, pt3, rotationAngle);
|
|
44473
|
-
pWorldDraw.drawMcDbEntity(pl);
|
|
44480
|
+
pWorldDraw.drawMcDbEntity(pl, true);
|
|
44474
44481
|
};
|
|
44475
44482
|
getPoint.setUserDraw(userDrawPoint1Rect);
|
|
44476
44483
|
run = /*#__PURE__*/function () {
|
|
@@ -44506,7 +44513,7 @@ var drawRectang = /*#__PURE__*/function () {
|
|
|
44506
44513
|
}
|
|
44507
44514
|
if (!pt2CAD) return;
|
|
44508
44515
|
pl = getRect(pt1CAD, pt2CAD, rotationAngle);
|
|
44509
|
-
pWorldDraw.drawMcDbEntity(pl);
|
|
44516
|
+
pWorldDraw.drawMcDbEntity(pl, true);
|
|
44510
44517
|
};
|
|
44511
44518
|
if (!getPoint.isKeyWordPicked("A")) {
|
|
44512
44519
|
_context2.next = 40;
|
|
@@ -44608,7 +44615,7 @@ var drawRectang = /*#__PURE__*/function () {
|
|
|
44608
44615
|
rotationAngle = angleTo(currentPoint.x, currentPoint.y, pt1CAD.x, pt1CAD.y);
|
|
44609
44616
|
pl = getRect(pt1CAD, pt2CADOld);
|
|
44610
44617
|
pl.rotate(pt1CAD, rotationAngle);
|
|
44611
|
-
pWorldDraw.drawMcDbEntity(pl);
|
|
44618
|
+
pWorldDraw.drawMcDbEntity(pl, true);
|
|
44612
44619
|
});
|
|
44613
44620
|
_context2.next = 68;
|
|
44614
44621
|
return getPoint.go();
|