Merge branch 'develop'

martin1cerny · martin1cerny · commit 4ed33f7a0427 · 2024-03-06T17:00:21.000+01:00
diff --git a/Tests/BinaryDataTests.cs b/Tests/BinaryDataTests.cs
@@ -90,7 +90,7 @@ private static void PixelTextureTestCode(XbimSchemaVersion version)
             var data = new List<byte[]>() { new byte[] { 0, 0, 255, 255 }, new byte[] { 0, 255, 255, 255 }, new byte[] { 255, 0, 255, 255 }, new byte[] { 255, 0, 0, 255 } };
             using (var model = new MemoryModel(new EntityFactoryIfc4()))
             {
-                var create = new Create(model);
+                var create = new EntityCreator(model);
                 using (var txn = model.BeginTransaction(""))
                 {
                     var pt = create.PixelTexture(t => {
diff --git a/Tests/Ifc4x3Tests.cs b/Tests/Ifc4x3Tests.cs
@@ -12,6 +12,7 @@
 using Xbim.Ifc4x3.GeometryResource;
 using Xbim.Ifc4x3.MeasureResource;
 using Xbim.Ifc4x3.ProductExtension;
+using Xbim.IO.Memory;
 
 namespace Xbim.Essentials.Tests
 {
@@ -121,5 +122,17 @@ public void SurfaceDimensionsImplemented()
 
             }
         }
+
+        [TestMethod]
+        public void CanCreateEntitiesWithFactory()
+        {
+            using var model = new MemoryModel(new EntityFactoryIfc4x3Add2());
+            using var txn = model.BeginTransaction("Creation");
+
+            var c = new EntityCreator(model);
+            c.Wall(w => w.Name = "First wall");
+
+            txn.Commit();
+        }
     }
 }
diff --git a/Tests/OwnerHistoryTests.cs b/Tests/OwnerHistoryTests.cs
@@ -17,7 +17,7 @@ public void NonEmptyEditorCredentials()
             {
                 using (var txn = model.BeginTransaction())
                 {
-                    var create = new Create(model);
+                    var create = new EntityCreator(model);
                     var wall = create.Wall(w => w.Name = "New wall");
                     Assert.IsNotNull(wall.OwnerHistory);
                     Assert.IsTrue(model.Instances.Count > 1);
@@ -33,7 +33,7 @@ public void EmptyEditorCredentials()
                 model.ManageOwnerHistory = false;
                 using (var txn = model.BeginTransaction())
                 {
-                    var create = new Create(model);
+                    var create = new EntityCreator(model);
                     var wall = create.Wall(w => w.Name = "New wall");
                     Assert.IsNull(wall.OwnerHistory);
                     Assert.AreEqual(1, model.Instances.Count);
@@ -48,7 +48,7 @@ public void NoOwnerHistoryForInsertCopy()
             {
                 using (var txn = source.BeginTransaction())
                 {
-                    var create = new Create(source);
+                    var create = new EntityCreator(source);
                     source.ManageOwnerHistory = false;
                     create.Wall(w => w.Name = "New wall #1");
                     create.Wall(w => w.Name = "New wall #2");
diff --git a/Tests/Pure4Tests.cs b/Tests/Pure4Tests.cs
@@ -22,7 +22,7 @@ public void IndependentCreation()
 
         public void CreateDataWithoutInitializers(IModel model)
         {
-            var create = new Create(model);
+            var create = new EntityCreator(model);
             var wall = create.Wall();
             wall.PredefinedType = IfcWallTypeEnum.POLYGONAL;
             wall.Name = "Name of the perfect wall";
@@ -37,7 +37,7 @@ public void CreateDataWithoutInitializers(IModel model)
 
         public void CreateDataWithInitializers(IModel model)
         {
-            var create = new Create(model);
+            var create = new EntityCreator(model);
             var wall = create.Wall(w =>
             {
                 w.PredefinedType = IfcWallTypeEnum.POLYGONAL;
diff --git a/Tests/ValidationTests.cs b/Tests/ValidationTests.cs
@@ -46,7 +46,7 @@ public void ContextDependentUnitValidationTest()
             {
                 using (var txn = model.BeginTransaction())
                 {
-                    var c = new Create(model);
+                    var c = new EntityCreator(model);
                     var unit = c.ContextDependentUnit(u =>
                     {
                         u.UnitType = IfcUnitEnum.USERDEFINED;
diff --git a/Xbim.Essentials.tmpl b/Xbim.Essentials.tmpl
@@ -38,22 +38,32 @@
 			</group>
 			<group targetFramework="netstandard2.1">
 				<dependency id="Xbim.Common" version="{{version}}" />
+				<dependency id="Xbim.Ifc" version="{{version}}" />
 				<dependency id="Xbim.Ifc4" version="{{version}}" />
 				<dependency id="Xbim.Ifc2x3" version="{{version}}" />
 				<dependency id="Xbim.Ifc4x3" version="{{version}}" />
 				<dependency id="Xbim.IO.Esent" version="{{version}}" />
 				<dependency id="Xbim.IO.MemoryModel" version="{{version}}" />
-				<dependency id="Xbim.Ifc" version="{{version}}" />
 				<dependency id="Xbim.Tessellator" version="{{version}}" />
 			</group>
 			<group targetFramework="net6.0">
 				<dependency id="Xbim.Common" version="{{version}}" />
+				<dependency id="Xbim.Ifc" version="{{version}}" />
 				<dependency id="Xbim.Ifc4" version="{{version}}" />
 				<dependency id="Xbim.Ifc2x3" version="{{version}}" />
 				<dependency id="Xbim.Ifc4x3" version="{{version}}" />
 				<dependency id="Xbim.IO.Esent" version="{{version}}" />
 				<dependency id="Xbim.IO.MemoryModel" version="{{version}}" />
+				<dependency id="Xbim.Tessellator" version="{{version}}" />
+			</group>
+			<group targetFramework="net8.0">
+				<dependency id="Xbim.Common" version="{{version}}" />
 				<dependency id="Xbim.Ifc" version="{{version}}" />
+				<dependency id="Xbim.Ifc4" version="{{version}}" />
+				<dependency id="Xbim.Ifc2x3" version="{{version}}" />
+				<dependency id="Xbim.Ifc4x3" version="{{version}}" />
+				<dependency id="Xbim.IO.Esent" version="{{version}}" />
+				<dependency id="Xbim.IO.MemoryModel" version="{{version}}" />
 				<dependency id="Xbim.Tessellator" version="{{version}}" />
 			</group>
 		</dependencies>
diff --git a/Xbim.Ifc/Create.cs b/Xbim.Ifc/Create.cs
diff --git a/Xbim.Ifc/Xbim.Ifc.csproj b/Xbim.Ifc/Xbim.Ifc.csproj
diff --git a/Xbim.Ifc2x3/Interfaces/IFC4/Create.cs b/Xbim.Ifc2x3/Interfaces/IFC4/Create.cs

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private static void PixelTextureTestCode(XbimSchemaVersion version)`
`90`	`90`	`var data = new List<byte[]>() { new byte[] { 0, 0, 255, 255 }, new byte[] { 0, 255, 255, 255 }, new byte[] { 255, 0, 255, 255 }, new byte[] { 255, 0, 0, 255 } };`
`91`	`91`	`using (var model = new MemoryModel(new EntityFactoryIfc4()))`
`92`	`92`	`{`
`93`		`- var create = new Create(model);`
	`93`	`+ var create = new EntityCreator(model);`
`94`	`94`	`using (var txn = model.BeginTransaction(""))`
`95`	`95`	`{`
`96`	`96`	`var pt = create.PixelTexture(t => {`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using Xbim.Ifc4x3.GeometryResource;`
`13`	`13`	`using Xbim.Ifc4x3.MeasureResource;`
`14`	`14`	`using Xbim.Ifc4x3.ProductExtension;`
	`15`	`+using Xbim.IO.Memory;`
`15`	`16`
`16`	`17`	`namespace Xbim.Essentials.Tests`
`17`	`18`	`{`
`@@ -121,5 +122,17 @@ public void SurfaceDimensionsImplemented()`
`121`	`122`
`122`	`123`	`}`
`123`	`124`	`}`
	`125`	`+`
	`126`	`+ [TestMethod]`
	`127`	`+ public void CanCreateEntitiesWithFactory()`
	`128`	`+ {`
	`129`	`+ using var model = new MemoryModel(new EntityFactoryIfc4x3Add2());`
	`130`	`+ using var txn = model.BeginTransaction("Creation");`
	`131`	`+`
	`132`	`+ var c = new EntityCreator(model);`
	`133`	`+ c.Wall(w => w.Name = "First wall");`
	`134`	`+`
	`135`	`+ txn.Commit();`
	`136`	`+ }`
`124`	`137`	`}`
`125`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public void NonEmptyEditorCredentials()`
`17`	`17`	`{`
`18`	`18`	`using (var txn = model.BeginTransaction())`
`19`	`19`	`{`
`20`		`- var create = new Create(model);`
	`20`	`+ var create = new EntityCreator(model);`
`21`	`21`	`var wall = create.Wall(w => w.Name = "New wall");`
`22`	`22`	`Assert.IsNotNull(wall.OwnerHistory);`
`23`	`23`	`Assert.IsTrue(model.Instances.Count > 1);`
`@@ -33,7 +33,7 @@ public void EmptyEditorCredentials()`
`33`	`33`	`model.ManageOwnerHistory = false;`
`34`	`34`	`using (var txn = model.BeginTransaction())`
`35`	`35`	`{`
`36`		`- var create = new Create(model);`
	`36`	`+ var create = new EntityCreator(model);`
`37`	`37`	`var wall = create.Wall(w => w.Name = "New wall");`
`38`	`38`	`Assert.IsNull(wall.OwnerHistory);`
`39`	`39`	`Assert.AreEqual(1, model.Instances.Count);`
`@@ -48,7 +48,7 @@ public void NoOwnerHistoryForInsertCopy()`
`48`	`48`	`{`
`49`	`49`	`using (var txn = source.BeginTransaction())`
`50`	`50`	`{`
`51`		`- var create = new Create(source);`
	`51`	`+ var create = new EntityCreator(source);`
`52`	`52`	`source.ManageOwnerHistory = false;`
`53`	`53`	`create.Wall(w => w.Name = "New wall #1");`
`54`	`54`	`create.Wall(w => w.Name = "New wall #2");`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void IndependentCreation()`
`22`	`22`
`23`	`23`	`public void CreateDataWithoutInitializers(IModel model)`
`24`	`24`	`{`
`25`		`- var create = new Create(model);`
	`25`	`+ var create = new EntityCreator(model);`
`26`	`26`	`var wall = create.Wall();`
`27`	`27`	`wall.PredefinedType = IfcWallTypeEnum.POLYGONAL;`
`28`	`28`	`wall.Name = "Name of the perfect wall";`
`@@ -37,7 +37,7 @@ public void CreateDataWithoutInitializers(IModel model)`
`37`	`37`
`38`	`38`	`public void CreateDataWithInitializers(IModel model)`
`39`	`39`	`{`
`40`		`- var create = new Create(model);`
	`40`	`+ var create = new EntityCreator(model);`
`41`	`41`	`var wall = create.Wall(w =>`
`42`	`42`	`{`
`43`	`43`	`w.PredefinedType = IfcWallTypeEnum.POLYGONAL;`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void ContextDependentUnitValidationTest()`
`46`	`46`	`{`
`47`	`47`	`using (var txn = model.BeginTransaction())`
`48`	`48`	`{`
`49`		`- var c = new Create(model);`
	`49`	`+ var c = new EntityCreator(model);`
`50`	`50`	`var unit = c.ContextDependentUnit(u =>`
`51`	`51`	`{`
`52`	`52`	`u.UnitType = IfcUnitEnum.USERDEFINED;`