xzw 1 year ago
parent
commit
e4c226b5d6

+ 1 - 1
public/static/lib/potree/potree.js

@@ -82832,7 +82832,7 @@ void main()
 	        }
 	        if(this.clickSelected)return    
 	        this.setSelected(true, 'focus');
-	        this.dispatchEvent({type:'selected', state:true});
+	        dontEmit || this.dispatchEvent({type:'selected', state:true});
 	        this.clickSelected = true;
 	        if(this.measureType == 'MulDistance_shape'){
 	            this.markers.forEach(e=>e.visible = true);

File diff suppressed because it is too large
+ 1 - 1
public/static/lib/potree/potree.js.map


+ 7 - 3
src/sdk/laser/core/enter.js

@@ -260,6 +260,8 @@ var enter = ({
 
         measure.addEventListener("selected", (e) => {
             bus.emit(isShape ? "selectGraph":"selected", e.state) 
+            isShape && measure.mainPoint.ret.selected(e.state, true)
+            
         });
 
 
@@ -801,6 +803,8 @@ var enter = ({
                     ifDrawVerMeasure && bus.on("graphChange",updateMeasure) 
                     
                     measureFun = getMeasureFunction(shape, bus, true) 
+                    
+                    shape.mainPoint = mainPoint
                     //和普通MulDistance不同点:选中才能拖拽 非选中时不展示marker (clickSelected);选中后marker是非选中状态, 但是颜色一样
                     //https://lanhuapp.com/web/#/item/project/stage?tid=de3e5e3e-a489-4b19-862a-7c87ce113467&pid=fa4ff928-d61e-438a-b8ee-f848048b7f52
                      
@@ -861,12 +865,12 @@ var enter = ({
                     hide:()=>{
                         setDisplay(false)
                     },
-                    selected(state){
+                    selected(state, ignoreShape){
                         //console.error(mainPoint.index11, 'selected', state)
                         if(graph){
-                            measureFun.selected(state)  
+                            ignoreShape || measureFun.selected(state)  
                         }
-                        if(ifDrawVerMeasure){ 
+                        if(ifDrawVerMeasure && mainPoint.disMeasure1){ 
                             if(state){
                                 mainPoint.disMeasure1.focus({dontMoveCamera:true, dontEmit:true})
                                 mainPoint.disMeasure2.focus({dontMoveCamera:true, dontEmit:true})