GeometryGym
/
GeometryGymIFC
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Minor Improvements

This commit is contained in:
Jon Mirtschin 2023-03-13 08:25:26 +11:00
Родитель e2854dbc79
Коммит 9e49830668
7 изменённых файлов: 71 добавлений и 50 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

79
Core/IFC/IFC A.cs
Просмотреть файл

@ -245,8 +245,8 @@ namespace GeometryGym.Ifc
internal IfcAlarmType(DatabaseIfc db, IfcAlarmType t, DuplicateOptions options) : base(db, t, options) { PredefinedType = t.PredefinedType; }
public IfcAlarmType(DatabaseIfc db, string name, IfcAlarmTypeEnum t) : base(db) { Name = name; PredefinedType = t; }
}
[Serializable]
public partial class IfcAlignment : IfcLinearPositioningElement //IFC4.1
[Serializable, VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment : IfcLinearPositioningElement
{
private IfcAlignmentTypeEnum mPredefinedType = IfcAlignmentTypeEnum.NOTDEFINED;// : OPTIONAL IfcAlignmentTypeEnum;
public IfcAlignmentTypeEnum PredefinedType { get { return mPredefinedType; } set { mPredefinedType = validPredefinedType<IfcAlignmentTypeEnum>(value, mDatabase == null ? ReleaseVersion.IFC4X3 : mDatabase.Release); } }
@ -293,8 +293,7 @@ namespace GeometryGym.Ifc
return base.isDuplicate(e, options);
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DCant : IfcAxisLateralInclination
{
private LIST<IfcAlignment2DCantSegment> mSegments = new LIST<IfcAlignment2DCantSegment>(); //: LIST[1:?] OF IfcAlignment2DCantSegment;
@ -316,8 +315,7 @@ namespace GeometryGym.Ifc
RailHeadDistance = railHeadDistance;
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DCantSegLine : IfcAlignment2DCantSegment
{
public IfcAlignment2DCantSegLine() : base() { }
@ -325,8 +323,7 @@ namespace GeometryGym.Ifc
public IfcAlignment2DCantSegLine(DatabaseIfc db, double startDistAlong, double horizontalLength, double startCantLeft, double startCantRight)
: base(db, startDistAlong, horizontalLength, startCantLeft, startCantRight) { }
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public abstract partial class IfcAlignment2DCantSegment : IfcAlignment2DSegment
{
private double mStartDistAlong = 0; //: IfcPositiveLengthMeasure;
@ -360,8 +357,7 @@ namespace GeometryGym.Ifc
StartCantRight = startCantRight;
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DCantSegConstant : IfcAlignment2DCantSegment
{
public IfcAlignment2DCantSegConstant() : base() { }
@ -370,8 +366,7 @@ namespace GeometryGym.Ifc
public IfcAlignment2DCantSegConstant(DatabaseIfc db, double startDistAlong, double horizontalLength, double startCantLeft, double startCantRight, bool isStartRadiusCCW, bool isEndRadiusCCW, IfcTransitionCurveType transitionCurveType, double endCantLeft, double endCantRight)
: base(db, startDistAlong, horizontalLength, startCantLeft, startCantRight) { }
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DCantSegTransition : IfcAlignment2DCantSegment
{
private double mEndCantLeft = double.NaN; //: OPTIONAL IfcLengthMeasure;
@ -393,8 +388,7 @@ namespace GeometryGym.Ifc
EndCantRight = endCantRight;
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DCantSegTransitionNonLinear : IfcAlignment2DCantSegTransition
{
private double mStartRadius = double.NaN; //: OPTIONAL IfcPositiveLengthMeasure;
@ -427,8 +421,7 @@ namespace GeometryGym.Ifc
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DVerSegTransition : IfcAlignment2DVerticalSegment
{
private double mStartRadius = double.NaN; //: OPTIONAL IfcPositiveLengthMeasure;
@ -460,8 +453,7 @@ namespace GeometryGym.Ifc
TransitionCurveType = transitionCurveType;
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DHorizontal : IfcGeometricRepresentationItem //IFC4.1
{
internal double mStartDistAlong = double.NaN;// : OPTIONAL IfcLengthMeasure;
@ -501,8 +493,7 @@ namespace GeometryGym.Ifc
}
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DHorizontalSegment : IfcAlignment2DSegment //IFC4.1
{
private IfcCurveSegment2D mCurveGeometry;// : IfcCurveSegment2D;
@ -516,8 +507,7 @@ namespace GeometryGym.Ifc
internal IfcAlignment2DHorizontalSegment(DatabaseIfc db, IfcAlignment2DHorizontalSegment s, DuplicateOptions options) : base(db, s, options) { CurveGeometry = db.Factory.Duplicate(s.CurveGeometry) as IfcCurveSegment2D; }
public IfcAlignment2DHorizontalSegment(IfcCurveSegment2D seg) : base(seg.mDatabase) { CurveGeometry = seg; }
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public abstract partial class IfcAlignment2DSegment : IfcGeometricRepresentationItem //IFC4.1 ABSTRACT SUPERTYPE OF(ONEOF(IfcAlignment2DHorizontalSegment, IfcAlignment2DVerticalSegment))
{
internal IfcLogicalEnum mTangentialContinuity = IfcLogicalEnum.UNKNOWN;// : OPTIONAL IfcBoolean;
@ -537,8 +527,7 @@ namespace GeometryGym.Ifc
EndTag = s.EndTag;
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DVerSegCircularArc : IfcAlignment2DVerticalSegment //IFC4.1
{
private double mRadius;// : IfcPositiveLengthMeasure;
@ -560,17 +549,15 @@ namespace GeometryGym.Ifc
mIsConvex = isConvex;
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
public partial class IfcAlignment2DVerSegLine : IfcAlignment2DVerticalSegment //IFC4.1
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DVerSegLine : IfcAlignment2DVerticalSegment
{
internal IfcAlignment2DVerSegLine() : base() { }
internal IfcAlignment2DVerSegLine(DatabaseIfc db, IfcAlignment2DVerSegLine alignment2DVerSegLine, DuplicateOptions options) : base(db, alignment2DVerSegLine, options) { }
public IfcAlignment2DVerSegLine(DatabaseIfc db, double startDist, double horizontalLength, double startHeight, double startGradient)
: base(db, startDist, horizontalLength, startHeight, startGradient) { }
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DVerSegParabolicArc : IfcAlignment2DVerticalSegment //IFC4.1
{
private double mParabolaConstant;// : IfcPositiveLengthMeasure;
@ -592,9 +579,8 @@ namespace GeometryGym.Ifc
mIsConvex = isConvex;
}
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
public partial class IfcAlignment2DVertical : IfcGeometricRepresentationItem //IFC4.1
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignment2DVertical : IfcGeometricRepresentationItem
{
internal LIST<IfcAlignment2DVerticalSegment> mSegments = new LIST<IfcAlignment2DVerticalSegment>();// : LIST [1:?] OF IfcAlignment2DVerticalSegment;
//INVERSE
@ -609,9 +595,8 @@ namespace GeometryGym.Ifc
}
public IfcAlignment2DVertical(IEnumerable<IfcAlignment2DVerticalSegment> segments) : base(segments.First().Database) { Segments.AddRange(segments); }
}
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable]
public abstract partial class IfcAlignment2DVerticalSegment : IfcAlignment2DSegment //IFC4.1
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public abstract partial class IfcAlignment2DVerticalSegment : IfcAlignment2DSegment
{
internal double mStartDistAlong;// : IfcLengthMeasure;
internal double mHorizontalLength;// : IfcPositiveLengthMeasure;
@ -639,7 +624,7 @@ namespace GeometryGym.Ifc
mStartGradient = startGradient;
}
}
[Serializable]
[Serializable, VersionAdded(ReleaseVersion.IFC4X3)]
public partial class IfcAlignmentCant : IfcLinearElement
{
private double mRailHeadDistance = 0; //: IfcPositiveLengthMeasure;
@ -680,7 +665,7 @@ namespace GeometryGym.Ifc
return result;
}
}
[Serializable]
[Serializable, VersionAdded(ReleaseVersion.IFC4X3)]
public partial class IfcAlignmentCantSegment : IfcAlignmentParameterSegment
{
private double mStartDistAlong = 0; //: IfcLengthMeasure;
@ -787,8 +772,7 @@ namespace GeometryGym.Ifc
return result;
}
}
[Serializable]
[Obsolete("DEPRECATED IFC4X3", false)]
[Serializable, Obsolete("DEPRECATED IFC4X3", false), VersionAdded(ReleaseVersion.IFC4X1)]
public partial class IfcAlignmentCurve : IfcBoundedCurve //IFC4.1
{
internal IfcAlignment2DHorizontal mHorizontal = null;// : OPTIONAL IfcAlignment2DHorizontal;
@ -813,7 +797,7 @@ namespace GeometryGym.Ifc
public IfcAlignmentCurve(IfcAlignment2DVertical vertical) : base(vertical.Database) { Vertical = vertical; }
public IfcAlignmentCurve(IfcAlignment2DHorizontal horizontal, IfcAlignment2DVertical vertical) : this(horizontal) { Vertical = vertical; }
}
[Serializable]
[Serializable, VersionAdded(ReleaseVersion.IFC4X3)]
public partial class IfcAlignmentHorizontal : IfcLinearElement
{
[Obsolete("Removed IFC4x3RC4", false)]
@ -904,7 +888,7 @@ namespace GeometryGym.Ifc
return base.isDuplicate(e, options);
}
}
[Serializable]
[Serializable, VersionAdded(ReleaseVersion.IFC4X3)]
public partial class IfcAlignmentHorizontalSegment : IfcAlignmentParameterSegment
{
private IfcCartesianPoint mStartPoint;// : IfcCartesianPoint;
@ -1104,7 +1088,7 @@ namespace GeometryGym.Ifc
return base.isDuplicate(e, tol);
}
}
[Serializable]
[Serializable, VersionAdded(ReleaseVersion.IFC4X3)]
public abstract partial class IfcAlignmentParameterSegment : BaseClassIfc
{
private string mStartTag = ""; //: OPTIONAL IfcLabel;
@ -1140,7 +1124,7 @@ namespace GeometryGym.Ifc
return base.isDuplicate(e, tol);
}
}
[Serializable]
[Serializable, VersionAdded(ReleaseVersion.IFC4X3)]
public partial class IfcAlignmentSegment : IfcLinearElement
{
private IfcAlignmentParameterSegment mDesignParameters = null;// : IfcAlignmentParameterSegment;
@ -1182,7 +1166,7 @@ namespace GeometryGym.Ifc
return base.isDuplicate(e, options);
}
}
[Serializable]
[Serializable, VersionAdded(ReleaseVersion.IFC4X3)]
public partial class IfcAlignmentVertical : IfcLinearElement
{
[Obsolete("Interim during IFC4x3RC2", false)]
@ -1221,7 +1205,7 @@ namespace GeometryGym.Ifc
return result;
}
}
[Serializable]
[Serializable, VersionAdded(ReleaseVersion.IFC4X3)]
public partial class IfcAlignmentVerticalSegment : IfcAlignmentParameterSegment
{
private double mStartDistAlong = 0; //: IfcLengthMeasure;
@ -1348,9 +1332,8 @@ namespace GeometryGym.Ifc
throw new NotImplementedException("Computation of height for " + PredefinedType + " not implemented yet!");
}
}
[Obsolete("DEPRECATED IFC4", false)]
[Serializable]
public partial class IfcAngularDimension : IfcDimensionCurveDirectedCallout //IFC4 DEPRECATED
[Serializable, Obsolete("DEPRECATED IFC4", false)]
public partial class IfcAngularDimension : IfcDimensionCurveDirectedCallout
{
internal IfcAngularDimension() : base() { }
}

11
Core/IFC/IFC B.cs
Просмотреть файл

@ -356,6 +356,17 @@ namespace GeometryGym.Ifc
}
return new IfcIndexedPolyCurve(new IfcCartesianPointList2D(db, points), segments);
}
internal T representationOf<T>() where T : IfcProduct
{
IfcShapeModel shapeModel = Represents.FirstOrDefault();
if (shapeModel != null)
{
var ofRepresentation = shapeModel.OfProductRepresentation.SelectMany(x => x.ShapeOfProduct);
return ofRepresentation.OfType<T>().FirstOrDefault();
}
return null;
}
}
[Serializable]
public abstract partial class IfcBoundedSurface : IfcSurface // ABSTRACT SUPERTYPE OF (ONEOF(IfcCurveBoundedPlane,IfcRectangularTrimmedSurface))

