Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-25 17:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Same distance function for viewport and svg #1321 #3198

Browse Source
This commit is contained in:
Andrej730
2023-05-29 12:03:02 +05:00
parent 07638dac27
commit 605097de76
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/drawing/decoration.py
+15 -10
View File
@@ -32,9 +32,10 @@ from bpy.types import SpaceView3D
from mathutils import Vector, Matrix from mathutils import Vector, Matrix
from bpy_extras.view3d_utils import location_3d_to_region_2d from bpy_extras.view3d_utils import location_3d_to_region_2d
from gpu_extras.batch import batch_for_shader from gpu_extras.batch import batch_for_shader
from blenderbim.bim.module.drawing.data import DecoratorData from blenderbim.bim.module.drawing.data import DecoratorData, DrawingsData
from blenderbim.bim.module.drawing.shaders import BASE_LIB_GLSL, BASE_DEF_GLSL, add_verts_sequence, add_offsets from blenderbim.bim.module.drawing.shaders import add_verts_sequence, add_offsets
from blenderbim.bim.module.drawing.helper import format_distance
from functools import lru_cache
UNSPECIAL_ELEMENT_COLOR = (0.2, 0.2, 0.2, 1) # GREY # TODO: move back to 0.2 UNSPECIAL_ELEMENT_COLOR = (0.2, 0.2, 0.2, 1) # GREY # TODO: move back to 0.2
@@ -486,14 +487,15 @@ class BaseDecorator:
blf.draw(font_id, text) blf.draw(font_id, text)
blf.disable(font_id, blf.ROTATION) blf.disable(font_id, blf.ROTATION)
@lru_cache(maxsize=None)
def format_value(self, context, value): def format_value(self, context, value):
return bpy.utils.units.to_string( drawing_pset_data = DrawingsData.data["active_drawing_pset_data"]
context.scene.unit_settings.system, precision = drawing_pset_data.get("MetricPrecision", None)
"LENGTH", if not precision:
value, precision = drawing_pset_data.get("ImperialPrecision", None)
precision=4,
split_unit=context.scene.unit_settings.system == "IMPERIAL", decimal_places = drawing_pset_data.get("DecimalPlaces", None)
) return format_distance(value, precision=precision, decimal_places=decimal_places)
def draw_asterisk(self, context, obj): def draw_asterisk(self, context, obj):
# gather geometry data and convert to winspace # gather geometry data and convert to winspace
@@ -1932,6 +1934,9 @@ class DecorationsHandler:
if collection is None: if collection is None:
return return
if not DrawingsData.is_loaded:
DrawingsData.load()
for decorator in self.decorators: for decorator in self.decorators:
for obj in decorator.get_objects(collection): for obj in decorator.get_objects(collection):
decorator.decorate(context, obj) decorator.decorate(context, obj)