From 183f071a939d4c900e22444ce569562354a7a8e2 Mon Sep 17 00:00:00 2001 From: DomCR Date: Tue, 24 Sep 2024 15:55:08 +0200 Subject: [PATCH 1/3] submodule --- src/ACadSharp.Tests/IO/IOTestsBase.cs | 2 +- src/CSUtilities | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ACadSharp.Tests/IO/IOTestsBase.cs b/src/ACadSharp.Tests/IO/IOTestsBase.cs index 608165a8..abd0887d 100644 --- a/src/ACadSharp.Tests/IO/IOTestsBase.cs +++ b/src/ACadSharp.Tests/IO/IOTestsBase.cs @@ -97,7 +97,7 @@ protected static void loadSamples(string folder, string ext, TheoryData Date: Tue, 24 Sep 2024 16:14:09 +0200 Subject: [PATCH 2/3] submodules fix --- src/ACadSharp/IO/DXF/DxfStreamReader/DxfSectionReaderBase.cs | 2 +- src/ACadSharp/IO/DXF/DxfStreamReader/DxfTablesSectionReader.cs | 2 +- src/ACadSharp/MathUtils.cs | 2 +- src/ACadSharp/Tables/DimensionStyle.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ACadSharp/IO/DXF/DxfStreamReader/DxfSectionReaderBase.cs b/src/ACadSharp/IO/DXF/DxfStreamReader/DxfSectionReaderBase.cs index 26030894..d303be4e 100644 --- a/src/ACadSharp/IO/DXF/DxfStreamReader/DxfSectionReaderBase.cs +++ b/src/ACadSharp/IO/DXF/DxfStreamReader/DxfSectionReaderBase.cs @@ -374,7 +374,7 @@ private bool readDimension(CadEntityTemplate template, DxfMap map, string subcla case 50: var dim = new DimensionLinear(); tmp.SetDimensionObject(dim); - dim.Rotation = CSMath.MathUtils.DegToRad(this._reader.ValueAsDouble); + dim.Rotation = CSMath.Utilities.DegToRad(this._reader.ValueAsDouble); map.SubClasses.Add(DxfSubclassMarker.LinearDimension, DxfClassMap.Create()); return true; case 70: diff --git a/src/ACadSharp/IO/DXF/DxfStreamReader/DxfTablesSectionReader.cs b/src/ACadSharp/IO/DXF/DxfStreamReader/DxfTablesSectionReader.cs index c1978b2a..ec321f9a 100644 --- a/src/ACadSharp/IO/DXF/DxfStreamReader/DxfTablesSectionReader.cs +++ b/src/ACadSharp/IO/DXF/DxfStreamReader/DxfTablesSectionReader.cs @@ -356,7 +356,7 @@ private bool readDimensionStyle(CadTableEntryTemplate template, template.CadObject.FixedExtensionLineLength = this._reader.ValueAsDouble; return true; case 50: - template.CadObject.JoggedRadiusDimensionTransverseSegmentAngle = CSMath.MathUtils.DegToRad(this._reader.ValueAsDouble); + template.CadObject.JoggedRadiusDimensionTransverseSegmentAngle = CSMath.Utilities.DegToRad(this._reader.ValueAsDouble); return true; case 69: template.CadObject.TextBackgroundFillMode = (DimensionTextBackgroundFillMode)this._reader.ValueAsShort; diff --git a/src/ACadSharp/MathUtils.cs b/src/ACadSharp/MathUtils.cs index 75e4c051..e593616a 100644 --- a/src/ACadSharp/MathUtils.cs +++ b/src/ACadSharp/MathUtils.cs @@ -61,7 +61,7 @@ public static XY GetCenter(XY start, XY end, double bulge, out double radius) double gamma = (Math.PI - theta) / 2; double phi = (end - start).GetAngle() + Math.Sign(bulge) * gamma; - return new XY(start.X + radius * CSMath.MathUtils.Cos(phi), start.Y + radius * CSMath.MathUtils.Sin(phi)); + return new XY(start.X + radius * CSMath.Utilities.Cos(phi), start.Y + radius * CSMath.Utilities.Sin(phi)); } /// diff --git a/src/ACadSharp/Tables/DimensionStyle.cs b/src/ACadSharp/Tables/DimensionStyle.cs index d990d726..9a747f47 100644 --- a/src/ACadSharp/Tables/DimensionStyle.cs +++ b/src/ACadSharp/Tables/DimensionStyle.cs @@ -538,7 +538,7 @@ public double JoggedRadiusDimensionTransverseSegmentAngle set { //5 - 90 - if (value < CSMath.MathUtils.DegToRad(5) || value > Math.PI / 2) + if (value < CSMath.Utilities.DegToRad(5) || value > Math.PI / 2) { throw new ArgumentOutOfRangeException(nameof(value), value, $"The {nameof(JoggedRadiusDimensionTransverseSegmentAngle)} must be in range of 5 to 90 degrees."); } From 9db2387c3bd8cdfd1d5e3887d262345ca3b82c7d Mon Sep 17 00:00:00 2001 From: DomCR Date: Tue, 24 Sep 2024 16:25:14 +0200 Subject: [PATCH 3/3] update --- src/CSUtilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CSUtilities b/src/CSUtilities index c42c0e20..0a0a875c 160000 --- a/src/CSUtilities +++ b/src/CSUtilities @@ -1 +1 @@ -Subproject commit c42c0e20dcaaadda45ee537041ac4312d2b2ad89 +Subproject commit 0a0a875c18c70a82ca5d44e26440991d89100647