xzw 2 سال پیش
والد
کامیت
6eeef1e5cc
5فایلهای تغییر یافته به همراه46 افزوده شده و 21 حذف شده
  1. 1 0
      .laser-lib-path
  2. 4 6
      src/custom/start.js
  3. 3 4
      src/custom/viewer/ViewerNew.js
  4. 2 2
      src/viewer/PropertyPanels/PropertiesPanel.js
  5. 36 9
      src/viewer/sidebarNew.js

+ 1 - 0
.laser-lib-path

@@ -0,0 +1 @@
+D:\apache-tomcat-7.0.68\webapps\Git\traffic-laser\public\static\lib

+ 4 - 6
src/custom/start.js

@@ -21,14 +21,12 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
     viewer.setFOV(Potree.config.view.fov); 
      
     
-    /* if(!Potree.settings.isOfficial){ 
+     if(!Potree.settings.isOfficial){ 
         viewer.loadGUI(() => {
-            viewer.setLanguage('en');
-            //$("#menu_appearance").next().show();
+            viewer.setLanguage('en'); 
             $("#menu_tools").next().show();
             $("#menu_scene").next().show();
-            $("#siteModel").show();
-            //$("#alignment").show();
+              
             viewer.toggleSidebar();
         }); 
         Potree.settings.sizeFitToLevel = true//当type为衰减模式时自动根据level调节大小。每长一级,大小就除以2
@@ -36,7 +34,7 @@ export function start(dom, mapDom, number ){ //t-Zvd3w0m
         if( browser.isMobile()){
             changeLog()
         }
-    } */  
+    }   
 
     {
             

+ 3 - 4
src/custom/viewer/ViewerNew.js

@@ -193,16 +193,15 @@ export class Viewer extends ViewerBase{
                 }
                 
                 //add
-                { 
+                /* { 
                     if(!mapArea && Potree.settings.editType != 'merge'){
                         $(domElement).append($("<div id='potree_labels'></div>"))
                         
                         mapArea = $("<div id='mapGaode'></div>")
                         $(domElement).append(mapArea)
                         mapArea = mapArea[0]
-                    }
-                    
-                }
+                    } 
+                } */
                  
              
                /*  let domRoot = this.renderer.domElement.parentElement; 

+ 2 - 2
src/viewer/PropertyPanels/PropertiesPanel.js

@@ -57,9 +57,9 @@ export class PropertiesPanel{
 			this.setCamera(object);
 		}else if(object instanceof Annotation){
 			this.setAnnotation(object);
-		}else if(object instanceof CameraAnimation){//改
+		}/* else if(object instanceof CameraAnimation){//改
 			this.setCameraAnimation(object);
-		}
+		} */
 		
 	}
 

+ 36 - 9
src/viewer/sidebarNew.js

@@ -62,15 +62,7 @@ export class Sidebar{
             //this.initClippingTool(); //因为修改了clipping,所以这项有bug不能使用
             this.initSettings();
             
-            if(Potree.settings.editType != 'pano'){
-                this.initAlignment();
-                this.initClipModel();
-                this.initSiteModel()
-                this.initParitcle()
-                this.initClippingModel()
-            }else{
-                this.initPanosEdit()
-            }
+            
             
         }
          
@@ -460,6 +452,41 @@ export class Sidebar{
 				$.jstree.reference(jsonNode.id).select_node(jsonNode.id);
 			}
 		));
+        
+        // DISTANCE 带箭头的
+		elToolbar.append(this.createToolIcon(
+			Potree.resourcePath + '/icons/distance.svg',
+			'[title]arrow DISTANCE',
+			() => {
+				$('#menu_measurements').next().slideDown();
+				let measurement = this.measuringTool.startInsertion({
+					showDistances: true,
+					showArea: false,
+					closed: false,
+                    minMarkers:2,
+                    maxMarkers: 2,
+					measureType: 'Distance-withArrow'
+                });
+
+				let measurementsRoot = $("#jstree_scene").jstree().get_json("measurements");
+				let jsonNode = measurementsRoot.children.find(child => child.data.uuid === measurement.uuid);
+				$.jstree.reference(jsonNode.id).deselect_all();
+				$.jstree.reference(jsonNode.id).select_node(jsonNode.id);
+			}
+		));
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         // DISTANCE2
 		elToolbar.append(this.createToolIcon(
 			Potree.resourcePath + '/icons/distance.svg',