From f9b598c0553e451d9ecad44764bc4862cd73e603 Mon Sep 17 00:00:00 2001 From: katehryhorenko Date: Thu, 20 Feb 2025 12:52:46 -0400 Subject: [PATCH] elements 2.3.0-alpha.5 functions 1.13.1-alpha.21 --- dependencies/ConceptualMass.g.cs | 6 +- dependencies/InitialDimensions.g.cs | 57 +++++++++++++++ dependencies/SpaceBoundary.g.cs | 6 +- .../SpacePlanning.Dependencies.csproj | 6 +- dependencies/Type.g.cs | 69 +++++++++++++++++++ dependencies/ViewScope.g.cs | 12 +++- src/SpacePlanning.csproj | 2 +- test/SpacePlanning.Tests.csproj | 3 +- 8 files changed, 153 insertions(+), 8 deletions(-) create mode 100644 dependencies/InitialDimensions.g.cs create mode 100644 dependencies/Type.g.cs diff --git a/dependencies/ConceptualMass.g.cs b/dependencies/ConceptualMass.g.cs index fa933a8..69180e0 100644 --- a/dependencies/ConceptualMass.g.cs +++ b/dependencies/ConceptualMass.g.cs @@ -27,7 +27,7 @@ namespace Elements public partial class ConceptualMass : Envelope { [JsonConstructor] - public ConceptualMass(IList @skeleton, string @primaryUseCategory, System.Guid? @building, IList @levelIds, Transform @localCoordinateSystem, Profile @profile, double @elevation, double @height, Vector3 @direction, double @rotation, IList @floorToFloorHeights, Transform @transform, Material @material, Representation @representation, bool @isElementDefinition, System.Guid @id, string @name) + public ConceptualMass(IList @skeleton, string @primaryUseCategory, System.Guid? @building, IList @levelIds, Transform @localCoordinateSystem, Profile @boundary, Profile @profile, double @elevation, double @height, Vector3 @direction, double @rotation, IList @floorToFloorHeights, Transform @transform, Material @material, Representation @representation, bool @isElementDefinition, System.Guid @id, string @name) : base(profile, elevation, height, direction, rotation, floorToFloorHeights, transform, material, representation, isElementDefinition, id, name) { this.Skeleton = @skeleton; @@ -35,6 +35,7 @@ public ConceptualMass(IList @skeleton, string @primaryUseCategory, System. this.Building = @building; this.LevelIds = @levelIds; this.LocalCoordinateSystem = @localCoordinateSystem; + this.Boundary = @boundary; } @@ -64,6 +65,9 @@ public ConceptualMass() [JsonProperty("Local Coordinate System", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public Transform LocalCoordinateSystem { get; set; } + [JsonProperty("Boundary", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public Profile Boundary { get; set; } + } } \ No newline at end of file diff --git a/dependencies/InitialDimensions.g.cs b/dependencies/InitialDimensions.g.cs new file mode 100644 index 0000000..d86ba47 --- /dev/null +++ b/dependencies/InitialDimensions.g.cs @@ -0,0 +1,57 @@ +//---------------------- +// +// Generated using the NJsonSchema v10.1.21.0 (Newtonsoft.Json v13.0.0.0) (http://NJsonSchema.org) +// +//---------------------- +using Elements; +using Elements.GeoJSON; +using Elements.Geometry; +using Elements.Geometry.Solids; +using Elements.Spatial; +using Elements.Validators; +using Elements.Serialization.JSON; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using Line = Elements.Geometry.Line; +using Polygon = Elements.Geometry.Polygon; + +namespace Elements +{ + #pragma warning disable // Disable all warnings + + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")] + public partial class InitialDimensions + { + [JsonConstructor] + public InitialDimensions(double @width, double @depth) + { + this.Width = @width; + this.Depth = @depth; + } + + + // Empty constructor + public InitialDimensions() + { + } + + [JsonProperty("width", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public double Width { get; set; } + + [JsonProperty("depth", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public double Depth { get; set; } + + private System.Collections.Generic.IDictionary _additionalProperties = new System.Collections.Generic.Dictionary(); + + [JsonExtensionData] + public System.Collections.Generic.IDictionary AdditionalProperties + { + get { return _additionalProperties; } + set { _additionalProperties = value; } + } + + + } +} \ No newline at end of file diff --git a/dependencies/SpaceBoundary.g.cs b/dependencies/SpaceBoundary.g.cs index 8ce5974..0caf8b8 100644 --- a/dependencies/SpaceBoundary.g.cs +++ b/dependencies/SpaceBoundary.g.cs @@ -27,7 +27,7 @@ namespace Elements public partial class SpaceBoundary : GeometricElement { [JsonConstructor] - public SpaceBoundary(Profile @boundary, IList @cells, double @area, double? @length, double? @depth, double @height, string @programGroup, string @programType, System.Guid? @programRequirement, System.Guid? @level, System.Guid? @levelLayout, string @hyparSpaceType, string @defaultWallType, Transform @transform = null, Material @material = null, Representation @representation = null, bool @isElementDefinition = false, System.Guid @id = default, string @name = null) + public SpaceBoundary(Profile @boundary, IList @cells, double @area, double? @length, double? @depth, double @height, string @programGroup, string @programType, Type @type, System.Guid? @programRequirement, System.Guid? @level, System.Guid? @levelLayout, string @hyparSpaceType, string @defaultWallType, Transform @transform = null, Material @material = null, Representation @representation = null, bool @isElementDefinition = false, System.Guid @id = default, string @name = null) : base(transform, material, representation, isElementDefinition, id, name) { this.Boundary = @boundary; @@ -38,6 +38,7 @@ public SpaceBoundary(Profile @boundary, IList @cells, double @area, dou this.Height = @height; this.ProgramGroup = @programGroup; this.ProgramType = @programType; + this.Type = @type; this.ProgramRequirement = @programRequirement; this.Level = @level; this.LevelLayout = @levelLayout; @@ -84,6 +85,9 @@ public SpaceBoundary() [JsonProperty("Program Type", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public string ProgramType { get; set; } + [JsonProperty("Type", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public Type Type { get; set; } + [JsonProperty("Program Requirement", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public System.Guid? ProgramRequirement { get; set; } diff --git a/dependencies/SpacePlanning.Dependencies.csproj b/dependencies/SpacePlanning.Dependencies.csproj index 46ba04a..029919f 100644 --- a/dependencies/SpacePlanning.Dependencies.csproj +++ b/dependencies/SpacePlanning.Dependencies.csproj @@ -1,11 +1,11 @@  - net6.0 + net8.0 - - + + diff --git a/dependencies/Type.g.cs b/dependencies/Type.g.cs new file mode 100644 index 0000000..c89d61c --- /dev/null +++ b/dependencies/Type.g.cs @@ -0,0 +1,69 @@ +//---------------------- +// +// Generated using the NJsonSchema v10.1.21.0 (Newtonsoft.Json v13.0.0.0) (http://NJsonSchema.org) +// +//---------------------- +using Elements; +using Elements.GeoJSON; +using Elements.Geometry; +using Elements.Geometry.Solids; +using Elements.Spatial; +using Elements.Validators; +using Elements.Serialization.JSON; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using Line = Elements.Geometry.Line; +using Polygon = Elements.Geometry.Polygon; + +namespace Elements +{ + #pragma warning disable // Disable all warnings + + [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.21.0 (Newtonsoft.Json v13.0.0.0)")] + public partial class Type + { + [JsonConstructor] + public Type(string @configurationSource, string @name, System.Guid @id, bool @profileLinkedToType, InitialDimensions @initialDimensions) + { + this.ConfigurationSource = @configurationSource; + this.Name = @name; + this.Id = @id; + this.ProfileLinkedToType = @profileLinkedToType; + this.InitialDimensions = @initialDimensions; + } + + + // Empty constructor + public Type() + { + } + + [JsonProperty("configurationSource", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public string ConfigurationSource { get; set; } + + [JsonProperty("name", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public string Name { get; set; } + + [JsonProperty("id", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public System.Guid Id { get; set; } + + [JsonProperty("profileLinkedToType", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public bool ProfileLinkedToType { get; set; } + + [JsonProperty("initialDimensions", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public InitialDimensions InitialDimensions { get; set; } + + private System.Collections.Generic.IDictionary _additionalProperties = new System.Collections.Generic.Dictionary(); + + [JsonExtensionData] + public System.Collections.Generic.IDictionary AdditionalProperties + { + get { return _additionalProperties; } + set { _additionalProperties = value; } + } + + + } +} \ No newline at end of file diff --git a/dependencies/ViewScope.g.cs b/dependencies/ViewScope.g.cs index aeff146..1136b72 100644 --- a/dependencies/ViewScope.g.cs +++ b/dependencies/ViewScope.g.cs @@ -27,12 +27,14 @@ namespace Elements public partial class ViewScope : Element { [JsonConstructor] - public ViewScope(BBox3 @boundingBox, Camera @camera, bool? @lockRotation, bool? @clipWithBoundingBox, ViewScopeClippingBehavior? @clippingBehavior, bool? @modal, System.Collections.Generic.IDictionary @functionVisibility, IList @actions, System.Guid @id = default, string @name = null) + public ViewScope(BBox3 @boundingBox, Camera @camera, bool? @lockRotation, bool? @lockPosition, bool? @lockZoom, bool? @clipWithBoundingBox, ViewScopeClippingBehavior? @clippingBehavior, bool? @modal, System.Collections.Generic.IDictionary @functionVisibility, IList @actions, System.Guid @id = default, string @name = null) : base(id, name) { this.BoundingBox = @boundingBox; this.Camera = @camera; this.LockRotation = @lockRotation; + this.LockPosition = @lockPosition; + this.LockZoom = @lockZoom; this.ClipWithBoundingBox = @clipWithBoundingBox; this.ClippingBehavior = @clippingBehavior; this.Modal = @modal; @@ -59,6 +61,14 @@ public ViewScope() [JsonProperty("Lock Rotation", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public bool? LockRotation { get; set; } + /// Whether this scope should lock view position. True to lock, False to unlock, and null to leave unchanged. + [JsonProperty("Lock Position", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public bool? LockPosition { get; set; } + + /// Whether this scope should lock view zoom. True to lock, False to unlock, and null to leave unchanged. + [JsonProperty("Lock Zoom", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] + public bool? LockZoom { get; set; } + /// Whether this scope should clip to the specified bounding box. If false, it only zooms to the bounding box without clipping. [JsonProperty("Clip With Bounding Box", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)] public bool? ClipWithBoundingBox { get; set; } diff --git a/src/SpacePlanning.csproj b/src/SpacePlanning.csproj index 2713466..35f66c9 100644 --- a/src/SpacePlanning.csproj +++ b/src/SpacePlanning.csproj @@ -4,6 +4,6 @@ - net6.0 + net8.0 \ No newline at end of file diff --git a/test/SpacePlanning.Tests.csproj b/test/SpacePlanning.Tests.csproj index a8739d0..8a17656 100644 --- a/test/SpacePlanning.Tests.csproj +++ b/test/SpacePlanning.Tests.csproj @@ -1,6 +1,7 @@ + - net6.0 + net8.0 false