Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dui3 124 receiving curves arcs ellipses nurbs curves #3521

Merged
merged 14 commits into from
Jul 1, 2024
Merged

Dui3 124 receiving curves arcs ellipses nurbs curves #3521

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
56eed23
arcs received (tested with Rhino and AutoCAD commits)
KatKatKateryna Jun 17, 2024
68b0ac4
add SpetialRef to every new host geometry
KatKatKateryna Jun 17, 2024
b46096d
don't receive non-flat arcs, circles, ellipses
KatKatKateryna Jun 17, 2024
39a13ea
add nurbs curves
KatKatKateryna Jun 17, 2024
34e387d
Merge branch 'dui3/alpha' into DUI3-124-Receiving-Curves-Arcs-Ellipse…
KatKatKateryna Jun 17, 2024
db80cf3
Merge branch 'dui3/alpha' into DUI3-124-Receiving-Curves-Arcs-Ellipse…
KatKatKateryna Jun 26, 2024
ec7b49f
more specific exceptions
KatKatKateryna Jun 28, 2024
3a77152
namespaces and densification for arc-polygon edges
KatKatKateryna Jun 28, 2024
0bf9e9f
formatting
KatKatKateryna Jun 28, 2024
9010fa9
formatting
KatKatKateryna Jun 28, 2024
fc8ca65
Merge branch 'dui3/alpha' into DUI3-124-Receiving-Curves-Arcs-Ellipse…
KatKatKateryna Jul 1, 2024
7666608
added ICUrve converter (not used yet); added check for sequential Pol…
KatKatKateryna Jul 1, 2024
bcb7e99
precision points
KatKatKateryna Jul 1, 2024
3112dcb
Merge branch 'dui3/alpha' into DUI3-124-Receiving-Curves-Arcs-Ellipse…
KatKatKateryna Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions ...X/Converters/ArcGIS/Speckle.Converters.ArcGIS3/Features/PointFeatureToSpeckleConverter.cs
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions ...ers/ArcGIS/Speckle.Converters.ArcGIS3/Geometry/ISpeckleObjectToHost/ArcToHostConverter.cs
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions ...ArcGIS/Speckle.Converters.ArcGIS3/Geometry/ISpeckleObjectToHost/EllipseToHostConverter.cs
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions ...cGIS/Speckle.Converters.ArcGIS3/Geometry/ISpeckleObjectToHost/PolycurveToHostConverter.cs
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions ...verters/ArcGIS/Speckle.Converters.ArcGIS3/Geometry/SegmentCollectionToSpeckleConverter.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...IS3/Layers/FeatureClassToHostConverter.cs → ...ToHost/Raw/FeatureClassToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Speckle.Core.Models;
using FieldDescription = ArcGIS.Core.Data.DDL.FieldDescription;

