This commit is contained in:
Andrej730
2024-08-02 12:36:43 +05:00
parent 1ad654aab3
commit 5e56115050
38 changed files with 53 additions and 12 deletions
@@ -24,7 +24,6 @@ import numpy as np
import datetime import datetime
import zipfile import zipfile
import tempfile import tempfile
import addon_utils
import ifcopenshell import ifcopenshell
import ifcopenshell.api import ifcopenshell.api
import ifcopenshell.util.placement import ifcopenshell.util.placement
+1 -2
View File
@@ -18,10 +18,9 @@
import os import os
import bpy import bpy
import json
import addon_utils
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.representation import ifcopenshell.util.representation
import ifcopenshell.util.unit
import ifcopenshell.api.owner.settings import ifcopenshell.api.owner.settings
import blenderbim.bim import blenderbim.bim
import blenderbim.tool as tool import blenderbim.tool as tool
+1
View File
@@ -23,6 +23,7 @@ import math
import ifcopenshell import ifcopenshell
import ifcopenshell.util.attribute import ifcopenshell.util.attribute
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.unit
from ifcopenshell.util.doc import get_attribute_doc, get_predefined_type_doc, get_property_doc from ifcopenshell.util.doc import get_attribute_doc, get_predefined_type_doc, get_property_doc
from mathutils import geometry from mathutils import geometry
from mathutils import Vector from mathutils import Vector
@@ -18,6 +18,7 @@
import bpy import bpy
import ifcopenshell import ifcopenshell
import ifcopenshell.api
import ifcopenshell.util.element import ifcopenshell.util.element
import blenderbim.tool as tool import blenderbim.tool as tool
import blenderbim.core.aggregate as core import blenderbim.core.aggregate as core
@@ -18,14 +18,12 @@
import os import os
import bpy import bpy
import json
import string import string
import random import random
import shutil import shutil
import requests import requests
import tempfile import tempfile
import datetime import datetime
import addon_utils
import blenderbim.tool as tool import blenderbim.tool as tool
@@ -26,6 +26,7 @@ import numpy as np
import tempfile import tempfile
import webbrowser import webbrowser
import ifcopenshell import ifcopenshell
import ifcopenshell.util.geolocation
import ifcopenshell.util.unit import ifcopenshell.util.unit
import blenderbim.bim.module.bcf.prop as bcf_prop import blenderbim.bim.module.bcf.prop as bcf_prop
from . import bcfstore from . import bcfstore
@@ -22,7 +22,6 @@ import bpy
import time import time
import random import random
import logging import logging
import platform
import subprocess import subprocess
import ifcopenshell import ifcopenshell
import ifcopenshell.api import ifcopenshell.api
@@ -30,6 +29,7 @@ import ifcopenshell.geom
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.placement import ifcopenshell.util.placement
import ifcopenshell.util.representation import ifcopenshell.util.representation
import ifcopenshell.util.unit
import blenderbim.tool as tool import blenderbim.tool as tool
import blenderbim.core.debug as core import blenderbim.core.debug as core
import blenderbim.bim.handler import blenderbim.bim.handler
@@ -21,6 +21,7 @@ import bpy
import json import json
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.representation import ifcopenshell.util.representation
import ifcopenshell.util.unit
import blenderbim.tool as tool import blenderbim.tool as tool
from pathlib import Path from pathlib import Path
from typing import Any, Union from typing import Any, Union
@@ -25,6 +25,7 @@ import bmesh
import shapely import shapely
import ifcopenshell import ifcopenshell
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.unit
import blenderbim.tool as tool import blenderbim.tool as tool
import blenderbim.bim.module.drawing.helper as helper import blenderbim.bim.module.drawing.helper as helper
from math import pi, sin, cos, tan, acos, atan, degrees, radians, ceil from math import pi, sin, cos, tan, acos, atan, degrees, radians, ceil
@@ -21,6 +21,8 @@ import bpy
import json import json
import enum import enum
import ifcopenshell import ifcopenshell
import ifcopenshell.api
import ifcopenshell.util.element
import blenderbim.tool as tool import blenderbim.tool as tool
import blenderbim.core.drawing as core import blenderbim.core.drawing as core
import blenderbim.bim.module.drawing.annotation as annotation import blenderbim.bim.module.drawing.annotation as annotation
@@ -29,6 +29,7 @@ import ifcopenshell
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.representation import ifcopenshell.util.representation
import ifcopenshell.util.selector import ifcopenshell.util.selector
import ifcopenshell.util.unit
import blenderbim.tool as tool import blenderbim.tool as tool
import blenderbim.bim.module.drawing.helper as helper import blenderbim.bim.module.drawing.helper as helper
import blenderbim.bim.module.drawing.annotation as annotation import blenderbim.bim.module.drawing.annotation as annotation
@@ -18,8 +18,11 @@
import bpy import bpy
import ifcopenshell.util.element import ifcopenshell.util.element
import blenderbim.tool as tool import ifcopenshell.util.geolocation
import ifcopenshell.util.placement import ifcopenshell.util.placement
import ifcopenshell.util.schema
import ifcopenshell.util.unit
import blenderbim.tool as tool
from mathutils import Vector from mathutils import Vector
@@ -20,7 +20,10 @@
import bpy import bpy
import numpy as np import numpy as np
import blenderbim.tool as tool import blenderbim.tool as tool
import ifcopenshell.util.element
import ifcopenshell.util.geolocation import ifcopenshell.util.geolocation
import ifcopenshell.util.schema
import ifcopenshell.util.unit
from mathutils import Matrix, Vector from mathutils import Matrix, Vector
from ifcopenshell.util.doc import get_entity_doc from ifcopenshell.util.doc import get_entity_doc
@@ -22,6 +22,7 @@ import ifcopenshell.api
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.attribute import ifcopenshell.util.attribute
import ifcopenshell.util.representation import ifcopenshell.util.representation
import ifcopenshell.util.unit
import blenderbim.bim.helper import blenderbim.bim.helper
import blenderbim.tool as tool import blenderbim.tool as tool
import blenderbim.core.style import blenderbim.core.style
@@ -21,6 +21,7 @@ import json
import ifcopenshell import ifcopenshell
import ifcopenshell.api import ifcopenshell.api
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.unit
import blenderbim.tool as tool import blenderbim.tool as tool
from mathutils import Vector, Matrix from mathutils import Vector, Matrix
@@ -21,6 +21,7 @@ import math
import json import json
import ifcopenshell import ifcopenshell
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.schema
from ifcopenshell.util.doc import get_entity_doc, get_predefined_type_doc from ifcopenshell.util.doc import get_entity_doc, get_predefined_type_doc
import blenderbim.tool as tool import blenderbim.tool as tool
from math import degrees from math import degrees
@@ -25,6 +25,8 @@ import ifcopenshell
import ifcopenshell.api import ifcopenshell.api
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.representation import ifcopenshell.util.representation
import ifcopenshell.util.schema
import ifcopenshell.util.unit
from ifcopenshell.util.shape_builder import V from ifcopenshell.util.shape_builder import V
import blenderbim.tool as tool import blenderbim.tool as tool
import blenderbim.core.geometry import blenderbim.core.geometry
@@ -21,6 +21,7 @@ import json
import bmesh import bmesh
import ifcopenshell import ifcopenshell
import ifcopenshell.api import ifcopenshell.api
import ifcopenshell.util.element
import ifcopenshell.util.representation import ifcopenshell.util.representation
import ifcopenshell.util.unit import ifcopenshell.util.unit
import blenderbim.core.root import blenderbim.core.root
@@ -18,6 +18,7 @@
import os import os
import bpy import bpy
import ifcopenshell.util.element
import ifcopenshell.util.placement import ifcopenshell.util.placement
from blenderbim.bim.module.project.data import ProjectData from blenderbim.bim.module.project.data import ProjectData
from blenderbim.bim.ifc import IfcStore from blenderbim.bim.ifc import IfcStore
@@ -19,9 +19,10 @@
import bpy import bpy
import json import json
import ifcopenshell.api import ifcopenshell.api
import ifcopenshell.util.unit
import ifcopenshell.util.pset
import ifcopenshell.util.attribute import ifcopenshell.util.attribute
import ifcopenshell.util.element
import ifcopenshell.util.pset
import ifcopenshell.util.unit
import blenderbim.bim.schema import blenderbim.bim.schema
import blenderbim.bim.helper import blenderbim.bim.helper
import blenderbim.bim.handler import blenderbim.bim.handler
@@ -19,6 +19,9 @@
import bpy import bpy
import blenderbim.tool as tool import blenderbim.tool as tool
import ifcopenshell import ifcopenshell
import ifcopenshell.util.constraint
import ifcopenshell.util.cost
import ifcopenshell.util.date
import ifcopenshell.util.resource import ifcopenshell.util.resource
@@ -18,6 +18,7 @@
import bpy import bpy
import ifcopenshell import ifcopenshell
import ifcopenshell.util.element
import ifcopenshell.util.schema import ifcopenshell.util.schema
import blenderbim.tool as tool import blenderbim.tool as tool
from blenderbim.bim.module.root.data import IfcClassData from blenderbim.bim.module.root.data import IfcClassData
@@ -18,7 +18,7 @@
import bpy import bpy
import blenderbim.tool as tool import blenderbim.tool as tool
from ifcopenshell import util import ifcopenshell.util.schema
from blenderbim.bim.prop import ObjProperty, BIMFilterGroup from blenderbim.bim.prop import ObjProperty, BIMFilterGroup
from blenderbim.bim.module.search.data import SearchData, ColourByPropertyData, SelectSimilarData from blenderbim.bim.module.search.data import SearchData, ColourByPropertyData, SelectSimilarData
from bpy.types import PropertyGroup from bpy.types import PropertyGroup
@@ -134,6 +134,6 @@ class BIMSearchProperties(PropertyGroup):
def get_classes(self, ifc_product): def get_classes(self, ifc_product):
declaration = tool.Ifc.schema().declaration_by_name(ifc_product) declaration = tool.Ifc.schema().declaration_by_name(ifc_product)
declarations = util.schema.get_subtypes(declaration) declarations = ifcopenshell.util.schema.get_subtypes(declaration)
names = [d.name() for d in declarations] names = [d.name() for d in declarations]
return [(c, c, "") for c in sorted(names)] return [(c, c, "") for c in sorted(names)]
@@ -20,6 +20,7 @@ import bpy
import isodate import isodate
import ifcopenshell.api import ifcopenshell.api
import ifcopenshell.util.attribute import ifcopenshell.util.attribute
import ifcopenshell.util.date
from ifcopenshell.util.doc import get_predefined_type_doc from ifcopenshell.util.doc import get_predefined_type_doc
import blenderbim.tool as tool import blenderbim.tool as tool
import blenderbim.core.sequence as core import blenderbim.core.sequence as core
@@ -25,6 +25,7 @@ import blenderbim.core.style as core
import ifcopenshell.api import ifcopenshell.api
import ifcopenshell.api.style import ifcopenshell.api.style
import ifcopenshell.util.representation import ifcopenshell.util.representation
import ifcopenshell.util.unit
from pathlib import Path from pathlib import Path
from mathutils import Vector from mathutils import Vector
@@ -19,6 +19,8 @@
import bpy import bpy
import ifcopenshell import ifcopenshell
import ifcopenshell.util.schema import ifcopenshell.util.schema
import ifcopenshell.util.system
import ifcopenshell.util.unit
from ifcopenshell.util.doc import get_entity_doc from ifcopenshell.util.doc import get_entity_doc
import blenderbim.tool as tool import blenderbim.tool as tool
@@ -17,6 +17,7 @@
# along with BlenderBIM Add-on. If not, see <http://www.gnu.org/licenses/>. # along with BlenderBIM Add-on. If not, see <http://www.gnu.org/licenses/>.
import bpy import bpy
import ifcopenshell.util.element
import ifcopenshell.util.type import ifcopenshell.util.type
from blenderbim.bim.module.type.data import TypeData from blenderbim.bim.module.type.data import TypeData
from blenderbim.bim.prop import StrProperty, Attribute from blenderbim.bim.prop import StrProperty, Attribute
+1
View File
@@ -23,6 +23,7 @@ import json
import importlib import importlib
import ifcopenshell import ifcopenshell
import ifcopenshell.util.pset import ifcopenshell.util.pset
import ifcopenshell.util.unit
from ifcopenshell.util.doc import ( from ifcopenshell.util.doc import (
get_entity_doc, get_entity_doc,
get_attribute_doc, get_attribute_doc,
@@ -20,6 +20,7 @@ import bpy
import blenderbim.core.tool import blenderbim.core.tool
import blenderbim.tool as tool import blenderbim.tool as tool
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.representation
from typing import Union from typing import Union
+2
View File
@@ -21,6 +21,8 @@ import bpy
import ifcopenshell import ifcopenshell
import ifcopenshell.guid import ifcopenshell.guid
import ifcopenshell.util.brick import ifcopenshell.util.brick
import ifcopenshell.util.element
import ifcopenshell.util.system
import blenderbim.core.tool import blenderbim.core.tool
import blenderbim.tool as tool import blenderbim.tool as tool
from contextlib import contextmanager from contextlib import contextmanager
+1
View File
@@ -2,6 +2,7 @@ import os
import bpy import bpy
import blenderbim.core.tool import blenderbim.core.tool
import blenderbim.tool as tool import blenderbim.tool as tool
import ifcopenshell.api
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.date import ifcopenshell.util.date
import ifcopenshell.util.cost import ifcopenshell.util.cost
+2
View File
@@ -23,6 +23,8 @@ import bpy
import bmesh import bmesh
import ifcopenshell.geom import ifcopenshell.geom
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.geolocation
import ifcopenshell.util.placement
import ifcopenshell.util.shape import ifcopenshell.util.shape
import ifcopenshell.util.unit import ifcopenshell.util.unit
import blenderbim.core.tool import blenderbim.core.tool
+2 -1
View File
@@ -21,11 +21,12 @@ import ifcopenshell.api
import blenderbim.core.tool import blenderbim.core.tool
import blenderbim.tool as tool import blenderbim.tool as tool
import numpy as np import numpy as np
from mathutils import Matrix
class Surveyor(blenderbim.core.tool.Surveyor): class Surveyor(blenderbim.core.tool.Surveyor):
@classmethod @classmethod
def get_absolute_matrix(cls, obj): def get_absolute_matrix(cls, obj: bpy.types.Object) -> Matrix:
matrix = np.array(obj.matrix_world) matrix = np.array(obj.matrix_world)
props = bpy.context.scene.BIMGeoreferenceProperties props = bpy.context.scene.BIMGeoreferenceProperties
if props.has_blender_offset and obj.BIMObjectProperties.blender_offset_type != "NOT_APPLICABLE": if props.has_blender_offset and obj.BIMObjectProperties.blender_offset_type != "NOT_APPLICABLE":
+1
View File
@@ -24,6 +24,7 @@ import pytest
import webbrowser import webbrowser
import blenderbim import blenderbim
import ifcopenshell import ifcopenshell
import ifcopenshell.util.element
import ifcopenshell.util.representation import ifcopenshell.util.representation
from blenderbim.bim.ifc import IfcStore from blenderbim.bim.ifc import IfcStore
from mathutils import Vector from mathutils import Vector
+1
View File
@@ -23,6 +23,7 @@ import webbrowser
import numpy as np import numpy as np
import ifcopenshell import ifcopenshell
import ifcopenshell.util.element import ifcopenshell.util.element
import ifcopenshell.util.representation
import blenderbim.tool as tool import blenderbim.tool as tool
import blenderbim.bim import blenderbim.bim
from blenderbim.bim.ifc import IfcStore from blenderbim.bim.ifc import IfcStore
@@ -18,9 +18,11 @@
import bpy import bpy
import ifcopenshell import ifcopenshell
import ifcopenshell.api.geometry
import ifcopenshell.api.root import ifcopenshell.api.root
import ifcopenshell.api.unit import ifcopenshell.api.unit
import ifcopenshell.api.context import ifcopenshell.api.context
import ifcopenshell.util.shape_builder
import blenderbim.core.tool import blenderbim.core.tool
import blenderbim.tool as tool import blenderbim.tool as tool
from test.bim.bootstrap import NewFile from test.bim.bootstrap import NewFile
+1
View File
@@ -22,6 +22,7 @@ import brickschema
import brickschema.persistent import brickschema.persistent
from brickschema.namespaces import REF, A from brickschema.namespaces import REF, A
import ifcopenshell import ifcopenshell
import ifcopenshell.api
import ifcopenshell.guid import ifcopenshell.guid
import blenderbim.core.tool import blenderbim.core.tool
import blenderbim.tool as tool import blenderbim.tool as tool
+1
View File
@@ -18,6 +18,7 @@
import bpy import bpy
import ifcopenshell import ifcopenshell
import ifcopenshell.api
import blenderbim.core.tool import blenderbim.core.tool
import blenderbim.tool as tool import blenderbim.tool as tool
import numpy as np import numpy as np