Merge branch 'master' into master

2018-01-15 19:10:14 -08:00
parent d0c92e30be d0bf5c10f9
commit 86fa0f4524
14 changed files with 12621 additions and 101 deletions
--- a/scripts/IFCImporter/ExpressReader.py
+++ b/scripts/IFCImporter/ExpressReader.py
@@ -94,8 +94,9 @@ class Type:
        self.enums = enums
        

-def read(filename,silent=False):
+def read(filename, silent=False):
    schema = Schema()
+    print( "Try to read EXPRESS schema file" + filename)
    with open(filename,'rt') as inp: 
        contents = inp.read()
        types = re.findall(re_match_type,contents)
--- a/scripts/IFCImporter/schema_ifc2x3.exp
+++ b/scripts/IFCImporter/schema_ifc2x3.exp
--- a/scripts/IFCImporter/schema_ifc4.exp
+++ b/scripts/IFCImporter/schema_ifc4.exp