Skip to content

Commit

Permalink
Merge pull request #166 from arup-group/feature/GSAGH-113-switch-to-n…
Browse files Browse the repository at this point in the history 
…ew-oasysunits

Feature/GSAGH-113 switch to new oasysunits
  • Loading branch information
@tlmnrnhrdt
tlmnrnhrdt authored Sep 26, 2022
2 parents f4c717a + 96ecb00 commit 05eddd1
Show file tree
Hide file tree
Showing 97 changed files with 704 additions and 1,042 deletions.
17 changes: 9 additions & 8 deletions GsaGH/Components/0_Model/CreateModel.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Grasshopper.Kernel;
using Grasshopper.Kernel.Types;
using GsaAPI;
using GsaGH.Parameters;
using System.Linq;
using UnitsNet;
using OasysUnits;
using OasysUnits.Units;

namespace GsaGH.Components
{
Expand Down Expand Up @@ -38,7 +39,7 @@ public override void CreateAttributes()
selecteditems = new List<string>();

// length
//dropdownitems.Add(Enum.GetNames(typeof(UnitsNet.Units.LengthUnit)).ToList());
//dropdownitems.Add(Enum.GetNames(typeof(Units.LengthUnit)).ToList());
dropdownitems.Add(Units.FilteredLengthUnits);
selecteditems.Add(lengthUnit.ToString());

Expand All @@ -54,7 +55,7 @@ public void SetSelected(int i, int j)
// change selected item
selecteditems[i] = dropdownitems[i][j];

lengthUnit = (UnitsNet.Units.LengthUnit)Enum.Parse(typeof(UnitsNet.Units.LengthUnit), selecteditems[i]);
lengthUnit = (LengthUnit)Enum.Parse(typeof(LengthUnit), selecteditems[i]);

// update name of inputs (to display unit on sliders)
(this as IGH_VariableParameterComponent).VariableParameterMaintenance();
Expand All @@ -71,7 +72,7 @@ public void SetAnalysis(List<bool> value)
bool ReMesh;
private void UpdateUIFromSelectedItems()
{
lengthUnit = (UnitsNet.Units.LengthUnit)Enum.Parse(typeof(UnitsNet.Units.LengthUnit), selecteditems[0]);
lengthUnit = (LengthUnit)Enum.Parse(typeof(LengthUnit), selecteditems[0]);

CreateAttributes();
(this as IGH_VariableParameterComponent).VariableParameterMaintenance();
Expand All @@ -90,7 +91,7 @@ private void UpdateUIFromSelectedItems()
"Settings"
});
private bool first = true;
private UnitsNet.Units.LengthUnit lengthUnit = Units.LengthUnitGeometry;
private LengthUnit lengthUnit = Units.LengthUnitGeometry;
string unitAbbreviation;

#endregion
Expand Down Expand Up @@ -468,7 +469,7 @@ public override bool Read(GH_IO.Serialization.GH_IReader reader)
selecteditems = new List<string>();

// set length to meters as this was the only option for old components
lengthUnit = UnitsNet.Units.LengthUnit.Meter;
lengthUnit = LengthUnit.Meter;

dropdownitems.Add(Units.FilteredLengthUnits);
selecteditems.Add(lengthUnit.ToString());
Expand All @@ -487,7 +488,7 @@ public override bool Read(GH_IO.Serialization.GH_IReader reader)
selecteditems = new List<string>();

// set length to meters as this was the only option for old components
lengthUnit = UnitsNet.Units.LengthUnit.Meter;
lengthUnit = LengthUnit.Meter;

dropdownitems.Add(Units.FilteredLengthUnits);
selecteditems.Add(lengthUnit.ToString());
Expand Down
25 changes: 13 additions & 12 deletions GsaGH/Components/0_Model/GetGeometry.cs
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
using System;
using System.Linq;
using System.Collections.Concurrent;
using System.Collections.Generic;
using Grasshopper.Kernel;
using Rhino.Geometry;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using Grasshopper;
using Grasshopper.Kernel;
using Grasshopper.Kernel.Types;
using GsaAPI;
using GsaGH.Parameters;
using System.Threading.Tasks;
using System.Collections.Concurrent;
using UnitsNet;
using Grasshopper;
using OasysUnits;
using OasysUnits.Units;
using Rhino.Geometry;

namespace GsaGH.Components
{
Expand Down Expand Up @@ -45,7 +46,7 @@ public override void CreateAttributes()
selecteditems = new List<string>();

// length
//dropdownitems.Add(Enum.GetNames(typeof(UnitsNet.Units.LengthUnit)).ToList());
//dropdownitems.Add(Enum.GetNames(typeof(Units.LengthUnit)).ToList());
dropdownitems.Add(Units.FilteredLengthUnits);
selecteditems.Add(lengthUnit.ToString());

Expand All @@ -61,7 +62,7 @@ public void SetSelected(int i, int j)
// change selected item
selecteditems[i] = dropdownitems[i][j];

lengthUnit = (UnitsNet.Units.LengthUnit)Enum.Parse(typeof(UnitsNet.Units.LengthUnit), selecteditems[i]);
lengthUnit = (LengthUnit)Enum.Parse(typeof(LengthUnit), selecteditems[i]);

// update name of inputs (to display unit on sliders)
(this as IGH_VariableParameterComponent).VariableParameterMaintenance();
Expand All @@ -70,7 +71,7 @@ public void SetSelected(int i, int j)
}
private void UpdateUIFromSelectedItems()
{
lengthUnit = (UnitsNet.Units.LengthUnit)Enum.Parse(typeof(UnitsNet.Units.LengthUnit), selecteditems[0]);
lengthUnit = (LengthUnit)Enum.Parse(typeof(LengthUnit), selecteditems[0]);

CreateAttributes();
(this as IGH_VariableParameterComponent).VariableParameterMaintenance();
Expand All @@ -88,7 +89,7 @@ private void UpdateUIFromSelectedItems()
"Unit"
});
private bool first = true;
private UnitsNet.Units.LengthUnit lengthUnit = Units.LengthUnitGeometry;
private LengthUnit lengthUnit = Units.LengthUnitGeometry;
string unitAbbreviation;
#region menu override
private enum FoldMode
Expand Down Expand Up @@ -709,7 +710,7 @@ public override bool Read(GH_IO.Serialization.GH_IReader reader)
selecteditems = new List<string>();

// set length to meters as this was the only option for old components
lengthUnit = UnitsNet.Units.LengthUnit.Meter;
lengthUnit = LengthUnit.Meter;

dropdownitems.Add(Units.FilteredLengthUnits);
selecteditems.Add(lengthUnit.ToString());
Expand Down
15 changes: 8 additions & 7 deletions GsaGH/Components/0_Model/GetLoads.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Grasshopper.Kernel;
using GsaAPI;
using GsaGH.Parameters;
using UnitsNet;
using System.Linq;
using OasysUnits;
using OasysUnits.Units;

namespace GsaGH.Components
{
Expand Down Expand Up @@ -37,7 +38,7 @@ public override void CreateAttributes()
selecteditems = new List<string>();

// length
//dropdownitems.Add(Enum.GetNames(typeof(UnitsNet.Units.LengthUnit)).ToList());
//dropdownitems.Add(Enum.GetNames(typeof(Units.LengthUnit)).ToList());
dropdownitems.Add(Units.FilteredLengthUnits);
selecteditems.Add(lengthUnit.ToString());

Expand All @@ -53,7 +54,7 @@ public void SetSelected(int i, int j)
// change selected item
selecteditems[i] = dropdownitems[i][j];

lengthUnit = (UnitsNet.Units.LengthUnit)Enum.Parse(typeof(UnitsNet.Units.LengthUnit), selecteditems[i]);
lengthUnit = (LengthUnit)Enum.Parse(typeof(LengthUnit), selecteditems[i]);

// update name of inputs (to display unit on sliders)
(this as IGH_VariableParameterComponent).VariableParameterMaintenance();
Expand All @@ -63,7 +64,7 @@ public void SetSelected(int i, int j)
}
private void UpdateUIFromSelectedItems()
{
lengthUnit = (UnitsNet.Units.LengthUnit)Enum.Parse(typeof(UnitsNet.Units.LengthUnit), selecteditems[0]);
lengthUnit = (LengthUnit)Enum.Parse(typeof(LengthUnit), selecteditems[0]);

CreateAttributes();
(this as IGH_VariableParameterComponent).VariableParameterMaintenance();
Expand All @@ -81,7 +82,7 @@ private void UpdateUIFromSelectedItems()
"Unit"
});
private bool first = true;
private UnitsNet.Units.LengthUnit lengthUnit = Units.LengthUnitGeometry;
private LengthUnit lengthUnit = Units.LengthUnitGeometry;
string unitAbbreviation;
#endregion

