diff --git a/src/Speckle.Objects/BuiltElements/GridLine.cs b/src/Speckle.Objects/BuiltElements/GridLine.cs deleted file mode 100644 index 52576177..00000000 --- a/src/Speckle.Objects/BuiltElements/GridLine.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Speckle.Sdk.Models; - -namespace Speckle.Objects.BuiltElements; - -[SpeckleType("Objects.BuiltElements.GridLine")] -public class GridLine : Base, IDisplayValue> -{ - public required ICurve baseLine { get; set; } - public string label { get; set; } - public string units { get; set; } - - [DetachProperty] - public List displayValue { get; set; } -} diff --git a/src/Speckle.Objects/BuiltElements/Revit/DirectShape.cs b/src/Speckle.Objects/BuiltElements/Revit/DirectShape.cs deleted file mode 100644 index 97f1a2f5..00000000 --- a/src/Speckle.Objects/BuiltElements/Revit/DirectShape.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Speckle.Objects.Geometry; -using Speckle.Sdk.Models; - -namespace Speckle.Objects.BuiltElements.Revit; - -[SpeckleType("Objects.BuiltElements.Revit.DirectShape")] -public class DirectShape : Base, IDisplayValue> -{ - public required string name { get; set; } - public RevitCategory category { get; set; } - public Base? parameters { get; set; } - public string elementId { get; set; } - - [DetachProperty] - public List baseGeometries { get; set; } = new(); - - public string units { get; set; } - - [DetachProperty] - public List displayValue { get; set; } - - public bool IsValidObject(Base @base) - { - return @base is Point || @base is ICurve || @base is Mesh || @base is Brep; - } -} diff --git a/src/Speckle.Objects/BuiltElements/Revit/Enums.cs b/src/Speckle.Objects/BuiltElements/Revit/Enums.cs deleted file mode 100644 index 5ae7fa48..00000000 --- a/src/Speckle.Objects/BuiltElements/Revit/Enums.cs +++ /dev/null @@ -1,180 +0,0 @@ -namespace Speckle.Objects.BuiltElements.Revit; - -//This is an enum so that we can easily create a dropdown in GH for schema builder -//NOTE: if edited the list in Objects.Converter.Revit.Categories should be updated too -public enum RevitCategory -{ - AbutmentFoundations = 0, - AbutmentPiles = 1, - AbutmentWalls = 2, - DuctTerminal = 4, - BridgeAbutments = 3, - Alignments = 5, - StructConnectionAnchors = 6, - ApproachSlabs = 7, - BridgeArches = 8, - AudioVisualDevices = 9, - StairsRailingBaluster = 10, - BridgeBearings = 11, - StructConnectionBolts = 12, - BridgeCables = 13, - BridgeDecks = 14, - BridgeFraming = 15, - CableTrayFitting = 16, - CableTrayRun = 17, - CableTray = 18, - Casework = 19, - Ceilings = 20, - Columns = 21, - CommunicationDevices = 22, - ConduitFitting = 23, - Conduit = 24, - Coordination_Model = 25, - BridgeFramingCrossBracing = 26, - CurtainWallPanels = 27, - CurtaSystem = 28, - CurtainWallMullions = 29, - DataDevices = 30, - BridgeFramingDiaphragms = 31, - Doors = 32, - DuctAccessory = 33, - DuctFitting = 34, - PlaceHolderDucts = 35, - DuctSystem = 36, - DuctCurves = 37, - ElectricalEquipment = 38, - ElectricalFixtures = 39, - Entourage = 40, - ExpansionJoints = 41, - FireAlarmDevices = 42, - FireProtection = 43, - Floors = 44, - FoodServiceEquipment = 45, - Furniture = 46, - FurnitureSystems = 47, - GenericAnnotation = 48, - GenericModel = 49, - BridgeGirders = 50, - Hardscape = 51, - LightingDevices = 52, - LightingFixtures = 53, - Lines = 54, - Mass = 55, - MechanicalEquipment = 56, - MedicalEquipment = 57, - NurseCallDevices = 58, - Parking = 59, - Parts = 60, - PierCaps = 61, - PierColumns = 62, - BridgeFoundations = 63, - PierPiles = 64, - BridgeTowers = 65, - PierWalls = 66, - BridgePiers = 67, - PipeAccessory = 68, - PipeFitting = 69, - PlaceHolderPipes = 70, - PipeSegments = 71, - PipeCurves = 72, - PipingSystem = 73, - Planting = 74, - StructConnectionPlates = 75, - PlumbingFixtures = 76, - StructConnectionProfiles = 77, - StairsRailing = 78, - Ramps = 79, - Roads = 80, - Roofs = 81, - SecurityDevices = 82, - StructConnectionShearStuds = 83, - Signage = 84, - Site = 85, - SpecialityEquipment = 86, - Sprinklers = 87, - Stairs = 88, - StructuralFramingSystem = 89, - StructuralColumns = 90, - StructConnections = 91, - FabricAreas = 92, - StructuralFoundation = 93, - StructuralFraming = 94, - Rebar = 95, - Coupler = 96, - StructuralStiffener = 97, - StructuralTendons = 98, - StructuralTruss = 99, - TemporaryStructure = 100, - Topography = 101, - BridgeFramingTrusses = 102, - VerticalCirculation = 103, - VibrationDampers = 104, - VibrationIsolators = 105, - VibrationManagement = 106, - Walls = 107, - StructConnectionWelds = 108, - Windows = 109, - Railings = 110, -} - -/// -/// FamilyDocuments can only be assigned these categories -/// This is a subset of the list above which was manually retrieved from Revit's UI -/// -public enum RevitFamilyCategory -{ - AudioVisualDevices = 9, - CableTrayFitting = 16, - Casework = 19, - Columns = 21, - CommunicationDevices = 22, - ConduitFitting = 23, - DataDevices = 30, - Doors = 32, - DuctAccessory = 33, - DuctFitting = 34, - ElectricalEquipment = 38, - ElectricalFixtures = 39, - Entourage = 40, - FireAlarmDevices = 42, - FireProtection = 43, - FoodServiceEquipment = 45, - Furniture = 46, - FurnitureSystems = 47, - GenericModel = 49, - Hardscape = 51, - LightingDevices = 52, - LightingFixtures = 53, - Mass = 55, - MechanicalEquipment = 56, - MedicalEquipment = 57, - NurseCallDevices = 58, - Parking = 59, - PipeAccessory = 68, - PipeFitting = 69, - Planting = 74, - PlumbingFixtures = 76, - Roads = 80, - SecurityDevices = 82, - Signage = 84, - Site = 85, - SpecialityEquipment = 86, - Sprinklers = 87, - StructuralFramingSystem = 89, - StructuralColumns = 90, - StructConnections = 91, - StructuralFoundation = 93, - StructuralFraming = 94, - StructuralStiffener = 97, - TemporaryStructure = 100, - VerticalCirculation = 103, - Windows = 109, - Railings = 110, -} - -public enum LocationLine -{ - Centerline, - Exterior, - Interior, -} diff --git a/src/Speckle.Objects/Data/CivilObject.cs b/src/Speckle.Objects/Data/Civil3dObject.cs similarity index 87% rename from src/Speckle.Objects/Data/CivilObject.cs rename to src/Speckle.Objects/Data/Civil3dObject.cs index ef6bd3b4..90f7cf18 100644 --- a/src/Speckle.Objects/Data/CivilObject.cs +++ b/src/Speckle.Objects/Data/Civil3dObject.cs @@ -20,7 +20,7 @@ public class Civil3dObject : Base, ICivilObject /// Children objects, eg profiles, this civil entity may contain. /// [DetachProperty] - public required List elements { get; set; } + public required List elements { get; set; } public required List displayValue { get; set; } @@ -28,7 +28,7 @@ public class Civil3dObject : Base, ICivilObject public required string units { get; set; } - IReadOnlyList ICivilObject.elements => elements; + IReadOnlyList ICivilObject.elements => elements; IReadOnlyList IDataObject.displayValue => displayValue; } diff --git a/src/Speckle.Objects/Deprecated/LegacyV2.cs b/src/Speckle.Objects/Deprecated/LegacyV2.cs index cac72d0b..9ec73a99 100644 --- a/src/Speckle.Objects/Deprecated/LegacyV2.cs +++ b/src/Speckle.Objects/Deprecated/LegacyV2.cs @@ -6,6 +6,7 @@ namespace Speckle.Objects.Deprecated; [DeprecatedSpeckleType("Objects.Other.BlockInstance")] [DeprecatedSpeckleType("Objects.Other.Revit.RevitInstance")] [DeprecatedSpeckleType("Objects.BuiltElements.View")] +[DeprecatedSpeckleType("Objects.BuiltElements.GridLine")] [DeprecatedSpeckleType("Objects.Other.BlockDefinition")] [DeprecatedSpeckleType("Objects.Other.DisplayStyle")] [DeprecatedSpeckleType("Objects.Other.Material")] @@ -13,4 +14,5 @@ namespace Speckle.Objects.Deprecated; [DeprecatedSpeckleType("Objects.Other.Revit.RevitMaterial")] [DeprecatedSpeckleType("Objects.BuiltElements.Revit.Parameter")] [DeprecatedSpeckleType("Objects.BuiltElements.Revit.Curve.ModelCurve")] +[DeprecatedSpeckleType("Objects.BuiltElements.Revit.DirectShape")] public class LegacyV2 : Base { } diff --git a/src/Speckle.Objects/Interfaces.cs b/src/Speckle.Objects/Interfaces.cs index 2f6e5fc8..4cd16768 100644 --- a/src/Speckle.Objects/Interfaces.cs +++ b/src/Speckle.Objects/Interfaces.cs @@ -140,7 +140,6 @@ public interface IDataObject : ISpeckleObject, IProperties /// Should be simple geometry types: Point, Line, Polyline, and Mesh. /// Null indicates a non-displayable data object. /// - [DetachProperty] IReadOnlyList? displayValue { get; } } @@ -154,7 +153,6 @@ public interface IRevitObject : IDataObject Base? location { get; } - [DetachProperty] IReadOnlyList elements { get; } } @@ -164,15 +162,13 @@ public interface ICivilObject : IDataObject List? baseCurves { get; } - [DetachProperty] - IReadOnlyList elements { get; } + IReadOnlyList elements { get; } } public interface ITeklaObject : IDataObject { string type { get; } - [DetachProperty] IReadOnlyList elements { get; } } @@ -180,7 +176,6 @@ public interface ICsiObject : IDataObject { string type { get; } - [DetachProperty] IReadOnlyList elements { get; } }