all BHA changes

Author: berndhahnebach

src/ifcbimtester/README.md

@@ -36,7 +36,7 @@ Languages supported include (in alphabetical order):
 
 If you are not a developer, we highly recommend simply installing an integrated version of BIMTester.
 
- * If you use Blender, install the [Bonsai](https://bonsaibim.org)
+ * If you use Blender, install the [BlenderBIM Add-on](https://blenderbim.org)
  * If you use FreeCAD, install the [FreeCAD BIMTester Workbench](https://github.com/bimtester/bimtesterfc)
 
 If you are a developer, read on!

src/ifcbimtester/bimtester/__init__.py

@@ -1,24 +1,5 @@
-# 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 os.path import dirname
 from os.path import realpath
 
-__version__ = version = "0.0.0"
 
 package_path = dirname(realpath(__file__))

src/ifcbimtester/bimtester/clean.py

@@ -1,21 +1,3 @@
-# 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/>.
-
 import ifcopenshell
 import os
 from pathlib import Path

src/ifcbimtester/bimtester/features/environment.py

@@ -1,21 +1,3 @@
-# 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/>.
-
 import os
 from behave.model import Scenario
 
@@ -38,26 +20,55 @@ def before_all(context):
     if context.config.lang:
         switch_locale(context.locale_dir, context.config.lang)
 
-    continue_after_failed = userdata.getbool("runner.continue_after_failed_step", True)
-    Scenario.continue_after_failed_step = continue_after_failed
+    # continue_after_failed = userdata.getbool("runner.continue_after_failed_step", True)
+    Scenario.continue_after_failed_step = False
+    # for some Scenarios True would be better, may be dependend on the Scenario name as a workaround
 
     # context.ifc_path = userdata.get("ifc", "")
-    context.ifcfile_basename = os.path.basename(os.path.splitext(userdata["ifc"])[0])
+    context.ifcfile_basename = os.path.basename(
+        os.path.splitext(userdata["ifc"])[0]
+    )
     context.outpath = os.path.join(this_path, "..")
-    context.create_log = False
-    context.create_smartview = False
+    context.create_log = True
+    context.create_smartview = True
 
     if context.create_log is True:
         # set up log file
-        context.thelogfile = os.path.join(context.outpath, context.ifcfile_basename + ".log")
+        context.thelogfile = os.path.join(
+            context.outpath,
+            context.ifcfile_basename + ".log"
+        )
         create_logfile(
             context.thelogfile,
             context.ifcfile_basename,
         )
 
+    # we have to use a dict to preserve the contents
+    # https://stackoverflow.com/a/67606164
+    context.skip_all_other_features = {"skip": False}
+
+    # elements count container
+    context.elecount_data = []
+
+
+def after_all(context):
+    import json
+    # print(json.dumps(context.elecount_data, indent=4, ensure_ascii=False))
+    import yaml
+    yf = open(os.path.join(context.outpath, "elecount.yaml"), "w", encoding="utf-8")
+    # yaml schreibt strings ohne quotes, heisst 1.0.0 wird dann als float wieder eingelesen
+    # daher alle werte mit quote schreiben ... default_style='"'
+    # https://stackoverflow.com/a/69850618
+    yaml.safe_dump(context.elecount_data, yf, default_flow_style=False, allow_unicode=True, default_style='"')
+    yaml.safe_dump(context.elecount_data, yf, default_flow_style=False, allow_unicode=True)
+    yf.close()
+    print("---E N D E---")
+
 
 def before_feature(context, feature):
 
+    print("Start feature: {}".format(feature.name))
+
     # https://github.com/IfcOpenShell/IfcOpenShell/issues/1910#issuecomment-989732600
     # messages language, parsed by behaves lang argument
     print("Messages language: {}".format(context.config.lang))
@@ -74,19 +85,109 @@ def before_feature(context, feature):
     # TODO: refactor zoom smart view support into a decoupled module
     if context.create_smartview is True:
         smartview_name = context.ifcfile_basename + "_" + feature.name
-        context.smview_file = os.path.join(context.outpath, smartview_name + ".bcsv")
+        context.smview_file = os.path.join(
+            context.outpath,
+            smartview_name + ".bcsv"
+        )
         # print("SmartView file: {}".format(context.smview_file))
         create_zoom_set_of_smartviews(
             context.smview_file,
             smartview_name,
         )
 
+    # print(context.skip_all_other_features)
+    if context.skip_all_other_features["skip"] is True:
+        feature.skip("Due to a failing feature all other features are skipped.")
+        return
+        # https://stackoverflow.com/a/42721605
+
+
+def after_feature(context, feature):
+    print("After feature: {} --> {}".format(feature.name, feature.status))
+    # print(str(feature.status))
+    # print(context.skip_all_other_features)
+    # TODO: mit userdata bei start bimtester uebergeben
+    #
+    # Wenn allplan feature nicht erfuellt ist, sofort abbruch
+    #
+    features_to_continue = [
+        "681_Weitere",
+        # "682_Modellpruefungen_FBJ_Weitere_allplan",
+        "683_Modellpruefungen_FBJ_Weitere_bimtester",
+        "684_Modellpruefungen_FBJ_Geomqualitaet_bimtester",
+        "686_Modellpruefungen_TRW_Weitere_bimtester",
+        "891_Projektpruefungen_Allg",
+        # "892_Projektpruefungen_TRW_allplan",
+        "893_Projektpruefungen_TRW_bimtester",
+        # "899_Projektpruefungen_Name",
+    ]
+    if str(feature.status) == "Status.failed" and feature.name not in features_to_continue:
+        # print("set to skip all other features")
+        context.skip_all_other_features["skip"] = True
+    # print(context.skip_all_other_features)
+
+
+# workaround to finish specific scenarios
+finish_scenario = [
+    "Geometrieabmessungen Mauerwerk",
+    "Geometriefehler",
+    "Geometriequalität",
+    "Regextests",
+]
+def before_scenario(context, scenario):
+    # print(scenario.name)
+    if scenario.name in finish_scenario:
+        Scenario.continue_after_failed_step = True
+    context.open_step_counter = 0
+
+
+def after_scenario(context, scenario):
+    # print(scenario.name)
+    if scenario.name in finish_scenario:
+        Scenario.continue_after_failed_step = False
+    context.open_step_counter = 0
+
+
+def before_step(context, step):
+    # print("{}".format(step.name))
+    context.open_step_counter += 1
 
 def after_step(context, step):
 
     if step.status == "failed" and context.create_log is True:
         append_logfile(context, step)
 
-    if step.status == "failed" and context.create_smartview is True and hasattr(context, "falseguids"):
+    # Workaround: introduce a open_step_counter
+    # only if the counter of not finished steps is 1 create a smart view
+    # see https://github.com/behave/behave/issues/992
+    # the German step starts, calls the english step
+    # the English starts, fails, closes,
+    # than the German fails and closes
+    # thus both steps fail, thus both are in the smart view file
+    if (
+        step.status == "failed"
+        and context.create_smartview is True
+        and hasattr(context, "falseguids")
+        and context.open_step_counter == 1
+    ):
+        # print("\nDBG: {}, {}\n".format(step.name, context.open_step_counter))
         # print(context.falseguids)
-        add_smartview(context.smview_file, step.name, context.falseguids)
+        add_smartview(
+            context.smview_file,
+            step.name,
+            context.falseguids
+        )
+
+    # elecount
+    if hasattr(context, "elemcount"):
+        count = context.elemcount
+    else:
+        count = None
+    context.elecount_data.append([step.name, count])
+    # zuordnung step json und step elecount anstatt ueber name auch mit location moeglich
+    # siehe json und dort den location string
+    # damit keine umlaute etc ... 
+    # print(step.location)
+
+    context.open_step_counter -= 1
+    print("Finished step: {}".format(step.name))

src/ifcbimtester/bimtester/features/logfile.py

@@ -1,21 +1,3 @@
-# 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/>.
-
 import json
 
 
@@ -38,7 +20,11 @@ def append_logfile(thecontext, step):
     logfile = open(thecontext.thelogfile, "a")
     logfile.write("\n\nStep '{}' failed\n".format(step.name))
     if hasattr(thecontext, "falseelems"):
-        logfile.write("{}\n".format(json.dumps(thecontext.falseelems, indent=4)))
+        logfile.write("{}\n".format(
+            json.dumps(thecontext.falseelems, indent=4)
+        ))
         if hasattr(thecontext, "falseprops"):
-            logfile.write("{}\n".format(json.dumps(thecontext.falseprops, indent=4)))
+            logfile.write("{}\n".format(
+                json.dumps(thecontext.falseprops, indent=4)
+            ))
     logfile.close()

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

@@ -1,21 +1,3 @@
-# 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 behave import step, given, when, then, use_step_matcher
 
 from bimtester import util

src/ifcbimtester/bimtester/features/steps/all.py

@@ -1,34 +1,20 @@
-# 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/>.
-
 use_step_matcher("parse")
 from bimtester.features.steps.aggregation import en
 
 use_step_matcher("parse")
+from bimtester.features.steps.application import de
 from bimtester.features.steps.application import en
 
 use_step_matcher("parse")
-from bimtester.features.steps.attributes_eleclasses import de, en
+from bimtester.features.steps.attributes_eleclasses import de
+from bimtester.features.steps.attributes_eleclasses import en
 
 use_step_matcher("parse")
-from bimtester.features.steps.attributes_psets import en, de
+from bimtester.features.steps.attributes_psets import de
+from bimtester.features.steps.attributes_psets import en
 
 use_step_matcher("parse")
+from bimtester.features.steps.attributes_qsets import de
 from bimtester.features.steps.attributes_qsets import en
 
 use_step_matcher("parse")
@@ -44,13 +30,30 @@
 from bimtester.features.steps.geolocation import en
 
 use_step_matcher("parse")
-from bimtester.features.steps.geometric_detail import de, en
+from bimtester.features.steps.geometric_detail import de
+from bimtester.features.steps.geometric_detail import en
+
+use_step_matcher("parse")
+from bimtester.features.steps.geometric_freecad import de
+from bimtester.features.steps.geometric_freecad import en
+
+use_step_matcher("parse")
+from bimtester.features.steps.layer_and_style import de
+from bimtester.features.steps.layer_and_style import en
+
+use_step_matcher("parse")
+from bimtester.features.steps.materials import de
+from bimtester.features.steps.materials import en
 
 use_step_matcher("parse")
 from bimtester.features.steps.model_federation import en
 
 use_step_matcher("parse")
-from bimtester.features.steps.project_setup import de, en, fr, it, nl
+from bimtester.features.steps.project_setup import de
+from bimtester.features.steps.project_setup import en
+from bimtester.features.steps.project_setup import fr
+from bimtester.features.steps.project_setup import it
+from bimtester.features.steps.project_setup import nl
 
 use_step_matcher("parse")
 from bimtester.features.steps.spatial_structure import en

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

@@ -0,0 +1,14 @@
+from behave import step
+import ifcopenshell.util.element as eleutils
+
+from behave import step
+from behave import use_step_matcher
+
+from bimtester import util
+from bimtester.ifc import IfcStore
+from bimtester.lang import _
+
+
+@step('Die IFC-Datei wurde mit dem neuen Allplan Exporter erstellt. Das heisst der data header description hot folgenden Inhalt: "{target_header_file_description}"')
+def step_impl(context, target_header_file_description):
+    context.execute_steps(f'* The ifc file has been exported with the new Allplan ifc exporter. This means the ifc file data header description is as follows: "{target_header_file_description}"')