Expand Down Expand Up @@ -163,7 +164,7 @@ public override bool Read(GH_IO.Serialization.GH_IReader reader)
selecteditems = new List<string>();

// set length to meters as this was the only option for old components
lengthUnit = UnitsNet.Units.LengthUnit.Meter;
lengthUnit = LengthUnit.Meter;

dropdownitems.Add(Units.FilteredLengthUnits);
selecteditems.Add(lengthUnit.ToString());
Expand Down
19 changes: 10 additions & 9 deletions GsaGH/Components/1_Properties/CreateOffset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
using System.Collections.Generic;
using Grasshopper.Kernel;
using GsaGH.Parameters;
using UnitsNet;
using OasysUnits;
using System.Linq;
using OasysUnits.Units;

namespace GsaGH.Components
{
Expand Down Expand Up @@ -36,7 +37,7 @@ public override void CreateAttributes()
selecteditems = new List<string>();

// length
//dropdownitems.Add(Enum.GetNames(typeof(UnitsNet.Units.LengthUnit)).ToList());
//dropdownitems.Add(Enum.GetNames(typeof(Units.LengthUnit)).ToList());
dropdownitems.Add(Units.FilteredLengthUnits);
selecteditems.Add(lengthUnit.ToString());

Expand All @@ -53,7 +54,7 @@ public void SetSelected(int i, int j)
// change selected item
selecteditems[i] = dropdownitems[i][j];

lengthUnit = (UnitsNet.Units.LengthUnit)Enum.Parse(typeof(UnitsNet.Units.LengthUnit), selecteditems[i]);
lengthUnit = (LengthUnit)Enum.Parse(typeof(LengthUnit), selecteditems[i]);

// update name of inputs (to display unit on sliders)
(this as IGH_VariableParameterComponent).VariableParameterMaintenance();
Expand All @@ -64,7 +65,7 @@ public void SetSelected(int i, int j)

private void UpdateUIFromSelectedItems()
{
lengthUnit = (UnitsNet.Units.LengthUnit)Enum.Parse(typeof(UnitsNet.Units.LengthUnit), selecteditems[0]);
lengthUnit = (LengthUnit)Enum.Parse(typeof(LengthUnit), selecteditems[0]);

CreateAttributes();
(this as IGH_VariableParameterComponent).VariableParameterMaintenance();
Expand All @@ -85,7 +86,7 @@ private void UpdateUIFromSelectedItems()
"Measure"
});
private bool first = true;
private UnitsNet.Units.LengthUnit lengthUnit = GsaGH.Units.LengthUnitGeometry;
private LengthUnit lengthUnit = GsaGH.Units.LengthUnitGeometry;
string unitAbbreviation;
protected override void RegisterInputParams(GH_InputParamManager pManager)
{
Expand All @@ -111,10 +112,10 @@ protected override void SolveInstance(IGH_DataAccess DA)
{
GsaOffset offset = new GsaOffset
{
X1 = GetInput.Length(this, DA, 0, lengthUnit, true),
X2 = GetInput.Length(this, DA, 1, lengthUnit, true),
Y = GetInput.Length(this, DA, 2, lengthUnit, true),
Z = GetInput.Length(this, DA, 3, lengthUnit, true)
X1 = GetInput.GetLength(this, DA, 0, lengthUnit, true),
X2 = GetInput.GetLength(this, DA, 1, lengthUnit, true),
Y = GetInput.GetLength(this, DA, 2, lengthUnit, true),
Z = GetInput.GetLength(this, DA, 3, lengthUnit, true)
};

DA.SetData(0, new GsaOffsetGoo(offset));
Expand Down
Loading

0 comments on commit 05eddd1

Please sign in to comment.