minute fixes

Mathias-Fuchs · Dec 24, 2021 · b102b66 · b102b66
1 parent 4354fb6
commit b102b66
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 20 deletions.
diff --git a/MinSurfaceGH/MinSurfaceComponent.cs b/MinSurfaceGH/MinSurfaceComponent.cs
@@ -13,7 +13,7 @@ public class MinSurfaceComponent : GH_Component
 
         public MinSurfaceComponent()
           : base("MiniTwo", "minitwo",
-              "Computes an approximate minimal surface (soap film) inside one or two closed curves.",
+              "Computes an approximate minimal surface (soap film) inside two closed curves.",
               "MinSurface", "Geometry")
         { }
 
@@ -36,7 +36,7 @@ protected override void RegisterInputParams(GH_Component.GH_InputParamManager pM
             pManager.AddIntegerParameter("nrVerticesAround (optional)", "nrVerticesAround", "number of vertices around the cylinder.", GH_ParamAccess.item, 18);
             pManager.AddIntegerParameter("Degree (optional)", "degree", "degree of the surface.", GH_ParamAccess.item, 0);
 
-            pManager.AddAngleParameter("Rotation angle of one of the curves around itself (optional)", "roationAngle", "rotation angle of the curves around itself", GH_ParamAccess.item, 0);
+            pManager.AddAngleParameter("Rotation angle of one of the curves around itself (optional)", "rotationAngle", "rotation angle of the curves around itself", GH_ParamAccess.item, 0);
 
             pManager.AddBooleanParameter("Flip one curve (optional)", "flip", "flip one curve? try this to prevent self-intersection.", GH_ParamAccess.item, false);
 
@@ -94,8 +94,8 @@ protected override void SolveInstance(IGH_DataAccess DA)
             System.Diagnostics.FileVersionInfo fvi = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location);
             string version = fvi.FileVersion;
             Rhino.RhinoApp.WriteLine("Minimal surface component, version " + version);
-            Rhino.RhinoApp.WriteLine("GPL licensed, source: https://github.com/Mathias-Fuchs/MinimalSurface");
-            Rhino.RhinoApp.WriteLine("C Mathias Fuchs, https://mathiasfuchs.com");
+            Rhino.RhinoApp.WriteLine("GPLv3 licensed, source: https://github.com/Mathias-Fuchs/MinimalSurface");
+            Rhino.RhinoApp.WriteLine("Copyright Mathias Fuchs 2020 - 2021, https://mathiasfuchs.com");
 
 
             // the input curve

diff --git a/MinSurfaceGH/MinSurfaceComponentOneBoundaryComponent.cs b/MinSurfaceGH/MinSurfaceComponentOneBoundaryComponent.cs
@@ -12,18 +12,10 @@ public class MinSurfaceComponentOneBoundaryComponent : GH_Component
     {
         public MinSurfaceComponentOneBoundaryComponent()
           : base("MiniOne", "miniOne",
-              "Computes an approximate minimal surface (soap film) inside one given closed curves.",
-              "Mathias", "Geometry")
-        {
-        }
+              "Computes an approximate minimal surface (soap film) inside a closed curve.",
+              "MinSurface", "Geometry") {}
 
-        public override Guid ComponentGuid
-        {
-            get
-            {
-                return new Guid("A857FF66-CD2E-4AEA-850A-555CBFE5D762");
-            }
-        }
+        public override Guid ComponentGuid => new Guid("A857FF66-CD2E-4AEA-850A-555CBFE5D762");
 
         protected override void RegisterInputParams(GH_Component.GH_InputParamManager pManager)
         {
@@ -35,7 +27,7 @@ protected override void RegisterInputParams(GH_Component.GH_InputParamManager pM
 
             pManager.AddIntegerParameter("nrVerticesBoundary", "nrVerticesBoundary", "number of vertices along the boundary.", GH_ParamAccess.item, 300);
             pManager.AddIntegerParameter("Degree (optional)", "degree", "degree of the surface.", GH_ParamAccess.item, 0);
-            pManager.AddAngleParameter("Rotation angle of one of the curves around itself (optional)", "roationAngle", "rotation angle of the curves around itself", GH_ParamAccess.item, 0);
+            pManager.AddAngleParameter("Rotation angle of the curve (optional)", "rotationAngle", "rotation angle of the curve", GH_ParamAccess.item, 0);
 
         }
 
@@ -46,6 +38,13 @@ protected override void RegisterOutputParams(GH_Component.GH_OutputParamManager
 
         protected override void SolveInstance(IGH_DataAccess DA)
         {
+            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            System.Diagnostics.FileVersionInfo fvi = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location);
+            string version = fvi.FileVersion;
+            Rhino.RhinoApp.WriteLine("Minimal surface component, version " + version);
+            Rhino.RhinoApp.WriteLine("GPLv3 licensed, source: https://github.com/Mathias-Fuchs/MinimalSurface");
+            Rhino.RhinoApp.WriteLine("Copyright Mathias Fuchs 2020 - 2021, https://mathiasfuchs.com");
+
             Curve tc = null;
             int nrBoundaryVertices = 0;
             int degree = 0;
@@ -100,8 +99,15 @@ protected override void SolveInstance(IGH_DataAccess DA)
                 );
 
             // bottleneck            
+            MMM.Vertices.Capacity = MM.Vertices.Count;
             MMM.Vertices.AddVertices(mvl);
+            MMM.Faces.Capacity = MM.Faces.Count;
             MMM.Faces.AddFaces(MM.Faces);
+
+            if (MMM.Faces.GetClashingFacePairs(1).Any())
+                this.AddRuntimeMessage(
+                    GH_RuntimeMessageLevel.Warning,
+                    "The resulting mesh has self-intersections. Modifying the rotation angle input parameter can solve this.");
             DA.SetData(0, MMM);
         }
 

diff --git a/MinSurfaceGH/MinSurfacev7GH.csproj b/MinSurfaceGH/MinSurfacev7GH.csproj
@@ -19,15 +19,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\AppData\Roaming\McNeel\Rhinoceros\packages\7.0\MinSurface\0.1.3.5\</OutputPath>
+    <OutputPath>..\..\..\..\AppData\Roaming\McNeel\Rhinoceros\packages\7.0\MinSurface\0.1.3.6\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\..\AppData\Roaming\McNeel\Rhinoceros\packages\7.0\MinSurface\0.1.3.5\</OutputPath>
+    <OutputPath>..\..\..\..\AppData\Roaming\McNeel\Rhinoceros\packages\7.0\MinSurface\0.1.3.6\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/MinSurfaceGH/Properties/AssemblyInfo.cs b/MinSurfaceGH/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //      Revision
 //
 
-[assembly: AssemblyVersion("0.1.3.5")]
+[assembly: AssemblyVersion("0.1.3.6")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/printOccuringVersions.ps1 b/printOccuringVersions.ps1
@@ -14,4 +14,7 @@ ForEach($file in $files) {
     Write-Host $file -ForegroundColor Green;
     (Get-Content $file) | Select-String -Pattern "0.1" | Write;
 }
-
+
+Write-Host "Gha assembly:" -ForegroundColor Green;
+
+(Get-Item yakpackage\*.gha).VersionInfo | Write-Output;
diff --git a/publishedversion.txt b/publishedversion.txt