1

src/custom/objects/tool/MeasuringTool.js

@@ -467,7 +467,7 @@ export class MeasuringTool extends THREE.EventDispatcher{
                      
                     let marker = measure.cloneMarker(length - 1, length)
                     
-                    if(args.isRect && measure.markers.length == 3){//marker全可见 
+                    if(measure.isRect && measure.markers.length == 3){//marker全可见 
                         measure.cloneMarker(0, 3)
                     }else{ 
                         Potree.Utils.updateVisible(measure.markers[length],'adding',false) 
@@ -497,9 +497,9 @@ export class MeasuringTool extends THREE.EventDispatcher{
 		let end = (e={}) => {//确定、结束 
             if(!measure.isNew )return
              
-            if(args.minMarkers != void 0 ){
+            if(measure.minMarkers != void 0 ){
                 
-                if(!e.finish && measure.markers.length<=args.minMarkers ){//右键  当个数不够时取消
+                if(!e.finish && measure.markers.length<=measure.minMarkers ){//右键  当个数不够时取消
                     //this.viewer.scene.removeMeasurement(measure)
                     
                     //重新开始画
@@ -523,13 +523,13 @@ export class MeasuringTool extends THREE.EventDispatcher{
             
             let lastMarker = measure.markers[measure.markers.length-1]
             
-            if (/* !e.finish&& */ measure.markers.length > args.minMarkers) {
+            if (/* !e.finish&& */ measure.markers.length > measure.minMarkers) {
                 measure.removeMarker(measure.points.length - 1); 
                 measure.markers[0].removeEventListener('mouseover', mouseover);
                 measure.markers[0].removeEventListener('mouseleave', mouseleave);
                 measure.markers[0].removeEventListener('click'/* 'mousedown' */,Exit) 
                 
-                if(e.byClickMarker && measure.markers.length > args.minMarkers ){//通过点击第一个marker而结束的话，会多一个marker。但点击marker后可能会因为和它坐标一致而没有添加成功，就不删，根据添加的时间来判断。
+                if(e.byClickMarker && measure.markers.length > measure.minMarkers ){//通过点击第一个marker而结束的话，会多一个marker。但点击marker后可能会因为和它坐标一致而没有添加成功，就不删，根据添加的时间来判断。
                     let delta = Date.now() - lastMarker.createTime 
                     //console.log('delta',delta)
                     if(delta < 10){//刚生成的,说明点击后新增了一个marker
@@ -750,7 +750,7 @@ export class MeasuringTool extends THREE.EventDispatcher{
                 measure.dragChange(I.clone(), measure.points.length-1 )  //使最后一个点在鼠标处
             }
        
-            args.isRect || measure instanceof Path || ( measure.edges[measure.points.length-1].visible = false)
+            measure.isRect || measure instanceof Path || ( measure.edges[measure.points.length-1].visible = false)
               
             //measure.continueDrag(measure.markers[measure.points.length-1], o )  
         }