arc lines fixed

diego-apellaniz · Nov 5, 2021 · c37fe91 · c37fe91
1 parent 0da066e
commit c37fe91
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 8 deletions.
diff --git a/Examples/08 - Optimization/08 Parametric FEM Toolbox - Optimization.rf5 b/Examples/08 - Optimization/08 Parametric FEM Toolbox - Optimization.rf5
diff --git a/Examples/10 - LCA/10 Parametric FEM Toolbox - LCA.rf5 b/Examples/10 - LCA/10 Parametric FEM Toolbox - LCA.rf5
diff --git a/Parametric_FEM_Toolbox/.vs/Parametric_FEM_Toolbox/v15/.suo b/Parametric_FEM_Toolbox/.vs/Parametric_FEM_Toolbox/v15/.suo
diff --git a/Parametric_FEM_Toolbox/.vs/Parametric_FEM_Toolbox/v16/.suo b/Parametric_FEM_Toolbox/.vs/Parametric_FEM_Toolbox/v16/.suo
diff --git a/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/GUI/SubComponent_RFSurface_Assemble_GUI.cs b/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/GUI/SubComponent_RFSurface_Assemble_GUI.cs
@@ -132,8 +132,9 @@ public override void SolveInstance(IGH_DataAccess DA, out string msg, out GH_Run
             var axesLines = 0;
             Point3d pt1 = new Point3d();
             Point3d pt2 = new Point3d();
-            int csNo = 0;
+
             var rot = 0.0;
+            int csNo = 0;
 
             if (DA.GetData(13, ref inRFEM))
             {

diff --git a/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/HelperLibraries/Component_RFLine.cs b/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/HelperLibraries/Component_RFLine.cs
@@ -21,7 +21,7 @@ public static void SetGeometry(Curve curve, ref RFLine rFLine)
                 inControlPoints.Add(pt.Location);
             }
             rFLine.ControlPoints = inControlPoints.ToArray();
-            if (curve.Degree > 1 && !curve.IsArc() )
+            if (curve.Degree > 1 && !(curve.IsArc() && rFLine.ControlPoints.Length >= 5)) // if curve has less that 5 control points it wil be treated as NURBS regardless
                 {
                 var inWeights = new double[myNurbs.Points.Count];
                 var myKnots = new double[curve.Degree + myNurbs.Points.Count + 1];

diff --git a/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox.cs b/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox.cs
@@ -26,7 +26,7 @@ public override string Description
             get
             {
                 //Return a short string describing the purpose of this GHA library.
-                return "This Plug-In enables a functional interoperability between the FEM software RFEM and" +
+                return "This Plug-In enables a functional interoperability between the FEM software RFEM and " +
                     "Grasshopper. Thus, the full potential of Grasshopper can be used to manipulate existing" +
                     " RFEM - Models and get data from them.";
             }
@@ -59,7 +59,7 @@ public override string AssemblyVersion
         {
             get
             {
-                return "1.4.0";
+                return "1.4.1";
             }
         }
     }

diff --git a/...ric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Parametric_FEM_Toolbox-RAZER-DAQ.gha b/...ric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Parametric_FEM_Toolbox-RAZER-DAQ.gha
diff --git a/...ric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Parametric_FEM_Toolbox-RAZER-DAQ.pdb b/...ric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Parametric_FEM_Toolbox-RAZER-DAQ.pdb
diff --git a/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Parametric_FEM_Toolbox.gha b/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Parametric_FEM_Toolbox.gha
diff --git a/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Parametric_FEM_Toolbox.pdb b/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Parametric_FEM_Toolbox.pdb
diff --git a/...etric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Rhino 6/Parametric_FEM_Toolbox.gha b/...etric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Rhino 6/Parametric_FEM_Toolbox.gha
diff --git a/...EM_Toolbox/Parametric_FEM_Toolbox/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache b/...EM_Toolbox/Parametric_FEM_Toolbox/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/...olbox/Parametric_FEM_Toolbox/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/...olbox/Parametric_FEM_Toolbox/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/...arametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.csproj.CoreCompileInputs.cache b/...arametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-3797d02ba7ac9b78c487a2ddad733662b0d31f51
+3a8596a949ba9715023ef65a9ddb74f03054267b
diff --git a/...x/Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.csproj.FileListAbsolute.txt b/...x/Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.csproj.FileListAbsolute.txt
@@ -50,9 +50,6 @@ D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FE
 D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\obj\x64\Debug\Parametric_FEM_Toolbox.csproj.CopyComplete
 D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\obj\x64\Debug\Parametric_FEM_Toolbox.dll
 D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\obj\x64\Debug\Parametric_FEM_Toolbox.pdb
-D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\GH_IO.dll
-D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\Grasshopper.dll
-D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\RhinoCommon.dll
 C:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\obj\x64\Debug\Parametric_FEM_Toolbox.csproj.AssemblyReference.cache
 C:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\GH_IO.dll
 C:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\Grasshopper.dll
@@ -62,3 +59,6 @@ C:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FE
 C:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\GH_IO.xml
 C:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\Grasshopper.xml
 C:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\RhinoCommon.xml
+D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\GH_IO.dll
+D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\Grasshopper.dll
+D:\Users\dapellaniz\OneDrive\Projects\Repos\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\Parametric_FEM_Toolbox\bin\x64\Debug\RhinoCommon.dll
diff --git a/...Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.csproj.GenerateResource.cache b/...Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.csproj.GenerateResource.cache
diff --git a/...Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.csprojAssemblyReference.cache b/...Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.csprojAssemblyReference.cache
diff --git a/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.dll b/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.dll
diff --git a/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.pdb b/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/obj/x64/Debug/Parametric_FEM_Toolbox.pdb
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		3797d02ba7ac9b78c487a2ddad733662b0d31f51
		3a8596a949ba9715023ef65a9ddb74f03054267b