9
Core/IFC/IFC C.cs
Просмотреть файл

@ -1005,6 +1005,15 @@ namespace GeometryGym.Ifc
{
Segments.AddRange(c.Segments.Select(x => db.Factory.Duplicate(x) as IfcSegment));
mSelfIntersect = c.mSelfIntersect;
IfcLinearElement linearElement = representationOf<IfcLinearElement>();
if (linearElement != null)
db.Factory.Duplicate(linearElement, new DuplicateOptions(options) { DuplicateHost = true });
else
{
IfcPositioningElement positioningElement = c.representationOf<IfcPositioningElement>();
if (positioningElement != null)
db.Factory.Duplicate(positioningElement, new DuplicateOptions(options) { DuplicateHost = true });
}
}
public IfcCompositeCurve(IEnumerable<IfcSegment> segments) : base(segments.First().mDatabase) { mSegments.AddRange(segments); }
public IfcCompositeCurve(params IfcSegment[] segments) : base(segments[0].mDatabase) { mSegments.AddRange(segments); }

2
Core/IFC/IFC F.cs
Просмотреть файл

@ -79,7 +79,7 @@ namespace GeometryGym.Ifc
return result;
}
}
[Serializable]
[Serializable, Obsolete("DEPRECATED IFC4", false)]
public partial class IfcFaceBasedSurfaceModel : IfcGeometricRepresentationItem, IfcSurfaceOrFaceSurface
{
private SET<IfcConnectedFaceSet> mFbsmFaces = new SET<IfcConnectedFaceSet>();// : SET [1:?] OF IfcConnectedFaceSet;

9
Core/IFC/IFC G.cs
Просмотреть файл

@ -411,6 +411,15 @@ namespace GeometryGym.Ifc
{
mBaseCurve = db.Factory.Duplicate(c.mBaseCurve) as IfcBoundedCurve;
mEndPoint = db.Factory.Duplicate(c.mEndPoint) as IfcPlacement;
IfcLinearElement linearElement = c.representationOf<IfcLinearElement>();
if (linearElement != null)
db.Factory.Duplicate(linearElement, new DuplicateOptions(options) { DuplicateHost = true });
else
{
IfcPositioningElement positioningElement = c.representationOf<IfcPositioningElement>();
if(positioningElement != null)
db.Factory.Duplicate(positioningElement, new DuplicateOptions(options) { DuplicateHost = true });
}
}
public IfcGradientCurve(IfcBoundedCurve baseCurve, IEnumerable<IfcCurveSegment> segments)
: base(segments) { BaseCurve = baseCurve; }

2
Core/IFC/IFC R.cs
Просмотреть файл

@ -2532,7 +2532,7 @@ namespace GeometryGym.Ifc
public IfcShapeModel MappedRepresentation
{
get { return mMappedRepresentation; }
set { mMappedRepresentation = value; value.mRepresentationMap = this; }
set { mMappedRepresentation = value; if(value != null) value.mRepresentationMap = this; }
}
public SET<IfcShapeAspect> HasShapeAspects { get { return mHasShapeAspects; } }
public SET<IfcMappedItem> MapUsage { get { return mMapUsage; } }

9
Core/IFC/IFC S.cs
Просмотреть файл

@ -357,6 +357,15 @@ namespace GeometryGym.Ifc
{
BaseCurve = db.Factory.Duplicate(segmentedReferenceCurve.BaseCurve, options) as IfcBoundedCurve;
EndPoint = db.Factory.Duplicate(segmentedReferenceCurve.EndPoint, options) as IfcPlacement;
IfcLinearElement linearElement = segmentedReferenceCurve.representationOf<IfcLinearElement>();
if (linearElement != null)
db.Factory.Duplicate(linearElement, new DuplicateOptions(options) { DuplicateHost = true });
else
{
IfcPositioningElement positioningElement = segmentedReferenceCurve.representationOf<IfcPositioningElement>();
if (positioningElement != null)
db.Factory.Duplicate(positioningElement, new DuplicateOptions(options) { DuplicateHost = true });
}
}
public IfcSegmentedReferenceCurve(IfcBoundedCurve baseCurve, IEnumerable<IfcCurveSegment> segments)
: base(segments) { BaseCurve = baseCurve; }