Desktop/HStation.Desktop.Xhs.Core/Program.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydro/Yw.EPAnet.Calcu.Core/04-Inp/InpInteropHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Hydro/Yw.Hydro.Core/ParseHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Desktop/HStation.Desktop.Xhs.Core/Program.cs
@@ -63,7 +63,7 @@ // Yw.FileFolderZipHelper.Zip(@"C:\Users\ZKC\Desktop\循环水用例", @"C:\Users\ZKC\Desktop\循环水用例.ywrvt"); //Yw.FileFolderZipHelper.Zip(@"C:\Users\Eventech\Desktop\循环水用例", @"C:\Users\Eventech\Desktop\循环水用例.ywrvt"); Yw.FileFolderZipHelper.Zip(@"C:\Users\admin\Desktop\居家办公工作\循环水用例", @"C:\Users\admin\Desktop\居家办公工作\循环水用例.ywrvt"); Yw.FileFolderZipHelper.Zip(@"C:\Users\admin\Desktop\居家办公工作\model", @"C:\Users\admin\Desktop\居家办公工作\model.ywrvt"); //var json = RevitTestHelper.GenerateJson(); Hydro/Yw.EPAnet.Calcu.Core/04-Inp/InpInteropHelper.cs
@@ -96,7 +96,8 @@ net.Tanks.ForEach(o => { tankStringBuilder.AppendLine($"{o.Id}\t{o.PoolElev}\t{o.InitLevel}\t{o.MinLevel}\t{o.MaxLevel}\t{o.Diameter}\t{o.MinVol}\t{o.VolCurve}\t{o.Overflow}\t;\t");// + $"0"); // tankStringBuilder.AppendLine($"{o.Id}\t{o.PoolElev}\t{o.InitLevel}\t{o.MinLevel}\t{o.MaxLevel}\t{o.Diameter}\t{o.MinVol}\t{o.VolCurve}\t{o.Overflow}\t;\t");// + $"0"); tankStringBuilder.AppendLine($"{o.Id}\t{o.PoolElev}\t{o.InitLevel}\t{o.MinLevel}\t{o.MaxLevel}\t{o.Diameter}\t{o.MinVol}\t{o.VolCurve}\t;\t");// + $"0"); coorStringBuilder.AppendLine(o.Id + " " + o.Position.X + " " + o.Position.Y); }); string tankString = tankStringBuilder.ToString(); @@ -133,7 +134,7 @@ StringBuilder pumpStringBuilder = new StringBuilder(); pumpStringBuilder.AppendLine(";ID Node1 Node2 Diameter Type Setting MinorLoss "); pumpStringBuilder.AppendLine(";ID Node1 Node2 Parameters "); net.Pumps.ForEach(o => { Hydro/Yw.Hydro.Core/ParseHelper.cs
@@ -246,6 +246,7 @@ waterboxModel.MinVol = waterbox.MinVol; waterboxModel.VolCurve = waterbox.VolCurve; waterboxModel.Diameter = waterbox.Diameter; waterboxModel.Overflow = waterbox.OverFlow; netWork.Tanks.Add(waterboxModel); } } @@ -326,6 +327,11 @@ pumpModel.LinkStatus = pump.LinkStatus; pumpModel.RatedPower = pump.RatedPower; pumpModel.CurveQH = pump.CurveQH; if (string.IsNullOrEmpty(pumpModel.CurveQH)) { pumpModel.CurveQH = "PumpDefault";//使用network默认泵曲线 } pumpModel.SpeedRatio = pump.SpeedRatio; pumpModel.SpeedRatioPattern = pump.SpeedRatioPattern; pumpModel.Price = pump.Price; WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -228,8 +228,8 @@ return true; } //var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//上传 var bimfaceId = 10000872887098; //测试用例 var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//上传 //var bimfaceId = 10000872887098; //测试用例 if (bimfaceId < 1) { feedBackMsg?.Invoke("Revit模型文件上传失败!!!"); @@ -302,8 +302,8 @@ #region 第十步 发起bimface转换(进度 80%) feedBackMsg?.Invoke("正在进行Bimface模型轻量化..."); // var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//发起转换 var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//测试代码 var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//发起转换 //var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//测试代码 feedBackProgress?.Invoke(100, 60); if (bimfaceTranslateStatus != Yw.BIMFace.eTranslateStatus.Success) {