[Bf-extensions-cvs] [3bd42f4] master: Refactoring script. Added by binding to the parent.

[Spivak Vladimir]

Commit: 3bd42f489e963fec07b693fca355303383bed886
Author: Spivak Vladimir
Date:   Fri Jun 12 14:14:19 2015 +0300
Branches: master
https://developer.blender.org/rBAC3bd42f489e963fec07b693fca355303383bed886

Refactoring script. Added by binding to the parent.

===================================================================

M	add_dimension.py

===================================================================

diff --git a/add_dimension.py b/add_dimension.py
index 5c24a4e..e9531a2 100644
--- a/add_dimension.py
+++ b/add_dimension.py
@@ -19,7 +19,7 @@
 bl_info = {
     'name': 'Dimension',
     'author': 'Spivak Vladimir (http://cwolf3d.korostyshev.net)',
-    'version': (3, 9, 3),
+    'version': (3, 9, 4),
     'blender': (2, 7, 4),
     'location': 'View3D > Add > Curve',
     'description': 'Adds Dimension',
@@ -76,41 +76,19 @@ def Linear1(width = 2, length = 2, dsize = 1, depth = 0.1, center = False, arrow
        center1 = 0
        center2 = w * depth
 
-    if arrow == 'Arrow1':
-        newpoints.append([-center1, 0, 0]) #1
-        newpoints.append([-center1, length, 0]) #2
-        newpoints.append([-center1, length + l * dsize, 0]) #3
-        newpoints.append([center2, length + l * dsize, 0]) #4
-        newpoints.append([center2, length + l * dsize / 2 + l * depth / 100, 0]) #5
-        newpoints.append([center2 + w * arrowlength, length + l * dsize / 2 + l * arrowdepth + l * depth / 2, 0]) #6
-        newpoints.append([center2 + w * arrowlength, length + l * dsize / 2 + l * depth / 2, 0]) #7
-        newpoints.append([width-center2-w * arrowlength, length + l * dsize / 2 + l * depth / 2, 0]) #8
-        newpoints.append([width-center2-w * arrowlength, length + l * dsize / 2 + l * arrowdepth + l * depth / 2, 0]) #9
-        newpoints.append([width-center2, length + l * dsize / 2 + l * depth / 100, 0]) #10
-        newpoints.append([width-center2, length + l * dsize, 0]) #11
-        newpoints.append([width + center1, length + l * dsize, 0]) #12
-        newpoints.append([width + center1, length, 0]) #13
-        newpoints.append([width + center1, 0, 0]) #14
-        newpoints.append([width-center2, 0, 0]) #15
-        newpoints.append([width-center2, length, 0]) #16
-        newpoints.append([width-center2, length + l * dsize / 2-l * depth / 100, 0]) #17
-        newpoints.append([width-center2-w * arrowlength, length + l * dsize / 2-l * arrowdepth-l * depth / 2, 0]) #18
-        newpoints.append([width-center2-w * arrowlength, length + l * dsize / 2-l * depth / 2, 0]) #19
-        newpoints.append([center2 + w * arrowlength, length + l * dsize / 2-l * depth / 2, 0]) #20
-        newpoints.append([center2 + w * arrowlength, length + l * dsize / 2-l * arrowdepth-l * depth / 2, 0]) #21
-        newpoints.append([center2, length + l * dsize / 2-l * depth / 100, 0]) #22
-        newpoints.append([center2, length, 0]) #23
-        newpoints.append([center2, 0, 0]) #24
-
-    elif arrow == 'Arrow2':
+    if arrow == 'Arrow1' or arrow == 'Arrow2':
         newpoints.append([-center1, 0, 0]) #1
         newpoints.append([-center1, length, 0]) #2
         newpoints.append([-center1, length + l * dsize, 0]) #3
         newpoints.append([center2, length + l * dsize, 0]) #4
         newpoints.append([center2, length + l * dsize / 2 + l * depth / 100, 0]) #5
         newpoints.append([center2 + w * arrowlength, length + l * dsize / 2 + l * arrowdepth + l * depth / 2, 0]) #6
-        newpoints.append([center2 + w * arrowlength * 3 / 4, length + l * dsize / 2 + l * depth / 2, 0]) #7
-        newpoints.append([width-center2-w * arrowlength * 3 / 4, length + l * dsize / 2 + l * depth / 2, 0]) #8
+        if arrow == 'Arrow1':
+            newpoints.append([center2 + w * arrowlength, length + l * dsize / 2 + l * depth / 2, 0]) #7
+            newpoints.append([width-center2-w * arrowlength, length + l * dsize / 2 + l * depth / 2, 0]) #8
+        else:
+            newpoints.append([center2 + w * arrowlength * 3 / 4, length + l * dsize / 2 + l * depth / 2, 0]) #7
+            newpoints.append([width-center2-w * arrowlength * 3 / 4, length + l * dsize / 2 + l * depth / 2, 0]) #8
         newpoints.append([width-center2-w * arrowlength, length + l * dsize / 2 + l * arrowdepth + l * depth / 2, 0]) #9
         newpoints.append([width-center2, length + l * dsize / 2 + l * depth / 100, 0]) #10
         newpoints.append([width-center2, length + l * dsize, 0]) #11
@@ -121,49 +99,18 @@ def Linear1(width = 2, length = 2, dsize = 1, depth = 0.1, center = False, arrow
         newpoints.append([width-center2, length, 0]) #16
         newpoints.append([width-center2, length + l * dsize / 2-l * depth / 100, 0]) #17
         newpoints.append([width-center2-w * arrowlength, length + l * dsize / 2-l * arrowdepth-l * depth / 2, 0]) #18
-        newpoints.append([width-center2-w * arrowlength * 3 / 4, length + l * dsize / 2-l * depth / 2, 0]) #19
-        newpoints.append([center2 + w * arrowlength * 3 / 4, length + l * dsize / 2-l * depth / 2, 0]) #20
+        if arrow == 'Arrow1':
+            newpoints.append([width-center2-w * arrowlength, length + l * dsize / 2-l * depth / 2, 0]) #19
+            newpoints.append([center2 + w * arrowlength, length + l * dsize / 2-l * depth / 2, 0]) #20
+        else:
+            newpoints.append([width-center2-w * arrowlength * 3 / 4, length + l * dsize / 2-l * depth / 2, 0]) #19
+            newpoints.append([center2 + w * arrowlength * 3 / 4, length + l * dsize / 2-l * depth / 2, 0]) #20
         newpoints.append([center2 + w * arrowlength, length + l * dsize / 2-l * arrowdepth-l * depth / 2, 0]) #21
         newpoints.append([center2, length + l * dsize / 2-l * depth / 100, 0]) #22
         newpoints.append([center2, length, 0]) #23
         newpoints.append([center2, 0, 0]) #24
 
-    elif arrow == 'Serifs1':
-        b = sqrt(depth * depth / 2)
-        x = sin(radians(45)) * arrowlength * w
-        y = cos(radians(45)) * arrowlength * l
-        newpoints.append([-center1, 0, 0]) #1
-        newpoints.append([-center1, length, 0]) #2
-        newpoints.append([-center1, length + l * dsize / 2-l * depth / 2-l * b, 0]) #3
-        newpoints.append([-center1-x, length + l * dsize / 2-l * depth / 2-l * b-y, 0]) #4
-        newpoints.append([-center1-w * b-x, length + l * dsize / 2-l * depth / 2-y, 0]) #5
-        newpoints.append([-center1, length + l * dsize / 2 + l * depth / 2, 0]) #9
-        newpoints.append([-center1, length + l * dsize, 0]) #10
-        newpoints.append([center2, length + l * dsize, 0]) #11
-        newpoints.append([center2, length + l * dsize / 2 + l * depth / 2 + l * b, 0]) #12
-        newpoints.append([center2 + x, length + l * dsize / 2 + l * depth / 2 + l * b + y, 0]) #13
-        newpoints.append([center2 + w * b + x, length + l * dsize / 2 + l * depth / 2 + y, 0]) #14
-        newpoints.append([center2 + w * b, length + l * dsize / 2 + l * depth / 2, 0]) #15
-        newpoints.append([width-center2, length + l * dsize / 2 + l * depth / 2, 0]) #16
-        newpoints.append([width-center2, length + l * dsize, 0]) #17
-        newpoints.append([width + center1, length + l * dsize, 0]) #18
-        newpoints.append([width + center1, length + l * dsize / 2 + l * depth / 2 + l * b, 0]) #19
-        newpoints.append([width + center1 + x, length + l * dsize / 2 + l * depth / 2 + l * b + y, 0]) #20
-        newpoints.append([width + center1 + w * b + x, length + l * dsize / 2 + l * depth / 2 + y, 0]) #21
-        newpoints.append([width + center1, length + l * dsize / 2-l * depth / 2, 0]) #25
-        newpoints.append([width + center1, length, 0]) #26
-        newpoints.append([width + center1, 0, 0]) #27
-        newpoints.append([width-center2, 0, 0]) #28
-        newpoints.append([width-center2, length, 0]) #29
-        newpoints.append([width-center2, length + l * dsize / 2-l * depth / 2-l * b, 0]) #30
-        newpoints.append([width-center2-x, length + l * dsize / 2-l * depth / 2-l * b-y, 0]) #31
-        newpoints.append([width-center2-w * b-x, length + l * dsize / 2-l * depth / 2-y, 0]) #32
-        newpoints.append([width-center2-w * b, length + l * dsize / 2-l * depth / 2, 0]) #33
-        newpoints.append([center2, length + l * dsize / 2-l * depth / 2, 0]) #34
-        newpoints.append([center2, length, 0]) #35
-        newpoints.append([center2, 0, 0]) #36
-
-    elif arrow == 'Serifs2':
+    if arrow == 'Serifs1' or arrow == 'Serifs2':
         b = sqrt(depth * depth / 2)
         x = sin(radians(45)) * arrowlength * w
         y = cos(radians(45)) * arrowlength * l
@@ -172,9 +119,10 @@ def Linear1(width = 2, length = 2, dsize = 1, depth = 0.1, center = False, arrow
         newpoints.append([-center1, length + l * dsize / 2-l * depth / 2-l * b, 0]) #3
         newpoints.append([-center1-x, length + l * dsize / 2-l * depth / 2-l * b-y, 0]) #4
         newpoints.append([-center1-w * b-x, length + l * dsize / 2-l * depth / 2-y, 0]) #5
-        newpoints.append([-center1-w * b, length + l * dsize / 2-l * depth / 2, 0]) #6
-        newpoints.append([-center1-w * dsize / 2, length + l * dsize / 2-l * depth / 2, 0]) #7
-        newpoints.append([-center1-w * dsize / 2, length + l * dsize / 2 + l * depth / 2, 0]) #8
+        if arrow == 'Serifs2':
+            newpoints.append([-center1-w * b, length + l * dsize / 2-l * depth / 2, 0]) #6
+            newpoints.append([-center1-w * dsize / 2, length + l * dsize / 2-l * depth / 2, 0]) #7
+            newpoints.append([-center1-w * dsize / 2, length + l * dsize / 2 + l * depth / 2, 0]) #8
         newpoints.append([-center1, length + l * dsize / 2 + l * depth / 2, 0]) #9
         newpoints.append([-center1, length + l * dsize, 0]) #10
         newpoints.append([center2, length + l * dsize, 0]) #11
@@ -188,9 +136,10 @@ def Linear1(width = 2, length = 2, dsize = 1, depth = 0.1, center = False, arrow
         newpoints.append([width + center1, length + l * dsize / 2 + l * depth / 2 + l * b, 0]) #19
         newpoints.append([width + center1 + x, length + l * dsize / 2 + l * depth / 2 + l * b + y, 0]) #20
         newpoints.append([width + center1 + w * b + x, length + l * dsize / 2 + l * depth / 2 + y, 0]) #21
-        newpoints.append([width + center1 + w * b, length + l * dsize / 2 + l * depth / 2, 0]) #22
-        newpoints.append([width + center1 + w * dsize / 2, length + l * dsize / 2 + l * depth / 2, 0]) #23
-        newpoints.append([width + center1 + w * dsize / 2, length + l * dsize / 2-l * depth / 2, 0]) #24
+        if arrow == 'Serifs2':
+            newpoints.append([width + center1 + w * b, length + l * dsize / 2 + l * depth / 2, 0]) #22
+       

@@ Diff output truncated at 10240 characters. @@