|
@@ -331,10 +331,10 @@ var enter = ({
|
|
|
string: viewer.unitConvert.convert(
|
|
|
value,
|
|
|
"distance",
|
|
|
- void 0,
|
|
|
+ Potree.settings.precision,
|
|
|
measure.unitSystem,
|
|
|
- 0.1,
|
|
|
- true),
|
|
|
+ 0.01,
|
|
|
+ true,true),
|
|
|
};
|
|
|
},
|
|
|
changeUnit: (unit) => {
|
|
@@ -486,10 +486,7 @@ var enter = ({
|
|
|
}
|
|
|
|
|
|
|
|
|
- fixPoint.bus.emit('measureChange',[
|
|
|
- {line: info.disMeasure1.points, dis: info.disMeasure1.points[0].distanceTo(info.disMeasure1.points[1])},
|
|
|
- {line: info.disMeasure2.points, dis: info.disMeasure2.points[0].distanceTo(info.disMeasure2.points[1])}
|
|
|
- ])
|
|
|
+ //fixPoint.emitLines()
|
|
|
|
|
|
|
|
|
return info
|
|
@@ -553,7 +550,8 @@ var enter = ({
|
|
|
if(!I)return //向上了
|
|
|
let dragVec = new THREE.Vector3().subVectors(I, dragInfo.dragPoint);
|
|
|
dragVec.projectOnVector(dragInfo.normal)
|
|
|
- dragDisMeasure2(fixPoint, dragVec, dragInfo.startMeasurePoints)
|
|
|
+ dragDisMeasure2(fixPoint, dragVec, dragInfo.startMeasurePoints)
|
|
|
+ fixPoint.emitLines()
|
|
|
})
|
|
|
|
|
|
fixPoint.disMeasure1 = disMeasure1;
|
|
@@ -570,6 +568,8 @@ var enter = ({
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
+
|
|
|
+ fixPoint.emitLines()
|
|
|
}
|
|
|
|
|
|
|
|
@@ -589,13 +589,7 @@ var enter = ({
|
|
|
disMeasure2.updateGuideLines()
|
|
|
disMeasure2.update({ifUpdateMarkers:true})
|
|
|
viewer.dispatchEvent('content_changed')
|
|
|
-
|
|
|
-
|
|
|
- fixPoint.bus.emit('measureChange',[
|
|
|
- {line: disMeasure1.points.map(e=>e.clone()), dis: disMeasure1.points[0].distanceTo(disMeasure1.points[1])},
|
|
|
- {line: disMeasure2.points.map(e=>e.clone()), dis: disMeasure2.points[0].distanceTo(disMeasure2.points[1])}
|
|
|
- ])
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
@@ -631,9 +625,9 @@ var enter = ({
|
|
|
dragVec = newVec
|
|
|
}
|
|
|
dragDisMeasure2(fixPoint, dragVec)//恢复之前拖拽的距离
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
|
|
|
+ fixPoint.emitLines()
|
|
|
|
|
|
|
|
|
}
|
|
@@ -921,7 +915,12 @@ var enter = ({
|
|
|
}
|
|
|
viewer.dispatchEvent('content_changed')
|
|
|
}
|
|
|
-
|
|
|
+ mainPoint.emitLines = ()=>{
|
|
|
+ mainPoint.bus.emit('measureChange',[
|
|
|
+ {line: mainPoint.disMeasure1.points.map(e=>e.clone()), dis: mainPoint.disMeasure1.points[0].distanceTo(mainPoint.disMeasure1.points[1])},
|
|
|
+ {line: mainPoint.disMeasure2.points.map(e=>e.clone()), dis: mainPoint.disMeasure2.points[0].distanceTo(mainPoint.disMeasure2.points[1])}
|
|
|
+ ])
|
|
|
+ }
|
|
|
|
|
|
if(graph){ //多线段形状
|
|
|
let info = {
|
|
@@ -963,16 +962,15 @@ var enter = ({
|
|
|
mainPoint.copy(pos)
|
|
|
mainPoint.isFixPoint = true
|
|
|
mainPoint.pos2d = Potree.Utils.getPos2d(mainPoint, viewer.mainViewport, viewer.renderArea )
|
|
|
- ifDrawVerMeasure && createMeasureForPoint(mainPoint, disMeasure2points)
|
|
|
- viewer.fixPoints.push(mainPoint)
|
|
|
|
|
|
- ifDrawVerMeasure && setTimeout(()=>{
|
|
|
- mainPoint.bus.emit('measureChange',[
|
|
|
- {line: mainPoint.disMeasure1.points.map(e=>e.clone()), dis: mainPoint.disMeasure1.points[0].distanceTo(mainPoint.disMeasure1.points[1])},
|
|
|
- {line: mainPoint.disMeasure2.points.map(e=>e.clone()), dis: mainPoint.disMeasure2.points[0].distanceTo(mainPoint.disMeasure2.points[1])}
|
|
|
- ])
|
|
|
- },10)
|
|
|
-
|
|
|
+
|
|
|
+ if(ifDrawVerMeasure){
|
|
|
+ createMeasureForPoint(mainPoint, disMeasure2points)
|
|
|
+ setTimeout(()=>{
|
|
|
+ mainPoint.emitLines()
|
|
|
+ },10)
|
|
|
+ }
|
|
|
+ viewer.fixPoints.push(mainPoint)
|
|
|
}
|
|
|
|
|
|
|