Skip to content

Commit a8a4427

Browse files
IsakNaslundBhFraser Greenroyd
IsakNaslundBh
authored and
Fraser Greenroyd
committed
Align with changes in Structure_Engine
1 parent e13473e commit a8a4427

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎RAM_Adapter/Convert/ToBHoM.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ public static Bar ToBHoMObject(this IColumn ramColumn)
207207
SCoordinate startPt = new SCoordinate();
208208
SCoordinate endPt = new SCoordinate();
209209
ramColumn.GetEndCoordinates(ref startPt, ref endPt);
210-
Node startNode = Engine.Structure.Create.Node(startPt.PointFromRAM());
211-
Node endNode = Engine.Structure.Create.Node(endPt.PointFromRAM());
210+
Node startNode = new Node { Position = startPt.PointFromRAM() };
211+
Node endNode = new Node { Position = endPt.PointFromRAM() };
212212

213213
//Assign section property per bar
214214
string sectionName = ramColumn.strSectionLabel;
@@ -263,8 +263,8 @@ public static Bar ToBHoMObject(this IBeam ramBeam, ILayoutBeam ramLayoutBeam, do
263263
SCoordinate startPt = new SCoordinate();
264264
SCoordinate endPt = new SCoordinate();
265265
ramBeam.GetCoordinates(EBeamCoordLoc.eBeamEnds, ref startPt, ref endPt);
266-
Node startNode = Engine.Structure.Create.Node(startPt.PointFromRAM());
267-
Node endNode = Engine.Structure.Create.Node(endPt.PointFromRAM());
266+
Node startNode = new Node { Position = startPt.PointFromRAM() };
267+
Node endNode = new Node { Position = endPt.PointFromRAM() };
268268

269269
//Assign section property per bar
270270
string sectionName = ramBeam.strSectionLabel;
@@ -364,8 +364,8 @@ public static Bar ToBHoMObject(this IVerticalBrace ramVerticalBrace)
364364
SCoordinate startPt = new SCoordinate();
365365
SCoordinate endPt = new SCoordinate();
366366
ramVerticalBrace.GetEndCoordinates(ref startPt, ref endPt);
367-
Node startNode = Engine.Structure.Create.Node(startPt.PointFromRAM());
368-
Node endNode = Engine.Structure.Create.Node(endPt.PointFromRAM());
367+
Node startNode = new Node { Position = startPt.PointFromRAM() };
368+
Node endNode = new Node { Position = endPt.PointFromRAM() };
369369

370370

371371
Bar bhomBar = new Bar { StartNode = startNode, EndNode = endNode, SectionProperty = sectionProperty, Name = sectionName };
@@ -410,8 +410,8 @@ public static Bar ToBHoMObject(IHorizBrace ramHorizBrace, ILayoutHorizBrace ramL
410410

411411
// Get coordinates from ILayout Brace
412412
ramLayoutHorizBrace.GetLayoutCoordinates(out StartSupportX, out StartSupportY, out StartSupportZOffset, out EndSupportX, out EndSupportY, out EndSupportZOffset);
413-
Node startNode = Engine.Structure.Create.Node(new oM.Geometry.Point() { X = StartSupportX.FromInch(), Y = StartSupportY.FromInch(), Z = StoryZ.FromInch() + StartSupportZOffset.FromInch() });
414-
Node endNode = Engine.Structure.Create.Node(new oM.Geometry.Point() { X = EndSupportX.FromInch(), Y = EndSupportY.FromInch(), Z = StoryZ.FromInch() + EndSupportZOffset.FromInch() });
413+
Node startNode = new Node { Position = new oM.Geometry.Point() { X = StartSupportX.FromInch(), Y = StartSupportY.FromInch(), Z = StoryZ.FromInch() + StartSupportZOffset.FromInch() } };
414+
Node endNode = new Node { Position = new oM.Geometry.Point() { X = EndSupportX.FromInch(), Y = EndSupportY.FromInch(), Z = StoryZ.FromInch() + EndSupportZOffset.FromInch() } };
415415

416416
Bar bhomBar = new Bar { StartNode = startNode, EndNode = endNode, SectionProperty = sectionProperty, Name = sectionName };
417417

@@ -616,7 +616,7 @@ public static Node ToBHoMObject(this INode ramNode)
616616
SCoordinate location = new SCoordinate();
617617
location = ramNode.sLocation;
618618

619-
Node node = Engine.Structure.Create.Node(location.PointFromRAM());
619+
Node node = new Node { Position = location.PointFromRAM() };
620620

621621
IMemberForces IMemberForces = ramNode.GetReactions();
622622

‎RAM_Adapter/Convert/ToRAM.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public static ILayoutBeam ToRAM(this Bar bar, ILayoutBeams iLayoutBeams)
4646
{
4747
ILayoutBeam iLayoutBeam = iLayoutBeams.GetAt(0);
4848

49-
SCoordinate start = bar.StartNode.Position().ToRAM();
50-
SCoordinate end = bar.EndNode.Position().ToRAM();
49+
SCoordinate start = bar.StartNode.Position.ToRAM();
50+
SCoordinate end = bar.EndNode.Position.ToRAM();
5151

5252
//Set support coordinates and name
5353
//CAUTION: different from actual end points and cantilevers hardcoded
@@ -88,7 +88,7 @@ public static IStory GetStory(this Bar bar, StructuralUsage1D usage1D, IStories
8888
{
8989
case StructuralUsage1D.Beam:
9090
//Use lowest end elevation
91-
elev = Math.Min(bar.StartNode.Position().Z, bar.EndNode.Position().Z).ToInch();
91+
elev = Math.Min(bar.StartNode.Position.Z, bar.EndNode.Position.Z).ToInch();
9292
break;
9393
case StructuralUsage1D.Column:
9494
// Get RAM column data
@@ -101,16 +101,16 @@ public static IStory GetStory(this Bar bar, StructuralUsage1D usage1D, IStories
101101

102102
if (isHanging.Equals("True") || isHanging.Equals("1")) //Hanging Column to be placed on its btm level.
103103
{
104-
elev = Math.Min(bar.StartNode.Position().Z, bar.EndNode.Position().Z).ToInch();
104+
elev = Math.Min(bar.StartNode.Position.Z, bar.EndNode.Position.Z).ToInch();
105105
}
106106
else //Column to be placed on the level it supports.
107107
{
108-
elev = Math.Max(bar.StartNode.Position().Z, bar.EndNode.Position().Z).ToInch();
108+
elev = Math.Max(bar.StartNode.Position.Z, bar.EndNode.Position.Z).ToInch();
109109
}
110110
break;
111111
default:
112112
//Use lowest end elevation
113-
elev = Math.Min(bar.StartNode.Position().Z, bar.EndNode.Position().Z).ToInch();
113+
elev = Math.Min(bar.StartNode.Position.Z, bar.EndNode.Position.Z).ToInch();
114114
break;
115115
}
116116

‎RAM_Adapter/Create/Bar.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ private bool CreateCollection(IEnumerable<Bar> bhomBars)
8989
IFloorType ramFloorType = barStory.GetFloorType();
9090
ILayoutBeams ramBeams = ramFloorType.GetLayoutBeams();
9191

92-
double zStart = bar.StartNode.Position().Z.ToInch() - barStory.dElevation;
93-
double zEnd = bar.EndNode.Position().Z.ToInch() - barStory.dElevation;
92+
double zStart = bar.StartNode.Position.Z.ToInch() - barStory.dElevation;
93+
double zEnd = bar.EndNode.Position.Z.ToInch() - barStory.dElevation;
9494

9595
// Get beam fragment cantilever data
9696
double startCant = 0;
@@ -109,13 +109,13 @@ private bool CreateCollection(IEnumerable<Bar> bhomBars)
109109
SCoordinate startPt, endPt;
110110
if (startCant > 0) // Ensure startPt corresponds with support point
111111
{
112-
startPt = bar.EndNode.Position().ToRAM();
113-
endPt = bar.StartNode.Position().ToRAM();
112+
startPt = bar.EndNode.Position.ToRAM();
113+
endPt = bar.StartNode.Position.ToRAM();
114114
}
115115
else
116116
{
117-
startPt = bar.StartNode.Position().ToRAM();
118-
endPt = bar.EndNode.Position().ToRAM();
117+
startPt = bar.StartNode.Position.ToRAM();
118+
endPt = bar.EndNode.Position.ToRAM();
119119
}
120120

121121
ramBeam = ramBeams.AddStubCantilever(bar.SectionProperty.Material.ToRAM(), startPt.dXLoc, startPt.dYLoc, 0, endPt.dXLoc, endPt.dYLoc, 0); // No Z offsets, beams flat on closest story
@@ -124,8 +124,8 @@ private bool CreateCollection(IEnumerable<Bar> bhomBars)
124124
{
125125
// Get support points
126126
Vector barDir = bar.Tangent(true);
127-
Point startSupPt = BH.Engine.Geometry.Modify.Translate(bar.StartNode.Position(), barDir * startCant);
128-
Point endSupPt = BH.Engine.Geometry.Modify.Translate(bar.EndNode.Position(), -barDir * endCant);
127+
Point startSupPt = BH.Engine.Geometry.Modify.Translate(bar.StartNode.Position, barDir * startCant);
128+
Point endSupPt = BH.Engine.Geometry.Modify.Translate(bar.EndNode.Position, -barDir * endCant);
129129
SCoordinate start = startSupPt.ToRAM();
130130
SCoordinate end = endSupPt.ToRAM();
131131

‎RAM_Adapter/Update/Bar.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ protected bool Update(IEnumerable<Bar> bars)
6363
ILayoutColumn ILayoutColumn = IModel.GetLayoutColumn(ID);
6464

6565
// Move column
66-
double xStart = bar.StartNode.Position().X;
67-
double yStart = bar.StartNode.Position().Y;
68-
double zStart = bar.StartNode.Position().Z;
69-
double xEnd = bar.EndNode.Position().X;
70-
double yEnd = bar.EndNode.Position().Y;
71-
double zEnd = bar.EndNode.Position().Z;
66+
double xStart = bar.StartNode.Position.X;
67+
double yStart = bar.StartNode.Position.Y;
68+
double zStart = bar.StartNode.Position.Z;
69+
double xEnd = bar.EndNode.Position.X;
70+
double yEnd = bar.EndNode.Position.Y;
71+
double zEnd = bar.EndNode.Position.Z;
7272

7373
// Need level rather than offset for setting (still in progress)
7474
ILayoutColumn.SetLayoutCoordinates2(xStart, yStart, zStart, xEnd, yEnd, zEnd);

0 commit comments

Comments
 (0)