add streamline changes do my bimtester 2

Author: berndhahnebach

src/ifcbimtester/bimtester/features/steps/application/en.py

@@ -26,7 +26,7 @@
 def step_impl(context, fullname):
 
     real_fullname = IfcStore.file.by_type("IfcApplication")[0].ApplicationFullName
-    assert  real_fullname == fullname , (
+    assert real_fullname == fullname, (
         "The IFC file was not exported by application full name {} "
         "instead it was exported by application full name {}"
         .format(fullname, real_fullname)

src/ifcbimtester/bimtester/features/steps/geolocation/en.py

@@ -30,7 +30,7 @@
 from bimtester.lang import _
 
 
-@step(u'There must be at least one "{ifc_class}" element')
+@step('There must be at least one "{ifc_class}" element')
 def step_impl(context, ifc_class):
     assert len(IfcStore.file.by_type(ifc_class)) >= 1, _("An element of {} could not be found").format(ifc_class)
 
@@ -68,7 +68,7 @@ def check_ifc4_geolocation(entity_name, prop_name=None, value=None, should_asser
         return actual_value
 
 
-@step(u"The project must have coordinate reference system data")
+@step("The project must have coordinate reference system data")
 def step_impl(context):
     if IfcStore.file.schema == "IFC2X3":
         for site in IfcStore.file.by_type("IfcSite"):
@@ -77,7 +77,7 @@ def step_impl(context):
     check_ifc4_geolocation("IfcProjectedCRS")
 
 
-@step(u'The name of the CRS must be "{coordinate_reference_name}"')
+@step('The name of the CRS must be "{coordinate_reference_name}"')
 def step_impl(context, coordinate_reference_name):
     if IfcStore.file.schema == "IFC2X3":
         for site in IfcStore.file.by_type("IfcSite"):
@@ -86,7 +86,7 @@ def step_impl(context, coordinate_reference_name):
     check_ifc4_geolocation("IfcProjectedCRS", "Name", coordinate_reference_name)
 
 
-@step(u'The description of the CRS must be "{value}"')
+@step('The description of the CRS must be "{value}"')
 def step_impl(context, value):
     if IfcStore.file.schema == "IFC2X3":
         for site in IfcStore.file.by_type("IfcSite"):
@@ -95,7 +95,7 @@ def step_impl(context, value):
     check_ifc4_geolocation("IfcProjectedCRS", "Description", value)
 
 
-@step(u'The geodetic datum must be "{coordinate_reference_name}"')
+@step('The geodetic datum must be "{coordinate_reference_name}"')
 def step_impl(context, coordinate_reference_name):
     if IfcStore.file.schema == "IFC2X3":
         for site in IfcStore.file.by_type("IfcSite"):
@@ -104,7 +104,7 @@ def step_impl(context, coordinate_reference_name):
     check_ifc4_geolocation("IfcProjectedCRS", "GeodeticDatum", coordinate_reference_name)
 
 
-@step(u'The vertical datum must be "{coordinate_reference_name}"')
+@step('The vertical datum must be "{coordinate_reference_name}"')
 def step_impl(context, coordinate_reference_name):
     if IfcStore.file.schema == "IFC2X3":
         for site in IfcStore.file.by_type("IfcSite"):
@@ -113,7 +113,7 @@ def step_impl(context, coordinate_reference_name):
     check_ifc4_geolocation("IfcProjectedCRS", "VerticalDatum", coordinate_reference_name)
 
 
-@step(u'The map projection must be "{coordinate_reference_name}"')
+@step('The map projection must be "{coordinate_reference_name}"')
 def step_impl(context, coordinate_reference_name):
     if IfcStore.file.schema == "IFC2X3":
         for site in IfcStore.file.by_type("IfcSite"):
@@ -122,7 +122,7 @@ def step_impl(context, coordinate_reference_name):
     check_ifc4_geolocation("IfcProjectedCRS", "MapProjection", coordinate_reference_name)
 
 
-@step(u'The map zone must be "{coordinate_reference_name}"')
+@step('The map zone must be "{coordinate_reference_name}"')
 def step_impl(context, coordinate_reference_name):
     if IfcStore.file.schema == "IFC2X3":
         for site in IfcStore.file.by_type("IfcSite"):
@@ -131,7 +131,7 @@ def step_impl(context, coordinate_reference_name):
     check_ifc4_geolocation("IfcProjectedCRS", "MapZone", coordinate_reference_name)
 
 
-@step(u'The map unit must be "{unit}"')
+@step('The map unit must be "{unit}"')
 def step_impl(context, unit):
     if IfcStore.file.schema == "IFC2X3":
         for site in IfcStore.file.by_type("IfcSite"):
@@ -148,15 +148,15 @@ def step_impl(context, unit):
     assert actual_value == unit, _('We expected a value of "{}" but instead got "{}"').format(unit, actual_value)
 
 
-@step(u"The project must have coordinate transformations to convert from local to global coordinates")
+@step("The project must have coordinate transformations to convert from local to global coordinates")
 def step_impl(context):
     if IfcStore.file.schema == "IFC2X3":
         for site in IfcStore.file.by_type("IfcSite"):
             util.assert_pset(site, "EPset_MapConversion")
     check_ifc4_geolocation("IfcMapConversion")
 
 
-@step(u'The eastings of the model must be offset by "{number}" to derive its global coordinates')
+@step('The eastings of the model must be offset by "{number}" to derive its global coordinates')
 def step_impl(context, number):
     number = util.assert_number(number)
     if IfcStore.file.schema == "IFC2X3":
@@ -166,7 +166,7 @@ def step_impl(context, number):
     check_ifc4_geolocation("IfcMapConversion", "Eastings", number)
 
 
-@step(u'The northings of the model must be offset by "{number}" to derive its global coordinates')
+@step('The northings of the model must be offset by "{number}" to derive its global coordinates')
 def step_impl(context, number):
     number = util.assert_number(number)
     if IfcStore.file.schema == "IFC2X3":
@@ -176,7 +176,7 @@ def step_impl(context, number):
     check_ifc4_geolocation("IfcMapConversion", "Northings", number)
 
 
-@step(u'The height of the model must be offset by "{number}" to derive its global coordinates')
+@step('The height of the model must be offset by "{number}" to derive its global coordinates')
 def step_impl(context, number):
     number = util.assert_number(number)
     if IfcStore.file.schema == "IFC2X3":
@@ -186,7 +186,7 @@ def step_impl(context, number):
     check_ifc4_geolocation("IfcMapConversion", "OrthogonalHeight", number)
 
 
-@step(u'The model must be rotated clockwise by "{number}" to derive its global coordinates')
+@step('The model must be rotated clockwise by "{number}" to derive its global coordinates')
 def step_impl(context, number):
     number = util.assert_number(number)
     if IfcStore.file.schema == "IFC2X3":
@@ -198,7 +198,7 @@ def step_impl(context, number):
     assert actual_value == value, _('We expected a value of "{}" but instead got "{}"').format(value, actual_value)
 
 
-@step(u'The model must be scaled along the horizontal axis by "{number}" to derive its global coordinates')
+@step('The model must be scaled along the horizontal axis by "{number}" to derive its global coordinates')
 def step_impl(context, number):
     number = util.assert_number(number)
     if IfcStore.file.schema == "IFC2X3":
@@ -208,7 +208,7 @@ def step_impl(context, number):
     check_ifc4_geolocation("IfcMapConversion", "Scale", number)
 
 
-@step(u'The model must be rotated clockwise by "{number}" for true north to point up')
+@step('The model must be rotated clockwise by "{number}" for true north to point up')
 def step_impl(context, number):
     number = util.assert_number(number)
     project = IfcStore.file.by_type("IfcProject")[0]
@@ -228,7 +228,7 @@ def step_impl(context, number):
     assert False, _("True north is not defined in the file")
 
 
-@step(u'The site "{guid}" has a longitude of "{number}"')
+@step('The site "{guid}" has a longitude of "{number}"')
 def step_impl(context, guid, number):
     number = util.assert_number(number)
     site = util.assert_guid(IfcStore.file, guid)
@@ -238,7 +238,7 @@ def step_impl(context, guid, number):
     util.assert_attribute(site, "RefLongitude", number)
 
 
-@step(u'The site "{guid}" has a latitude of "{number}"')
+@step('The site "{guid}" has a latitude of "{number}"')
 def step_impl(context, guid, number):
     number = util.assert_number(number)
     site = util.assert_guid(IfcStore.file, guid)
@@ -248,20 +248,20 @@ def step_impl(context, guid, number):
     util.assert_attribute(site, "RefLatitude", number)
 
 
-@step(u'The site "{guid}" has an elevation of "{number}"')
+@step('The site "{guid}" has an elevation of "{number}"')
 def step_impl(context, guid, number):
     number = util.assert_number(number)
     site = util.assert_guid(IfcStore.file, guid)
     util.assert_type(site, "IfcSite")
     util.assert_attribute(site, "RefElevation", number)
 
 
-@step(u'The site "{guid}" must be coincident with the project origin')
+@step('The site "{guid}" must be coincident with the project origin')
 def step_impl(context, guid):
     site = util.assert_guid(IfcStore.file, guid)
     util.assert_type(site, "IfcSite")
     if not site.ObjectPlacement:
         assert False, _("The site has no object placement")
-    site_placement = ifcopenshell.util.placement.get_local_placement(site.ObjectPlacement)[:,3][0:3]
+    site_placement = ifcopenshell.util.placement.get_local_placement(site.ObjectPlacement)[:, 3][0:3]
     origin = np.array([0, 0, 0])
     assert np.allclose(origin, site_placement), _('The site location is at "{}" instead of "{}"')

src/ifcbimtester/bimtester/features/steps/spatial_structure/en.py

@@ -22,7 +22,7 @@
 from bimtester.lang import _
 
 
-@step('All buildings have an address')
+@step("All buildings have an address")
 def step_impl(context):
     for building in IfcStore.file.by_type("IfcBuilding"):
         if not building.BuildingAddress:

src/ifcbimtester/bimtester/lang.py

@@ -20,6 +20,7 @@
 
 translation = None
 
+
 def _(message):
     if translation:
         return translation(message)

src/ifcbimtester/bimtester/resources/reports/template.html

@@ -1,3 +1,18 @@
+<!--
+    BIMTester - OpenBIM Auditing Tool
+    Copyright (C) 2021 Dion Moult <[email protected]>
+    This file is part of BIMTester.
+    BIMTester is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    BIMTester is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+    You should have received a copy of the GNU Lesser General Public License
+    along with BIMTester.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <!DOCTYPE html>
 <html lang={{_lang}}>
 <head>
@@ -72,7 +87,7 @@ <h2>{{name}}</h2>
     <hr>
     <footer>
         <p>
-            <a href="https://wiki.osarch.org/index.php?title=BIMTester">BIMTester</a> {{_auditing}} <a href="https://blenderbim.org/">BlenderBIM</a> {{_and}} <a href="http://ifcopenshell.org/">IfcOpenShell</a>.
+            {{_auditing}} <a href="https://bonsaibim.org/">Bonsai</a> {{_and}} <a href="http://ifcopenshell.org/">IfcOpenShell</a>.
         </p>
     </footer>
 </body>

src/ifcbimtester/bimtester/table.py

@@ -34,4 +34,4 @@ def get_count(self):
         return len(self.rows)
 
     def get_count_distinct_values(self):
-        return len(set(item for sublist in self.rows.values() for item in sublist))
+        return len(set(item for sublist in self.rows.values() for item in sublist))

src/ifcbimtester/gui.py

@@ -1,5 +1,24 @@
 #!/usr/bin/env python3
 
+# BIMTester - OpenBIM Auditing Tool
+# Copyright (C) 2021 Dion Moult <[email protected]>
+#
+# This file is part of BIMTester.
+#
+# BIMTester is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BIMTester is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BIMTester.  If not, see <http://www.gnu.org/licenses/>.
+
+
 from bimtester.guiwidget import run
 
 

src/ifcbimtester/patch/junit.patch

@@ -1,3 +1,22 @@
+<!--
+    BIMTester - OpenBIM Auditing Tool
+    Copyright (C) 2021 Dion Moult <[email protected]>
+
+    This file is part of BIMTester.
+
+    BIMTester is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    BIMTester is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with BIMTester.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <!doctype html>
 <html class="no-js" lang="">
 
@@ -53,7 +72,7 @@ <h2 style="border-bottom: 0px; display: inline; padding-right: 20px;">
                     Import
                 </h2>
                 <img class="vendor-icon vendor-full" src="images/archicad.png" width="24px">
-                <img class="vendor-icon vendor-full" src="images/blenderbim.png" width="24px">
+                <img class="vendor-icon vendor-full" src="images/bonsai.png" width="24px">
                 <img class="vendor-icon vendor-partial" src="images/freecad.png" width="24px">
                 <img class="vendor-icon vendor-bad" src="images/revit.png" width="24px">
                 <img class="vendor-icon vendor-unknown" src="images/tekla.png" width="24px">
@@ -62,7 +81,7 @@ <h2 style="border-bottom: 0px; display: inline; padding-right: 20px; padding-lef
                     Export
                 </h2>
                 <img class="vendor-icon vendor-partial" src="images/archicad.png" width="24px">
-                <img class="vendor-icon vendor-full" src="images/blenderbim.png" width="24px">
+                <img class="vendor-icon vendor-full" src="images/bonsai.png" width="24px">
                 <img class="vendor-icon vendor-partial" src="images/freecad.png" width="24px">
                 <img class="vendor-icon vendor-full" src="images/revit.png" width="24px">
                 <img class="vendor-icon vendor-unknown" src="images/tekla.png" width="24px">
@@ -214,7 +233,7 @@ <h4>
     </div>
     <footer>
         <p>
-            BIMTester is built with &hearts; on the awesome <a href="http://www.ifcopenshell.org/">IfcOpenShell</a> project by <a href="https://blenderbim.org/community.html">amazing volunteers</a>. You can be one too!
+            BIMTester is built with &hearts; on the awesome <a href="http://www.ifcopenshell.org/">IfcOpenShell</a> project by <a href="https://bonsaibim.org/community.html">amazing volunteers</a>. You can be one too!
         </p>
     </footer>
     <!--