[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2676] branches/geodesic_domes/ geodesic_domes_260/third_domes_panel.py: code cleanup direct use of self parameters and not storing it before ONE use!
Peter K.H. Gragert
pkhgragert at gmail.com
Mon Nov 28 16:59:09 CET 2011
Revision: 2676
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2676
Author: pkhg
Date: 2011-11-28 15:59:05 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
code cleanup direct use of self parameters and not storing it before ONE use!
Modified Paths:
--------------
branches/geodesic_domes/geodesic_domes_260/third_domes_panel.py
Modified: branches/geodesic_domes/geodesic_domes_260/third_domes_panel.py
===================================================================
--- branches/geodesic_domes/geodesic_domes_260/third_domes_panel.py 2011-11-28 15:49:43 UTC (rev 2675)
+++ branches/geodesic_domes/geodesic_domes_260/third_domes_panel.py 2011-11-28 15:59:05 UTC (rev 2676)
@@ -212,7 +212,7 @@
vtwist= FloatProperty(name="vtwist", min = -4, max = 4, default = 0 )
#Sphere
- bradius= FloatProperty(name="bradius", min = 0.001, default = 1 )
+#PKHG_NOT_USED? bradius= FloatProperty(name="bradius", min = 0.001, default = 1 )
bures= IntProperty(name="bures", min = 3, max = 32, default = 8 )
bvres= IntProperty(name="bvres", min = 3, max = 32, default = 8 )
burad= FloatProperty(name="burad", min = -4, max = 4, default = 1 )
@@ -363,9 +363,9 @@
row = layout.row()
elif tmp == 'Sphere':
col.label("Sphere")
+#??? row = layout.row()
+#PKHG_NOT_USED??? row.prop(self, "bradius")
row = layout.row()
- row.prop(self, "bradius")
- row = layout.row()
row.prop(self,"bures")
row.prop(self,"bvres")
row = layout.row()
@@ -534,26 +534,11 @@
def execute(self, context):
global last_generated_object, last_imported_mesh, basegeodesic, imported_hubmesh_to_use
#default superformparam = [3, 10, 10, 10, 1, 1, 4, 10, 10, 10, 1, 1, 0, 0, 0.0, 0.0, 0, 0]]
- uact = self.uact
- vact = self.vact
- um = self.um
- un1 = self.un1
- un2 = self.un2
- un3 = self.un3
- ua = self.ua
- ub = self.ub
- uturn = self.uturn
- utwist = self.utwist
- vm = self.vm
- vn1 = self.vn1
- vn2 = self.vn2
- vn3 = self.vn3
- va = self.va
- vb = self.vb
- vturn = self.vturn
- vtwist = self.vtwist
- superformparam = [um,un1,un2,un3,ua,ub,vm,vn1,vn2,vn3,va,vb,\
- uact,vact,uturn*pi,vturn*pi,utwist,vtwist]
+ superformparam = [self.um, self.un1, self.un2, self.un3, self.ua,\
+ self.ub, self.vm, self.vn1, self.vn2, self.vn3,\
+ self.va, self.vb, self.uact, self.vact,\
+ self.uturn*pi, self.vturn*pi, \
+ self.utwist, self.vtwist]
#PKHG 22-11
context.scene.error_message = ""
if self.mainpages == 'Main':
@@ -572,11 +557,9 @@
klass = 1
shape = 0
parameters = [self.frequency, self.eccentricity, self.squish,\
- self.radius, self.squareness, self.squarez,\
- 0,\
- shape, self.baselevel,\
- faceshape,self.dual,\
- self.rotxy, self.rotz, klass, superformparam]
+ self.radius, self.squareness, self.squarez, 0,\
+ shape, self.baselevel, faceshape, self.dual,\
+ self.rotxy, self.rotz, klass, superformparam]
basegeodesic = creategeo(self.base_type,self.orientation,parameters)
@@ -590,73 +573,37 @@
context.scene.objects.active = last_generated_object
elif self.geodesic_types == 'Grid':
- grxres = self.grxres
- gryres = self.gryres
- grxsz = self.grxsz
- grysz = self.grysz
- basegeodesic = forms_259.grid(grxres,gryres,\
- grxsz,grysz,1.0,1.0,0,0,0,\
+ basegeodesic = forms_259.grid(self.grxres,self.gryres,\
+ self.grxsz,self.grysz,1.0,1.0,0,0,0,\
0,1.0,1.0,superformparam)
vefm_259.vefm_add_object(basegeodesic)
bpy.data.objects[-1].location = (0,0,0)
elif self.geodesic_types == "Cylinder":
- cyxres = self.cyxres
- cyyres = self.cyyres
- cyxsz = self.cyxsz
- cyysz = self.cyysz
- cyxell = self.cyxell
- cygap = self.cygap
- cygphase = self.cygphase
- basegeodesic = forms_259.cylinder(cyxres,cyyres,cyxsz,cyysz,cygap,\
- 1.0,cygphase,0,0,0,cyxell,1.0,superformparam)
+ basegeodesic = forms_259.cylinder(self.cyxres, self.cyyres, \
+ self.cyxsz, self.cyysz, self.cygap, \
+ 1.0, self.cygphase, 0, 0, 0, self.cyxell,\
+ 1.0, superformparam)
vefm_259.vefm_add_object(basegeodesic)
bpy.data.objects[-1].location = (0,0,0)
elif self.geodesic_types == "Parabola":
- paxres = self.paxres
- payres = self.payres
- paxsz = self.paxsz
- paysz = self.paysz
- paxell = self.paxell
- pagap = self.pagap
- pagphase = self.pagphase
- basegeodesic=forms_259.parabola(paxres,payres,paxsz,paysz,pagap,1.0,pagphase,0,0,0,paxell,1.0,superformparam)
+ basegeodesic=forms_259.parabola(self.paxres, self.payres,\
+ self.paxsz, self.paysz, self.pagap,1.0, self.pagphase,\
+ 0,0,0, self.paxell,1.0,superformparam)
vefm_259.vefm_add_object(basegeodesic)
bpy.data.objects[-1].location = (0,0,0)
elif self.geodesic_types == "Torus":
- ures = self.ures
- vres = self.vres
- urad = self.urad
- vrad = self.vrad
- uellipse = self.uellipse
- vellipse = self.vellipse
- upart = self.upart
- vpart = self.vpart
- ugap = self.ugap
- vgap = self.vgap
- uphase = self.uphase
- vphase = self.vphase
- uexp = self.uexp
- vexp = self.vexp
- usuper = self.usuper
- vsuper = self.vsuper
- utwist = self.utwist
- vtwist = self.vtwist
- basegeodesic = forms_259.torus(ures,vres,vrad,urad,upart,vpart,ugap,vgap,0,0,uellipse,vellipse,superformparam)
+ basegeodesic = forms_259.torus(self.ures, self.vres,\
+ self.vrad, self.urad, self.upart, self.vpart,\
+ self.ugap, self.vgap,0,0, self.uellipse,\
+ self.vellipse, superformparam)
vefm_259.vefm_add_object(basegeodesic)
bpy.data.objects[-1].location = (0,0,0)
elif self.geodesic_types == "Sphere":
- bradius = self.bradius
- bures = self.bures
- bvres = self.bvres
- burad = self.burad
- bupart = self.bupart
- bvpart = self.bvpart
- buphase = self.buphase
- bvphase = self.bvphase
- buellipse = self.buellipse
- bvellipse = self.bvellipse
- basegeodesic=forms_259.sphere(bures,bvres,burad,1.0,bupart,bvpart,buphase,bvphase,0,0,buellipse,bvellipse,superformparam)
+ basegeodesic=forms_259.sphere(self.bures, self.bvres,\
+ self.burad,1.0, self.bupart, self.bvpart,\
+ self.buphase, self.bvphase,0,0, self.buellipse,\
+ self.bvellipse,superformparam)
vefm_259.vefm_add_object(basegeodesic)
bpy.data.objects[-1].location = (0,0,0)
More information about the Bf-extensions-cvs
mailing list