From 0dd4e6bd89a9830d742e44cc4eec35f99a98e9ae Mon Sep 17 00:00:00 2001
From: loooooo <sppedflyer@gmail.com>
Date: Fri, 7 Nov 2014 15:57:07 +0100
Subject: [PATCH] aenderungen

---
 gear/gear_rc.pyc                  | Bin 206264 -> 206264 bytes
 gear/gearfunc/_Classes.py         |  63 ++++++++++++++++++------------
 gear/gearfunc/_Classes.pyc        | Bin 15289 -> 15587 bytes
 gear/gearfunc/__init__.pyc        | Bin 4730 -> 4730 bytes
 gear/gearfunc/_bevel_tooth.pyc    | Bin 7586 -> 7586 bytes
 gear/gearfunc/_cycloide_tooth.pyc | Bin 5267 -> 5267 bytes
 gear/gearfunc/_functions.pyc      | Bin 4969 -> 4969 bytes
 gear/gearfunc/_involute_tooth.pyc | Bin 8172 -> 8172 bytes
 8 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/gear/gear_rc.pyc b/gear/gear_rc.pyc
index f506d53871e9b6b45bd9557a64608c9e95b5494c..a2d0c808c54fa43a1422ea6c0d2cf1475e2b24df 100644
GIT binary patch
delta 28
kcmdmSnrFvp9uDTuyj(3SokAKpS~(b7IheL`FmF%=0GRO!G5`Po

delta 28
kcmdmSnrFvp9uDTuyj&ONZ4YkbXyssR<zU*%!Ms5g0HhiT=Kufz

diff --git a/gear/gearfunc/_Classes.py b/gear/gearfunc/_Classes.py
index bb3761f..c724445 100644
--- a/gear/gearfunc/_Classes.py
+++ b/gear/gearfunc/_Classes.py
@@ -27,6 +27,7 @@ from _bevel_tooth import bevel_tooth
 from Part import BSplineCurve, Shape, Wire, Face, makePolygon, \
     BRepOffsetAPI, Shell, makeLoft, Solid, Line, BSplineSurface, Compound,\
      show, makePolygon, makeLoft, makeHelix
+import Part
 from _functions import rotation3D
 from numpy import pi, cos, sin, tan
 
@@ -46,6 +47,8 @@ class involute_gear():
 
     def __init__(self, obj):
         self.involute_tooth = involute_tooth()
+        obj.addProperty(
+            "App::PropertyBool", "simple", "gear_parameter", "simple")
         obj.addProperty("App::PropertyInteger",
                         "teeth", "gear_parameter", "number of teeth")
         obj.addProperty(
@@ -68,6 +71,7 @@ class involute_gear():
             "App::PropertyLength", "backlash", "gear_parameter", "backlash in mm")
         obj.addProperty("App::PropertyPythonObject", "gear", "test", "test")
         obj.gear = self.involute_tooth
+        obj.simple = True
         obj.teeth = 15
         obj.module = '1. mm'
         obj.undercut = True
@@ -92,34 +96,41 @@ class involute_gear():
         fp.gear.backlash = fp.backlash.Value
         fp.gear._update()
         pts = fp.gear.points(num=fp.numpoints)
-        wi = []
-        for i in pts:
-            out = BSplineCurve()
-            out.interpolate(map(fcvec, i))
-            wi.append(out)
-        s = Wire(Shape(wi).Edges)
-        wi = []
-        for i in range(fp.gear.z):
-            rot = App.Matrix()
-            rot.rotateZ(-i * fp.gear.phipart)
-            tooth_rot = s.transformGeometry(rot)
-            if i != 0:
-                pt_0 = wi[-1].Edges[-1].Vertexes[0].Point
-                pt_1 = tooth_rot.Edges[0].Vertexes[-1].Point
-                wi.append(Wire([Line(pt_0, pt_1).toShape()]))
-            wi.append(tooth_rot)
-        pt_0 = wi[-1].Edges[-1].Vertexes[0].Point
-        pt_1 = wi[0].Edges[0].Vertexes[-1].Point
-        wi.append(Wire([Line(pt_0, pt_1).toShape()]))
+        if not fp.simple:
+            wi = []
+            for i in pts:
+                out = BSplineCurve()
+                out.interpolate(map(fcvec, i))
+                wi.append(out)
+            s = Wire(Shape(wi).Edges)
+            wi = []
+            for i in range(fp.gear.z):
+                rot = App.Matrix()
+                rot.rotateZ(-i * fp.gear.phipart)
+                tooth_rot = s.transformGeometry(rot)
+                if i != 0:
+                    pt_0 = wi[-1].Edges[-1].Vertexes[0].Point
+                    pt_1 = tooth_rot.Edges[0].Vertexes[-1].Point
+                    wi.append(Wire([Line(pt_0, pt_1).toShape()]))
+                wi.append(tooth_rot)
+            pt_0 = wi[-1].Edges[-1].Vertexes[0].Point
+            pt_1 = wi[0].Edges[0].Vertexes[-1].Point
+            wi.append(Wire([Line(pt_0, pt_1).toShape()]))
 
-        wi = Wire(wi)
-        fp.Shape = wi
-        if fp.beta.Value == 0:
-            sh = Face(wi)
-            fp.Shape = sh.extrude(App.Vector(0, 0, fp.height.Value))
+            wi = Wire(wi)
+            fp.Shape = wi
+            if fp.beta.Value == 0:
+                sh = Face(wi)
+                fp.Shape = sh.extrude(App.Vector(0, 0, fp.height.Value))
+            else:
+                fp.Shape = helicalextrusion(
+                    wi, fp.height.Value, fp.height.Value * tan(fp.gear.beta) * 2 / fp.gear.d)
         else:
-            fp.Shape = helicalextrusion(
-                wi, fp.height.Value, fp.height.Value * tan(fp.gear.beta) * 2 / fp.gear.d)
+            rw = fp.gear.dw / 2
+            circle = Part.Circle(App.Vector(0, 0, 0), App.Vector(0, 0, 1), rw)
+            wire = Part.Wire(circle.toShape())
+            face = Part.Face(wire)
+            fp.Shape = face.extrude(App.Vector(0, 0, fp.height.Value))
 
     def __getstate__(self):
         return None
diff --git a/gear/gearfunc/_Classes.pyc b/gear/gearfunc/_Classes.pyc
index cc61ba52e8cf9eb143479c88e3a5a3de636d25a7..a972ef3f7ed61b0786d4b649ec191d6337ac8263 100644
GIT binary patch
delta 3670
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
UzboYSH?%Icj<%j_{gyxaUmVhD<^TWy

delta 3354
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

diff --git a/gear/gearfunc/__init__.pyc b/gear/gearfunc/__init__.pyc
index 710ca50e5cb295c870b2048ce07dc08e4bcc779c..4e37efe1364fa06cee79f705f3707ef892e2d375 100644
GIT binary patch
delta 17
YcmeyR@=Jw-`7<w9%Sxw^jT}Wn06!xJQUCw|

delta 17
YcmeyR@=Jw-`7<xq*5ob08##)E06}O5t^fc4

diff --git a/gear/gearfunc/_bevel_tooth.pyc b/gear/gearfunc/_bevel_tooth.pyc
index c81bd7c1ee673f75a27d901cb7a57c5e09a7376f..2f7143af70ae166c98c520f11bdace978d321926 100644
GIT binary patch
delta 17
YcmZ2vy~vt_`7<w9%Sxw^jU2ON0XHxP0{{R3

delta 17
YcmZ2vy~vt_`7<w<L-x$zjU2ON0X1U<*8l(j

diff --git a/gear/gearfunc/_cycloide_tooth.pyc b/gear/gearfunc/_cycloide_tooth.pyc
index 2113dff2ec6d837227c43f90eb759fb65c587100..938130a4bbc9d4b4b997fceb6d1b4e600b9c79a8 100644
GIT binary patch
delta 17
YcmbQNIa!l~`7<w9%Sxw^jU3$~05c5*sQ>@~

delta 17
YcmbQNIa!l~`7<xqx_>pn8#%f~05}H*VE_OC

diff --git a/gear/gearfunc/_functions.pyc b/gear/gearfunc/_functions.pyc
index dba059f0b9e0964ecc7a3cb37fc722f541e378fa..796ab8a826f6ab4448b8f4954ee3d5330c154190 100644
GIT binary patch
delta 17
YcmaE<_EL?5`7<w9%Sxw^jU0)>06iWCBme*a

delta 17
ZcmaE<_EL?5`7<xq?#0`KH*zEj0{}r~2FU;b

diff --git a/gear/gearfunc/_involute_tooth.pyc b/gear/gearfunc/_involute_tooth.pyc
index f2b0db7c31d599a2502d5b9177363777d105aa36..70521c40d1ca665347565a5cd0e9e2a9289221e4 100644
GIT binary patch
delta 17
YcmaE3|Hht!`7<w9%Sxw^jT}$p0YQES>i_@%

delta 17
YcmaE3|Hht!`7<w9r}f6*jT}$p0YNzi@Bjb+