Merge pull request #257 from Knuttatutta/knuttatutta/add_axis_type

Fix: Add AxisType and fix its type in Axis
Merge branch 'main' into knuttatutta/add_axis_type
2023-02-01 15:27:34 +02:00 · 2023-02-01 15:26:10 +02:00 · 2023-02-01 15:24:45 +02:00 · 2023-02-01 10:34:01 +01:00 · 2023-02-01 10:16:13 +01:00 · 2023-01-17 10:46:31 +01:00
3 changed files with 15 additions and 4 deletions
@@ -6,7 +6,10 @@ from specklepy.objects.structural.analysis import (
    ModelSettings,
    ModelUnits,
 )
-from specklepy.objects.structural.axis import Axis
+from specklepy.objects.structural.axis import (
+    AxisType,
+    Axis
+)
 from specklepy.objects.structural.geometry import (
    Element1D,
    Element2D,
@@ -82,6 +85,7 @@ __all__ = [
    "ElementType1D",
    "ElementType2D",
    "ElementType3D",
+    "AxisType",
    "Axis",
    "Node",
    "Restraint",
@@ -1,10 +1,17 @@
 from typing import Optional
+from enum import Enum

 from specklepy.objects.base import Base
 from specklepy.objects.geometry import Plane


+class AxisType(int, Enum):
+    Cartesian = 0
+    Cylindrical = 1
+    Spherical = 2
+
+
 class Axis(Base, speckle_type="Objects.Structural.Geometry.Axis"):
    name: Optional[str] = None
-    axisType: Optional[str] = None
+    axisType: Optional[AxisType] = None
    plane: Optional[Plane] = None
@@ -5,7 +5,7 @@ from specklepy.objects.base import Base
 from specklepy.objects.structural.axis import Axis
 from specklepy.objects.structural.materials import StructuralMaterial

-STRUCTURAL_PROPERTY = "Objectives.Structural.Properties"
+STRUCTURAL_PROPERTY = "Objects.Structural.Properties"


 class MemberType(int, Enum):
@@ -90,7 +90,7 @@ class Property(Base, speckle_type=STRUCTURAL_PROPERTY):
    name: Optional[str] = None


-class SectionProfile(Base, speckle_type=STRUCTURAL_PROPERTY + ".SectionProfile"):
+class SectionProfile(Base, speckle_type=STRUCTURAL_PROPERTY + ".Profiles.SectionProfile"):
    name: Optional[str] = None
    shapeType: Optional[ShapeType] = None
    area: float = 0.0
Author	SHA1	Message	Date
Gergő Jedlicska	8352bb5c9a	Merge pull request #257 from Knuttatutta/knuttatutta/add_axis_type Fix: Add AxisType and fix its type in Axis	2023-02-01 15:27:34 +02:00
Gergő Jedlicska	fc34b876fd	Merge branch 'main' into knuttatutta/add_axis_type	2023-02-01 15:26:10 +02:00
Gergő Jedlicska	183993cfc5	Merge pull request #254 from RobClaessensRHDHV/feature/revit_analytical_to_specklepy_structural_fixes Fix: Interoperability from Revit analytical to specklepy structural	2023-02-01 15:24:45 +02:00
Knuttatutta	9be3b4b93d	Added AxisType in module init	2023-02-01 10:34:01 +01:00
Knuttatutta	0b14660115	Add AxisType, fix type in Axis	2023-02-01 10:16:13 +01:00
908599	68c4c682a0	Revert incorrect type hint change	2023-01-17 10:46:31 +01:00
908599	4f93ddcaf3	Update speckle_type of SectionProfile to match C#, update type hints with C# Enum values to int. For the SectionProfile, a separate static variable e.g. STRUCTURAL_PROFILE could be created later, I now just made an easy fix. For the enumeration attributes, I believe they should be integer, as e.g. Revit pushes them as integers, not strings.	2023-01-16 16:01:33 +01:00
Gergő Jedlicska	e842f651b9	Merge pull request #253 from RobClaessensRHDHV/feature/structural_property_bugfix Typo fix in properties.py	2023-01-16 13:53:44 +01:00
908599	7e1bec1aba	Typo fix in properties.py	2023-01-16 11:39:41 +01:00