|
|
@@ -42240,14 +42240,14 @@
|
|
|
this.editEnable && viewer.dispatchEvent({
|
|
|
type: "CursorChange",
|
|
|
action: 'remove',
|
|
|
- name: 'hoverGrab'
|
|
|
+ name: 'grabbing'
|
|
|
});
|
|
|
});
|
|
|
line.addEventListener('mouseleave', e => {
|
|
|
this.editEnable && viewer.dispatchEvent({
|
|
|
type: "CursorChange",
|
|
|
action: 'remove',
|
|
|
- name: 'grabbing'
|
|
|
+ name: 'hoverGrab'
|
|
|
});
|
|
|
});
|
|
|
line.addEventListener('drag', e => {
|
|
|
@@ -42423,6 +42423,7 @@
|
|
|
this.halfPathWidth = v;
|
|
|
this.markers.forEach(e => setMarkerScale(e, this.halfPathWidth));
|
|
|
this.updateEdge();
|
|
|
+ this.editEnable || this.updateEndCaps();
|
|
|
viewer.dispatchEvent('content_changed');
|
|
|
this.hideArrowUntilUpdate();
|
|
|
}
|
|
|
@@ -42430,6 +42431,7 @@
|
|
|
if (this.pathColor == color) return;
|
|
|
this.pathColor = color;
|
|
|
this.edge.material.color.set(color);
|
|
|
+ this.endCaps[0].children[0].material.color.set(color);
|
|
|
viewer.dispatchEvent('content_changed');
|
|
|
}
|
|
|
updateEdge() {
|
|
|
@@ -42530,6 +42532,13 @@
|
|
|
this.hideArrowUntilUpdate();
|
|
|
viewer.measuringTool.history.afterChange(this);
|
|
|
this.dispatchEvent('changed');
|
|
|
+ if (this.points.length == 0) {
|
|
|
+ //viewer.measuringTool.changeToAddState(this)
|
|
|
+ viewer.measuringTool.startInsertion({
|
|
|
+ resume: true,
|
|
|
+ measure: this
|
|
|
+ });
|
|
|
+ }
|
|
|
} else {
|
|
|
//点击选中点
|
|
|
this.dispatchEvent({
|
|
|
@@ -42608,7 +42617,15 @@
|
|
|
this.editEnable = !!state;
|
|
|
this.markers.forEach(e => Potree.Utils.updateVisible(e, 'editEnable', this.editEnable));
|
|
|
this.endCaps.forEach((e, i) => Potree.Utils.updateVisible(e, 'editEnable', !this.editEnable));
|
|
|
- state || this.updateEndCaps();
|
|
|
+ if (!state) {
|
|
|
+ this.updateEndCaps();
|
|
|
+ /* viewer.dispatchEvent({
|
|
|
+ type : "CursorChange", action:'remove', name:'grabbing'
|
|
|
+ })
|
|
|
+ viewer.dispatchEvent({
|
|
|
+ type : "CursorChange", action:'remove', name:'hoverGrab'
|
|
|
+ }) */
|
|
|
+ }
|
|
|
viewer.dispatchEvent('content_changed');
|
|
|
}
|
|
|
setAddOrRemPoint(state) {
|
|
|
@@ -43572,6 +43589,7 @@
|
|
|
var domElement = this.viewer.renderer.domElement;
|
|
|
if (args.resume) {
|
|
|
measure = args.measure;
|
|
|
+ args.minMarkers = measure.minMarkers;
|
|
|
} else {
|
|
|
measure = args.measureType == 'MulDistance Ring' ? new Prism(args) : args.type == 'Path' ? new Path$1(args) : new Measure$1(args);
|
|
|
this.scene.add(measure);
|
|
|
@@ -43738,9 +43756,6 @@
|
|
|
});
|
|
|
//}
|
|
|
this.viewer.inputHandler.drag && (this.viewer.inputHandler.drag.object = null);
|
|
|
- if (e.remove || e.type == 'cancel_insertions' && !e.dontRemove) {
|
|
|
- viewer.scene.removeMeasurement(measure);
|
|
|
- }
|
|
|
};
|
|
|
this.viewer.addEventListener('cancel_insertions', Exit);
|
|
|
|
|
|
@@ -64014,7 +64029,14 @@
|
|
|
var CursorDeal = {
|
|
|
priorityEvent: [
|
|
|
//在前面的优先级高
|
|
|
+
|
|
|
{
|
|
|
+ pen_delPoint: "url({Potree.resourcePath}/images/polygon_mark/pic_pen_sub.png),auto"
|
|
|
+ }, {
|
|
|
+ pen_addPoint: "url({Potree.resourcePath}/images/polygon_mark/pic_pen_add.png),auto"
|
|
|
+ }, {
|
|
|
+ pen: "url({Potree.resourcePath}/images/polygon_mark/pic_pen.png),auto"
|
|
|
+ }, {
|
|
|
'grabbing': 'grabbing'
|
|
|
},
|
|
|
//通用
|
|
|
@@ -64023,12 +64045,6 @@
|
|
|
},
|
|
|
//通用
|
|
|
{
|
|
|
- pen_delPoint: "url({Potree.resourcePath}/images/polygon_mark/pic_pen_sub.png),auto"
|
|
|
- }, {
|
|
|
- pen_addPoint: "url({Potree.resourcePath}/images/polygon_mark/pic_pen_add.png),auto"
|
|
|
- }, {
|
|
|
- pen: "url({Potree.resourcePath}/images/polygon_mark/pic_pen.png),auto"
|
|
|
- }, {
|
|
|
'zoomInCloud': 'zoom-in'
|
|
|
}, {
|
|
|
'hoverPano': 'pointer'
|
