Bug fixes

DavidVeld · Apr 19, 2024 · 53e6e77 · 53e6e77
1 parent 5e1c6e1
commit 53e6e77
Show file tree

Hide file tree

Showing 7 changed files with 398 additions and 9 deletions.
diff --git a/CarboCroc/CarboCroc.csproj b/CarboCroc/CarboCroc.csproj
@@ -36,11 +36,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="GH_IO">
-      <HintPath>..\..\..\..\Program Files\Rhino 6\Plug-ins\Grasshopper\GH_IO.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files\Rhino 7\Plug-ins\Grasshopper\GH_IO.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Grasshopper">
-      <HintPath>..\..\..\..\Program Files\Rhino 6\Plug-ins\Grasshopper\Grasshopper.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Program Files\Rhino 7\Plug-ins\Grasshopper\Grasshopper.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="PresentationCore" />

diff --git a/CarboLifeAPI/Data/CarboGroup.cs b/CarboLifeAPI/Data/CarboGroup.cs
@@ -334,8 +334,8 @@ private string GetDescription(CarboElement carboElement)
             if (carboElement.isExisting == true && carboElement.isDemolished == false)
                 prefix = "Existing ";
 
-            if (carboElement.isSubstructure == true)
-                suffix = " (Substructure)";
+//            if (carboElement.isSubstructure == true)
+//               suffix = " (Substructure)";
 
             result = prefix + carboElement.Category + suffix;
 
@@ -628,7 +628,7 @@ internal void getDescription(CarboGroupSettings importSettings)
             //check if substructure note is required.
             if (importSettings.IncludeSubStructure == true && isSubstructure==true)
             {
-                description += "(Substructure)";
+                description += " (Substructure)";
             }
 
             if (importSettings.IncludeAdditionalParameter == true && additionalData != "")

diff --git a/CarboLifeAPI/Data/CarboProject.cs b/CarboLifeAPI/Data/CarboProject.cs
@@ -2120,6 +2120,11 @@ private CarboGroup getRCGroup(CarboGroup grp, CarboMaterial reinforcementMateria
             result.Category = "Reinforcement";
             result.Description = grp.Category + " reinforcement " + rcDensityProperty.Value.ToString() + " kg/m³";
 
+            if (result.isSubstructure == true)
+            {
+                result.Description += "(Substructure)";
+            }
+
             //based on the values set a volume;
             if (grp.AllElements.Count > 0)
             {