ow-eengine-power 1.2.3 → 2.0.1

package/dist/OW_EEngine_Power.js

@@ -45449,7 +45449,7 @@ class MD {
     oe(this, "displacementData", []);
     // 在类属性中添加（浏览器环境）
     // private _animationInterval: number | null = null;
-    //  private  byElemens:ElementStressData[]=[];
+    // private  byElemens:ElementStressData[]=[];
     // private  byTimes:TimePointData[]=[];
     // 或者如果是Node.js环境：
     oe(this, "_animationInterval", null);
@@ -45470,7 +45470,7 @@ class MD {
     const n = u.fromDegrees(this.TowerFZS.Longitude, this.TowerFZS.Latitude, this.TowerFZS.Altitude);
     this.connections.forEach((i) => {
       const s = this.TowerNodes.find((h) => h.id === i.from), a = this.TowerNodes.find((h) => h.id === i.to), r = [], f = new u(s == null ? void 0 : s.x, s == null ? void 0 : s.y, s == null ? void 0 : s.z);
-      r.push(Q(n, f, t)), Kr(
+      r.push(Q(n, f, t)), this.entityCollection2.add(Kr(
         this.viewer,
         r[0],
         (s == null ? void 0 : s.id) + "",
@@ -45480,9 +45480,9 @@ class MD {
           fontSize: 18,
           pixelOffset: [0, -30]
         }
-      );
+      ));
       const c = new u(a == null ? void 0 : a.x, a == null ? void 0 : a.y, a == null ? void 0 : a.z);
-      r.push(Q(n, c, t)), Kr(
+      r.push(Q(n, c, t)), this.entityCollection2.add(Kr(
         this.viewer,
         r[1],
         (a == null ? void 0 : a.id) + "",
@@ -45492,7 +45492,7 @@ class MD {
           fontSize: 18,
           pixelOffset: [0, -30]
         }
-      ), this.entityCollection2.add(v(r, i.from + "" + i.to, this.TowerFZS.TowerMembersWidth, this.TowerFZS.TowerMemberColor));
+      )), this.entityCollection2.add(v(r, i.from + "" + i.to, this.TowerFZS.TowerMembersWidth, this.TowerFZS.TowerMemberColor));
     });
   }
   /**
@@ -45538,7 +45538,7 @@ class MD {
         c.y - d.y,
         c.z - d.z
       ), T = Q(a, p, s);
-      Kr(
+      this.entityCollection2.add(Kr(
         this.viewer,
         T,
         r.from + "",
@@ -45548,9 +45548,9 @@ class MD {
           fontSize: 18,
           pixelOffset: [0, -30]
         }
-      );
+      ));
       const y = Q(a, m, s);
-      Kr(
+      this.entityCollection2.add(Kr(
         this.viewer,
         y,
         r.to + "",
@@ -45560,7 +45560,7 @@ class MD {
           fontSize: 18,
           pixelOffset: [0, -30]
         }
-      );
+      ));
       const w = [T, y], A = `${r.from}_${r.to}`;
       debugger;
       this.entityCollection2.add(

package/dist/OW_EEngine_Power.umd.cjs

@@ -6595,4 +6595,4 @@ void main()
                   }
               `},translucent:function(){return!0}})}setLineVisible(t){this.Keym=="OW_JPS_EEngin_001"&&(this.entityCollection2.show=t)}RemoveLineModel(){this.Keym=="OW_JPS_EEngin_001"&&(this.viewer.dataSources.remove(this.dataSource2),this.entityCollection2.show=!1)}}class Fx{constructor(){se(this,"id","");se(this,"name","");se(this,"towerFZinfo","");se(this,"towerDisFile","");se(this,"stressFileContent","");se(this,"TowerMemberColor","#FFFFFF");se(this,"TowerMembersWidth",2);se(this,"Longitude",0);se(this,"Latitude",0);se(this,"Altitude",0);se(this,"RollX",0);se(this,"RollY",90);se(this,"RollZ",0)}}function Mx(e){debugger;const t=e.split(`
 `),n=[],i=[],o=/^\s*(\d+)\s+([\d.-]+)\s+([\d.-]+)\s+([\d.-]+)\s+(-?\d+)/,a=/^\s*(\d+)\s+(\d+)\s+(\d+)\s*(?:#|$)/;for(const r of t){const f=r.trim();if(!f)continue;const c=f.match(o);if(c){n.push({id:parseInt(c[1]),x:parseFloat(c[2]),y:parseFloat(c[3]),z:parseFloat(c[4]),flag:parseInt(c[5])});continue}const h=f.match(a);h&&i.push({from:parseInt(h[1]),to:parseInt(h[2]),type:parseInt(h[3])})}return{TowerNodes:n,connections:i}}function Ux(e){const t=e.split(`
-`),n=[];for(const i of t){if(!i.trim())continue;const o=i.trim().split(/\s+/).filter(f=>f!==""),a=parseInt(o[0]);if(isNaN(a))continue;const r=[];for(let f=1;f<o.length;f+=3){const c=parseFloat(o[f]),h=parseFloat(o[f+1]),d=parseFloat(o[f+2]);if(!isNaN(c)&&!isNaN(h)&&!isNaN(d)){const p=Math.floor((f-1)/3)+1;r.push({timeStep:p,x:c,y:h,z:d})}}n.push({nodeId:a,displacements:r})}return n}function B0(e){const t={};return e.forEach(n=>{n.displacements.forEach(i=>{t[i.timeStep]||(t[i.timeStep]=[]),t[i.timeStep].push({nodeId:n.nodeId,...i})})}),t}class kx{constructor(t,n,i){se(this,"viewer");se(this,"TowerFZS");se(this,"Keym","");se(this,"dataSource2",new rr("fztower"));se(this,"entityCollection2",this.dataSource2.entities);se(this,"TowerNodes",[]);se(this,"connections",[]);se(this,"displacementData",[]);se(this,"_animationInterval",null);this.Keym=i,this.viewer=t,this.TowerFZS=n}loadfile(){if(this.Keym!="OW_JPS_EEngin_001")return;const{TowerNodes:t,connections:n}=Mx(this.TowerFZS.towerFZinfo);this.TowerNodes=t,this.connections=n,this.displacementData=Ux(this.TowerFZS.towerDisFile);debugger}loadFZTower(){if(this.Keym!="OW_JPS_EEngin_001")return;let t=new He(S.toRadians(this.TowerFZS.RollX),this.TowerFZS.RollY,this.TowerFZS.RollZ);const n=u.fromDegrees(this.TowerFZS.Longitude,this.TowerFZS.Latitude,this.TowerFZS.Altitude);this.connections.forEach(i=>{const o=this.TowerNodes.find(h=>h.id===i.from),a=this.TowerNodes.find(h=>h.id===i.to),r=[],f=new u(o==null?void 0:o.x,o==null?void 0:o.y,o==null?void 0:o.z);r.push(Q(n,f,t)),Pa(this.viewer,r[0],(o==null?void 0:o.id)+"",{pointColor:I.RED,labelColor:I.GOLD,fontSize:18,pixelOffset:[0,-30]});const c=new u(a==null?void 0:a.x,a==null?void 0:a.y,a==null?void 0:a.z);r.push(Q(n,c,t)),Pa(this.viewer,r[1],(a==null?void 0:a.id)+"",{pointColor:I.RED,labelColor:I.GOLD,fontSize:18,pixelOffset:[0,-30]}),this.entityCollection2.add(v(r,i.from+""+i.to,this.TowerFZS.TowerMembersWidth,this.TowerFZS.TowerMemberColor))})}loadFZDISTower(t){if(this.Keym!=="OW_JPS_EEngin_001")return;const i=B0(this.displacementData)[t];debugger;if(!i){console.warn(`未找到时间步 ${t} 的位移数据`);return}const o=new He(S.toRadians(this.TowerFZS.RollX),this.TowerFZS.RollY,this.TowerFZS.RollZ),a=u.fromDegrees(this.TowerFZS.Longitude,this.TowerFZS.Latitude,this.TowerFZS.Altitude);this.connections.forEach(r=>{const f=this.TowerNodes.find(E=>E.id===r.from),c=this.TowerNodes.find(E=>E.id===r.to);if(!f||!c){console.warn(`找不到连接 ${r.from}->${r.to} 的节点`);return}debugger;const h=i.find(E=>E.nodeId===r.from),d=i.find(E=>E.nodeId===r.to);if(!h||!d){console.warn(`找不到连接 ${r.from}->${r.to} 的位移数据`);return}const p=new u(f.x-h.x,f.y-h.y,f.z-h.z),m=new u(c.x-d.x,c.y-d.y,c.z-d.z),T=Q(a,p,o);Pa(this.viewer,T,r.from+"",{pointColor:I.RED,labelColor:I.GOLD,fontSize:18,pixelOffset:[0,-30]});const y=Q(a,m,o);Pa(this.viewer,y,r.to+"",{pointColor:I.RED,labelColor:I.GOLD,fontSize:18,pixelOffset:[0,-30]});const w=[T,y],A=`${r.from}_${r.to}`;debugger;this.entityCollection2.add(v(w,A+t,this.TowerFZS.TowerMembersWidth,"#ffffff"))})}loadFZDISTower1(t){if(this.Keym!="OW_JPS_EEngin_001")return;const n=B0(this.displacementData);let i=new He(S.toRadians(this.TowerFZS.RollX),this.TowerFZS.RollY,this.TowerFZS.RollZ);const o=u.fromDegrees(this.TowerFZS.Longitude,this.TowerFZS.Latitude,this.TowerFZS.Altitude);this.connections.forEach(a=>{const r=this.TowerNodes.find(T=>T.id===a.from),f=n[t].find(T=>T.nodeId===a.from),c=this.TowerNodes.find(T=>T.id===a.to),h=n[t].find(T=>T.nodeId===a.to),d=[],p=new u(r.x-f.x,r.y-f.y,r.z-f.z);d.push(Q(o,p,i));const m=new u(c.x-h.x,c.y-h.y,c.z-h.z);d.push(Q(o,m,i));debugger;this.entityCollection2.add(v(d,a.from+""+a.to,this.TowerFZS.TowerMembersWidth,this.TowerFZS.TowerMemberColor))})}loadAllFZDisTower(){if(this.Keym!=="OW_JPS_EEngin_001")return;if(!this.displacementData||this.displacementData.length===0){console.warn("没有可用的位移数据");return}let t=1;const n=this.displacementData.length;this._animationInterval&&(clearInterval(this._animationInterval),this._animationInterval=null);const i=()=>{if(this.viewer.dataSources.contains(this.dataSource2)&&this.viewer.dataSources.remove(this.dataSource2,!0),t>n){t=1;return}this.dataSource2=new rr("fztower"),this.entityCollection2=this.dataSource2.entities;try{this.loadFZDISTower(t),this.loadFZModel(),console.log(`正在显示位移帧: ${t}/${n}`),t++}catch(o){console.error("加载位移帧时出错:",o),this._animationInterval&&(clearInterval(this._animationInterval),this._animationInterval=null)}};i(),this._animationInterval=setInterval(i,300)}stopDisplacementAnimation(){this._animationInterval&&(clearInterval(this._animationInterval),this._animationInterval=null)}toggleAnimation(t){t?this.stopDisplacementAnimation():this.loadAllFZDisTower()}loadFZModel(){this.Keym=="OW_JPS_EEngin_001"&&(this.viewer.dataSources.add(this.dataSource2),this.viewer.entities.show)}setFZModelVisible(t){this.Keym=="OW_JPS_EEngin_001"&&(this.entityCollection2.show=t)}RemoveFZModel(){this.Keym=="OW_JPS_EEngin_001"&&(this.viewer.dataSources.remove(this.dataSource2),this.entityCollection2.show=!1)}}it.GUAPoint=Lx,it.InsulatorInfo=zx,it.InsulatorType=Ht,it.LineNum=ar,it.LineType=P0,it.OWEEgineFZManager=kx,it.OWEEgineManager=Nx,it.PhaseSType=nn,it.TowerFZInfo=Fx,it.TowerInfo=Rx,it.TowerLineInfo=Bx,it.TowerType=$i,it.WairnumType=$,it.drawModel=go,Object.defineProperty(it,Symbol.toStringTag,{value:"Module"})});
+`),n=[];for(const i of t){if(!i.trim())continue;const o=i.trim().split(/\s+/).filter(f=>f!==""),a=parseInt(o[0]);if(isNaN(a))continue;const r=[];for(let f=1;f<o.length;f+=3){const c=parseFloat(o[f]),h=parseFloat(o[f+1]),d=parseFloat(o[f+2]);if(!isNaN(c)&&!isNaN(h)&&!isNaN(d)){const p=Math.floor((f-1)/3)+1;r.push({timeStep:p,x:c,y:h,z:d})}}n.push({nodeId:a,displacements:r})}return n}function B0(e){const t={};return e.forEach(n=>{n.displacements.forEach(i=>{t[i.timeStep]||(t[i.timeStep]=[]),t[i.timeStep].push({nodeId:n.nodeId,...i})})}),t}class kx{constructor(t,n,i){se(this,"viewer");se(this,"TowerFZS");se(this,"Keym","");se(this,"dataSource2",new rr("fztower"));se(this,"entityCollection2",this.dataSource2.entities);se(this,"TowerNodes",[]);se(this,"connections",[]);se(this,"displacementData",[]);se(this,"_animationInterval",null);this.Keym=i,this.viewer=t,this.TowerFZS=n}loadfile(){if(this.Keym!="OW_JPS_EEngin_001")return;const{TowerNodes:t,connections:n}=Mx(this.TowerFZS.towerFZinfo);this.TowerNodes=t,this.connections=n,this.displacementData=Ux(this.TowerFZS.towerDisFile);debugger}loadFZTower(){if(this.Keym!="OW_JPS_EEngin_001")return;let t=new He(S.toRadians(this.TowerFZS.RollX),this.TowerFZS.RollY,this.TowerFZS.RollZ);const n=u.fromDegrees(this.TowerFZS.Longitude,this.TowerFZS.Latitude,this.TowerFZS.Altitude);this.connections.forEach(i=>{const o=this.TowerNodes.find(h=>h.id===i.from),a=this.TowerNodes.find(h=>h.id===i.to),r=[],f=new u(o==null?void 0:o.x,o==null?void 0:o.y,o==null?void 0:o.z);r.push(Q(n,f,t)),this.entityCollection2.add(Pa(this.viewer,r[0],(o==null?void 0:o.id)+"",{pointColor:I.RED,labelColor:I.GOLD,fontSize:18,pixelOffset:[0,-30]}));const c=new u(a==null?void 0:a.x,a==null?void 0:a.y,a==null?void 0:a.z);r.push(Q(n,c,t)),this.entityCollection2.add(Pa(this.viewer,r[1],(a==null?void 0:a.id)+"",{pointColor:I.RED,labelColor:I.GOLD,fontSize:18,pixelOffset:[0,-30]})),this.entityCollection2.add(v(r,i.from+""+i.to,this.TowerFZS.TowerMembersWidth,this.TowerFZS.TowerMemberColor))})}loadFZDISTower(t){if(this.Keym!=="OW_JPS_EEngin_001")return;const i=B0(this.displacementData)[t];debugger;if(!i){console.warn(`未找到时间步 ${t} 的位移数据`);return}const o=new He(S.toRadians(this.TowerFZS.RollX),this.TowerFZS.RollY,this.TowerFZS.RollZ),a=u.fromDegrees(this.TowerFZS.Longitude,this.TowerFZS.Latitude,this.TowerFZS.Altitude);this.connections.forEach(r=>{const f=this.TowerNodes.find(E=>E.id===r.from),c=this.TowerNodes.find(E=>E.id===r.to);if(!f||!c){console.warn(`找不到连接 ${r.from}->${r.to} 的节点`);return}debugger;const h=i.find(E=>E.nodeId===r.from),d=i.find(E=>E.nodeId===r.to);if(!h||!d){console.warn(`找不到连接 ${r.from}->${r.to} 的位移数据`);return}const p=new u(f.x-h.x,f.y-h.y,f.z-h.z),m=new u(c.x-d.x,c.y-d.y,c.z-d.z),T=Q(a,p,o);this.entityCollection2.add(Pa(this.viewer,T,r.from+"",{pointColor:I.RED,labelColor:I.GOLD,fontSize:18,pixelOffset:[0,-30]}));const y=Q(a,m,o);this.entityCollection2.add(Pa(this.viewer,y,r.to+"",{pointColor:I.RED,labelColor:I.GOLD,fontSize:18,pixelOffset:[0,-30]}));const w=[T,y],A=`${r.from}_${r.to}`;debugger;this.entityCollection2.add(v(w,A+t,this.TowerFZS.TowerMembersWidth,"#ffffff"))})}loadFZDISTower1(t){if(this.Keym!="OW_JPS_EEngin_001")return;const n=B0(this.displacementData);let i=new He(S.toRadians(this.TowerFZS.RollX),this.TowerFZS.RollY,this.TowerFZS.RollZ);const o=u.fromDegrees(this.TowerFZS.Longitude,this.TowerFZS.Latitude,this.TowerFZS.Altitude);this.connections.forEach(a=>{const r=this.TowerNodes.find(T=>T.id===a.from),f=n[t].find(T=>T.nodeId===a.from),c=this.TowerNodes.find(T=>T.id===a.to),h=n[t].find(T=>T.nodeId===a.to),d=[],p=new u(r.x-f.x,r.y-f.y,r.z-f.z);d.push(Q(o,p,i));const m=new u(c.x-h.x,c.y-h.y,c.z-h.z);d.push(Q(o,m,i));debugger;this.entityCollection2.add(v(d,a.from+""+a.to,this.TowerFZS.TowerMembersWidth,this.TowerFZS.TowerMemberColor))})}loadAllFZDisTower(){if(this.Keym!=="OW_JPS_EEngin_001")return;if(!this.displacementData||this.displacementData.length===0){console.warn("没有可用的位移数据");return}let t=1;const n=this.displacementData.length;this._animationInterval&&(clearInterval(this._animationInterval),this._animationInterval=null);const i=()=>{if(this.viewer.dataSources.contains(this.dataSource2)&&this.viewer.dataSources.remove(this.dataSource2,!0),t>n){t=1;return}this.dataSource2=new rr("fztower"),this.entityCollection2=this.dataSource2.entities;try{this.loadFZDISTower(t),this.loadFZModel(),console.log(`正在显示位移帧: ${t}/${n}`),t++}catch(o){console.error("加载位移帧时出错:",o),this._animationInterval&&(clearInterval(this._animationInterval),this._animationInterval=null)}};i(),this._animationInterval=setInterval(i,300)}stopDisplacementAnimation(){this._animationInterval&&(clearInterval(this._animationInterval),this._animationInterval=null)}toggleAnimation(t){t?this.stopDisplacementAnimation():this.loadAllFZDisTower()}loadFZModel(){this.Keym=="OW_JPS_EEngin_001"&&(this.viewer.dataSources.add(this.dataSource2),this.viewer.entities.show)}setFZModelVisible(t){this.Keym=="OW_JPS_EEngin_001"&&(this.entityCollection2.show=t)}RemoveFZModel(){this.Keym=="OW_JPS_EEngin_001"&&(this.viewer.dataSources.remove(this.dataSource2),this.entityCollection2.show=!1)}}it.GUAPoint=Lx,it.InsulatorInfo=zx,it.InsulatorType=Ht,it.LineNum=ar,it.LineType=P0,it.OWEEgineFZManager=kx,it.OWEEgineManager=Nx,it.PhaseSType=nn,it.TowerFZInfo=Fx,it.TowerInfo=Rx,it.TowerLineInfo=Bx,it.TowerType=$i,it.WairnumType=$,it.drawModel=go,Object.defineProperty(it,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ow-eengine-power",
   "private": false,
-  "version": "1.2.3",
+  "version": "2.0.1",
   "type": "module",
   "files": [
     "dist",