diff options
author | Antonioya <blendergit@gmail.com> | 2016-10-01 12:04:23 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2016-10-01 12:04:23 +0300 |
commit | 6e5fdd343256e26d1d4b87138bee0401aecc61eb (patch) | |
tree | bac60094ef6f4145fda02ae8cae3a68c87f2bf54 /measureit | |
parent | b13fa5d81cb68c375e2e0ab3776dcdedc501eb25 (diff) |
MeasureIt: New option to hide unit of measurement
A new option to hide unit of measurement in the viewport
Diffstat (limited to 'measureit')
-rw-r--r-- | measureit/__init__.py | 6 | ||||
-rw-r--r-- | measureit/measureit_geometry.py | 31 | ||||
-rw-r--r-- | measureit/measureit_main.py | 3 |
3 files changed, 28 insertions, 12 deletions
diff --git a/measureit/__init__.py b/measureit/__init__.py index abafcd80..6c2d14c9 100644 --- a/measureit/__init__.py +++ b/measureit/__init__.py @@ -29,7 +29,7 @@ bl_info = { "name": "MeasureIt", "author": "Antonio Vazquez (antonioya)", "location": "View3D > Tools Panel /Properties panel", - "version": (1, 6, 7), + "version": (1, 6, 8), "blender": (2, 7, 4), "description": "Tools for measuring objects.", "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/3D_interaction/Measureit", @@ -214,6 +214,9 @@ def register(): name="Units", default="2", description="Units") + Scene.measureit_hide_units = BoolProperty(name="hide_units", + description="Do not display unit of measurement on viewport", + default=False) Scene.measureit_render = BoolProperty(name="Render", description="Save an image with measures over" " render image", @@ -400,6 +403,7 @@ def unregister(): del Scene.measureit_ovr_color del Scene.measureit_ovr_width del Scene.measureit_units + del Scene.measureit_hide_units del Scene.measureit_render del Scene.measureit_render_type del Scene.measureit_sum diff --git a/measureit/measureit_geometry.py b/measureit/measureit_geometry.py index c542df88..2ecbe58a 100644 --- a/measureit/measureit_geometry.py +++ b/measureit/measureit_geometry.py @@ -1253,6 +1253,7 @@ def get_arc_data(pointa, pointb, pointc, pointd): # ------------------------------------------------------------- def format_distance(fmt, units, value, factor=1): s_code = "\u00b2" # Superscript two + hide_units = bpy.context.scene.measureit_hide_units # ------------------------ # Units automatic # ------------------------ @@ -1261,31 +1262,36 @@ def format_distance(fmt, units, value, factor=1): if bpy.context.scene.unit_settings.system == "IMPERIAL": feet = value * (3.2808399 ** factor) if round(feet, 2) >= 1.0: - fmt += " ft" + if hide_units is False: + fmt += " ft" if factor == 2: fmt += s_code tx_dist = fmt % feet else: inches = value * (39.3700787 ** factor) - fmt += " in" + if hide_units is False: + fmt += " in" if factor == 2: fmt += s_code tx_dist = fmt % inches elif bpy.context.scene.unit_settings.system == "METRIC": if round(value, 2) >= 1.0: - fmt += " m" + if hide_units is False: + fmt += " m" if factor == 2: fmt += s_code tx_dist = fmt % value else: if round(value, 2) >= 0.01: - fmt += " cm" + if hide_units is False: + fmt += " cm" if factor == 2: fmt += s_code d_cm = value * (100 ** factor) tx_dist = fmt % d_cm else: - fmt += " mm" + if hide_units is False: + fmt += " mm" if factor == 2: fmt += s_code d_mm = value * (1000 ** factor) @@ -1296,7 +1302,8 @@ def format_distance(fmt, units, value, factor=1): # Units meters # ------------------------ elif units == "2": - fmt += " m" + if hide_units is False: + fmt += " m" if factor == 2: fmt += s_code tx_dist = fmt % value @@ -1304,7 +1311,8 @@ def format_distance(fmt, units, value, factor=1): # Units centimeters # ------------------------ elif units == "3": - fmt += " cm" + if hide_units is False: + fmt += " cm" if factor == 2: fmt += s_code d_cm = value * (100 ** factor) @@ -1313,7 +1321,8 @@ def format_distance(fmt, units, value, factor=1): # Units milimiters # ------------------------ elif units == "4": - fmt += " mm" + if hide_units is False: + fmt += " mm" if factor == 2: fmt += s_code d_mm = value * (1000 ** factor) @@ -1322,7 +1331,8 @@ def format_distance(fmt, units, value, factor=1): # Units feet # ------------------------ elif units == "5": - fmt += " ft" + if hide_units is False: + fmt += " ft" if factor == 2: fmt += s_code feet = value * (3.2808399 ** factor) @@ -1331,7 +1341,8 @@ def format_distance(fmt, units, value, factor=1): # Units inches # ------------------------ elif units == "6": - fmt += " in" + if hide_units is False: + fmt += " in" if factor == 2: fmt += s_code inches = value * (39.3700787 ** factor) diff --git a/measureit/measureit_main.py b/measureit/measureit_main.py index 64137fcd..a27f90e9 100644 --- a/measureit/measureit_main.py +++ b/measureit/measureit_main.py @@ -358,7 +358,8 @@ class MeasureitEditPanel(Panel): row = box.row() row.prop(scene, 'measureit_gl_show_d', text="Distances", toggle=True, icon="ALIGN") row.prop(scene, 'measureit_gl_show_n', text="Texts", toggle=True, icon="FONT_DATA") - + row = box.row() + row.prop(scene, 'measureit_hide_units', text="Hide measurement unit") # Scale factor row = box.row() row.prop(scene, 'measureit_scale', text="Scale") |