diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs b/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs index 2e6952ac9..2f2a1a0c0 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/HostApp/TeklaMaterialUnpacker.cs @@ -1,4 +1,4 @@ -using System.Drawing; +using System.Drawing; using Speckle.Connector.Tekla2024.Extensions; using Speckle.Objects.Other; @@ -38,7 +38,7 @@ public List UnpackRenderMaterial(List atom } else { - var renderMaterial = new RenderMaterial() { name = colorId, diffuseColor = systemColor }; + var renderMaterial = new RenderMaterial() { name = colorId, diffuse = systemColor.ToArgb() }; RenderMaterialProxy proxyRenderMaterial = new() { diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs index e9c70627f..b906c3301 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToHost/Raw/Geometry/ArcConverterToHost.cs @@ -25,11 +25,8 @@ public DB.Arc Convert(SOG.Arc target) // Endpoints coincide, it's a circle. if (SOG.Point.Distance(target.startPoint, target.endPoint) < 1E-6) { - double radius = - target.radius ?? _scalingService.ScaleToNative(target.plane.origin.DistanceTo(target.startPoint), target.units); var plane = _planeConverter.Convert(target.plane); - return DB.Arc.Create(plane, _scalingService.ScaleToNative(radius, target.units), 0, Math.PI * 2); - + return DB.Arc.Create(plane, _scalingService.ScaleToNative(target.radius, target.units), 0, Math.PI * 2); } return DB.Arc.Create( diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs index b3c8b107d..a37213406 100644 --- a/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs +++ b/Converters/Revit/Speckle.Converters.RevitShared/ToSpeckle/TopLevel/ModelCurveToSpeckleTopLevelConverter.cs @@ -5,7 +5,7 @@ namespace Speckle.Converters.RevitShared.ToSpeckle; -// Converts model curves to regurlar speckle curves, since we aren't receiving them and the only property used in V2 was the linestyle (not element ids or parameters). Don't see a need to handle these differently from regular geometry. +// Converts model curves to regular speckle curves, since we aren't receiving them and the only property used in V2 was the linestyle (not element ids or parameters). Don't see a need to handle these differently from regular geometry. [NameAndRankValue(nameof(DB.ModelCurve), 0)] public class ModelCurveToSpeckleTopLevelConverter : BaseTopLevelConverterToSpeckle { diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/ArcToSpeckleConverterTests.cs b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/ArcToSpeckleConverterTests.cs index 57806f31c..5f73f5606 100644 --- a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/ArcToSpeckleConverterTests.cs +++ b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/ArcToSpeckleConverterTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using FluentAssertions; using Moq; using NUnit.Framework; using Speckle.Converters.Common; @@ -15,7 +15,6 @@ public class ArcToSpeckleConverterTests : MoqTest public void Convert_ShouldConvertArcCorrectly() { // Arrange - var radius = 1.1d; var mockPointConverter = Create>(); var mockPlaneConverter = Create>(); var mockBoxConverter = Create>(); @@ -33,11 +32,6 @@ public void Convert_ShouldConvertArcCorrectly() var boundbox = Create(); targetArc.Setup(x => x.Plane).Returns(targetPlane.Object); - targetArc.Setup(x => x.Radius).Returns(radius); - targetArc.Setup(x => x.StartAngle).Returns(radius); - targetArc.Setup(x => x.EndAngle).Returns(radius); - targetArc.Setup(x => x.Angle).Returns(radius); - targetArc.Setup(x => x.Length).Returns(radius); targetArc.Setup(x => x.StartPoint).Returns(point3d.Object); targetArc.Setup(x => x.MidPoint).Returns(point3d.Object); targetArc.Setup(x => x.EndPoint).Returns(point3d.Object);