Skip to content

Commit

Permalink
fix(*): lib encoding and prop
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonelloDN committed Nov 17, 2023
1 parent e3a5ca6 commit 484819e
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion project/Morpho/Morpho25/Geometry/Building.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class Building : Entity, IEquatable<Building>
/// <summary>
/// Geometry of the building.
/// </summary>
public FaceGroup Geometry { get; }
public FaceGroup Geometry { get; set; }

[JsonIgnore]
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/Morpho25/Geometry/Plant2d.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class Plant2d : Entity, IEquatable<Plant2d>
/// <summary>
/// Geometry of the plant 2D.
/// </summary>
public FaceGroup Geometry { get; }
public FaceGroup Geometry { get; set; }

[JsonIgnore]
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/Morpho25/Geometry/Plant3d.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class Plant3d : Entity, IEquatable<Plant3d>
/// <summary>
/// Geometry of the plant 3D.
/// </summary>
public Vector Geometry { get; }
public Vector Geometry { get; set; }

[DisplayName("Material")]
[Description("Plant3D type")]
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/Morpho25/Geometry/Receptor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class Receptor : Entity, IEquatable<Receptor>
/// <summary>
/// Geometry of the receptor.
/// </summary>
public Vector Geometry { get; }
public Vector Geometry { get; set; }

[JsonIgnore]
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/Morpho25/Geometry/Soil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class Soil : Entity, IEquatable<Soil>
/// <summary>
/// Geometry of the soil.
/// </summary>
public FaceGroup Geometry { get; }
public FaceGroup Geometry { get; set; }

[JsonIgnore]
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/Morpho25/Geometry/Source.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class Source : Entity, IEquatable<Source>
/// <summary>
/// Geometry of the source.
/// </summary>
public FaceGroup Geometry { get; }
public FaceGroup Geometry { get; set; }

[JsonIgnore]
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/Morpho25/Geometry/Terrain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class Terrain : Entity, IEquatable<Terrain>
/// <summary>
/// Geometry of the terrain.
/// </summary>
public FaceGroup Geometry { get; }
public FaceGroup Geometry { get; set; }

[JsonIgnore]
/// <summary>
Expand Down
3 changes: 2 additions & 1 deletion project/Morpho/Morpho25/IO/Library.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ private string GetCompatibleText(string file)
{
string characters = @"[^\s()_<>/,\.A-Za-z0-9=""\P{IsBasicLatin}]+";

Encoding iso = Encoding.GetEncoding("ISO-8859-1");
if (!System.IO.File.Exists(file))
throw new Exception($"{file} not found.");
string text = System.IO.File.ReadAllText(file);
string text = System.IO.File.ReadAllText(file, iso);
string res = Regex.Replace(text, characters, "");

return res;
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/Morpho25/Morpho25.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>Morpho25</AssemblyName>
<Authors>AntonelloDN</Authors>
<Company>ENVI-met GmbH</Company>
<Version>2.0.0</Version>
<Version>2.0.1</Version>
<Title>Envimet morpho 25 library</Title>
<Description>Envimet morpho 25 library</Description>
<Configurations>Debug;Release;ReleaseLoc</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/MorphoGeometry/MorphoGeometry.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>MorphoGeometry</AssemblyName>
<Authors>AntonelloDN</Authors>
<Company>ENVI-met GmbH</Company>
<Version>2.0.0</Version>
<Version>2.0.1</Version>
<Title>Envimet geometry library</Title>
<Description>Envimet geometry library</Description>
<Configurations>Debug;Release;ReleaseLoc</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/MorphoReader/MorphoReader.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Company>ENVI-met GmbH</Company>
<PackageId>Morpho.Envimet</PackageId>
<Product>Morpho.Envimet</Product>
<Version>2.0.0</Version>
<Version>2.0.1</Version>
<Title>Envimet libraries</Title>
<PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>
<Copyright>Copyright © 2022 Antonello Di Nunzio</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion project/Morpho/MorphoRhino/MorphoRhino.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>MorphoRhino</AssemblyName>
<Authors>AntonelloDN</Authors>
<Company>ENVI-met GmbH</Company>
<Version>2.0.0</Version>
<Version>2.0.1</Version>
<Title>Envimet rhino library</Title>
<Description>Envimet rhino library</Description>

Expand Down

0 comments on commit 484819e

Please sign in to comment.