namespace Speckle.Converters.ArcGIS3.Layers;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class FeatureClassToHostConverter : ITypedConverter<VectorLayer, FeatureClass>
{
Expand Down
2 changes: 1 addition & 1 deletion ...cGIS3/Features/GeometryToHostConverter.cs → ...IS3/ToHost/Raw/GeometryToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Speckle.Converters.Common.Objects;
using Speckle.Core.Models;

namespace Speckle.Converters.ArcGIS3.Features;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class GeometryToHostConverter : ITypedConverter<IReadOnlyList<Base>, ACG.Geometry>
{
Expand Down
11 changes: 8 additions & 3 deletions ...ometriesToHost/MeshListToHostConverter.cs → ...IS3/ToHost/Raw/MeshListToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;

namespace Speckle.Converters.ArcGIS3.Geometry.GisFeatureGeometriesToHost;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class MeshListToHostConverter : ITypedConverter<List<SOG.Mesh>, ACG.Multipatch>
{
private readonly ITypedConverter<SOG.Point, ACG.MapPoint> _pointConverter;
private readonly IConversionContextStack<ArcGISDocument, ACG.Unit> _contextStack;

public MeshListToHostConverter(ITypedConverter<SOG.Point, ACG.MapPoint> pointConverter)
public MeshListToHostConverter(
ITypedConverter<SOG.Point, ACG.MapPoint> pointConverter,
IConversionContextStack<ArcGISDocument, ACG.Unit> contextStack
)
{
_pointConverter = pointConverter;
_contextStack = contextStack;
}

public ACG.Multipatch Convert(List<SOG.Mesh> target)
Expand All @@ -19,7 +24,7 @@ public ACG.Multipatch Convert(List<SOG.Mesh> target)
{
throw new SpeckleConversionException("Feature contains no geometries");
}
ACG.MultipatchBuilderEx multipatchPart = new();
ACG.MultipatchBuilderEx multipatchPart = new(_contextStack.Current.Document.Map.SpatialReference);
foreach (SOG.Mesh part in target)
{
part.TriangulateMesh();
Expand Down
2 changes: 1 addition & 1 deletion ...esToHost/MultipatchListToHostConverter.cs → ...Host/Raw/MultipatchListToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;

namespace Speckle.Converters.ArcGIS3.Geometry.GisFeatureGeometriesToHost;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class MultipatchListToHostConverter : ITypedConverter<List<SGIS.GisMultipatchGeometry>, ACG.Multipatch>
{
Expand Down
2 changes: 1 addition & 1 deletion ...metriesToHost/PointListToHostConverter.cs → ...S3/ToHost/Raw/PointListToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;

namespace Speckle.Converters.ArcGIS3.Geometry.GisFeatureGeometriesToHost;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class PointListToHostConverter : ITypedConverter<List<SOG.Point>, ACG.Multipoint>
{
Expand Down
5 changes: 3 additions & 2 deletions ...S3/Geometry/PointSingleToHostConverter.cs → .../ToHost/Raw/PointSingleToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Speckle.Core.Kits;
using Speckle.Core.Models;

namespace Speckle.Converters.ArcGIS3.Geometry;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class PointToHostConverter : ITypedConverter<SOG.Point, ACG.MapPoint>
{
Expand All @@ -22,7 +22,8 @@ public ACG.MapPoint Convert(SOG.Point target)
return new ACG.MapPointBuilderEx(
target.x * scaleFactor,
target.y * scaleFactor,
target.z * scaleFactor
target.z * scaleFactor,
_contextStack.Current.Document.Map.SpatialReference
).ToGeometry();
}
}
2 changes: 1 addition & 1 deletion .../Layers/PointcloudLayerToHostConverter.cs → ...ost/Raw/PointcloudLayerToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Speckle.Converters.Common.Objects;
using Speckle.Core.Models;

namespace Speckle.Converters.ArcGIS3.Layers;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class PointcloudLayerToHostConverter : ITypedConverter<VectorLayer, LasDatasetLayer>
{
Expand Down
4 changes: 2 additions & 2 deletions ...iesToHost/Polygon3dListToHostConverter.cs → ...oHost/Raw/Polygon3dListToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Speckle.Converters.Common.Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;

namespace Speckle.Converters.ArcGIS3.Geometry.GisFeatureGeometriesToHost;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class Polygon3dListToHostConverter : ITypedConverter<List<SGIS.PolygonGeometry3d>, ACG.Multipatch>
{
Expand Down
4 changes: 2 additions & 2 deletions ...triesToHost/PolygonListToHostConverter.cs → .../ToHost/Raw/PolygonListToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Speckle.Converters.Common.Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;

namespace Speckle.Converters.ArcGIS3.Geometry.GisFeatureGeometriesToHost;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class PolygonListToHostConverter : ITypedConverter<List<SGIS.PolygonGeometry>, ACG.Polygon>
{
Expand Down
4 changes: 2 additions & 2 deletions ...riesToHost/PolylineListToHostConverter.cs → ...ToHost/Raw/PolylineListToHostConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Speckle.Converters.Common.Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;

namespace Speckle.Converters.ArcGIS3.Geometry.GisFeatureGeometriesToHost;
namespace Speckle.Converters.ArcGIS3.ToHost.Raw;

public class PolylineListToHostConverter : ITypedConverter<List<SOG.Polyline>, ACG.Polyline>
{
Expand Down
Loading
Loading