From 3e4fa61e398cb7c6fa3d0173ebaf740a14992e8c Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 13 八月 2024 16:11:36 +0800
Subject: [PATCH] 主界面修改
---
Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs | 108 ++++++++++++++++++-----------------------------------
1 files changed, 37 insertions(+), 71 deletions(-)
diff --git a/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs b/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs
index 4e47512..4807b3e 100644
--- a/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs
+++ b/Service/HStation.Service.Revit.Core/04-service/01-json/RevitJsonHelper.cs
@@ -550,6 +550,43 @@
model.Hydrants.Add(hydrant);
}
break;
+ case RevitJsonCatalog.Exchanger:
+ {
+ var exchanger = new Model.RevitExchanger();
+ exchanger.Id = jobject[RevitJsonProp.Id].ToString();
+ exchanger.Code = jobject[RevitJsonProp.Code].ToString();
+ if (string.IsNullOrEmpty(exchanger.Code))
+ {
+ exchanger.Code = exchanger.Id;
+ }
+ exchanger.Name = jobject[RevitJsonProp.Name].ToString();
+ exchanger.ModelType = jobject[RevitJsonProp.ModelType].ToString();
+ exchanger.Flags = Yw.Untity.FlagsHelper.ToList(jobject[RevitJsonProp.Flags].ToString());
+ exchanger.Description = jobject[RevitJsonProp.Description].ToString();
+ if (jobject[RevitJsonProp.Quality].MatchNumeric(out double quality))
+ {
+ exchanger.Quality = quality;
+ }
+ var linkList = JsonHelper.Json2Object<List<RevitJsonLinkerModel>>(jobject[RevitJsonProp.Links].ToString());
+ var centerPoint = linkList.GetCenterPoint();
+ exchanger.Position = new Model.RevitPosition()
+ {
+ X = centerPoint.X,
+ Y = centerPoint.Y,
+ Z = centerPoint.Z
+ };
+ if (jobject[RevitJsonProp.Elev].MatchNumeric(out double elev))
+ {
+ exchanger.Elev = elev;
+ }
+ if (jobject[RevitJsonProp.Demand].MatchNumeric(out double demand))
+ {
+ exchanger.Demand = demand;
+ }
+ exchanger.DemandPattern = jobject[RevitJsonProp.DemandPattern].ToString();
+ model.Exchangers.Add(exchanger);
+ }
+ break;
case RevitJsonCatalog.Pipe:
{
var pipe = new Model.RevitPipe();
@@ -690,77 +727,6 @@
translation.Roughness = roughness;
}
model.Translations.Add(translation);
- }
- break;
- case RevitJsonCatalog.Exchanger:
- {
- var exchanger = new Model.RevitExchanger();
- exchanger.Id = jobject[RevitJsonProp.Id].ToString();
- exchanger.Code = jobject[RevitJsonProp.Code].ToString();
- if (string.IsNullOrEmpty(exchanger.Code))
- {
- exchanger.Code = exchanger.Id;
- }
- exchanger.Name = jobject[RevitJsonProp.Name].ToString();
- exchanger.ModelType = jobject[RevitJsonProp.ModelType].ToString();
- exchanger.Flags = Yw.Untity.FlagsHelper.ToList(jobject[RevitJsonProp.Flags].ToString());
- exchanger.Description = jobject[RevitJsonProp.Description].ToString();
- var linkList = JsonHelper.Json2Object<List<RevitJsonLinkerModel>>(jobject[RevitJsonProp.Links].ToString());
- var startLinker = linkList.GetStartLinker();
- var endLinker = linkList.GetEndLinker();
- exchanger.StartCode = startLinker.ConnectId;
- exchanger.EndCode = endLinker.ConnectId;
- exchanger.StartPosition = new Model.RevitPosition()
- {
- X = startLinker.Point.X,
- Y = startLinker.Point.Y,
- Z = startLinker.Point.Z
- };
- exchanger.EndPosition = new Model.RevitPosition()
- {
- X = endLinker.Point.X,
- Y = endLinker.Point.Y,
- Z = endLinker.Point.Z
- };
- exchanger.LinkStatus = jobject[RevitJsonProp.LinkStatusPipe].ToString();
- if (jobject[RevitJsonProp.StartElev].MatchNumeric(out double startElev))
- {
- exchanger.StartElev = startElev;
- }
- if (jobject[RevitJsonProp.EndElev].MatchNumeric(out double endElev))
- {
- exchanger.EndElev = endElev;
- }
- if (jobject[RevitJsonProp.StartQuality].MatchNumeric(out double startQuality))
- {
- exchanger.StartQuality = startQuality;
- }
- if (jobject[RevitJsonProp.EndQuality].MatchNumeric(out double endQuality))
- {
- exchanger.EndQuality = endQuality;
- }
-
- if (jobject[RevitJsonProp.Length].MatchNumeric(out double length))
- {
- exchanger.Length = length;
- }
- if (jobject[RevitJsonProp.Diameter].MatchNumeric(out double diameter))
- {
- exchanger.Diameter = diameter;
- }
- else if (jobject[RevitJsonProp.InternalDiameter].MatchNumeric(out double internalDiameter))
- {
- exchanger.Diameter = internalDiameter;
- }
- if (jobject[RevitJsonProp.MinorLoss].MatchNumeric(out double minorLoss))
- {
- exchanger.MinorLoss = minorLoss;
- }
- if (jobject[RevitJsonProp.Roughness].MatchNumeric(out double roughness))
- {
- exchanger.Roughness = roughness;
- }
- model.Exchangers.Add(exchanger);
}
break;
case RevitJsonCatalog.Pump:
--
Gitblit v1.9.3