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

add curve to direct shape conversions #37

Merged
merged 6 commits into from
Jul 19, 2024
Merged

add curve to direct shape conversions #37

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de7e180
add curve to direct shape conversions
Jul 16, 2024
740c388
rename base converter
Jul 17, 2024
d2b68c6
Merge remote-tracking branch 'origin/dev' into DUI3-475-DirectShape-C…
Jul 17, 2024
0cb943d
Merge remote-tracking branch 'origin/dev' into DUI3-475-DirectShape-C…
Jul 18, 2024
2918214
update projitems
Jul 18, 2024
d2c5fe7
Fix XML comments
adamhathcock Jul 19, 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
8 changes: 8 additions & 0 deletions Converters/Revit/Speckle.Converters.RevitShared/Speckle.Converters.RevitShared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,20 @@
<Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\Geometry\PlaneConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\Geometry\PointConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\Geometry\PolylineConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\ToDirectShape\ArcToDirectShapeConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\ToDirectShape\CircleToDirectShapeConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\ToDirectShape\CurveToDirectShapeConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\ToDirectShape\EllipseToDirectShapeConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\ToDirectShape\LineToDirectShapeConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\ToDirectShape\PolycurveConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\ToDirectShape\PolylineConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\Geometry\VectorConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\RenderMaterialToHostConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\SurfaceConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\BaseTopLevelConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\BrepToHostTopLevelConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\DirectShapeTopLevelConverterToHost.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\ToDirectShape\ICurveToDirectShapeConverterToHostBase.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\LevelToHostTopLevelConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\GridlineToHostTopLevelConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ToHost\TopLevel\MeshToHostTopLevelConverter.cs" />
Expand Down
17 changes: 17 additions & 0 deletions ...e.Converters.RevitShared/ToHost/TopLevel/ToDirectShape/ArcToDirectShapeConverterToHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;
using Speckle.Converters.RevitShared.Helpers;
using Speckle.Converters.RevitShared.ToHost.TopLevel;

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

[NameAndRankValue(nameof(SOG.Arc), 0)]
public class ArcToDirectShapeConverterToHost : CurveToDirectShapeConverterToHostBase<SOG.Arc>
{
public ArcToDirectShapeConverterToHost(
IRevitConversionContextStack contextStack,
ITypedConverter<ICurve, DB.CurveArray> curveConverter
)
: base(contextStack, curveConverter) { }
}
17 changes: 17 additions & 0 deletions ...onverters.RevitShared/ToHost/TopLevel/ToDirectShape/CircleToDirectShapeConverterToHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;
using Speckle.Converters.RevitShared.Helpers;
using Speckle.Converters.RevitShared.ToHost.TopLevel;

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

[NameAndRankValue(nameof(SOG.Circle), 0)]
public class CircleToDirectShapeConverterToHost : CurveToDirectShapeConverterToHostBase<SOG.Circle>
{
public CircleToDirectShapeConverterToHost(
IRevitConversionContextStack contextStack,
ITypedConverter<ICurve, DB.CurveArray> curveConverter
)
: base(contextStack, curveConverter) { }
}
17 changes: 17 additions & 0 deletions ...Converters.RevitShared/ToHost/TopLevel/ToDirectShape/CurveToDirectShapeConverterToHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;
using Speckle.Converters.RevitShared.Helpers;
using Speckle.Converters.RevitShared.ToHost.TopLevel;

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

[NameAndRankValue(nameof(SOG.Curve), 0)]
public class CurveToDirectShapeConverterToHost : CurveToDirectShapeConverterToHostBase<SOG.Curve>
{
public CurveToDirectShapeConverterToHost(
IRevitConversionContextStack contextStack,
ITypedConverter<ICurve, DB.CurveArray> curveConverter
)
: base(contextStack, curveConverter) { }
}
50 changes: 50 additions & 0 deletions ...erters.RevitShared/ToHost/TopLevel/ToDirectShape/CurveToDirectShapeConverterToHostBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
using Objects;
using Speckle.Converters.Common.Objects;
using Speckle.Converters.RevitShared.Helpers;
using Speckle.Core.Models;

namespace Speckle.Converters.RevitShared.ToHost.TopLevel;

