diff --git a/README.md b/README.md index 74ae645805..5b7682f829 100644 --- a/README.md +++ b/README.md @@ -230,6 +230,7 @@ bcf | LGPL-3.0-or-later blenderbim | GPL-3.0-or-later bsdd | LGPL-3.0-or-later ifc2ca | LGPL-3.0-or-later +ifc4d | LGPL-3.0-or-later ifcbimtester | LGPL-3.0-or-later ifcblender | LGPL-3.0-or-later\* ifccityjson | LGPL-3.0-or-later @@ -245,7 +246,6 @@ ifcgeomserver | LGPL-3.0-or-later\* ifcjni | LGPL-3.0-or-later\* ifcmax | LGPL-3.0-or-later\* ifcopenshell-python | LGPL-3.0-or-later\* -ifcp6 | LGPL-3.0-or-later ifcparse | LGPL-3.0-or-later\* ifcpatch | LGPL-3.0-or-later ifcsverchok | GPL-3.0-or-later diff --git a/src/blenderbim/Makefile b/src/blenderbim/Makefile index 7277fa9446..47f491b142 100644 --- a/src/blenderbim/Makefile +++ b/src/blenderbim/Makefile @@ -119,8 +119,8 @@ endif cp -r dist/working/IfcOpenShell-0.6.0/src/ifccsv/* dist/blenderbim/libs/site/packages/ # Provides IFCPatch functionality cp -r dist/working/IfcOpenShell-0.6.0/src/ifcpatch/ifcpatch dist/blenderbim/libs/site/packages/ - # Provides IFCP6 functionality - cp -r dist/working/IfcOpenShell-0.6.0/src/ifcp6/ifcp6 dist/blenderbim/libs/site/packages/ + # Provides IFC4D functionality + cp -r dist/working/IfcOpenShell-0.6.0/src/ifc4d/ifc4d dist/blenderbim/libs/site/packages/ rm -rf dist/working # Provides Mustache templating in construction documentation diff --git a/src/blenderbim/blenderbim/bim/module/sequence/operator.py b/src/blenderbim/blenderbim/bim/module/sequence/operator.py index 994838bec4..30ac8f770e 100644 --- a/src/blenderbim/blenderbim/bim/module/sequence/operator.py +++ b/src/blenderbim/blenderbim/bim/module/sequence/operator.py @@ -996,7 +996,7 @@ class ImportP6(bpy.types.Operator, ImportHelper): filter_glob: bpy.props.StringProperty(default="*.xml", options={"HIDDEN"}) def execute(self, context): - from ifcp6.p62ifc import P62Ifc + from ifc4d.p62ifc import P62Ifc self.file = IfcStore.get_file() start = time.time() @@ -1018,7 +1018,7 @@ class ImportMSP(bpy.types.Operator, ImportHelper): filter_glob: bpy.props.StringProperty(default="*.xml", options={"HIDDEN"}) def execute(self, context): - from ifcp6.msp2ifc import MSP2Ifc + from ifc4d.msp2ifc import MSP2Ifc self.file = IfcStore.get_file() start = time.time() diff --git a/src/bsdd/bsdd.py b/src/bsdd/bsdd.py index ad45fb5fe1..0e0f704cc5 100644 --- a/src/bsdd/bsdd.py +++ b/src/bsdd/bsdd.py @@ -1,3 +1,22 @@ + +# bSDD - Python bSDD library +# Copyright (C) 2021 Dion Moult +# +# This file is part of bSDD. +# +# bSDD 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. +# +# bSDD 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 bSDD. If not, see . + import uuid import time import json diff --git a/src/ifcp6/COPYING b/src/ifc4d/COPYING similarity index 100% rename from src/ifcp6/COPYING rename to src/ifc4d/COPYING diff --git a/src/ifcp6/COPYING.LESSER b/src/ifc4d/COPYING.LESSER similarity index 100% rename from src/ifcp6/COPYING.LESSER rename to src/ifc4d/COPYING.LESSER diff --git a/src/ifc4d/README.md b/src/ifc4d/README.md new file mode 100644 index 0000000000..5fa0d61392 --- /dev/null +++ b/src/ifc4d/README.md @@ -0,0 +1,6 @@ +# ifc4d + +Ifc4D contains a series of utilities for converting to and from various 4D software. Currently supported: + + - Microsoft Project to IFC + - Oracle Primavera 6 (P6) to IFC diff --git a/src/ifcp6/ifcp6/msp2ifc.py b/src/ifc4d/ifc4d/msp2ifc.py similarity index 100% rename from src/ifcp6/ifcp6/msp2ifc.py rename to src/ifc4d/ifc4d/msp2ifc.py diff --git a/src/ifcp6/ifcp6/p62ifc.py b/src/ifc4d/ifc4d/p62ifc.py similarity index 100% rename from src/ifcp6/ifcp6/p62ifc.py rename to src/ifc4d/ifc4d/p62ifc.py diff --git a/src/ifcclash/bootstrap.py b/src/ifcclash/bootstrap.py index 8ad42c5195..15ec2f242a 100644 --- a/src/ifcclash/bootstrap.py +++ b/src/ifcclash/bootstrap.py @@ -1 +1,21 @@ + +# IfcClash - IFC-based clash detection. +# Copyright (C) 2020, 2021 Dion Moult +# +# This file is part of IfcClash. +# +# IfcClash 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. +# +# IfcClash 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 IfcClash. If not, see . + import ifcclash.__main__ + diff --git a/src/ifcclash/ifcclash/__main__.py b/src/ifcclash/ifcclash/__main__.py index 047eabd822..bc81131a53 100644 --- a/src/ifcclash/ifcclash/__main__.py +++ b/src/ifcclash/ifcclash/__main__.py @@ -1,4 +1,23 @@ #!/usr/bin/env python3 + +# IfcClash - IFC-based clash detection. +# Copyright (C) 2020, 2021 Dion Moult +# +# This file is part of IfcClash. +# +# IfcClash 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. +# +# IfcClash 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 IfcClash. If not, see . + import sys import json import logging diff --git a/src/ifcclash/ifcclash/collider.py b/src/ifcclash/ifcclash/collider.py index b04dc3a9f7..472fb9416d 100644 --- a/src/ifcclash/ifcclash/collider.py +++ b/src/ifcclash/ifcclash/collider.py @@ -1,3 +1,22 @@ + +# IfcClash - IFC-based clash detection. +# Copyright (C) 2020, 2021 Dion Moult +# +# This file is part of IfcClash. +# +# IfcClash 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. +# +# IfcClash 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 IfcClash. If not, see . + import hppfcl import numpy as np import ifcopenshell diff --git a/src/ifcclash/ifcclash/ifcclash.py b/src/ifcclash/ifcclash/ifcclash.py index 76f22e668c..e1f828d709 100644 --- a/src/ifcclash/ifcclash/ifcclash.py +++ b/src/ifcclash/ifcclash/ifcclash.py @@ -1,5 +1,24 @@ #!/usr/bin/env python3 +# IfcClash - IFC-based clash detection. +# Copyright (C) 2020, 2021 Dion Moult +# +# This file is part of IfcClash. +# +# IfcClash 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. +# +# IfcClash 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 IfcClash. If not, see . + + import numpy as np import json import sys diff --git a/src/ifcclash/make.py b/src/ifcclash/make.py index 1c766da8d6..1e1f26ee70 100644 --- a/src/ifcclash/make.py +++ b/src/ifcclash/make.py @@ -1,7 +1,27 @@ #!/usr/bin/env python3 + +# IfcClash - IFC-based clash detection. +# Copyright (C) 2020, 2021 Dion Moult +# +# This file is part of IfcClash. +# +# IfcClash 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. +# +# IfcClash 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 IfcClash. If not, see . + import os import subprocess cmd = "pyinstaller ./bootstrap.py --name ifcclash --onefile --clean" subprocess.check_output(cmd, shell=True) + diff --git a/src/ifccobie/cobie.py b/src/ifccobie/cobie.py index 41ed46612d..9c42890e02 100755 --- a/src/ifccobie/cobie.py +++ b/src/ifccobie/cobie.py @@ -1,4 +1,23 @@ #!/usr/bin/env python3 + +# IfcCOBie - Extract COBie data from IFC to spreadsheets +# Copyright (C) 2019, 2020, 2021 Dion Moult +# +# This file is part of IfcCOBie. +# +# IfcCOBie 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. +# +# IfcCOBie 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 IfcCOBie. If not, see . + # This can be packaged with `pyinstaller --onefile --clean --icon=icon.ico bimtester.py` import os diff --git a/src/ifccobie/get_maintainable_assets.py b/src/ifccobie/get_maintainable_assets.py index 1e71ac50d5..591a080088 100644 --- a/src/ifccobie/get_maintainable_assets.py +++ b/src/ifccobie/get_maintainable_assets.py @@ -1,3 +1,22 @@ + +# IfcCOBie - Extract COBie data from IFC to spreadsheets +# Copyright (C) 2019, 2020, 2021 Dion Moult +# +# This file is part of IfcCOBie. +# +# IfcCOBie 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. +# +# IfcCOBie 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 IfcCOBie. If not, see . + import json import ifcopenshell import ifcopenshell.util.selector diff --git a/src/ifccsv/ifccsv.py b/src/ifccsv/ifccsv.py index 0f9d2aa4b8..5106d5c7c2 100755 --- a/src/ifccsv/ifccsv.py +++ b/src/ifccsv/ifccsv.py @@ -1,4 +1,23 @@ #!/usr/bin/env python3 + +# IfcCSV - A utility to interact with IFC data through CSV. +# Copyright (C) 2020, 2021 Dion Moult +# +# This file is part of IfcCSV. +# +# IfcCSV 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. +# +# IfcCSV 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 IfcCSV. If not, see . + # This can be packaged with `pyinstaller --onefile --clean --icon=icon.ico ifccsv.py` import ifcopenshell diff --git a/src/ifcdiff/ifcdiff.py b/src/ifcdiff/ifcdiff.py index d6af516af2..294b32d179 100755 --- a/src/ifcdiff/ifcdiff.py +++ b/src/ifcdiff/ifcdiff.py @@ -1,4 +1,23 @@ #!/usr/bin/env python3 + +# IfcDiff - Compare IFCs +# Copyright (C) 2020, 2021 Dion Moult +# +# This file is part of IfcDiff. +# +# IfcDiff 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. +# +# IfcDiff 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 IfcDiff. If not, see . + # This can be packaged with `pyinstaller --onefile --clean --icon=icon.ico ifcdiff.py` import ifcopenshell diff --git a/src/ifcfm/ifcfm/parser.py b/src/ifcfm/ifcfm/parser.py index fc67f57f37..69a27815dc 100644 --- a/src/ifcfm/ifcfm/parser.py +++ b/src/ifcfm/ifcfm/parser.py @@ -1,3 +1,22 @@ + +# IfcFM - IFC for facility management +# Copyright (C) 2021 Dion Moult +# +# This file is part of IfcFM. +# +# IfcFM 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. +# +# IfcFM 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 IfcFM. If not, see . + import datetime import ifcopenshell import ifcopenshell.util.fm diff --git a/src/ifcfm/ifcfm/writer.py b/src/ifcfm/ifcfm/writer.py index 143eac353e..803a6cc9b1 100644 --- a/src/ifcfm/ifcfm/writer.py +++ b/src/ifcfm/ifcfm/writer.py @@ -1,3 +1,22 @@ + +# IfcFM - IFC for facility management +# Copyright (C) 2021 Dion Moult +# +# This file is part of IfcFM. +# +# IfcFM 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. +# +# IfcFM 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 IfcFM. If not, see . + import csv try: