IfcTextLiteral Improvements

GeometryGym · Oct 6, 2022 · a45248f · a45248f
1 parent 0589fe7
commit a45248f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Core/IFC/Enumerations.cs b/Core/IFC/Enumerations.cs
@@ -59,6 +59,7 @@ public enum IfcBearingTypeDisplacementEnum { NOTDEFINED, FIXED_MOVEMENT, GUIDED_
 	public enum IfcBearingTypeEnum { NOTDEFINED, USERDEFINED, CYLINDRICAL, SPHERICAL, ELASTOMERIC, POT, GUIDE, ROCKER, ROLLER, [VersionAdded(ReleaseVersion.IFC4X2)] DISK };
 	public enum IfcBenchmarkEnum { GREATERTHAN, GREATERTHANOREQUALTO, LESSTHAN, LESSTHANOREQUALTO, EQUALTO, NOTEQUALTO, INCLUDES, NOTINCLUDES, INCLUDEDIN, NOTINCLUDEDIN };
 	public enum IfcBoilerTypeEnum { NOTDEFINED, USERDEFINED, WATER, STEAM };
+	public enum IfcBoxAlignment { TOP_LEFT, TOP_MIDDLE, TOP_RIGHT, MIDDLE_LEFT, CENTER, MIDDLE_RIGHT, BOTTOM_LEFT, BOTTOM_MIDDLE, BOTTOM_RIGHT };
 	public enum IfcBooleanOperator { UNION, INTERSECTION, DIFFERENCE };
 	public enum IfcBridgePartTypeEnum { NOTDEFINED, USERDEFINED, ABUTMENT, DECK, DECK_SEGMENT, FOUNDATION, PIER, PIER_SEGMENT, PYLON, SUBSTRUCTURE, SUPERSTRUCTURE, SURFACESTRUCTURE };
 	public enum IfcBridgeTypeEnum { NOTDEFINED, USERDEFINED, ARCHED, CABLE_STAYED, CANTILEVER, CULVERT, FRAMEWORK, GIRDER, SUSPENSION, TRUSS };

diff --git a/Core/IFC/IFC T.cs b/Core/IFC/IFC T.cs
@@ -413,7 +413,7 @@ public partial class IfcTextLiteral : IfcGeometricRepresentationItem //SUPERTYPE
 		internal IfcAxis2Placement mPlacement;// : IfcAxis2Placement;
 		internal IfcTextPath mPath;// : IfcTextPath;
 
-		public string Literal { get { return ParserIfc.Decode(mLiteral); } set { mLiteral = ParserIfc.Encode(value); } }
+		public string Literal { get { return mLiteral; } set { mLiteral = value; } }
 		public IfcAxis2Placement Placement { get { return mPlacement; } }
 		public IfcTextPath Path { get { return mPath; } set { mPath = value; } }
 
@@ -424,16 +424,29 @@ internal IfcTextLiteral(DatabaseIfc db, IfcTextLiteral l, DuplicateOptions optio
 			mPlacement = db.Factory.Duplicate<IfcAxis2Placement>(l.mPlacement);
 			mPath = l.mPath; 
 		}
+		public IfcTextLiteral(string literal, IfcAxis2Placement placement, IfcTextPath path)
+			: base(placement.Database)
+		{
+			Literal = literal;
+			mPlacement = placement;
+			mPath = path;
+		}
 	}
 	[Serializable]
 	public partial class IfcTextLiteralWithExtent : IfcTextLiteral
 	{
 		internal IfcPlanarExtent mExtent;// : IfcPlanarExtent;
-		internal string mBoxAlignment = "";// : IfcBoxAlignment; 
+		internal IfcBoxAlignment mBoxAlignment = IfcBoxAlignment.CENTER;// : IfcBoxAlignment; 
 
 		public IfcPlanarExtent Extent { get { return mExtent; } set { mExtent = value; } }
 
 		internal IfcTextLiteralWithExtent() : base() { }
+		public IfcTextLiteralWithExtent(string literal, IfcAxis2Placement placement, IfcTextPath path, IfcPlanarExtent extent, IfcBoxAlignment alignment)
+			: base(literal, placement, path)
+		{
+			mExtent = extent;
+			mBoxAlignment = alignment;
+		}
 	}
 	[Serializable]
 	public partial class IfcTextStyle : IfcPresentationStyle, IfcPresentationStyleSelect

diff --git a/Core/IFC/STEP/IFC T STEP.cs b/Core/IFC/STEP/IFC T STEP.cs
@@ -411,12 +411,15 @@ internal override void parse(string str, ref int pos, ReleaseVersion release, in
 	}
 	public partial class IfcTextLiteralWithExtent
 	{
-		protected override string BuildStringSTEP(ReleaseVersion release) { return base.BuildStringSTEP(release) + ",#" + mExtent.StepId + ",'" + mBoxAlignment + "'"; }
+		protected override string BuildStringSTEP(ReleaseVersion release) 
+		{ 
+			return base.BuildStringSTEP(release) + ",#" + mExtent.StepId + ",'" + mBoxAlignment.ToString().ToLower().Replace("_","-") + "'";
+		}
 		internal override void parse(string str, ref int pos, ReleaseVersion release, int len, ConcurrentDictionary<int, BaseClassIfc> dictionary)
 		{
 			base.parse(str, ref pos, release, len, dictionary);
 			mExtent = dictionary[ParserSTEP.StripLink(str, ref pos, len)] as IfcPlanarExtent;
-			mBoxAlignment = ParserSTEP.StripString(str, ref pos, len);
+			Enum.TryParse<IfcBoxAlignment>(ParserSTEP.StripString(str, ref pos, len).Replace("-","_"), true, out mBoxAlignment);
 		}
 	}
 	public partial class IfcTextStyle