public abstract class CurveToDirectShapeConverterToHostBase<TCurve>
: ITypedConverter<TCurve, List<DB.GeometryObject>>,
IToHostTopLevelConverter
where TCurve : Base, ICurve
{
private readonly IRevitConversionContextStack _contextStack;
private readonly ITypedConverter<ICurve, DB.CurveArray> _curveConverter;

public CurveToDirectShapeConverterToHostBase(
IRevitConversionContextStack contextStack,
ITypedConverter<ICurve, DB.CurveArray> curveConverter
)
{
_contextStack = contextStack;
_curveConverter = curveConverter;
}

public List<DB.GeometryObject> Convert(TCurve target)
{
var converted = new List<DB.GeometryObject>();

DB.CurveArray curveArray = _curveConverter.Convert(target);
converted.AddRange(curveArray.Cast<DB.Curve>());

var genericModelCategory = _contextStack.Current.Document.Settings.Categories.get_Item(
DB.BuiltInCategory.OST_GenericModel
);

var revitDs = DB.DirectShape.CreateElement(_contextStack.Current.Document, genericModelCategory.Id);
if (target is Base speckleObject && speckleObject.applicationId != null)
{
revitDs.ApplicationId = speckleObject.applicationId;
}

revitDs.ApplicationDataId = Guid.NewGuid().ToString();
revitDs.SetShape(converted);
revitDs.Name = "CurveAsDirectShape";

return converted;
}

public object Convert(Base target) => Convert((TCurve)target);
}
17 changes: 17 additions & 0 deletions ...nverters.RevitShared/ToHost/TopLevel/ToDirectShape/EllipseToDirectShapeConverterToHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;
using Speckle.Converters.RevitShared.Helpers;
using Speckle.Converters.RevitShared.ToHost.TopLevel;

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

[NameAndRankValue(nameof(SOG.Ellipse), 0)]
public class EllipseToDirectShapeConverterToHost : CurveToDirectShapeConverterToHostBase<SOG.Ellipse>
{
public EllipseToDirectShapeConverterToHost(
IRevitConversionContextStack contextStack,
ITypedConverter<ICurve, DB.CurveArray> curveConverter
)
: base(contextStack, curveConverter) { }
}
17 changes: 17 additions & 0 deletions ....Converters.RevitShared/ToHost/TopLevel/ToDirectShape/LineToDirectShapeConverterToHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;
using Speckle.Converters.RevitShared.Helpers;
using Speckle.Converters.RevitShared.ToHost.TopLevel;

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

[NameAndRankValue(nameof(SOG.Line), 0)]
public class LineToDirectShapeConverterToHost : CurveToDirectShapeConverterToHostBase<SOG.Line>
{
public LineToDirectShapeConverterToHost(
IRevitConversionContextStack contextStack,
ITypedConverter<ICurve, DB.CurveArray> curveConverter
)
: base(contextStack, curveConverter) { }
}
17 changes: 17 additions & 0 deletions .../Speckle.Converters.RevitShared/ToHost/TopLevel/ToDirectShape/PolycurveConverterToHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;
using Speckle.Converters.RevitShared.Helpers;
using Speckle.Converters.RevitShared.ToHost.TopLevel;

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

[NameAndRankValue(nameof(SOG.Polycurve), 0)]
public class PolycurveToDirectShapeConverterToHost : CurveToDirectShapeConverterToHostBase<SOG.Polycurve>
{
public PolycurveToDirectShapeConverterToHost(
IRevitConversionContextStack contextStack,
ITypedConverter<ICurve, DB.CurveArray> curveConverter
)
: base(contextStack, curveConverter) { }
}
17 changes: 17 additions & 0 deletions ...t/Speckle.Converters.RevitShared/ToHost/TopLevel/ToDirectShape/PolylineConverterToHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Objects;
using Speckle.Converters.Common;
using Speckle.Converters.Common.Objects;
using Speckle.Converters.RevitShared.Helpers;
using Speckle.Converters.RevitShared.ToHost.TopLevel;

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

[NameAndRankValue(nameof(SOG.Polyline), 0)]
public class PolylineToDirectShapeConverterToHost : CurveToDirectShapeConverterToHostBase<SOG.Polyline>
{
public PolylineToDirectShapeConverterToHost(
IRevitConversionContextStack contextStack,
ITypedConverter<ICurve, DB.CurveArray> curveConverter
)
: base(contextStack, curveConverter) { }
}
Loading