xzw 3 gadi atpakaļ
vecāks
revīzija
e55c7d9757

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

@@ -91767,7 +91767,7 @@ void main() {
                 //this.dispatchEvent('cameraMoveDone')
                 toPano.deferred && toPano.deferred.resolve(makeIt);  //测量线截图时发现,resolve需要写在flying=false 后才行。
             };
-            if(this.currentPano == toPano.pano && this.isAtPano() && !toPano.target ){
+            if(this.currentPano == toPano.pano && this.isAtPano() && !toPano.target && !toPano.quaternion  ){
                 this.dispatchEvent({type:'flyToPano', toPano});
                 return done(true);
             }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
public/lib/potree/potree.js.map


+ 30 - 8
src/sdk/cover/index.js

@@ -688,10 +688,20 @@ export const enter = (dom, isLocal) => {
                 info,
                 () => {
                     //done:
-                    bus.emit('end',  {
+                    /* bus.emit('submit',  {
                         dataset_points: measure.dataset_points.map(p=>p.clone()) , 
                         points_datasets: measure.points_datasets
-                    }/* , ret */) //完成
+                    } ) //完成 */
+                    
+                    bus.emit('submit')
+                    bus.emit('update',[
+                        measure.dataset_points.map(p=>p.clone()) , 
+                        measure.points_datasets
+                    ])
+                    
+                    
+                    
+                    
                 },
                 () => {
                     //cancel
@@ -748,10 +758,10 @@ export const enter = (dom, isLocal) => {
             measure.addEventListener('marker_dropped',(e)=>{//拖拽结束后发送changeCallBack
                 if (measure.parent) {
                     //未被删除
-                    bus.emit('update',{
-                        dataset_points: measure.dataset_points.map(p=>p.clone()) , 
-                        points_datasets: measure.points_datasets
-                    })
+                    bus.emit('update',[
+                        measure.dataset_points.map(p=>p.clone()) , 
+                        measure.points_datasets
+                    ])
                 }
             })
             
@@ -783,9 +793,21 @@ export const enter = (dom, isLocal) => {
                  
                 changeSelect(isHight){
                     measure.setSelected(isHight, 'byList')
-                }
+                },
 
-              
+                getArea: () => {
+                    return measure.area //{value:area, string:..}
+                },
+                getDistance: () => {
+                    if (measure.points.length < 2) return null
+
+                    var value = measure.points[0].distanceTo(measure.points[1])
+
+                    return {
+                        value, //米
+                        string: viewer.unitConvert.convert(value, 'distance', void 0, measure.unitSystem, 0.1, true),
+                    }
+                },
             }
             return result
         },