From 52cb9f865f29deaaf52a13395f67c1199d1712e8 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Thu, 18 Jul 2024 14:59:17 +1000 Subject: [PATCH] Make all "from" imports relative --- src/blenderbim/blenderbim/bim/export_ifc.py | 2 +- src/blenderbim/blenderbim/bim/handler.py | 8 ++++---- src/blenderbim/blenderbim/bim/helper.py | 2 +- src/blenderbim/blenderbim/bim/ifc.py | 2 +- src/blenderbim/blenderbim/bim/import_ifc.py | 4 ++-- .../blenderbim/bim/module/aggregate/operator.py | 2 +- .../blenderbim/bim/module/aggregate/prop.py | 4 ++-- .../blenderbim/bim/module/aggregate/ui.py | 6 +++--- .../blenderbim/bim/module/attribute/operator.py | 2 +- .../blenderbim/bim/module/attribute/prop.py | 4 ++-- .../blenderbim/bim/module/attribute/ui.py | 4 ++-- .../blenderbim/bim/module/bcf/operator.py | 2 +- src/blenderbim/blenderbim/bim/module/bcf/prop.py | 2 +- .../blenderbim/bim/module/boundary/operator.py | 6 +++--- .../blenderbim/bim/module/boundary/prop.py | 2 +- .../blenderbim/bim/module/boundary/ui.py | 4 ++-- .../blenderbim/bim/module/brick/data.py | 2 +- .../blenderbim/bim/module/brick/operator.py | 4 ++-- .../blenderbim/bim/module/brick/prop.py | 6 +++--- src/blenderbim/blenderbim/bim/module/brick/ui.py | 6 +++--- .../blenderbim/bim/module/bsdd/operator.py | 2 +- .../blenderbim/bim/module/bsdd/prop.py | 2 +- src/blenderbim/blenderbim/bim/module/bsdd/ui.py | 2 +- src/blenderbim/blenderbim/bim/module/cad/prop.py | 2 +- .../blenderbim/bim/module/cad/workspace.py | 2 +- .../blenderbim/bim/module/clash/operator.py | 4 ++-- .../blenderbim/bim/module/clash/prop.py | 2 +- src/blenderbim/blenderbim/bim/module/clash/ui.py | 2 +- .../blenderbim/bim/module/classification/data.py | 2 +- .../bim/module/classification/operator.py | 2 +- .../blenderbim/bim/module/classification/prop.py | 6 +++--- .../blenderbim/bim/module/classification/ui.py | 4 ++-- .../blenderbim/bim/module/constraint/operator.py | 2 +- .../blenderbim/bim/module/constraint/prop.py | 2 +- .../blenderbim/bim/module/constraint/ui.py | 6 +++--- .../blenderbim/bim/module/context/operator.py | 2 +- .../blenderbim/bim/module/context/prop.py | 4 ++-- .../blenderbim/bim/module/context/ui.py | 2 +- .../blenderbim/bim/module/cost/prop.py | 8 ++++---- src/blenderbim/blenderbim/bim/module/cost/ui.py | 4 ++-- .../blenderbim/bim/module/covering/prop.py | 2 +- .../blenderbim/bim/module/covering/workspace.py | 6 +++--- .../blenderbim/bim/module/covetool/operator.py | 2 +- .../blenderbim/bim/module/csv/operator.py | 4 ++-- src/blenderbim/blenderbim/bim/module/csv/prop.py | 2 +- src/blenderbim/blenderbim/bim/module/csv/ui.py | 4 ++-- .../blenderbim/bim/module/debug/operator.py | 7 +++++-- .../blenderbim/bim/module/debug/prop.py | 2 +- src/blenderbim/blenderbim/bim/module/demo/ui.py | 2 +- .../blenderbim/bim/module/diff/operator.py | 2 +- .../blenderbim/bim/module/diff/prop.py | 4 ++-- src/blenderbim/blenderbim/bim/module/diff/ui.py | 4 ++-- .../blenderbim/bim/module/document/operator.py | 2 +- .../blenderbim/bim/module/document/prop.py | 2 +- .../blenderbim/bim/module/document/ui.py | 6 +++--- .../blenderbim/bim/module/drawing/decoration.py | 6 +++--- .../blenderbim/bim/module/drawing/gizmos.py | 2 +- .../blenderbim/bim/module/drawing/operator.py | 8 ++++---- .../blenderbim/bim/module/drawing/prop.py | 8 ++++---- .../blenderbim/bim/module/drawing/scheduler.py | 2 +- .../blenderbim/bim/module/drawing/svgwriter.py | 6 +++--- .../blenderbim/bim/module/drawing/ui.py | 2 +- .../blenderbim/bim/module/drawing/workspace.py | 6 +++--- .../blenderbim/bim/module/fm/operator.py | 2 +- src/blenderbim/blenderbim/bim/module/fm/prop.py | 4 ++-- src/blenderbim/blenderbim/bim/module/fm/ui.py | 4 ++-- .../blenderbim/bim/module/geometry/operator.py | 2 +- .../blenderbim/bim/module/geometry/prop.py | 4 ++-- .../blenderbim/bim/module/geometry/ui.py | 8 ++++---- .../bim/module/georeference/decorator.py | 2 +- .../bim/module/georeference/operator.py | 2 +- .../blenderbim/bim/module/georeference/prop.py | 6 +++--- .../blenderbim/bim/module/georeference/ui.py | 4 ++-- src/blenderbim/blenderbim/bim/module/gis/prop.py | 2 +- .../blenderbim/bim/module/group/operator.py | 2 +- .../blenderbim/bim/module/group/prop.py | 4 ++-- src/blenderbim/blenderbim/bim/module/group/ui.py | 4 ++-- .../blenderbim/bim/module/ifcgit/operator.py | 2 +- .../blenderbim/bim/module/ifcgit/prop.py | 2 +- .../blenderbim/bim/module/ifcgit/ui.py | 2 +- .../blenderbim/bim/module/layer/operator.py | 2 +- .../blenderbim/bim/module/layer/prop.py | 2 +- src/blenderbim/blenderbim/bim/module/layer/ui.py | 4 ++-- .../blenderbim/bim/module/library/operator.py | 2 +- .../blenderbim/bim/module/library/prop.py | 4 ++-- .../blenderbim/bim/module/library/ui.py | 2 +- .../blenderbim/bim/module/light/decorator.py | 2 +- .../blenderbim/bim/module/light/operator.py | 2 +- .../blenderbim/bim/module/light/prop.py | 4 ++-- src/blenderbim/blenderbim/bim/module/light/ui.py | 2 +- .../blenderbim/bim/module/material/data.py | 2 +- .../blenderbim/bim/module/material/operator.py | 4 ++-- .../blenderbim/bim/module/material/prop.py | 6 +++--- .../blenderbim/bim/module/material/ui.py | 10 +++++----- .../blenderbim/bim/module/misc/operator.py | 2 +- .../blenderbim/bim/module/misc/prop.py | 2 +- .../blenderbim/bim/module/model/door.py | 2 +- .../blenderbim/bim/module/model/handler.py | 4 ++-- .../blenderbim/bim/module/model/mep.py | 4 ++-- .../blenderbim/bim/module/model/opening.py | 2 +- .../blenderbim/bim/module/model/pie.py | 2 +- .../blenderbim/bim/module/model/product.py | 4 ++-- .../blenderbim/bim/module/model/profile.py | 6 +++--- .../blenderbim/bim/module/model/prop.py | 4 ++-- .../blenderbim/bim/module/model/railing.py | 6 +++--- .../blenderbim/bim/module/model/roof.py | 8 ++++---- .../blenderbim/bim/module/model/root.py | 2 +- .../blenderbim/bim/module/model/slab.py | 4 ++-- src/blenderbim/blenderbim/bim/module/model/ui.py | 16 ++++++++-------- .../blenderbim/bim/module/model/wall.py | 4 ++-- .../blenderbim/bim/module/model/workspace.py | 10 +++++----- .../blenderbim/bim/module/nest/operator.py | 2 +- .../blenderbim/bim/module/nest/prop.py | 4 ++-- src/blenderbim/blenderbim/bim/module/nest/ui.py | 4 ++-- .../blenderbim/bim/module/owner/operator.py | 2 +- .../blenderbim/bim/module/owner/prop.py | 4 ++-- src/blenderbim/blenderbim/bim/module/owner/ui.py | 2 +- .../blenderbim/bim/module/patch/prop.py | 2 +- src/blenderbim/blenderbim/bim/module/patch/ui.py | 4 ++-- .../blenderbim/bim/module/profile/operator.py | 6 +++--- .../blenderbim/bim/module/profile/prop.py | 6 +++--- .../blenderbim/bim/module/profile/ui.py | 4 ++-- .../blenderbim/bim/module/project/data.py | 2 +- .../blenderbim/bim/module/project/operator.py | 12 ++++++------ .../blenderbim/bim/module/project/prop.py | 6 +++--- .../blenderbim/bim/module/project/ui.py | 6 +++--- .../blenderbim/bim/module/project/workspace.py | 2 +- .../blenderbim/bim/module/pset/operator.py | 2 +- .../blenderbim/bim/module/pset/prop.py | 6 +++--- src/blenderbim/blenderbim/bim/module/pset/ui.py | 6 +++--- .../blenderbim/bim/module/pset_template/data.py | 2 +- .../bim/module/pset_template/operator.py | 2 +- .../blenderbim/bim/module/pset_template/prop.py | 6 +++--- .../blenderbim/bim/module/pset_template/ui.py | 4 ++-- .../blenderbim/bim/module/qto/operator.py | 4 ++-- src/blenderbim/blenderbim/bim/module/qto/prop.py | 2 +- src/blenderbim/blenderbim/bim/module/qto/ui.py | 2 +- .../blenderbim/bim/module/resource/operator.py | 2 +- .../blenderbim/bim/module/resource/prop.py | 4 ++-- .../blenderbim/bim/module/resource/ui.py | 4 ++-- .../blenderbim/bim/module/root/data.py | 2 +- .../blenderbim/bim/module/root/operator.py | 4 ++-- .../blenderbim/bim/module/root/prop.py | 2 +- src/blenderbim/blenderbim/bim/module/root/ui.py | 6 +++--- .../blenderbim/bim/module/search/operator.py | 2 +- .../blenderbim/bim/module/search/prop.py | 4 ++-- .../blenderbim/bim/module/search/ui.py | 2 +- .../blenderbim/bim/module/sequence/operator.py | 2 +- .../blenderbim/bim/module/sequence/prop.py | 6 +++--- .../blenderbim/bim/module/sequence/ui.py | 6 +++--- .../blenderbim/bim/module/spatial/prop.py | 4 ++-- .../blenderbim/bim/module/spatial/ui.py | 2 +- .../blenderbim/bim/module/spatial/workspace.py | 4 ++-- .../blenderbim/bim/module/structural/operator.py | 2 +- .../blenderbim/bim/module/structural/prop.py | 6 +++--- .../blenderbim/bim/module/structural/ui.py | 6 +++--- .../bim/module/structural/workspace.py | 4 ++-- .../blenderbim/bim/module/style/prop.py | 4 ++-- src/blenderbim/blenderbim/bim/module/style/ui.py | 4 ++-- .../blenderbim/bim/module/system/decorator.py | 2 +- .../blenderbim/bim/module/system/operator.py | 4 ++-- .../blenderbim/bim/module/system/prop.py | 4 ++-- .../blenderbim/bim/module/system/ui.py | 4 ++-- .../blenderbim/bim/module/tester/operator.py | 2 +- .../blenderbim/bim/module/tester/prop.py | 4 ++-- .../blenderbim/bim/module/tester/ui.py | 2 +- .../blenderbim/bim/module/type/operator.py | 2 +- .../blenderbim/bim/module/type/prop.py | 6 +++--- src/blenderbim/blenderbim/bim/module/type/ui.py | 6 +++--- .../blenderbim/bim/module/unit/operator.py | 2 +- .../blenderbim/bim/module/unit/prop.py | 6 +++--- src/blenderbim/blenderbim/bim/module/unit/ui.py | 6 +++--- .../blenderbim/bim/module/void/operator.py | 4 ++-- src/blenderbim/blenderbim/bim/module/void/ui.py | 2 +- src/blenderbim/blenderbim/bim/module/web/ui.py | 2 +- src/blenderbim/blenderbim/bim/operator.py | 10 +++++----- src/blenderbim/blenderbim/bim/prop.py | 2 +- src/blenderbim/blenderbim/bim/ui.py | 4 +--- 178 files changed, 337 insertions(+), 336 deletions(-) diff --git a/src/blenderbim/blenderbim/bim/export_ifc.py b/src/blenderbim/blenderbim/bim/export_ifc.py index b99bdfa65e..922ffb0d46 100644 --- a/src/blenderbim/blenderbim/bim/export_ifc.py +++ b/src/blenderbim/blenderbim/bim/export_ifc.py @@ -34,7 +34,7 @@ import blenderbim.core.geometry import blenderbim.core.aggregate import blenderbim.core.spatial import blenderbim.core.style -from blenderbim.bim.ifc import IfcStore +from .ifc import IfcStore from mathutils import Vector from typing import Union from logging import Logger diff --git a/src/blenderbim/blenderbim/bim/handler.py b/src/blenderbim/blenderbim/bim/handler.py index dbbf59ed3a..23f272146f 100644 --- a/src/blenderbim/blenderbim/bim/handler.py +++ b/src/blenderbim/blenderbim/bim/handler.py @@ -27,10 +27,10 @@ import blenderbim.bim import blenderbim.tool as tool import blenderbim.core.owner as core_owner from bpy.app.handlers import persistent -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.owner.prop import get_user_person, get_user_organisation -from blenderbim.bim.module.model.data import AuthoringData -from blenderbim.bim.module.model.workspace import LIST_OF_TOOLS, TOOLS_TO_CLASSES_MAP +from .ifc import IfcStore +from .module.owner.prop import get_user_person, get_user_organisation +from .module.model.data import AuthoringData +from .module.model.workspace import LIST_OF_TOOLS, TOOLS_TO_CLASSES_MAP from mathutils import Vector from math import cos, degrees from typing import Union diff --git a/src/blenderbim/blenderbim/bim/helper.py b/src/blenderbim/blenderbim/bim/helper.py index 867e51b222..88360e2c45 100644 --- a/src/blenderbim/blenderbim/bim/helper.py +++ b/src/blenderbim/blenderbim/bim/helper.py @@ -27,7 +27,7 @@ from ifcopenshell.util.doc import get_attribute_doc, get_predefined_type_doc, ge from mathutils import geometry from mathutils import Vector import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from .ifc import IfcStore from typing import Optional, Callable, Any, Union diff --git a/src/blenderbim/blenderbim/bim/ifc.py b/src/blenderbim/blenderbim/bim/ifc.py index 888931c354..c7da7f3c78 100644 --- a/src/blenderbim/blenderbim/bim/ifc.py +++ b/src/blenderbim/blenderbim/bim/ifc.py @@ -31,7 +31,7 @@ import ifcopenshell.ifcopenshell_wrapper import blenderbim.bim.handler import blenderbim.tool as tool from pathlib import Path -from blenderbim.tool.brick import BrickStore +from ..tool.brick import BrickStore from typing import Set, Union, Optional, TypedDict, Callable diff --git a/src/blenderbim/blenderbim/bim/import_ifc.py b/src/blenderbim/blenderbim/bim/import_ifc.py index 60d202194d..7666514df7 100644 --- a/src/blenderbim/blenderbim/bim/import_ifc.py +++ b/src/blenderbim/blenderbim/bim/import_ifc.py @@ -34,8 +34,8 @@ import ifcopenshell.util.representation import ifcopenshell.util.shape import blenderbim.tool as tool from itertools import chain, accumulate -from blenderbim.bim.ifc import IfcStore, IFC_CONNECTED_TYPE -from blenderbim.tool.loader import OBJECT_DATA_TYPE +from .ifc import IfcStore, IFC_CONNECTED_TYPE +from ..tool.loader import OBJECT_DATA_TYPE from typing import Dict, Union, Optional, Any diff --git a/src/blenderbim/blenderbim/bim/module/aggregate/operator.py b/src/blenderbim/blenderbim/bim/module/aggregate/operator.py index 4de60645a3..fe8e43c635 100644 --- a/src/blenderbim/blenderbim/bim/module/aggregate/operator.py +++ b/src/blenderbim/blenderbim/bim/module/aggregate/operator.py @@ -23,7 +23,7 @@ import blenderbim.tool as tool import blenderbim.core.aggregate as core import blenderbim.core.spatial import blenderbim.bim.handler -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class BIM_OT_aggregate_assign_object(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/aggregate/prop.py b/src/blenderbim/blenderbim/bim/module/aggregate/prop.py index 852eee7abf..ed9a95777e 100644 --- a/src/blenderbim/blenderbim/bim/module/aggregate/prop.py +++ b/src/blenderbim/blenderbim/bim/module/aggregate/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.spatial.data import SpatialData +from ...prop import StrProperty, Attribute +from ..spatial.data import SpatialData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/aggregate/ui.py b/src/blenderbim/blenderbim/bim/module/aggregate/ui.py index ff2292baad..7d4727edcb 100644 --- a/src/blenderbim/blenderbim/bim/module/aggregate/ui.py +++ b/src/blenderbim/blenderbim/bim/module/aggregate/ui.py @@ -17,9 +17,9 @@ # along with BlenderBIM Add-on. If not, see . from bpy.types import Panel -from blenderbim.bim.module.aggregate.data import AggregateData -from blenderbim.bim.module.group.data import GroupsData, ObjectGroupsData -from blenderbim.bim.ifc import IfcStore +from .data import AggregateData +from ..group.data import GroupsData, ObjectGroupsData +from ...ifc import IfcStore import blenderbim.tool as tool diff --git a/src/blenderbim/blenderbim/bim/module/attribute/operator.py b/src/blenderbim/blenderbim/bim/module/attribute/operator.py index bc6a983d9a..be3b37dd99 100644 --- a/src/blenderbim/blenderbim/bim/module/attribute/operator.py +++ b/src/blenderbim/blenderbim/bim/module/attribute/operator.py @@ -25,7 +25,7 @@ import blenderbim.bim.helper import blenderbim.bim.handler import blenderbim.tool as tool import blenderbim.core.attribute as core -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class EnableEditingAttributes(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/attribute/prop.py b/src/blenderbim/blenderbim/bim/module/attribute/prop.py index 35391fc321..eb3e2fbb4b 100644 --- a/src/blenderbim/blenderbim/bim/module/attribute/prop.py +++ b/src/blenderbim/blenderbim/bim/module/attribute/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.prop import StrProperty, Attribute +from ...ifc import IfcStore +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/attribute/ui.py b/src/blenderbim/blenderbim/bim/module/attribute/ui.py index 0680d5f654..4fd96dacdc 100644 --- a/src/blenderbim/blenderbim/bim/module/attribute/ui.py +++ b/src/blenderbim/blenderbim/bim/module/attribute/ui.py @@ -18,8 +18,8 @@ import blenderbim.bim.helper from bpy.types import Panel -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.attribute.data import AttributesData +from ...ifc import IfcStore +from .data import AttributesData def draw_ui(context, layout, attributes): diff --git a/src/blenderbim/blenderbim/bim/module/bcf/operator.py b/src/blenderbim/blenderbim/bim/module/bcf/operator.py index 828b953d29..9ddbc6e5dc 100644 --- a/src/blenderbim/blenderbim/bim/module/bcf/operator.py +++ b/src/blenderbim/blenderbim/bim/module/bcf/operator.py @@ -30,7 +30,7 @@ import ifcopenshell.util.unit import blenderbim.bim.module.bcf.prop as bcf_prop from . import bcfstore from pathlib import Path -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore from math import radians, degrees, atan, tan, cos, sin from mathutils import Vector, Matrix, Euler, geometry from xsdata.models.datatype import XmlDateTime diff --git a/src/blenderbim/blenderbim/bim/module/bcf/prop.py b/src/blenderbim/blenderbim/bim/module/bcf/prop.py index 7dc6f29757..a00051bfd7 100644 --- a/src/blenderbim/blenderbim/bim/module/bcf/prop.py +++ b/src/blenderbim/blenderbim/bim/module/bcf/prop.py @@ -18,7 +18,7 @@ import bpy from . import bcfstore -from blenderbim.bim.prop import StrProperty +from ...prop import StrProperty from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/boundary/operator.py b/src/blenderbim/blenderbim/bim/module/boundary/operator.py index e8536076e0..dd9f40e308 100644 --- a/src/blenderbim/blenderbim/bim/module/boundary/operator.py +++ b/src/blenderbim/blenderbim/bim/module/boundary/operator.py @@ -35,9 +35,9 @@ import blenderbim.tool as tool import blenderbim.bim.import_ifc as import_ifc from math import pi, inf, degrees, acos, radians from mathutils import Vector, Matrix -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.model.decorator import ProfileDecorator -from blenderbim.bim.module.boundary.decorator import BoundaryDecorator +from ...ifc import IfcStore +from ..model.decorator import ProfileDecorator +from .decorator import BoundaryDecorator import blenderbim.core import blenderbim.core.geometry diff --git a/src/blenderbim/blenderbim/bim/module/boundary/prop.py b/src/blenderbim/blenderbim/bim/module/boundary/prop.py index 11ffa39706..fb0b5f8b79 100644 --- a/src/blenderbim/blenderbim/bim/module/boundary/prop.py +++ b/src/blenderbim/blenderbim/bim/module/boundary/prop.py @@ -18,7 +18,7 @@ import bpy from bpy.types import PropertyGroup -from blenderbim.bim.prop import ObjProperty +from ...prop import ObjProperty from bpy.props import ( PointerProperty, StringProperty, diff --git a/src/blenderbim/blenderbim/bim/module/boundary/ui.py b/src/blenderbim/blenderbim/bim/module/boundary/ui.py index fada4c0ca3..aec8b3b343 100644 --- a/src/blenderbim/blenderbim/bim/module/boundary/ui.py +++ b/src/blenderbim/blenderbim/bim/module/boundary/ui.py @@ -19,9 +19,9 @@ import bpy import blenderbim.bim.helper from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore import blenderbim.tool as tool -from blenderbim.bim.module.boundary.data import SpaceBoundariesData +from .data import SpaceBoundariesData class BIM_PT_SceneBoundaries(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/brick/data.py b/src/blenderbim/blenderbim/bim/module/brick/data.py index db8cb856d9..d8176dc2ab 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/data.py +++ b/src/blenderbim/blenderbim/bim/module/brick/data.py @@ -18,7 +18,7 @@ import bpy import blenderbim.tool as tool -from blenderbim.tool.brick import BrickStore +from ....tool.brick import BrickStore try: from rdflib import URIRef, BNode diff --git a/src/blenderbim/blenderbim/bim/module/brick/operator.py b/src/blenderbim/blenderbim/bim/module/brick/operator.py index efd58c3e64..0f372bee71 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/operator.py +++ b/src/blenderbim/blenderbim/bim/module/brick/operator.py @@ -22,8 +22,8 @@ import ifcopenshell.api import blenderbim.tool as tool import blenderbim.core.brick as core import blenderbim.bim.handler -from blenderbim.bim.ifc import IfcStore -from blenderbim.tool.brick import BrickStore +from ...ifc import IfcStore +from ....tool.brick import BrickStore class LoadBrickProject(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/brick/prop.py b/src/blenderbim/blenderbim/bim/module/brick/prop.py index a9f271e927..edd617f5aa 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/prop.py +++ b/src/blenderbim/blenderbim/bim/module/brick/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.module.brick.data import BrickschemaData, BrickschemaReferencesData -from blenderbim.bim.prop import StrProperty, Attribute +from .data import BrickschemaData, BrickschemaReferencesData +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, @@ -32,7 +32,7 @@ from bpy.props import ( ) import blenderbim.core.brick as core import blenderbim.tool.brick as tool -from blenderbim.tool.brick import BrickStore +from ....tool.brick import BrickStore def update_active_brick_index(self, context): BrickschemaData.is_loaded = False diff --git a/src/blenderbim/blenderbim/bim/module/brick/ui.py b/src/blenderbim/blenderbim/bim/module/brick/ui.py index b09507ea83..9f3a379dea 100644 --- a/src/blenderbim/blenderbim/bim/module/brick/ui.py +++ b/src/blenderbim/blenderbim/bim/module/brick/ui.py @@ -18,9 +18,9 @@ import blenderbim.tool as tool from bpy.types import Panel, UIList -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.module.brick.data import BrickschemaData, BrickschemaReferencesData -from blenderbim.tool.brick import BrickStore +from ...helper import prop_with_search +from .data import BrickschemaData, BrickschemaReferencesData +from ....tool.brick import BrickStore class BIM_PT_brickschema(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/bsdd/operator.py b/src/blenderbim/blenderbim/bim/module/bsdd/operator.py index 1d64f03029..d301165c9f 100644 --- a/src/blenderbim/blenderbim/bim/module/bsdd/operator.py +++ b/src/blenderbim/blenderbim/bim/module/bsdd/operator.py @@ -19,7 +19,7 @@ import bpy import bsdd import blenderbim.tool as tool -from blenderbim.core import bsdd as core +from ....core import bsdd as core class LoadBSDDDomains(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/bsdd/prop.py b/src/blenderbim/blenderbim/bim/module/bsdd/prop.py index 2a54c8f7ce..847b4836d3 100644 --- a/src/blenderbim/blenderbim/bim/module/bsdd/prop.py +++ b/src/blenderbim/blenderbim/bim/module/bsdd/prop.py @@ -18,7 +18,7 @@ import bpy from bpy.types import PropertyGroup -from blenderbim.bim.prop import Attribute, StrProperty +from ...prop import Attribute, StrProperty from bpy.props import ( PointerProperty, StringProperty, diff --git a/src/blenderbim/blenderbim/bim/module/bsdd/ui.py b/src/blenderbim/blenderbim/bim/module/bsdd/ui.py index 899e8dcf2b..f8e6324b98 100644 --- a/src/blenderbim/blenderbim/bim/module/bsdd/ui.py +++ b/src/blenderbim/blenderbim/bim/module/bsdd/ui.py @@ -18,7 +18,7 @@ import blenderbim.tool as tool from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class BIM_PT_bsdd(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/cad/prop.py b/src/blenderbim/blenderbim/bim/module/cad/prop.py index ed795a74aa..c2c6b01f52 100644 --- a/src/blenderbim/blenderbim/bim/module/cad/prop.py +++ b/src/blenderbim/blenderbim/bim/module/cad/prop.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.module.model.data import AuthoringData +from ..model.data import AuthoringData from bpy.types import PropertyGroup from math import pi diff --git a/src/blenderbim/blenderbim/bim/module/cad/workspace.py b/src/blenderbim/blenderbim/bim/module/cad/workspace.py index e5b8e33d0a..29167a250c 100644 --- a/src/blenderbim/blenderbim/bim/module/cad/workspace.py +++ b/src/blenderbim/blenderbim/bim/module/cad/workspace.py @@ -22,7 +22,7 @@ import blenderbim.tool as tool import blenderbim.bim.module.type.prop as type_prop import ifcopenshell.util.unit from bpy.types import WorkSpaceTool -from blenderbim.bim.module.model.data import AuthoringData, RailingData, RoofData +from ..model.data import AuthoringData, RailingData, RoofData class CadTool(WorkSpaceTool): diff --git a/src/blenderbim/blenderbim/bim/module/clash/operator.py b/src/blenderbim/blenderbim/bim/module/clash/operator.py index f32e7bfad3..1cd8295472 100644 --- a/src/blenderbim/blenderbim/bim/module/clash/operator.py +++ b/src/blenderbim/blenderbim/bim/module/clash/operator.py @@ -26,8 +26,8 @@ import ifcopenshell import blenderbim.tool as tool from math import radians from mathutils import Matrix, Vector -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.clash.decorator import ClashDecorator +from ...ifc import IfcStore +from .decorator import ClashDecorator class ExportClashSets(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/clash/prop.py b/src/blenderbim/blenderbim/bim/module/clash/prop.py index 0f7e7c2275..13be0b8928 100644 --- a/src/blenderbim/blenderbim/bim/module/clash/prop.py +++ b/src/blenderbim/blenderbim/bim/module/clash/prop.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute, BIMFilterGroup +from ...prop import StrProperty, Attribute, BIMFilterGroup from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/clash/ui.py b/src/blenderbim/blenderbim/bim/module/clash/ui.py index d5322a568b..8daa31777d 100644 --- a/src/blenderbim/blenderbim/bim/module/clash/ui.py +++ b/src/blenderbim/blenderbim/bim/module/clash/ui.py @@ -19,7 +19,7 @@ import bpy import blenderbim.bim.helper from bpy.types import Panel -from blenderbim.bim.module.clash.data import ClashData +from .data import ClashData class BIM_PT_ifcclash(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/classification/data.py b/src/blenderbim/blenderbim/bim/module/classification/data.py index 942ae6809d..4b82544949 100644 --- a/src/blenderbim/blenderbim/bim/module/classification/data.py +++ b/src/blenderbim/blenderbim/bim/module/classification/data.py @@ -21,7 +21,7 @@ import ifcopenshell import ifcopenshell.util.date import ifcopenshell.util.classification import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore def refresh(): diff --git a/src/blenderbim/blenderbim/bim/module/classification/operator.py b/src/blenderbim/blenderbim/bim/module/classification/operator.py index 2536e2865b..78cb4670d3 100644 --- a/src/blenderbim/blenderbim/bim/module/classification/operator.py +++ b/src/blenderbim/blenderbim/bim/module/classification/operator.py @@ -24,7 +24,7 @@ import ifcopenshell.util.classification import ifcopenshell.util.element import blenderbim.tool as tool import blenderbim.bim.helper -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class LoadClassificationLibrary(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/classification/prop.py b/src/blenderbim/blenderbim/bim/module/classification/prop.py index d2a6282d40..927a12e564 100644 --- a/src/blenderbim/blenderbim/bim/module/classification/prop.py +++ b/src/blenderbim/blenderbim/bim/module/classification/prop.py @@ -18,9 +18,9 @@ import bpy import blenderbim.bim.helper -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.classification.data import ClassificationsData, ClassificationReferencesData +from ...ifc import IfcStore +from ...prop import StrProperty, Attribute +from .data import ClassificationsData, ClassificationReferencesData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/classification/ui.py b/src/blenderbim/blenderbim/bim/module/classification/ui.py index cdc2ef3356..99c869515a 100644 --- a/src/blenderbim/blenderbim/bim/module/classification/ui.py +++ b/src/blenderbim/blenderbim/bim/module/classification/ui.py @@ -20,8 +20,8 @@ import blenderbim.bim.helper import blenderbim.tool as tool import blenderbim.bim.module.classification.prop as classification_prop from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.classification.data import ( +from ...ifc import IfcStore +from .data import ( ClassificationsData, ClassificationReferencesData, MaterialClassificationsData, diff --git a/src/blenderbim/blenderbim/bim/module/constraint/operator.py b/src/blenderbim/blenderbim/bim/module/constraint/operator.py index f461554c49..b0bd481928 100644 --- a/src/blenderbim/blenderbim/bim/module/constraint/operator.py +++ b/src/blenderbim/blenderbim/bim/module/constraint/operator.py @@ -22,7 +22,7 @@ import ifcopenshell.api import ifcopenshell.util.attribute import blenderbim.bim.helper import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class LoadObjectives(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/constraint/prop.py b/src/blenderbim/blenderbim/bim/module/constraint/prop.py index 7f9fe99a13..69d9712002 100644 --- a/src/blenderbim/blenderbim/bim/module/constraint/prop.py +++ b/src/blenderbim/blenderbim/bim/module/constraint/prop.py @@ -19,7 +19,7 @@ import bpy from ifcopenshell.util.doc import get_entity_doc import blenderbim.tool as tool -from blenderbim.bim.prop import Attribute +from ...prop import Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/constraint/ui.py b/src/blenderbim/blenderbim/bim/module/constraint/ui.py index 0f3b522c7e..b52398db24 100644 --- a/src/blenderbim/blenderbim/bim/module/constraint/ui.py +++ b/src/blenderbim/blenderbim/bim/module/constraint/ui.py @@ -17,9 +17,9 @@ # along with BlenderBIM Add-on. If not, see . from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import draw_attributes -from blenderbim.bim.module.constraint.data import ConstraintsData, ObjectConstraintsData +from ...ifc import IfcStore +from ...helper import draw_attributes +from .data import ConstraintsData, ObjectConstraintsData class BIM_PT_constraints(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/context/operator.py b/src/blenderbim/blenderbim/bim/module/context/operator.py index fd15c1933d..1df558de44 100644 --- a/src/blenderbim/blenderbim/bim/module/context/operator.py +++ b/src/blenderbim/blenderbim/bim/module/context/operator.py @@ -21,7 +21,7 @@ import blenderbim.tool as tool import blenderbim.core.context as core import blenderbim.bim.module.context.data import blenderbim.bim.handler -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class AddContext(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/context/prop.py b/src/blenderbim/blenderbim/bim/module/context/prop.py index b37cca9c19..046e3d5efc 100644 --- a/src/blenderbim/blenderbim/bim/module/context/prop.py +++ b/src/blenderbim/blenderbim/bim/module/context/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.context.data import ContextData +from ...prop import StrProperty, Attribute +from .data import ContextData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/context/ui.py b/src/blenderbim/blenderbim/bim/module/context/ui.py index 85635fe86b..dfa8476ea6 100644 --- a/src/blenderbim/blenderbim/bim/module/context/ui.py +++ b/src/blenderbim/blenderbim/bim/module/context/ui.py @@ -19,7 +19,7 @@ import bpy import blenderbim.bim.helper import blenderbim.tool as tool -from blenderbim.bim.module.context.data import ContextData +from .data import ContextData class BIM_PT_context(bpy.types.Panel): diff --git a/src/blenderbim/blenderbim/bim/module/cost/prop.py b/src/blenderbim/blenderbim/bim/module/cost/prop.py index d35cad5446..62d0d5fb9a 100644 --- a/src/blenderbim/blenderbim/bim/module/cost/prop.py +++ b/src/blenderbim/blenderbim/bim/module/cost/prop.py @@ -19,10 +19,10 @@ import bpy import ifcopenshell.api import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.classification.data import CostClassificationsData -from blenderbim.bim.module.cost.data import CostSchedulesData, CostItemRatesData, CostItemQuantitiesData -from blenderbim.bim.prop import StrProperty, Attribute +from ...ifc import IfcStore +from ..classification.data import CostClassificationsData +from .data import CostSchedulesData, CostItemRatesData, CostItemQuantitiesData +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/cost/ui.py b/src/blenderbim/blenderbim/bim/module/cost/ui.py index 0df9354468..1fe9c045d7 100644 --- a/src/blenderbim/blenderbim/bim/module/cost/ui.py +++ b/src/blenderbim/blenderbim/bim/module/cost/ui.py @@ -19,8 +19,8 @@ import blenderbim.bim.helper import blenderbim.bim.module.cost.prop as CostProp from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.cost.data import CostSchedulesData +from ...ifc import IfcStore +from .data import CostSchedulesData from typing import Any diff --git a/src/blenderbim/blenderbim/bim/module/covering/prop.py b/src/blenderbim/blenderbim/bim/module/covering/prop.py index 76cd6ee3e0..5dae8fa999 100644 --- a/src/blenderbim/blenderbim/bim/module/covering/prop.py +++ b/src/blenderbim/blenderbim/bim/module/covering/prop.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute #from blenderbim.bim.module.spatial.data import SpatialData from bpy.types import PropertyGroup from bpy.props import ( diff --git a/src/blenderbim/blenderbim/bim/module/covering/workspace.py b/src/blenderbim/blenderbim/bim/module/covering/workspace.py index e14b4bba71..012274d279 100644 --- a/src/blenderbim/blenderbim/bim/module/covering/workspace.py +++ b/src/blenderbim/blenderbim/bim/module/covering/workspace.py @@ -21,10 +21,10 @@ import os import bpy import ifcopenshell import blenderbim.tool as tool -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.module.model.data import AuthoringData +from ...helper import prop_with_search +from ..model.data import AuthoringData from bpy.types import WorkSpaceTool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore import blenderbim.bim.handler diff --git a/src/blenderbim/blenderbim/bim/module/covetool/operator.py b/src/blenderbim/blenderbim/bim/module/covetool/operator.py index e035063b9e..86ea79de3f 100644 --- a/src/blenderbim/blenderbim/bim/module/covetool/operator.py +++ b/src/blenderbim/blenderbim/bim/module/covetool/operator.py @@ -21,7 +21,7 @@ import json import ifcopenshell import ifcopenshell.util.element from math import degrees, atan2 -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore from .api import Api diff --git a/src/blenderbim/blenderbim/bim/module/csv/operator.py b/src/blenderbim/blenderbim/bim/module/csv/operator.py index 08ae965395..0178969aa8 100644 --- a/src/blenderbim/blenderbim/bim/module/csv/operator.py +++ b/src/blenderbim/blenderbim/bim/module/csv/operator.py @@ -26,8 +26,8 @@ import ifcopenshell import ifcopenshell.util.selector import blenderbim.tool as tool import blenderbim.bim.module.drawing.scheduler as scheduler -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.handler import refresh_ui_data +from ...ifc import IfcStore +from ...handler import refresh_ui_data class AddCsvAttribute(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/csv/prop.py b/src/blenderbim/blenderbim/bim/module/csv/prop.py index be2399734e..e661d7202e 100644 --- a/src/blenderbim/blenderbim/bim/module/csv/prop.py +++ b/src/blenderbim/blenderbim/bim/module/csv/prop.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, BIMFilterGroup +from ...prop import StrProperty, BIMFilterGroup from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/csv/ui.py b/src/blenderbim/blenderbim/bim/module/csv/ui.py index 18fbfe9f6a..67e6ec1c1a 100644 --- a/src/blenderbim/blenderbim/bim/module/csv/ui.py +++ b/src/blenderbim/blenderbim/bim/module/csv/ui.py @@ -18,8 +18,8 @@ import blenderbim.bim.helper from bpy.types import Panel -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.search.data import SearchData +from ...ifc import IfcStore +from ..search.data import SearchData class BIM_PT_ifccsv(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/debug/operator.py b/src/blenderbim/blenderbim/bim/module/debug/operator.py index 71f5817982..19843da6c4 100644 --- a/src/blenderbim/blenderbim/bim/module/debug/operator.py +++ b/src/blenderbim/blenderbim/bim/module/debug/operator.py @@ -23,6 +23,7 @@ import time import random import logging import platform +import importlib import subprocess import ifcopenshell import ifcopenshell.api @@ -35,9 +36,11 @@ import blenderbim.core.debug as core import blenderbim.bim.handler import blenderbim.bim.import_ifc as import_ifc from pathlib import Path -from blenderbim import get_debug_info, format_debug_info -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore +bbim = importlib.import_module("....", package=__package__) +get_debug_info = bbim.get_debug_info +format_debug_info = bbim.format_debug_info class CopyDebugInformation(bpy.types.Operator): bl_idname = "bim.copy_debug_information" diff --git a/src/blenderbim/blenderbim/bim/module/debug/prop.py b/src/blenderbim/blenderbim/bim/module/debug/prop.py index 456e2ad45c..9596986c4a 100644 --- a/src/blenderbim/blenderbim/bim/module/debug/prop.py +++ b/src/blenderbim/blenderbim/bim/module/debug/prop.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with BlenderBIM Add-on. If not, see . -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/demo/ui.py b/src/blenderbim/blenderbim/bim/module/demo/ui.py index f00d4ae05b..a92bdf3f0d 100644 --- a/src/blenderbim/blenderbim/bim/module/demo/ui.py +++ b/src/blenderbim/blenderbim/bim/module/demo/ui.py @@ -27,7 +27,7 @@ # panels, buttons, labels, and input fields are laid out. import bpy -from blenderbim.bim.module.demo.data import DemoData +from .data import DemoData # Every panel in the interface correlates to one of these classes. If you enable # the "Developer Extras" option in Blender, then you can actually right click on diff --git a/src/blenderbim/blenderbim/bim/module/diff/operator.py b/src/blenderbim/blenderbim/bim/module/diff/operator.py index 4ad46c64d4..8acf3cad55 100644 --- a/src/blenderbim/blenderbim/bim/module/diff/operator.py +++ b/src/blenderbim/blenderbim/bim/module/diff/operator.py @@ -22,7 +22,7 @@ import logging import ifcopenshell import blenderbim.bim.handler import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class SelectDiffJsonFile(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/diff/prop.py b/src/blenderbim/blenderbim/bim/module/diff/prop.py index c6b0a06c91..d58fb71321 100644 --- a/src/blenderbim/blenderbim/bim/module/diff/prop.py +++ b/src/blenderbim/blenderbim/bim/module/diff/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, BIMFilterGroup -from blenderbim.bim.module.diff.data import DiffData +from ...prop import StrProperty, BIMFilterGroup +from .data import DiffData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/diff/ui.py b/src/blenderbim/blenderbim/bim/module/diff/ui.py index 6593e7cd6f..306ee98915 100644 --- a/src/blenderbim/blenderbim/bim/module/diff/ui.py +++ b/src/blenderbim/blenderbim/bim/module/diff/ui.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . from bpy.types import Panel -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.diff.data import DiffData +from ...ifc import IfcStore +from .data import DiffData import blenderbim.bim.helper import blenderbim.tool as tool diff --git a/src/blenderbim/blenderbim/bim/module/document/operator.py b/src/blenderbim/blenderbim/bim/module/document/operator.py index 538f0d4211..19c86bd135 100644 --- a/src/blenderbim/blenderbim/bim/module/document/operator.py +++ b/src/blenderbim/blenderbim/bim/module/document/operator.py @@ -22,7 +22,7 @@ import ifcopenshell.api import ifcopenshell.util.attribute import blenderbim.tool as tool import blenderbim.core.document as core -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class LoadProjectDocuments(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/document/prop.py b/src/blenderbim/blenderbim/bim/module/document/prop.py index 1a9c7412cf..db1640e4bb 100644 --- a/src/blenderbim/blenderbim/bim/module/document/prop.py +++ b/src/blenderbim/blenderbim/bim/module/document/prop.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/document/ui.py b/src/blenderbim/blenderbim/bim/module/document/ui.py index 289e2f992f..75894ab791 100644 --- a/src/blenderbim/blenderbim/bim/module/document/ui.py +++ b/src/blenderbim/blenderbim/bim/module/document/ui.py @@ -17,9 +17,9 @@ # along with BlenderBIM Add-on. If not, see . from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import draw_attributes -from blenderbim.bim.module.document.data import DocumentData, ObjectDocumentData +from ...ifc import IfcStore +from ...helper import draw_attributes +from .data import DocumentData, ObjectDocumentData class BIM_PT_documents(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/drawing/decoration.py b/src/blenderbim/blenderbim/bim/module/drawing/decoration.py index f5cd213081..60df5d1c72 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/decoration.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/decoration.py @@ -32,9 +32,9 @@ from bpy.types import SpaceView3D from mathutils import Vector, Matrix from bpy_extras.view3d_utils import location_3d_to_region_2d from gpu_extras.batch import batch_for_shader -from blenderbim.bim.module.drawing.data import DecoratorData, DrawingsData -from blenderbim.bim.module.drawing.shaders import add_verts_sequence, add_offsets -from blenderbim.bim.module.drawing.helper import format_distance +from .data import DecoratorData, DrawingsData +from .shaders import add_verts_sequence, add_offsets +from .helper import format_distance from timeit import default_timer as timer from functools import lru_cache from typing import Optional, Iterator, Type, Union diff --git a/src/blenderbim/blenderbim/bim/module/drawing/gizmos.py b/src/blenderbim/blenderbim/bim/module/drawing/gizmos.py index 1fc497f395..35889b1f5c 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/gizmos.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/gizmos.py @@ -23,7 +23,7 @@ from bpy import types from mathutils import Vector from mathutils import geometry from bpy_extras import view3d_utils -from blenderbim.bim.module.drawing.shaders import DotsGizmoShader, ExtrusionGuidesShader +from .shaders import DotsGizmoShader, ExtrusionGuidesShader from ifcopenshell.util.unit import si_conversions diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py index 80558d6491..3c0cf7fd67 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py @@ -47,14 +47,14 @@ import blenderbim.bim.module.drawing.sheeter as sheeter import blenderbim.bim.module.drawing.scheduler as scheduler import blenderbim.bim.module.drawing.helper as helper import blenderbim.bim.export_ifc -from blenderbim.bim.module.drawing.decoration import CutDecorator -from blenderbim.bim.module.drawing.data import DecoratorData, DrawingsData +from .decoration import CutDecorator +from .data import DecoratorData, DrawingsData from typing import NamedTuple, List, Union, Optional, Literal from lxml import etree from mathutils import Vector, Color, Matrix from timeit import default_timer as timer -from blenderbim.bim.module.drawing.prop import RasterStyleProperty, RASTER_STYLE_PROPERTIES_EXCLUDE -from blenderbim.bim.ifc import IfcStore +from .prop import RasterStyleProperty, RASTER_STYLE_PROPERTIES_EXCLUDE +from ...ifc import IfcStore from pathlib import Path from bpy_extras.image_utils import load_image diff --git a/src/blenderbim/blenderbim/bim/module/drawing/prop.py b/src/blenderbim/blenderbim/bim/module/drawing/prop.py index 30a308a669..07136240c8 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/prop.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/prop.py @@ -25,11 +25,11 @@ import blenderbim.tool as tool import blenderbim.core.drawing as core import blenderbim.bim.module.drawing.annotation as annotation import blenderbim.bim.module.drawing.decoration as decoration -from blenderbim.bim.prop import BIMFilterGroup -from blenderbim.bim.module.drawing.data import DrawingsData, DecoratorData, SheetsData, AnnotationData -from blenderbim.bim.module.drawing.data import refresh as refresh_drawing_data +from ...prop import BIMFilterGroup +from .data import DrawingsData, DecoratorData, SheetsData, AnnotationData +from .data import refresh as refresh_drawing_data from pathlib import Path -from blenderbim.bim.prop import Attribute, StrProperty +from ...prop import Attribute, StrProperty from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/drawing/scheduler.py b/src/blenderbim/blenderbim/bim/module/drawing/scheduler.py index 72da3bbfa7..a5e0e99930 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/scheduler.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/scheduler.py @@ -23,7 +23,7 @@ import string import svgwrite import openpyxl -from blenderbim.bim.module.drawing.svgwriter import SvgWriter +from .svgwriter import SvgWriter from odf.opendocument import load as load_ods from odf.table import Table, TableRow, TableColumn, TableCell from odf.text import P diff --git a/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py b/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py index 4af3640c80..2bbddb74d2 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/svgwriter.py @@ -32,10 +32,10 @@ import ifcopenshell.util.selector import blenderbim.tool as tool import blenderbim.bim.module.drawing.helper as helper import blenderbim.bim.module.drawing.annotation as annotation -from blenderbim.bim.module.drawing.data import DrawingsData +from .data import DrawingsData -from blenderbim.bim.module.drawing.data import DecoratorData -from blenderbim.bim.ifc import IfcStore +from .data import DecoratorData +from ...ifc import IfcStore from math import pi, ceil, atan, degrees, acos from mathutils import geometry, Vector diff --git a/src/blenderbim/blenderbim/bim/module/drawing/ui.py b/src/blenderbim/blenderbim/bim/module/drawing/ui.py index 2b47df9431..56960ee601 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/ui.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/ui.py @@ -20,7 +20,7 @@ import bpy import blenderbim.bim.helper import blenderbim.tool as tool from bpy.types import Panel -from blenderbim.bim.module.drawing.data import ( +from .data import ( ProductAssignmentsData, SheetsData, DocumentsData, diff --git a/src/blenderbim/blenderbim/bim/module/drawing/workspace.py b/src/blenderbim/blenderbim/bim/module/drawing/workspace.py index a0cb1f4519..e9fe092f39 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/workspace.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/workspace.py @@ -21,11 +21,11 @@ import os import bpy import blenderbim.core.type import blenderbim.tool as tool -from blenderbim.bim.helper import prop_with_search +from ...helper import prop_with_search from bpy.types import WorkSpaceTool -from blenderbim.bim.module.drawing.data import DecoratorData, AnnotationData -from blenderbim.bim.ifc import IfcStore +from .data import DecoratorData, AnnotationData +from ...ifc import IfcStore import blenderbim.bim.handler diff --git a/src/blenderbim/blenderbim/bim/module/fm/operator.py b/src/blenderbim/blenderbim/bim/module/fm/operator.py index 77dd0ac72d..8fb2ce6464 100644 --- a/src/blenderbim/blenderbim/bim/module/fm/operator.py +++ b/src/blenderbim/blenderbim/bim/module/fm/operator.py @@ -24,7 +24,7 @@ import logging import tempfile import ifcopenshell import blenderbim.tool as tool -from blenderbim.bim.operator import MultipleFileSelector +from ...operator import MultipleFileSelector class SelectFMIfcFile(MultipleFileSelector): diff --git a/src/blenderbim/blenderbim/bim/module/fm/prop.py b/src/blenderbim/blenderbim/bim/module/fm/prop.py index f4a1868645..9ec82e8b93 100644 --- a/src/blenderbim/blenderbim/bim/module/fm/prop.py +++ b/src/blenderbim/blenderbim/bim/module/fm/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.module.fm.data import FMData -from blenderbim.bim.prop import StrProperty +from .data import FMData +from ...prop import StrProperty from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/fm/ui.py b/src/blenderbim/blenderbim/bim/module/fm/ui.py index ca5efe36f1..99eb421389 100644 --- a/src/blenderbim/blenderbim/bim/module/fm/ui.py +++ b/src/blenderbim/blenderbim/bim/module/fm/ui.py @@ -18,8 +18,8 @@ import blenderbim.tool as tool from bpy.types import Panel -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.fm.data import FMData +from ...ifc import IfcStore +from .data import FMData class BIM_PT_fm(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/geometry/operator.py b/src/blenderbim/blenderbim/bim/module/geometry/operator.py index 6c40c03fb9..91ec87e8c6 100644 --- a/src/blenderbim/blenderbim/bim/module/geometry/operator.py +++ b/src/blenderbim/blenderbim/bim/module/geometry/operator.py @@ -38,7 +38,7 @@ import blenderbim.tool as tool import blenderbim.bim.handler from mathutils import Vector, Matrix from time import time -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore from ifcopenshell.util.shape_builder import ShapeBuilder from typing import Any diff --git a/src/blenderbim/blenderbim/bim/module/geometry/prop.py b/src/blenderbim/blenderbim/bim/module/geometry/prop.py index 860a46eb58..aa82aaa2e7 100644 --- a/src/blenderbim/blenderbim/bim/module/geometry/prop.py +++ b/src/blenderbim/blenderbim/bim/module/geometry/prop.py @@ -18,8 +18,8 @@ import bpy import blenderbim.tool as tool -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.geometry.data import RepresentationsData, ViewportData +from ...prop import StrProperty, Attribute +from .data import RepresentationsData, ViewportData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/geometry/ui.py b/src/blenderbim/blenderbim/bim/module/geometry/ui.py index c084a2425e..bdeb34d88e 100644 --- a/src/blenderbim/blenderbim/bim/module/geometry/ui.py +++ b/src/blenderbim/blenderbim/bim/module/geometry/ui.py @@ -20,16 +20,16 @@ import bpy import blenderbim.bim import blenderbim.tool as tool from bpy.types import Panel, Menu, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.module.geometry.data import ( +from ...ifc import IfcStore +from ...helper import prop_with_search +from .data import ( RepresentationsData, RepresentationItemsData, ConnectionsData, PlacementData, DerivedCoordinatesData, ) -from blenderbim.bim.module.layer.data import LayersData +from ..layer.data import LayersData def mode_menu(self, context): diff --git a/src/blenderbim/blenderbim/bim/module/georeference/decorator.py b/src/blenderbim/blenderbim/bim/module/georeference/decorator.py index ed6175265d..6543a8f340 100644 --- a/src/blenderbim/blenderbim/bim/module/georeference/decorator.py +++ b/src/blenderbim/blenderbim/bim/module/georeference/decorator.py @@ -26,7 +26,7 @@ from bpy.types import SpaceView3D from mathutils import Vector, Matrix from gpu_extras.batch import batch_for_shader from bpy_extras.view3d_utils import location_3d_to_region_2d -from blenderbim.bim.module.georeference.data import GeoreferenceData +from .data import GeoreferenceData class GeoreferenceDecorator: diff --git a/src/blenderbim/blenderbim/bim/module/georeference/operator.py b/src/blenderbim/blenderbim/bim/module/georeference/operator.py index e86e877f9c..dd698ac326 100644 --- a/src/blenderbim/blenderbim/bim/module/georeference/operator.py +++ b/src/blenderbim/blenderbim/bim/module/georeference/operator.py @@ -20,7 +20,7 @@ import bpy import blenderbim.tool as tool import blenderbim.core.georeference as core -from blenderbim.bim.module.georeference.decorator import GeoreferenceDecorator +from .decorator import GeoreferenceDecorator class AddGeoreferencing(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/georeference/prop.py b/src/blenderbim/blenderbim/bim/module/georeference/prop.py index dfa947e03c..58af6223bb 100644 --- a/src/blenderbim/blenderbim/bim/module/georeference/prop.py +++ b/src/blenderbim/blenderbim/bim/module/georeference/prop.py @@ -18,7 +18,7 @@ import bpy import ifcopenshell.util.geolocation -from blenderbim.bim.prop import Attribute +from ...prop import Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, @@ -30,8 +30,8 @@ from bpy.props import ( FloatVectorProperty, CollectionProperty, ) -from blenderbim.bim.module.georeference.data import GeoreferenceData -from blenderbim.bim.module.georeference.decorator import GeoreferenceDecorator +from .data import GeoreferenceData +from .decorator import GeoreferenceDecorator def get_coordinate_operation_class(self, context): diff --git a/src/blenderbim/blenderbim/bim/module/georeference/ui.py b/src/blenderbim/blenderbim/bim/module/georeference/ui.py index dcd2d391b4..a027fb2c4a 100644 --- a/src/blenderbim/blenderbim/bim/module/georeference/ui.py +++ b/src/blenderbim/blenderbim/bim/module/georeference/ui.py @@ -18,8 +18,8 @@ import blenderbim.tool as tool from bpy.types import Panel -from blenderbim.bim.helper import draw_attributes, draw_attribute -from blenderbim.bim.module.georeference.data import GeoreferenceData +from ...helper import draw_attributes, draw_attribute +from .data import GeoreferenceData class BIM_PT_gis(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/gis/prop.py b/src/blenderbim/blenderbim/bim/module/gis/prop.py index e5fc1640d1..36280a8c57 100644 --- a/src/blenderbim/blenderbim/bim/module/gis/prop.py +++ b/src/blenderbim/blenderbim/bim/module/gis/prop.py @@ -18,7 +18,7 @@ from bpy.types import PropertyGroup from bpy.props import StringProperty, BoolProperty, EnumProperty, CollectionProperty -from blenderbim.bim.prop import StrProperty +from ...prop import StrProperty class BIMCityJsonProperties(PropertyGroup): diff --git a/src/blenderbim/blenderbim/bim/module/group/operator.py b/src/blenderbim/blenderbim/bim/module/group/operator.py index 528b1b59b8..4176e6c7ab 100644 --- a/src/blenderbim/blenderbim/bim/module/group/operator.py +++ b/src/blenderbim/blenderbim/bim/module/group/operator.py @@ -21,7 +21,7 @@ import ifcopenshell.util.attribute import ifcopenshell.api import blenderbim.bim.helper import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore import json diff --git a/src/blenderbim/blenderbim/bim/module/group/prop.py b/src/blenderbim/blenderbim/bim/module/group/prop.py index c4f6133533..1dded929b7 100644 --- a/src/blenderbim/blenderbim/bim/module/group/prop.py +++ b/src/blenderbim/blenderbim/bim/module/group/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.pset.data import refresh as refresh_pset +from ...prop import StrProperty, Attribute +from ..pset.data import refresh as refresh_pset from bpy.types import PropertyGroup import json from bpy.props import ( diff --git a/src/blenderbim/blenderbim/bim/module/group/ui.py b/src/blenderbim/blenderbim/bim/module/group/ui.py index ff0487cc13..a108aac7e5 100644 --- a/src/blenderbim/blenderbim/bim/module/group/ui.py +++ b/src/blenderbim/blenderbim/bim/module/group/ui.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.group.data import GroupsData, ObjectGroupsData +from ...ifc import IfcStore +from .data import GroupsData, ObjectGroupsData class BIM_PT_groups(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/ifcgit/operator.py b/src/blenderbim/blenderbim/bim/module/ifcgit/operator.py index 4cf00a4508..4ed7881af0 100644 --- a/src/blenderbim/blenderbim/bim/module/ifcgit/operator.py +++ b/src/blenderbim/blenderbim/bim/module/ifcgit/operator.py @@ -3,7 +3,7 @@ import re import bpy import blenderbim.core.ifcgit as core import blenderbim.tool as tool -from blenderbim.bim.module.ifcgit.data import IfcGitData, refresh +from .data import IfcGitData, refresh class CreateRepo(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/ifcgit/prop.py b/src/blenderbim/blenderbim/bim/module/ifcgit/prop.py index c34b2f6e84..eaac1aef15 100644 --- a/src/blenderbim/blenderbim/bim/module/ifcgit/prop.py +++ b/src/blenderbim/blenderbim/bim/module/ifcgit/prop.py @@ -7,7 +7,7 @@ from bpy.props import ( IntProperty, EnumProperty, ) -from blenderbim.bim.module.ifcgit.data import IfcGitData +from .data import IfcGitData def git_branches(self, context): diff --git a/src/blenderbim/blenderbim/bim/module/ifcgit/ui.py b/src/blenderbim/blenderbim/bim/module/ifcgit/ui.py index 7d3a886cba..2375312a78 100644 --- a/src/blenderbim/blenderbim/bim/module/ifcgit/ui.py +++ b/src/blenderbim/blenderbim/bim/module/ifcgit/ui.py @@ -1,6 +1,6 @@ import bpy import time -from blenderbim.bim.module.ifcgit.data import IfcGitData +from .data import IfcGitData class IFCGIT_PT_panel(bpy.types.Panel): diff --git a/src/blenderbim/blenderbim/bim/module/layer/operator.py b/src/blenderbim/blenderbim/bim/module/layer/operator.py index 70d1213586..6df8f646f8 100644 --- a/src/blenderbim/blenderbim/bim/module/layer/operator.py +++ b/src/blenderbim/blenderbim/bim/module/layer/operator.py @@ -23,7 +23,7 @@ import ifcopenshell.util.element import ifcopenshell.util.attribute import blenderbim.bim.helper import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class LoadLayers(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/layer/prop.py b/src/blenderbim/blenderbim/bim/module/layer/prop.py index c9c0c1fd28..f480a1f288 100644 --- a/src/blenderbim/blenderbim/bim/module/layer/prop.py +++ b/src/blenderbim/blenderbim/bim/module/layer/prop.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/layer/ui.py b/src/blenderbim/blenderbim/bim/module/layer/ui.py index 9f82f8ecb5..19b16ba250 100644 --- a/src/blenderbim/blenderbim/bim/module/layer/ui.py +++ b/src/blenderbim/blenderbim/bim/module/layer/ui.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . from bpy.types import Panel, UIList, Mesh -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.layer.data import LayersData +from ...ifc import IfcStore +from .data import LayersData class BIM_PT_layers(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/library/operator.py b/src/blenderbim/blenderbim/bim/module/library/operator.py index 385620b91a..5d1776aad8 100644 --- a/src/blenderbim/blenderbim/bim/module/library/operator.py +++ b/src/blenderbim/blenderbim/bim/module/library/operator.py @@ -21,7 +21,7 @@ import ifcopenshell.api import blenderbim.tool as tool import blenderbim.core.library as core import blenderbim.bim.handler -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class AddLibrary(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/library/prop.py b/src/blenderbim/blenderbim/bim/module/library/prop.py index a3c1dd2edd..25b82305e0 100644 --- a/src/blenderbim/blenderbim/bim/module/library/prop.py +++ b/src/blenderbim/blenderbim/bim/module/library/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.library.data import LibrariesData +from ...prop import StrProperty, Attribute +from .data import LibrariesData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/library/ui.py b/src/blenderbim/blenderbim/bim/module/library/ui.py index fb6ef10fda..03dca96494 100644 --- a/src/blenderbim/blenderbim/bim/module/library/ui.py +++ b/src/blenderbim/blenderbim/bim/module/library/ui.py @@ -19,7 +19,7 @@ import blenderbim.bim.helper import blenderbim.tool as tool from bpy.types import Panel, UIList -from blenderbim.bim.module.library.data import LibrariesData, LibraryReferencesData +from .data import LibrariesData, LibraryReferencesData class BIM_PT_libraries(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/light/decorator.py b/src/blenderbim/blenderbim/bim/module/light/decorator.py index 2637967494..c8f02447c0 100644 --- a/src/blenderbim/blenderbim/bim/module/light/decorator.py +++ b/src/blenderbim/blenderbim/bim/module/light/decorator.py @@ -26,7 +26,7 @@ from math import radians from mathutils import Vector, Matrix from gpu_extras.batch import batch_for_shader from bpy_extras.view3d_utils import location_3d_to_region_2d -from blenderbim.bim.module.light.data import SolarData +from .data import SolarData sun_position = tool.Blender.get_sun_position_addon() diff --git a/src/blenderbim/blenderbim/bim/module/light/operator.py b/src/blenderbim/blenderbim/bim/module/light/operator.py index c333564263..2262da4018 100644 --- a/src/blenderbim/blenderbim/bim/module/light/operator.py +++ b/src/blenderbim/blenderbim/bim/module/light/operator.py @@ -27,7 +27,7 @@ import ifcopenshell.geom import blenderbim.tool as tool from pathlib import Path from typing import Union -from blenderbim.bim.module.light.data import SolarData +from .data import SolarData class ExportOBJ(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/light/prop.py b/src/blenderbim/blenderbim/bim/module/light/prop.py index aefe832e22..192feac07a 100644 --- a/src/blenderbim/blenderbim/bim/module/light/prop.py +++ b/src/blenderbim/blenderbim/bim/module/light/prop.py @@ -25,8 +25,8 @@ from math import radians, pi from mathutils import Euler, Vector, Matrix, Quaternion from bpy.props import IntProperty, StringProperty, EnumProperty, FloatProperty, FloatVectorProperty, BoolProperty from bpy.types import PropertyGroup -from blenderbim.bim.module.light.data import SolarData -from blenderbim.bim.module.light.decorator import SolarDecorator +from .data import SolarData +from .decorator import SolarDecorator sun_position = tool.Blender.get_sun_position_addon() diff --git a/src/blenderbim/blenderbim/bim/module/light/ui.py b/src/blenderbim/blenderbim/bim/module/light/ui.py index 1ba4352522..0ae245d53b 100644 --- a/src/blenderbim/blenderbim/bim/module/light/ui.py +++ b/src/blenderbim/blenderbim/bim/module/light/ui.py @@ -18,7 +18,7 @@ import bpy import blenderbim.tool as tool -from blenderbim.bim.module.light.data import SolarData +from .data import SolarData sun_position = tool.Blender.get_sun_position_addon() diff --git a/src/blenderbim/blenderbim/bim/module/material/data.py b/src/blenderbim/blenderbim/bim/module/material/data.py index 9139452cce..bc3ee20da5 100644 --- a/src/blenderbim/blenderbim/bim/module/material/data.py +++ b/src/blenderbim/blenderbim/bim/module/material/data.py @@ -23,7 +23,7 @@ import ifcopenshell.util.element import ifcopenshell.util.doc import ifcopenshell.util.schema import blenderbim.tool as tool -from blenderbim.bim.module.drawing.helper import format_distance +from ..drawing.helper import format_distance def refresh(): diff --git a/src/blenderbim/blenderbim/bim/module/material/operator.py b/src/blenderbim/blenderbim/bim/module/material/operator.py index 9e7f3ec8ac..56618246eb 100644 --- a/src/blenderbim/blenderbim/bim/module/material/operator.py +++ b/src/blenderbim/blenderbim/bim/module/material/operator.py @@ -27,8 +27,8 @@ import blenderbim.tool as tool import blenderbim.core.style import blenderbim.core.material as core import blenderbim.bim.module.model.profile as model_profile -from blenderbim.bim.module.material.prop import purge as material_prop_purge -from blenderbim.bim.ifc import IfcStore +from .prop import purge as material_prop_purge +from ...ifc import IfcStore class LoadMaterials(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/material/prop.py b/src/blenderbim/blenderbim/bim/module/material/prop.py index 5967b4d896..38f3a57e37 100644 --- a/src/blenderbim/blenderbim/bim/module/material/prop.py +++ b/src/blenderbim/blenderbim/bim/module/material/prop.py @@ -19,9 +19,9 @@ import bpy from ifcopenshell.util.doc import get_entity_doc import blenderbim.tool as tool -from blenderbim.bim.module.material.data import MaterialsData, ObjectMaterialData -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.prop import StrProperty, Attribute +from .data import MaterialsData, ObjectMaterialData +from ...ifc import IfcStore +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/material/ui.py b/src/blenderbim/blenderbim/bim/module/material/ui.py index 7ba072d237..7c7e40158b 100644 --- a/src/blenderbim/blenderbim/bim/module/material/ui.py +++ b/src/blenderbim/blenderbim/bim/module/material/ui.py @@ -20,11 +20,11 @@ import blenderbim.bim.helper import blenderbim.tool as tool import bpy from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import draw_attributes -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.module.material.data import MaterialsData, ObjectMaterialData -from blenderbim.bim.module.drawing.helper import format_distance +from ...ifc import IfcStore +from ...helper import draw_attributes +from ...helper import prop_with_search +from .data import MaterialsData, ObjectMaterialData +from ..drawing.helper import format_distance class BIM_PT_materials(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/misc/operator.py b/src/blenderbim/blenderbim/bim/module/misc/operator.py index 5a738e435b..0b311f2706 100644 --- a/src/blenderbim/blenderbim/bim/module/misc/operator.py +++ b/src/blenderbim/blenderbim/bim/module/misc/operator.py @@ -24,7 +24,7 @@ import blenderbim.tool as tool import blenderbim.core.misc as core import blenderbim.core.geometry as core_geometry import blenderbim.core.root -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore from mathutils import Vector, Matrix, Euler diff --git a/src/blenderbim/blenderbim/bim/module/misc/prop.py b/src/blenderbim/blenderbim/bim/module/misc/prop.py index 7c2ddc54ea..75cf042b27 100644 --- a/src/blenderbim/blenderbim/bim/module/misc/prop.py +++ b/src/blenderbim/blenderbim/bim/module/misc/prop.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/model/door.py b/src/blenderbim/blenderbim/bim/module/model/door.py index 69d45bc714..e089059c6e 100644 --- a/src/blenderbim/blenderbim/bim/module/model/door.py +++ b/src/blenderbim/blenderbim/bim/module/model/door.py @@ -30,7 +30,7 @@ import blenderbim.tool as tool import blenderbim.core.geometry import blenderbim.core.geometry as core import blenderbim.core.root -from blenderbim.bim.module.model.window import create_bm_window, create_bm_box +from .window import create_bm_window, create_bm_box from mathutils import Vector, Matrix diff --git a/src/blenderbim/blenderbim/bim/module/model/handler.py b/src/blenderbim/blenderbim/bim/module/model/handler.py index 328ceaab31..5d69c6523c 100644 --- a/src/blenderbim/blenderbim/bim/module/model/handler.py +++ b/src/blenderbim/blenderbim/bim/module/model/handler.py @@ -19,8 +19,8 @@ import bpy import ifcopenshell import ifcopenshell.api -from blenderbim.bim.module.model import root, product, wall, slab, profile, opening, task -from blenderbim.bim.ifc import IfcStore +from . import root, product, wall, slab, profile, opening, task +from ...ifc import IfcStore from bpy.app.handlers import persistent diff --git a/src/blenderbim/blenderbim/bim/module/model/mep.py b/src/blenderbim/blenderbim/bim/module/model/mep.py index 7531c79ae4..e4d8fd3d3a 100644 --- a/src/blenderbim/blenderbim/bim/module/model/mep.py +++ b/src/blenderbim/blenderbim/bim/module/model/mep.py @@ -39,8 +39,8 @@ from math import pi, degrees, radians, sin, cos, asin, tan from copy import copy from mathutils import Vector, Matrix from ifcopenshell.util.shape_builder import ShapeBuilder -from blenderbim.bim.module.model.profile import DumbProfileJoiner -from blenderbim.tool.cad import VTX_PRECISION +from .profile import DumbProfileJoiner +from ....tool.cad import VTX_PRECISION V = lambda *x: Vector([float(i) for i in x]) diff --git a/src/blenderbim/blenderbim/bim/module/model/opening.py b/src/blenderbim/blenderbim/bim/module/model/opening.py index 82ee96954d..26cfc0549e 100644 --- a/src/blenderbim/blenderbim/bim/module/model/opening.py +++ b/src/blenderbim/blenderbim/bim/module/model/opening.py @@ -36,7 +36,7 @@ import blenderbim.tool as tool import blenderbim.core.geometry import blenderbim.bim.import_ifc as import_ifc import blenderbim.bim.handler -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore from math import pi, radians from mathutils import Vector, Matrix from bpy.types import Operator diff --git a/src/blenderbim/blenderbim/bim/module/model/pie.py b/src/blenderbim/blenderbim/bim/module/model/pie.py index 799673bffd..229ebca27b 100644 --- a/src/blenderbim/blenderbim/bim/module/model/pie.py +++ b/src/blenderbim/blenderbim/bim/module/model/pie.py @@ -20,7 +20,7 @@ import bpy import blenderbim.tool as tool import blenderbim.core.spatial import blenderbim.core.aggregate -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class OpenPieClass(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/model/product.py b/src/blenderbim/blenderbim/bim/module/model/product.py index 6599825048..25b93d6e43 100644 --- a/src/blenderbim/blenderbim/bim/module/model/product.py +++ b/src/blenderbim/blenderbim/bim/module/model/product.py @@ -34,8 +34,8 @@ import blenderbim.core.type import blenderbim.core.geometry import blenderbim.core.spatial from . import wall, slab, profile, mep -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.model.data import AuthoringData +from ...ifc import IfcStore +from .data import AuthoringData from mathutils import Vector, Matrix from bpy_extras.object_utils import AddObjectHelper import json diff --git a/src/blenderbim/blenderbim/bim/module/model/profile.py b/src/blenderbim/blenderbim/bim/module/model/profile.py index bec513544e..464b0ad492 100644 --- a/src/blenderbim/blenderbim/bim/module/model/profile.py +++ b/src/blenderbim/blenderbim/bim/module/model/profile.py @@ -35,9 +35,9 @@ import blenderbim.core.material import blenderbim.core.root from math import pi, degrees, inf from mathutils import Vector, Matrix, Quaternion -from blenderbim.bim.module.geometry.helper import Helper -from blenderbim.bim.module.model.wall import DumbWallRecalculator -from blenderbim.bim.module.model.decorator import ProfileDecorator +from ..geometry.helper import Helper +from .wall import DumbWallRecalculator +from .decorator import ProfileDecorator class DumbProfileGenerator: diff --git a/src/blenderbim/blenderbim/bim/module/model/prop.py b/src/blenderbim/blenderbim/bim/module/model/prop.py index 96f375fa1a..08c6a1e40a 100644 --- a/src/blenderbim/blenderbim/bim/module/model/prop.py +++ b/src/blenderbim/blenderbim/bim/module/model/prop.py @@ -20,8 +20,8 @@ import bpy import ifcopenshell import blenderbim.tool as tool import math -from blenderbim.bim.prop import ObjProperty -from blenderbim.bim.module.model.data import AuthoringData +from ...prop import ObjProperty +from .data import AuthoringData from bpy.types import PropertyGroup, NodeTree from math import pi diff --git a/src/blenderbim/blenderbim/bim/module/model/railing.py b/src/blenderbim/blenderbim/bim/module/model/railing.py index e4559fd2d6..f046d599e0 100644 --- a/src/blenderbim/blenderbim/bim/module/model/railing.py +++ b/src/blenderbim/blenderbim/bim/module/model/railing.py @@ -27,9 +27,9 @@ from ifcopenshell.util.shape_builder import V import blenderbim.core.root import blenderbim.core.geometry import blenderbim.tool as tool -from blenderbim.bim.module.model.door import bm_sort_out_geom -from blenderbim.bim.module.model.data import RailingData, refresh -from blenderbim.bim.module.model.decorator import ProfileDecorator +from .door import bm_sort_out_geom +from .data import RailingData, refresh +from .decorator import ProfileDecorator from mathutils import Vector import json diff --git a/src/blenderbim/blenderbim/bim/module/model/roof.py b/src/blenderbim/blenderbim/bim/module/model/roof.py index 02e4b18afe..368ef9210c 100644 --- a/src/blenderbim/blenderbim/bim/module/model/roof.py +++ b/src/blenderbim/blenderbim/bim/module/model/roof.py @@ -25,10 +25,10 @@ import ifcopenshell.util.representation import ifcopenshell.util.unit import blenderbim.core.root import blenderbim.tool as tool -from blenderbim.bim.helper import convert_property_group_from_si -from blenderbim.bim.module.model.door import bm_sort_out_geom -from blenderbim.bim.module.model.data import RoofData, refresh -from blenderbim.bim.module.model.decorator import ProfileDecorator +from ...helper import convert_property_group_from_si +from .door import bm_sort_out_geom +from .data import RoofData, refresh +from .decorator import ProfileDecorator import json from math import tan, pi, radians diff --git a/src/blenderbim/blenderbim/bim/module/model/root.py b/src/blenderbim/blenderbim/bim/module/model/root.py index 25e58acd64..6cc4364c08 100644 --- a/src/blenderbim/blenderbim/bim/module/model/root.py +++ b/src/blenderbim/blenderbim/bim/module/model/root.py @@ -20,7 +20,7 @@ import bpy import ifcopenshell.file import blenderbim.bim.handler import blenderbim.tool as tool -from blenderbim.bim.ifc import IFC_CONNECTED_TYPE +from ...ifc import IFC_CONNECTED_TYPE from typing import Any diff --git a/src/blenderbim/blenderbim/bim/module/model/slab.py b/src/blenderbim/blenderbim/bim/module/model/slab.py index 4e6da27e00..6ab7b54713 100644 --- a/src/blenderbim/blenderbim/bim/module/model/slab.py +++ b/src/blenderbim/blenderbim/bim/module/model/slab.py @@ -32,8 +32,8 @@ import blenderbim.core.geometry import blenderbim.core.root import blenderbim.tool as tool from mathutils import Vector, Matrix -from blenderbim.bim.module.geometry.helper import Helper -from blenderbim.bim.module.model.decorator import ProfileDecorator +from ..geometry.helper import Helper +from .decorator import ProfileDecorator from typing import Optional diff --git a/src/blenderbim/blenderbim/bim/module/model/ui.py b/src/blenderbim/blenderbim/bim/module/model/ui.py index 01727e6887..2688b744a8 100644 --- a/src/blenderbim/blenderbim/bim/module/model/ui.py +++ b/src/blenderbim/blenderbim/bim/module/model/ui.py @@ -20,7 +20,7 @@ import bpy import blenderbim.bim import blenderbim.tool as tool from bpy.types import Panel, Menu -from blenderbim.bim.module.model.data import ( +from .data import ( AuthoringData, ArrayData, StairData, @@ -30,13 +30,13 @@ from blenderbim.bim.module.model.data import ( RailingData, RoofData, ) -from blenderbim.bim.module.model.prop import get_ifc_class -from blenderbim.bim.module.model.stair import regenerate_stair_mesh -from blenderbim.bim.module.model.window import update_window_modifier_bmesh -from blenderbim.bim.module.model.door import update_door_modifier_bmesh -from blenderbim.bim.module.model.railing import update_railing_modifier_bmesh -from blenderbim.bim.module.model.roof import update_roof_modifier_bmesh -from blenderbim.bim.helper import prop_with_search +from .prop import get_ifc_class +from .stair import regenerate_stair_mesh +from .window import update_window_modifier_bmesh +from .door import update_door_modifier_bmesh +from .railing import update_railing_modifier_bmesh +from .roof import update_roof_modifier_bmesh +from ...helper import prop_with_search from collections.abc import Iterable diff --git a/src/blenderbim/blenderbim/bim/module/model/wall.py b/src/blenderbim/blenderbim/bim/module/model/wall.py index 726f35143a..07d8a01c50 100644 --- a/src/blenderbim/blenderbim/bim/module/model/wall.py +++ b/src/blenderbim/blenderbim/bim/module/model/wall.py @@ -34,10 +34,10 @@ import blenderbim.core.root import blenderbim.core.geometry import blenderbim.core.model as core import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore from math import pi, sin, cos, degrees from mathutils import Vector, Matrix -from blenderbim.bim.module.model.opening import FilledOpeningGenerator +from .opening import FilledOpeningGenerator from typing import Optional diff --git a/src/blenderbim/blenderbim/bim/module/model/workspace.py b/src/blenderbim/blenderbim/bim/module/model/workspace.py index 33b5bb0845..817236b90b 100644 --- a/src/blenderbim/blenderbim/bim/module/model/workspace.py +++ b/src/blenderbim/blenderbim/bim/module/model/workspace.py @@ -20,12 +20,12 @@ import os import bpy import blenderbim.tool as tool import blenderbim.core.model as core -from blenderbim.bim.module.model.wall import DumbWallJoiner -from blenderbim.bim.helper import prop_with_search +from .wall import DumbWallJoiner +from ...helper import prop_with_search from bpy.types import WorkSpaceTool -from blenderbim.bim.module.model.data import AuthoringData -from blenderbim.bim.module.system.data import PortData -from blenderbim.bim.module.model.prop import get_ifc_class +from .data import AuthoringData +from ..system.data import PortData +from .prop import get_ifc_class class BimTool(WorkSpaceTool): diff --git a/src/blenderbim/blenderbim/bim/module/nest/operator.py b/src/blenderbim/blenderbim/bim/module/nest/operator.py index 4b2a671386..dcb7bb6273 100644 --- a/src/blenderbim/blenderbim/bim/module/nest/operator.py +++ b/src/blenderbim/blenderbim/bim/module/nest/operator.py @@ -23,7 +23,7 @@ import blenderbim.tool as tool import blenderbim.core.nest as core import blenderbim.core.spatial import blenderbim.bim.handler -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class BIM_OT_nest_assign_object(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/nest/prop.py b/src/blenderbim/blenderbim/bim/module/nest/prop.py index 043258a386..994feb3d3f 100644 --- a/src/blenderbim/blenderbim/bim/module/nest/prop.py +++ b/src/blenderbim/blenderbim/bim/module/nest/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.spatial.data import SpatialData +from ...prop import StrProperty, Attribute +from ..spatial.data import SpatialData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/nest/ui.py b/src/blenderbim/blenderbim/bim/module/nest/ui.py index f9878c2d5e..b776a1521c 100644 --- a/src/blenderbim/blenderbim/bim/module/nest/ui.py +++ b/src/blenderbim/blenderbim/bim/module/nest/ui.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . from bpy.types import Panel -from blenderbim.bim.module.nest.data import NestData -from blenderbim.bim.ifc import IfcStore +from .data import NestData +from ...ifc import IfcStore class BIM_PT_nest(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/owner/operator.py b/src/blenderbim/blenderbim/bim/module/owner/operator.py index d9656adffa..4f46c1cc65 100644 --- a/src/blenderbim/blenderbim/bim/module/owner/operator.py +++ b/src/blenderbim/blenderbim/bim/module/owner/operator.py @@ -20,7 +20,7 @@ import bpy import blenderbim.tool as tool import blenderbim.core.owner as core import blenderbim.bim.handler -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class EnableEditingPerson(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/owner/prop.py b/src/blenderbim/blenderbim/bim/module/owner/prop.py index 1884a4f719..e197bd333f 100644 --- a/src/blenderbim/blenderbim/bim/module/owner/prop.py +++ b/src/blenderbim/blenderbim/bim/module/owner/prop.py @@ -19,8 +19,8 @@ import bpy from ifcopenshell.util.doc import get_entity_doc import blenderbim.tool as tool -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.owner.data import OwnerData, ActorData, ObjectActorData +from ...prop import StrProperty, Attribute +from .data import OwnerData, ActorData, ObjectActorData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/owner/ui.py b/src/blenderbim/blenderbim/bim/module/owner/ui.py index cd951316a8..ba23c32745 100644 --- a/src/blenderbim/blenderbim/bim/module/owner/ui.py +++ b/src/blenderbim/blenderbim/bim/module/owner/ui.py @@ -19,7 +19,7 @@ import bpy import blenderbim.bim.helper import blenderbim.tool as tool -from blenderbim.bim.module.owner.data import PeopleData, OrganisationsData, OwnerData, ActorData, ObjectActorData +from .data import PeopleData, OrganisationsData, OwnerData, ActorData, ObjectActorData def draw_roles(box, parent): diff --git a/src/blenderbim/blenderbim/bim/module/patch/prop.py b/src/blenderbim/blenderbim/bim/module/patch/prop.py index e965e63e15..256400db4c 100644 --- a/src/blenderbim/blenderbim/bim/module/patch/prop.py +++ b/src/blenderbim/blenderbim/bim/module/patch/prop.py @@ -21,7 +21,7 @@ import importlib import importlib.util from pathlib import Path import ifcpatch -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/patch/ui.py b/src/blenderbim/blenderbim/bim/module/patch/ui.py index c5013c31ff..4d71817c78 100644 --- a/src/blenderbim/blenderbim/bim/module/patch/ui.py +++ b/src/blenderbim/blenderbim/bim/module/patch/ui.py @@ -18,8 +18,8 @@ import bpy import blenderbim.tool as tool -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.helper import draw_attributes +from ...helper import prop_with_search +from ...helper import draw_attributes class BIM_PT_patch(bpy.types.Panel): diff --git a/src/blenderbim/blenderbim/bim/module/profile/operator.py b/src/blenderbim/blenderbim/bim/module/profile/operator.py index 4e9bee48a4..cf8f5a57b8 100644 --- a/src/blenderbim/blenderbim/bim/module/profile/operator.py +++ b/src/blenderbim/blenderbim/bim/module/profile/operator.py @@ -22,9 +22,9 @@ import blenderbim.bim.helper import blenderbim.tool as tool import blenderbim.bim.module.model.profile as model_profile import blenderbim.core.profile as core -from blenderbim.bim.module.model.decorator import ProfileDecorator -from blenderbim.bim.module.profile.prop import generate_thumbnail_for_active_profile -from blenderbim.bim.module.profile.data import refresh +from ..model.decorator import ProfileDecorator +from .prop import generate_thumbnail_for_active_profile +from .data import refresh class LoadProfiles(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/profile/prop.py b/src/blenderbim/blenderbim/bim/module/profile/prop.py index 89f7ed401c..0fc4e1fea7 100644 --- a/src/blenderbim/blenderbim/bim/module/profile/prop.py +++ b/src/blenderbim/blenderbim/bim/module/profile/prop.py @@ -21,9 +21,9 @@ import ifcopenshell import ifcopenshell.util.schema import ifcopenshell.util.attribute import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.profile.data import ProfileData +from ...ifc import IfcStore +from ...prop import StrProperty, Attribute +from .data import ProfileData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/profile/ui.py b/src/blenderbim/blenderbim/bim/module/profile/ui.py index 9ce74affdb..285b8c543a 100644 --- a/src/blenderbim/blenderbim/bim/module/profile/ui.py +++ b/src/blenderbim/blenderbim/bim/module/profile/ui.py @@ -20,8 +20,8 @@ import bpy import blenderbim.bim.helper import blenderbim.tool as tool from bpy.types import Panel, UIList -from blenderbim.bim.module.profile.data import ProfileData -from blenderbim.bim.module.profile.prop import generate_thumbnail_for_active_profile +from .data import ProfileData +from .prop import generate_thumbnail_for_active_profile class BIM_PT_profiles(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/project/data.py b/src/blenderbim/blenderbim/bim/module/project/data.py index 8949e7f407..8817da9c65 100644 --- a/src/blenderbim/blenderbim/bim/module/project/data.py +++ b/src/blenderbim/blenderbim/bim/module/project/data.py @@ -19,7 +19,7 @@ import os import bpy import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore def refresh(): diff --git a/src/blenderbim/blenderbim/bim/module/project/operator.py b/src/blenderbim/blenderbim/bim/module/project/operator.py index 280dedd232..cfe569d569 100644 --- a/src/blenderbim/blenderbim/bim/module/project/operator.py +++ b/src/blenderbim/blenderbim/bim/module/project/operator.py @@ -44,18 +44,18 @@ import blenderbim.core.project as core import blenderbim.core.context import blenderbim.core.owner import blenderbim.core.spatial -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.ui import IFCFileSelector -from blenderbim.bim import import_ifc -from blenderbim.bim import export_ifc +from ...ifc import IfcStore +from ...ui import IFCFileSelector +from ....bim import import_ifc +from ... import export_ifc from collections import defaultdict from math import radians from pathlib import Path from mathutils import Vector, Matrix from bpy.app.handlers import persistent from ifcopenshell.geom import ShapeElementType -from blenderbim.bim.module.project.data import LinksData -from blenderbim.bim.module.project.decorator import ProjectDecorator, ClippingPlaneDecorator +from .data import LinksData +from .decorator import ProjectDecorator, ClippingPlaneDecorator from typing import Union diff --git a/src/blenderbim/blenderbim/bim/module/project/prop.py b/src/blenderbim/blenderbim/bim/module/project/prop.py index 32e3e9c77e..1f41a9d95e 100644 --- a/src/blenderbim/blenderbim/bim/module/project/prop.py +++ b/src/blenderbim/blenderbim/bim/module/project/prop.py @@ -19,9 +19,9 @@ import os import bpy import ifcopenshell.util.placement -from blenderbim.bim.module.project.data import ProjectData -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.prop import StrProperty, ObjProperty +from .data import ProjectData +from ...ifc import IfcStore +from ...prop import StrProperty, ObjProperty from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/project/ui.py b/src/blenderbim/blenderbim/bim/module/project/ui.py index b53e6f808e..6e31ef926c 100644 --- a/src/blenderbim/blenderbim/bim/module/project/ui.py +++ b/src/blenderbim/blenderbim/bim/module/project/ui.py @@ -19,10 +19,10 @@ import os import blenderbim.bim import blenderbim.tool as tool -from blenderbim.bim.helper import prop_with_search +from ...helper import prop_with_search from bpy.types import Panel, Menu, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.project.data import ProjectData, LinksData +from ...ifc import IfcStore +from .data import ProjectData, LinksData class BIM_MT_project(Menu): diff --git a/src/blenderbim/blenderbim/bim/module/project/workspace.py b/src/blenderbim/blenderbim/bim/module/project/workspace.py index 4f8a5e2b8c..26112add3c 100644 --- a/src/blenderbim/blenderbim/bim/module/project/workspace.py +++ b/src/blenderbim/blenderbim/bim/module/project/workspace.py @@ -20,7 +20,7 @@ import os import bpy import blenderbim.tool as tool from bpy.types import WorkSpaceTool -from blenderbim.bim.module.project.data import LinksData +from .data import LinksData class ExploreTool(bpy.types.WorkSpaceTool): diff --git a/src/blenderbim/blenderbim/bim/module/pset/operator.py b/src/blenderbim/blenderbim/bim/module/pset/operator.py index 86195a9bac..aea9a4c5f3 100644 --- a/src/blenderbim/blenderbim/bim/module/pset/operator.py +++ b/src/blenderbim/blenderbim/bim/module/pset/operator.py @@ -28,7 +28,7 @@ import blenderbim.bim.handler import blenderbim.tool as tool import blenderbim.core.pset as core import blenderbim.bim.module.pset.data -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class TogglePsetExpansion(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/pset/prop.py b/src/blenderbim/blenderbim/bim/module/pset/prop.py index 12ad36d779..374647584c 100644 --- a/src/blenderbim/blenderbim/bim/module/pset/prop.py +++ b/src/blenderbim/blenderbim/bim/module/pset/prop.py @@ -23,9 +23,9 @@ import ifcopenshell.util.attribute import ifcopenshell.util.doc import ifcopenshell.util.element import blenderbim.tool as tool -from blenderbim.bim.prop import Attribute, StrProperty -from blenderbim.bim.module.pset.data import AddEditCustomPropertiesData, ObjectPsetsData, MaterialPsetsData -from blenderbim.bim.ifc import IfcStore +from ...prop import Attribute, StrProperty +from .data import AddEditCustomPropertiesData, ObjectPsetsData, MaterialPsetsData +from ...ifc import IfcStore from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/pset/ui.py b/src/blenderbim/blenderbim/bim/module/pset/ui.py index 8a6f6d9346..8aa9f7cdea 100644 --- a/src/blenderbim/blenderbim/bim/module/pset/ui.py +++ b/src/blenderbim/blenderbim/bim/module/pset/ui.py @@ -18,9 +18,9 @@ import blenderbim.tool as tool from bpy.types import Panel -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.module.pset.data import ( +from ...ifc import IfcStore +from ...helper import prop_with_search +from .data import ( ObjectPsetsData, ObjectQtosData, MaterialPsetsData, diff --git a/src/blenderbim/blenderbim/bim/module/pset_template/data.py b/src/blenderbim/blenderbim/bim/module/pset_template/data.py index 77b6685a36..b0f240f739 100644 --- a/src/blenderbim/blenderbim/bim/module/pset_template/data.py +++ b/src/blenderbim/blenderbim/bim/module/pset_template/data.py @@ -23,7 +23,7 @@ import ifcopenshell import ifcopenshell.util.attribute import ifcopenshell.util.doc import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore def refresh(): diff --git a/src/blenderbim/blenderbim/bim/module/pset_template/operator.py b/src/blenderbim/blenderbim/bim/module/pset_template/operator.py index 154bb446f5..600a7e3ab9 100644 --- a/src/blenderbim/blenderbim/bim/module/pset_template/operator.py +++ b/src/blenderbim/blenderbim/bim/module/pset_template/operator.py @@ -23,7 +23,7 @@ import ifcopenshell.api import blenderbim.bim.schema import blenderbim.bim.handler import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore from typing import final diff --git a/src/blenderbim/blenderbim/bim/module/pset_template/prop.py b/src/blenderbim/blenderbim/bim/module/pset_template/prop.py index 165144efd8..091bc8dcc9 100644 --- a/src/blenderbim/blenderbim/bim/module/pset_template/prop.py +++ b/src/blenderbim/blenderbim/bim/module/pset_template/prop.py @@ -20,9 +20,9 @@ import os import bpy import ifcopenshell from ifcopenshell.util.doc import get_attribute_doc -from blenderbim.bim.module.pset_template.data import PsetTemplatesData -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.ifc import IfcStore +from .data import PsetTemplatesData +from ...prop import StrProperty, Attribute +from ...ifc import IfcStore from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/pset_template/ui.py b/src/blenderbim/blenderbim/bim/module/pset_template/ui.py index 1975438471..10f46a958a 100644 --- a/src/blenderbim/blenderbim/bim/module/pset_template/ui.py +++ b/src/blenderbim/blenderbim/bim/module/pset_template/ui.py @@ -18,8 +18,8 @@ import bpy from bpy.types import Panel -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.module.pset_template.data import PsetTemplatesData +from ...helper import prop_with_search +from .data import PsetTemplatesData class BIM_PT_pset_template(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/qto/operator.py b/src/blenderbim/blenderbim/bim/module/qto/operator.py index c07df67466..f3e3d8973b 100644 --- a/src/blenderbim/blenderbim/bim/module/qto/operator.py +++ b/src/blenderbim/blenderbim/bim/module/qto/operator.py @@ -21,8 +21,8 @@ import ifcopenshell import ifcopenshell.api import blenderbim.tool as tool import blenderbim.core.qto as core -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.qto import helper +from ...ifc import IfcStore +from . import helper class CalculateCircleRadius(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/qto/prop.py b/src/blenderbim/blenderbim/bim/module/qto/prop.py index 73bf81afc6..6d1b298c27 100644 --- a/src/blenderbim/blenderbim/bim/module/qto/prop.py +++ b/src/blenderbim/blenderbim/bim/module/qto/prop.py @@ -18,7 +18,7 @@ import bpy import ifc5d.qto -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/qto/ui.py b/src/blenderbim/blenderbim/bim/module/qto/ui.py index 70c03b1496..78ef73cbdd 100644 --- a/src/blenderbim/blenderbim/bim/module/qto/ui.py +++ b/src/blenderbim/blenderbim/bim/module/qto/ui.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.module.qto.data import QtoData +from .data import QtoData class BIM_PT_qto(bpy.types.Panel): diff --git a/src/blenderbim/blenderbim/bim/module/resource/operator.py b/src/blenderbim/blenderbim/bim/module/resource/operator.py index 9024d82077..ac7524f6a5 100644 --- a/src/blenderbim/blenderbim/bim/module/resource/operator.py +++ b/src/blenderbim/blenderbim/bim/module/resource/operator.py @@ -18,7 +18,7 @@ import bpy from bpy_extras.io_utils import ImportHelper -from blenderbim.bim.module.resource.ui import draw_productivity_ui +from .ui import draw_productivity_ui import blenderbim.core.resource as core import blenderbim.tool as tool diff --git a/src/blenderbim/blenderbim/bim/module/resource/prop.py b/src/blenderbim/blenderbim/bim/module/resource/prop.py index 08a6a480ce..8b0c3286d7 100644 --- a/src/blenderbim/blenderbim/bim/module/resource/prop.py +++ b/src/blenderbim/blenderbim/bim/module/resource/prop.py @@ -19,12 +19,12 @@ import bpy import ifcopenshell.api import ifcopenshell.util.resource -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore import blenderbim.tool as tool import blenderbim.bim.module.pset.data import blenderbim.bim.module.resource.data import blenderbim.bim.module.sequence.data -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/resource/ui.py b/src/blenderbim/blenderbim/bim/module/resource/ui.py index df44c2088a..05a5bd77cb 100644 --- a/src/blenderbim/blenderbim/bim/module/resource/ui.py +++ b/src/blenderbim/blenderbim/bim/module/resource/ui.py @@ -18,8 +18,8 @@ import blenderbim.bim.helper from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.resource.data import ResourceData +from ...ifc import IfcStore +from .data import ResourceData class BIM_PT_resources(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/root/data.py b/src/blenderbim/blenderbim/bim/module/root/data.py index 6a2b348221..628d5ac024 100644 --- a/src/blenderbim/blenderbim/bim/module/root/data.py +++ b/src/blenderbim/blenderbim/bim/module/root/data.py @@ -22,7 +22,7 @@ import ifcopenshell.util.element import ifcopenshell.util.schema from ifcopenshell.util.doc import get_entity_doc, get_predefined_type_doc, get_class_suggestions import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore from typing import Union diff --git a/src/blenderbim/blenderbim/bim/module/root/operator.py b/src/blenderbim/blenderbim/bim/module/root/operator.py index b306086e2b..e35f2095e9 100644 --- a/src/blenderbim/blenderbim/bim/module/root/operator.py +++ b/src/blenderbim/blenderbim/bim/module/root/operator.py @@ -30,8 +30,8 @@ import blenderbim.core.style import blenderbim.core.type import blenderbim.core.root as core import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import get_enum_items +from ...ifc import IfcStore +from ...helper import get_enum_items class EnableReassignClass(bpy.types.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/root/prop.py b/src/blenderbim/blenderbim/bim/module/root/prop.py index 33887fe2c5..60e23fae82 100644 --- a/src/blenderbim/blenderbim/bim/module/root/prop.py +++ b/src/blenderbim/blenderbim/bim/module/root/prop.py @@ -20,7 +20,7 @@ import bpy import ifcopenshell import ifcopenshell.util.schema import blenderbim.tool as tool -from blenderbim.bim.module.root.data import IfcClassData +from .data import IfcClassData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/root/ui.py b/src/blenderbim/blenderbim/bim/module/root/ui.py index 80e44c6639..6bca66d10f 100644 --- a/src/blenderbim/blenderbim/bim/module/root/ui.py +++ b/src/blenderbim/blenderbim/bim/module/root/ui.py @@ -19,9 +19,9 @@ import bpy import blenderbim.bim.module.root.prop as root_prop from bpy.types import Panel -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.module.root.data import IfcClassData +from ...ifc import IfcStore +from ...helper import prop_with_search +from .data import IfcClassData class BIM_PT_class(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/search/operator.py b/src/blenderbim/blenderbim/bim/module/search/operator.py index 0c4da854ef..e48f340fb0 100644 --- a/src/blenderbim/blenderbim/bim/module/search/operator.py +++ b/src/blenderbim/blenderbim/bim/module/search/operator.py @@ -24,7 +24,7 @@ import ifcopenshell.guid import ifcopenshell.util.element import ifcopenshell.util.selector import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore import blenderbim.core.search as core from itertools import cycle from bpy.types import PropertyGroup, Operator diff --git a/src/blenderbim/blenderbim/bim/module/search/prop.py b/src/blenderbim/blenderbim/bim/module/search/prop.py index d2accf9027..10c69ac76c 100644 --- a/src/blenderbim/blenderbim/bim/module/search/prop.py +++ b/src/blenderbim/blenderbim/bim/module/search/prop.py @@ -19,8 +19,8 @@ import bpy import blenderbim.tool as tool from ifcopenshell import util -from blenderbim.bim.prop import ObjProperty, BIMFilterGroup -from blenderbim.bim.module.search.data import SearchData, ColourByPropertyData, SelectSimilarData +from ...prop import ObjProperty, BIMFilterGroup +from .data import SearchData, ColourByPropertyData, SelectSimilarData from bpy.types import PropertyGroup from . import ui, prop, operator from bpy.props import ( diff --git a/src/blenderbim/blenderbim/bim/module/search/ui.py b/src/blenderbim/blenderbim/bim/module/search/ui.py index 2e4d31bba6..744a8805c4 100644 --- a/src/blenderbim/blenderbim/bim/module/search/ui.py +++ b/src/blenderbim/blenderbim/bim/module/search/ui.py @@ -19,7 +19,7 @@ import bpy import blenderbim.bim.helper from bpy.types import Panel -from blenderbim.bim.module.search.data import SearchData, ColourByPropertyData, SelectSimilarData +from .data import SearchData, ColourByPropertyData, SelectSimilarData class BIM_PT_search(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/sequence/operator.py b/src/blenderbim/blenderbim/bim/module/sequence/operator.py index d64b0400ed..3925a24b1d 100644 --- a/src/blenderbim/blenderbim/bim/module/sequence/operator.py +++ b/src/blenderbim/blenderbim/bim/module/sequence/operator.py @@ -29,7 +29,7 @@ import ifcopenshell.util.sequence import ifcopenshell.util.selector from datetime import datetime from dateutil import parser, relativedelta -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore from bpy_extras.io_utils import ImportHelper diff --git a/src/blenderbim/blenderbim/bim/module/sequence/prop.py b/src/blenderbim/blenderbim/bim/module/sequence/prop.py index 57c425ddb9..ebfdc74517 100644 --- a/src/blenderbim/blenderbim/bim/module/sequence/prop.py +++ b/src/blenderbim/blenderbim/bim/module/sequence/prop.py @@ -23,11 +23,11 @@ import ifcopenshell.util.attribute from ifcopenshell.util.doc import get_predefined_type_doc import blenderbim.tool as tool import blenderbim.core.sequence as core -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.sequence.data import SequenceData, AnimationColorSchemeData, refresh as refresh_sequence_data +from ...ifc import IfcStore +from .data import SequenceData, AnimationColorSchemeData, refresh as refresh_sequence_data import blenderbim.bim.module.resource.data import blenderbim.bim.module.pset.data -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute from dateutil import parser from bpy.types import PropertyGroup from bpy.props import ( diff --git a/src/blenderbim/blenderbim/bim/module/sequence/ui.py b/src/blenderbim/blenderbim/bim/module/sequence/ui.py index 8239528f8d..dcfe0be6c8 100644 --- a/src/blenderbim/blenderbim/bim/module/sequence/ui.py +++ b/src/blenderbim/blenderbim/bim/module/sequence/ui.py @@ -19,9 +19,9 @@ import isodate import blenderbim.bim.helper from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import draw_attributes -from blenderbim.bim.module.sequence.data import ( +from ...ifc import IfcStore +from ...helper import draw_attributes +from .data import ( WorkPlansData, WorkScheduleData, SequenceData, diff --git a/src/blenderbim/blenderbim/bim/module/spatial/prop.py b/src/blenderbim/blenderbim/bim/module/spatial/prop.py index 2afee7fa23..0b24c13bf5 100644 --- a/src/blenderbim/blenderbim/bim/module/spatial/prop.py +++ b/src/blenderbim/blenderbim/bim/module/spatial/prop.py @@ -17,8 +17,8 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.spatial.data import SpatialDecompositionData +from ...prop import StrProperty, Attribute +from .data import SpatialDecompositionData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/spatial/ui.py b/src/blenderbim/blenderbim/bim/module/spatial/ui.py index 9dbf4b4856..47feefe989 100644 --- a/src/blenderbim/blenderbim/bim/module/spatial/ui.py +++ b/src/blenderbim/blenderbim/bim/module/spatial/ui.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . from bpy.types import Panel, UIList -from blenderbim.bim.module.spatial.data import SpatialData, SpatialDecompositionData +from .data import SpatialData, SpatialDecompositionData import blenderbim.tool as tool diff --git a/src/blenderbim/blenderbim/bim/module/spatial/workspace.py b/src/blenderbim/blenderbim/bim/module/spatial/workspace.py index addb9c53b2..435410ec75 100644 --- a/src/blenderbim/blenderbim/bim/module/spatial/workspace.py +++ b/src/blenderbim/blenderbim/bim/module/spatial/workspace.py @@ -20,9 +20,9 @@ import os import bpy import blenderbim.tool as tool -from blenderbim.bim.module.model.data import AuthoringData +from ..model.data import AuthoringData from bpy.types import WorkSpaceTool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore import blenderbim.bim.handler import blenderbim.core.spatial diff --git a/src/blenderbim/blenderbim/bim/module/structural/operator.py b/src/blenderbim/blenderbim/bim/module/structural/operator.py index 7cf14baa45..25d9a73e36 100644 --- a/src/blenderbim/blenderbim/bim/module/structural/operator.py +++ b/src/blenderbim/blenderbim/bim/module/structural/operator.py @@ -28,7 +28,7 @@ import blenderbim.tool as tool import blenderbim.core.context from math import degrees from mathutils import Vector, Matrix -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class AddStructuralMemberConnection(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/structural/prop.py b/src/blenderbim/blenderbim/bim/module/structural/prop.py index 6c801f583f..617ba8f35d 100644 --- a/src/blenderbim/blenderbim/bim/module/structural/prop.py +++ b/src/blenderbim/blenderbim/bim/module/structural/prop.py @@ -19,9 +19,9 @@ from math import radians import bpy import blenderbim.tool as tool -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.structural.data import StructuralLoadCasesData, StructuralLoadsData, BoundaryConditionsData +from ...ifc import IfcStore +from ...prop import StrProperty, Attribute +from .data import StructuralLoadCasesData, StructuralLoadsData, BoundaryConditionsData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/structural/ui.py b/src/blenderbim/blenderbim/bim/module/structural/ui.py index f92cd69bd5..7c0c3d0b3f 100644 --- a/src/blenderbim/blenderbim/bim/module/structural/ui.py +++ b/src/blenderbim/blenderbim/bim/module/structural/ui.py @@ -19,9 +19,9 @@ import bpy import blenderbim.bim.helper from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import draw_attributes, prop_with_search -from blenderbim.bim.module.structural.data import ( +from ...ifc import IfcStore +from ...helper import draw_attributes, prop_with_search +from .data import ( StructuralBoundaryConditionsData, ConnectedStructuralMembersData, StructuralMemberData, diff --git a/src/blenderbim/blenderbim/bim/module/structural/workspace.py b/src/blenderbim/blenderbim/bim/module/structural/workspace.py index 1be725bc75..acaa18716b 100644 --- a/src/blenderbim/blenderbim/bim/module/structural/workspace.py +++ b/src/blenderbim/blenderbim/bim/module/structural/workspace.py @@ -20,9 +20,9 @@ import os import bpy import blenderbim.tool as tool -from blenderbim.bim.helper import prop_with_search +from ...helper import prop_with_search from bpy.types import WorkSpaceTool -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore import blenderbim.bim.handler diff --git a/src/blenderbim/blenderbim/bim/module/style/prop.py b/src/blenderbim/blenderbim/bim/module/style/prop.py index d64fc8769a..cd1aa043b1 100644 --- a/src/blenderbim/blenderbim/bim/module/style/prop.py +++ b/src/blenderbim/blenderbim/bim/module/style/prop.py @@ -18,8 +18,8 @@ import bpy import blenderbim.tool as tool -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.style.data import StylesData +from ...prop import StrProperty, Attribute +from .data import StylesData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/style/ui.py b/src/blenderbim/blenderbim/bim/module/style/ui.py index 1702001672..42f96021a6 100644 --- a/src/blenderbim/blenderbim/bim/module/style/ui.py +++ b/src/blenderbim/blenderbim/bim/module/style/ui.py @@ -20,8 +20,8 @@ import bpy import blenderbim.bim.helper import blenderbim.tool as tool from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.style.data import StylesData, BlenderMaterialStyleData +from ...ifc import IfcStore +from .data import StylesData, BlenderMaterialStyleData class BIM_PT_styles(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/system/decorator.py b/src/blenderbim/blenderbim/bim/module/system/decorator.py index 0cc8d8ad6f..ebb848d363 100644 --- a/src/blenderbim/blenderbim/bim/module/system/decorator.py +++ b/src/blenderbim/blenderbim/bim/module/system/decorator.py @@ -25,7 +25,7 @@ from bpy.types import SpaceView3D from mathutils import Vector, Matrix from gpu_extras.batch import batch_for_shader import ifcopenshell -from blenderbim.bim.module.system.data import SystemDecorationData +from .data import SystemDecorationData from bpy.app.handlers import persistent diff --git a/src/blenderbim/blenderbim/bim/module/system/operator.py b/src/blenderbim/blenderbim/bim/module/system/operator.py index f987a4ce09..0f43b2c999 100644 --- a/src/blenderbim/blenderbim/bim/module/system/operator.py +++ b/src/blenderbim/blenderbim/bim/module/system/operator.py @@ -22,8 +22,8 @@ import blenderbim.tool as tool import blenderbim.core.system as core import blenderbim.bim.handler import blenderbim.bim.helper -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.system.data import PortData +from ...ifc import IfcStore +from .data import PortData from mathutils import Matrix diff --git a/src/blenderbim/blenderbim/bim/module/system/prop.py b/src/blenderbim/blenderbim/bim/module/system/prop.py index 7d935e1910..4438ae9791 100644 --- a/src/blenderbim/blenderbim/bim/module/system/prop.py +++ b/src/blenderbim/blenderbim/bim/module/system/prop.py @@ -17,9 +17,9 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.module.system.data import SystemData +from .data import SystemData import blenderbim.bim.module.system.decorator as decorator -from blenderbim.bim.prop import StrProperty, Attribute +from ...prop import StrProperty, Attribute from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/system/ui.py b/src/blenderbim/blenderbim/bim/module/system/ui.py index 4ad2922074..11289f72b3 100644 --- a/src/blenderbim/blenderbim/bim/module/system/ui.py +++ b/src/blenderbim/blenderbim/bim/module/system/ui.py @@ -19,9 +19,9 @@ import bpy import blenderbim.bim.helper import blenderbim.tool as tool -from blenderbim.bim.helper import prop_with_search +from ...helper import prop_with_search from bpy.types import Panel, UIList -from blenderbim.bim.module.system.data import SystemData, ZonesData, ActiveObjectZonesData, ObjectSystemData, PortData +from .data import SystemData, ZonesData, ActiveObjectZonesData, ObjectSystemData, PortData FLOW_DIRECTION_TO_ICON = { diff --git a/src/blenderbim/blenderbim/bim/module/tester/operator.py b/src/blenderbim/blenderbim/bim/module/tester/operator.py index 2885617055..140b9109e7 100644 --- a/src/blenderbim/blenderbim/bim/module/tester/operator.py +++ b/src/blenderbim/blenderbim/bim/module/tester/operator.py @@ -27,7 +27,7 @@ import ifctester.reporter import ifcopenshell import blenderbim.tool as tool import blenderbim.bim.handler -from blenderbim.bim.operator import MultipleFileSelector +from ...operator import MultipleFileSelector from pathlib import Path diff --git a/src/blenderbim/blenderbim/bim/module/tester/prop.py b/src/blenderbim/blenderbim/bim/module/tester/prop.py index bc2f65faa1..a07dfa7517 100644 --- a/src/blenderbim/blenderbim/bim/module/tester/prop.py +++ b/src/blenderbim/blenderbim/bim/module/tester/prop.py @@ -16,8 +16,8 @@ # You should have received a copy of the GNU General Public License # along with BlenderBIM Add-on. If not, see . -from blenderbim.bim.module.tester.data import TesterData -from blenderbim.bim.prop import StrProperty +from .data import TesterData +from ...prop import StrProperty from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/tester/ui.py b/src/blenderbim/blenderbim/bim/module/tester/ui.py index e864580691..a0cf0e7605 100644 --- a/src/blenderbim/blenderbim/bim/module/tester/ui.py +++ b/src/blenderbim/blenderbim/bim/module/tester/ui.py @@ -18,7 +18,7 @@ import blenderbim.tool as tool from bpy.types import Panel, UIList -from blenderbim.bim.module.tester.data import TesterData +from .data import TesterData class BIM_PT_tester(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/type/operator.py b/src/blenderbim/blenderbim/bim/module/type/operator.py index f368f9a73b..ae37e9fdb7 100644 --- a/src/blenderbim/blenderbim/bim/module/type/operator.py +++ b/src/blenderbim/blenderbim/bim/module/type/operator.py @@ -28,7 +28,7 @@ import blenderbim.tool as tool import blenderbim.core.geometry import blenderbim.core.type as core import blenderbim.core.root -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class AssignType(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/type/prop.py b/src/blenderbim/blenderbim/bim/module/type/prop.py index 7c9775cd79..028acf729b 100644 --- a/src/blenderbim/blenderbim/bim/module/type/prop.py +++ b/src/blenderbim/blenderbim/bim/module/type/prop.py @@ -18,9 +18,9 @@ import bpy import ifcopenshell.util.type -from blenderbim.bim.module.type.data import TypeData -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.ifc import IfcStore +from .data import TypeData +from ...prop import StrProperty, Attribute +from ...ifc import IfcStore import blenderbim.tool as tool from bpy.types import PropertyGroup from bpy.props import ( diff --git a/src/blenderbim/blenderbim/bim/module/type/ui.py b/src/blenderbim/blenderbim/bim/module/type/ui.py index 6275ae52ef..4025e1b7cb 100644 --- a/src/blenderbim/blenderbim/bim/module/type/ui.py +++ b/src/blenderbim/blenderbim/bim/module/type/ui.py @@ -19,9 +19,9 @@ import blenderbim.tool as tool import blenderbim.bim.module.type.prop as type_prop from bpy.types import Panel -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.module.type.data import TypeData +from ...ifc import IfcStore +from ...helper import prop_with_search +from .data import TypeData class BIM_PT_type(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/unit/operator.py b/src/blenderbim/blenderbim/bim/module/unit/operator.py index 3dfe2a9619..7fbba1f39e 100644 --- a/src/blenderbim/blenderbim/bim/module/unit/operator.py +++ b/src/blenderbim/blenderbim/bim/module/unit/operator.py @@ -24,7 +24,7 @@ import blenderbim.bim.helper import blenderbim.bim.handler import blenderbim.tool as tool import blenderbim.core.unit as core -from blenderbim.bim.ifc import IfcStore +from ...ifc import IfcStore class AssignSceneUnits(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/unit/prop.py b/src/blenderbim/blenderbim/bim/module/unit/prop.py index 22ef9c7a0e..9e71e7f391 100644 --- a/src/blenderbim/blenderbim/bim/module/unit/prop.py +++ b/src/blenderbim/blenderbim/bim/module/unit/prop.py @@ -17,9 +17,9 @@ # along with BlenderBIM Add-on. If not, see . import bpy -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.prop import StrProperty, Attribute -from blenderbim.bim.module.unit.data import UnitsData +from ...ifc import IfcStore +from ...prop import StrProperty, Attribute +from .data import UnitsData from bpy.types import PropertyGroup from bpy.props import ( PointerProperty, diff --git a/src/blenderbim/blenderbim/bim/module/unit/ui.py b/src/blenderbim/blenderbim/bim/module/unit/ui.py index 657dbc85c9..f4be63b31b 100644 --- a/src/blenderbim/blenderbim/bim/module/unit/ui.py +++ b/src/blenderbim/blenderbim/bim/module/unit/ui.py @@ -18,9 +18,9 @@ import blenderbim.bim.helper from bpy.types import Panel, UIList -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.helper import prop_with_search -from blenderbim.bim.module.unit.data import UnitsData +from ...ifc import IfcStore +from ...helper import prop_with_search +from .data import UnitsData class BIM_PT_units(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/void/operator.py b/src/blenderbim/blenderbim/bim/module/void/operator.py index d38f46f391..ada91d318d 100644 --- a/src/blenderbim/blenderbim/bim/module/void/operator.py +++ b/src/blenderbim/blenderbim/bim/module/void/operator.py @@ -24,8 +24,8 @@ import blenderbim.tool as tool import blenderbim.core.geometry import blenderbim.core.root import blenderbim.bim.handler -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.module.model.opening import FilledOpeningGenerator +from ...ifc import IfcStore +from ..model.opening import FilledOpeningGenerator class AddOpening(bpy.types.Operator, tool.Ifc.Operator): diff --git a/src/blenderbim/blenderbim/bim/module/void/ui.py b/src/blenderbim/blenderbim/bim/module/void/ui.py index 805dd31e24..497e150035 100644 --- a/src/blenderbim/blenderbim/bim/module/void/ui.py +++ b/src/blenderbim/blenderbim/bim/module/void/ui.py @@ -19,7 +19,7 @@ import bpy import blenderbim.tool as tool from bpy.types import Panel -from blenderbim.bim.module.void.data import BooleansData, VoidsData +from .data import BooleansData, VoidsData class BIM_PT_voids(Panel): diff --git a/src/blenderbim/blenderbim/bim/module/web/ui.py b/src/blenderbim/blenderbim/bim/module/web/ui.py index f1fda8a1bd..2cd57971c3 100644 --- a/src/blenderbim/blenderbim/bim/module/web/ui.py +++ b/src/blenderbim/blenderbim/bim/module/web/ui.py @@ -17,7 +17,7 @@ # along with BlenderBIM Add-on. If not, see . from bpy.types import Panel -from blenderbim.bim.module.web.data import WebData +from .data import WebData class BIM_PT_webui(Panel): diff --git a/src/blenderbim/blenderbim/bim/operator.py b/src/blenderbim/blenderbim/bim/operator.py index 1b6be272f2..bb53979bd7 100644 --- a/src/blenderbim/blenderbim/bim/operator.py +++ b/src/blenderbim/blenderbim/bim/operator.py @@ -33,11 +33,11 @@ import ifcopenshell import blenderbim.bim.handler import blenderbim.tool as tool from . import schema -from blenderbim.bim import import_ifc -from blenderbim.bim.ifc import IfcStore -from blenderbim.bim.prop import StrProperty -from blenderbim.bim.ui import IFCFileSelector -from blenderbim.bim.helper import get_enum_items +from ..bim import import_ifc +from .ifc import IfcStore +from .prop import StrProperty +from .ui import IFCFileSelector +from .helper import get_enum_items from mathutils import Vector, Matrix, Euler from math import radians from pathlib import Path diff --git a/src/blenderbim/blenderbim/bim/prop.py b/src/blenderbim/blenderbim/bim/prop.py index b94dc4ef68..3aecd6614a 100644 --- a/src/blenderbim/blenderbim/bim/prop.py +++ b/src/blenderbim/blenderbim/bim/prop.py @@ -33,7 +33,7 @@ from ifcopenshell.util.doc import ( import blenderbim.bim import blenderbim.bim.schema import blenderbim.bim.handler -from blenderbim.bim.ifc import IfcStore +from .ifc import IfcStore import blenderbim.tool as tool from collections import defaultdict from bpy.types import PropertyGroup diff --git a/src/blenderbim/blenderbim/bim/ui.py b/src/blenderbim/blenderbim/bim/ui.py index 851de0440c..1e8c36a496 100644 --- a/src/blenderbim/blenderbim/bim/ui.py +++ b/src/blenderbim/blenderbim/bim/ui.py @@ -29,12 +29,10 @@ from ifcopenshell.util.doc import ( get_type_doc, get_attribute_doc, ) -from . import ifc -from blenderbim import get_debug_info import blenderbim.bim import blenderbim.tool as tool from ifcopenshell.util.file import IfcHeaderExtractor -from blenderbim.bim.prop import Attribute +from .prop import Attribute from typing import Optional