[Bf-extensions-cvs] [b13fa5d] master: MeasureIt: Cleanup code
Antonioya
noreply at git.blender.org
Fri Sep 30 21:43:24 CEST 2016
Commit: b13fa5d81cb68c375e2e0ab3776dcdedc501eb25
Author: Antonioya
Date: Fri Sep 30 21:42:51 2016 +0200
Branches: master
https://developer.blender.org/rBAb13fa5d81cb68c375e2e0ab3776dcdedc501eb25
MeasureIt: Cleanup code
Clean and reformat code for better reading
===================================================================
M measureit/__init__.py
M measureit/measureit_main.py
===================================================================
diff --git a/measureit/__init__.py b/measureit/__init__.py
index 1a2aa37..abafcd8 100644
--- a/measureit/__init__.py
+++ b/measureit/__init__.py
@@ -34,7 +34,7 @@ bl_info = {
"description": "Tools for measuring objects.",
"wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/3D_interaction/Measureit",
"category": "3D View"
- }
+}
import sys
import os
@@ -57,15 +57,15 @@ import bpy
from bpy.types import Scene, WindowManager
from bpy.props import FloatVectorProperty, IntProperty, BoolProperty, StringProperty, FloatProperty, EnumProperty
-
# --------------------------------------------------------------
# Register all operators and panels
# --------------------------------------------------------------
## Addons Preferences Update Panel
from bpy.types import (
- AddonPreferences,
- )
+ AddonPreferences,
+)
+
def update_panel(self, context):
try:
@@ -84,24 +84,25 @@ def update_panel(self, context):
measureit_main.MeasureitRenderPanel.bl_category = context.user_preferences.addons[__name__].preferences.category
bpy.utils.register_class(measureit_main.MeasureitRenderPanel)
+
class Measure_Pref(AddonPreferences):
bl_idname = __name__
category = StringProperty(
- name="Tab Category",
- description="Choose a name for the category of the panel",
- default="Measureit",
- update=update_panel
- )
+ name="Tab Category",
+ description="Choose a name for the category of the panel",
+ default="Measureit",
+ update=update_panel
+ )
def draw(self, context):
-
layout = self.layout
row = layout.row()
col = row.column()
col.label(text="Tab Category:")
col.prop(self, "category", text="")
+
# Define menu
# noinspection PyUnusedLocal
def register():
@@ -135,220 +136,220 @@ def register():
subtype='COLOR',
size=4)
Scene.measureit_font_size = IntProperty(name="Text Size",
- description="Default text size",
- default=14, min=10, max=150)
+ description="Default text size",
+ default=14, min=10, max=150)
Scene.measureit_hint_space = FloatProperty(name='Separation', min=0, max=100, default=0.1,
- precision=3,
- description="Default distance to display measure")
+ precision=3,
+ description="Default distance to display measure")
Scene.measureit_gl_ghost = BoolProperty(name="All",
- description="Display measures for all objects,"
- " not only selected",
- default=True)
+ description="Display measures for all objects,"
+ " not only selected",
+ default=True)
Scene.measureit_gl_txt = StringProperty(name="Text", maxlen=256,
- description="Short description (use | for line break)")
+ description="Short description (use | for line break)")
Scene.measureit_gl_precision = IntProperty(name='Precision', min=0, max=5, default=2,
- description="Number of decimal precision")
+ description="Number of decimal precision")
Scene.measureit_gl_show_d = BoolProperty(name="ShowDist",
- description="Display distances",
- default=True)
+ description="Display distances",
+ default=True)
Scene.measureit_gl_show_n = BoolProperty(name="ShowName",
- description="Display texts",
- default=False)
+ description="Display texts",
+ default=False)
Scene.measureit_scale = BoolProperty(name="Scale",
- description="Use scale factor",
- default=False)
+ description="Use scale factor",
+ default=False)
Scene.measureit_scale_factor = FloatProperty(name='Factor', min=0.001, max=9999999,
- default=1.0,
- precision=3,
- description="Scale factor 1:x")
+ default=1.0,
+ precision=3,
+ description="Scale factor 1:x")
Scene.measureit_scale_color = FloatVectorProperty(name="Scale color",
- description="Scale Color",
- default=(1, 1, 0, 1.0),
- min=0.1,
- max=1,
- subtype='COLOR',
- size=4)
+ description="Scale Color",
+ default=(1, 1, 0, 1.0),
+ min=0.1,
+ max=1,
+ subtype='COLOR',
+ size=4)
Scene.measureit_scale_font = IntProperty(name="Font",
- description="Text size",
- default=14, min=10, max=150)
+ description="Text size",
+ default=14, min=10, max=150)
Scene.measureit_scale_pos_x = IntProperty(name="Position X",
- description="Margin on the X axis",
- default=5,
- min=0,
- max=100)
+ description="Margin on the X axis",
+ default=5,
+ min=0,
+ max=100)
Scene.measureit_scale_pos_y = IntProperty(name="Position Y",
- description="Margin on the Y axis",
- default=5,
- min=0,
- max=100)
+ description="Margin on the Y axis",
+ default=5,
+ min=0,
+ max=100)
Scene.measureit_gl_scaletxt = StringProperty(name="ScaleText", maxlen=48,
- description="Scale title",
- default="Scale:")
+ description="Scale title",
+ default="Scale:")
Scene.measureit_scale_precision = IntProperty(name='Precision', min=0, max=5, default=0,
- description="Number of decimal precision")
+ description="Number of decimal precision")
Scene.measureit_ovr = BoolProperty(name="Override",
- description="Override colors and fonts",
- default=False)
+ description="Override colors and fonts",
+ default=False)
Scene.measureit_ovr_font = IntProperty(name="Font",
- description="Override text size",
- default=14, min=10, max=150)
+ description="Override text size",
+ default=14, min=10, max=150)
Scene.measureit_ovr_color = FloatVectorProperty(name="Override color",
- description="Override Color",
- default=(1, 0, 0, 1.0),
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list