mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-26 10:11:46 +00:00
Fix #1574. Fix #1578. Bug where deprecated functions were used in Python 3.9 for drawing generation.
This commit is contained in:
@@ -28,7 +28,7 @@ class External(svgwrite.container.Group):
|
|||||||
# Remove namespace
|
# Remove namespace
|
||||||
ns = u"{http://www.w3.org/2000/svg}"
|
ns = u"{http://www.w3.org/2000/svg}"
|
||||||
nsl = len(ns)
|
nsl = len(ns)
|
||||||
for elem in self.xml.getiterator():
|
for elem in self.xml.iter():
|
||||||
if elem.tag.startswith(ns):
|
if elem.tag.startswith(ns):
|
||||||
elem.tag = elem.tag[nsl:]
|
elem.tag = elem.tag[nsl:]
|
||||||
|
|
||||||
@@ -85,19 +85,19 @@ class SvgWriter:
|
|||||||
def add_markers(self):
|
def add_markers(self):
|
||||||
tree = ET.parse(os.path.join(self.data_dir, "templates", "markers.svg"))
|
tree = ET.parse(os.path.join(self.data_dir, "templates", "markers.svg"))
|
||||||
root = tree.getroot()
|
root = tree.getroot()
|
||||||
for child in root.getchildren():
|
for child in root:
|
||||||
self.svg.defs.add(External(child))
|
self.svg.defs.add(External(child))
|
||||||
|
|
||||||
def add_symbols(self):
|
def add_symbols(self):
|
||||||
tree = ET.parse(os.path.join(self.data_dir, "templates", "symbols.svg"))
|
tree = ET.parse(os.path.join(self.data_dir, "templates", "symbols.svg"))
|
||||||
root = tree.getroot()
|
root = tree.getroot()
|
||||||
for child in root.getchildren():
|
for child in root:
|
||||||
self.svg.defs.add(External(child))
|
self.svg.defs.add(External(child))
|
||||||
|
|
||||||
def add_patterns(self):
|
def add_patterns(self):
|
||||||
tree = ET.parse(os.path.join(self.data_dir, "templates", "patterns.svg"))
|
tree = ET.parse(os.path.join(self.data_dir, "templates", "patterns.svg"))
|
||||||
root = tree.getroot()
|
root = tree.getroot()
|
||||||
for child in root.getchildren():
|
for child in root:
|
||||||
self.svg.defs.add(External(child))
|
self.svg.defs.add(External(child))
|
||||||
|
|
||||||
def draw_background_image(self):
|
def draw_background_image(self):
|
||||||
|
|||||||
@@ -5,9 +5,6 @@ import json
|
|||||||
import logging
|
import logging
|
||||||
import webbrowser
|
import webbrowser
|
||||||
import ifcopenshell
|
import ifcopenshell
|
||||||
|
|
||||||
# Deleting the below drawing import breaks svgwrite's ElementTree appending because ... magic?
|
|
||||||
import blenderbim.bim.module.drawing
|
|
||||||
from . import export_ifc
|
from . import export_ifc
|
||||||
from . import import_ifc
|
from . import import_ifc
|
||||||
from . import schema
|
from . import schema
|
||||||
|
|||||||
@@ -204,12 +204,12 @@ class Usecase:
|
|||||||
def create_variable_representation(self):
|
def create_variable_representation(self):
|
||||||
if isinstance(self.settings["geometry"], bpy.types.Curve):
|
if isinstance(self.settings["geometry"], bpy.types.Curve):
|
||||||
return self.create_curve3d_representation()
|
return self.create_curve3d_representation()
|
||||||
|
elif isinstance(self.settings["geometry"], bpy.types.Camera):
|
||||||
|
return self.create_camera_block_representation()
|
||||||
elif not len(self.settings["geometry"].polygons):
|
elif not len(self.settings["geometry"].polygons):
|
||||||
return self.create_curve3d_representation()
|
return self.create_curve3d_representation()
|
||||||
elif self.settings["is_point_cloud"]:
|
elif self.settings["is_point_cloud"]:
|
||||||
return self.create_point_cloud_representation()
|
return self.create_point_cloud_representation()
|
||||||
elif isinstance(self.settings["geometry"], bpy.types.Camera):
|
|
||||||
return self.create_camera_block_representation()
|
|
||||||
elif self.settings["ifc_representation_class"] == "IfcExtrudedAreaSolid/IfcRectangleProfileDef":
|
elif self.settings["ifc_representation_class"] == "IfcExtrudedAreaSolid/IfcRectangleProfileDef":
|
||||||
return self.create_rectangle_extrusion_representation()
|
return self.create_rectangle_extrusion_representation()
|
||||||
elif self.settings["ifc_representation_class"] == "IfcExtrudedAreaSolid/IfcCircleProfileDef":
|
elif self.settings["ifc_representation_class"] == "IfcExtrudedAreaSolid/IfcCircleProfileDef":
|
||||||
|
|||||||
Reference in New Issue
Block a user