[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2658] branches/geodesic_domes: improuvements for new gui

Peter K.H. Gragert pkhgragert at gmail.com
Fri Nov 25 19:32:10 CET 2011


Revision: 2658
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2658
Author:   pkhg
Date:     2011-11-25 18:32:07 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
improuvements for new gui

Modified Paths:
--------------
    branches/geodesic_domes/__init__.py
    branches/geodesic_domes/geodesic_classes_259.py
    branches/geodesic_domes/vefm_259.py

Added Paths:
-----------
    branches/geodesic_domes/third_domes_panel.py

Modified: branches/geodesic_domes/__init__.py
===================================================================
--- branches/geodesic_domes/__init__.py	2011-11-25 17:04:57 UTC (rev 2657)
+++ branches/geodesic_domes/__init__.py	2011-11-25 18:32:07 UTC (rev 2658)
@@ -19,10 +19,10 @@
 bl_info = {
     "name": "Geodesic Domes",
     "author": "PKHG (help in start the conversion: Kilon), original for 2.49 from Andy Houston",
-    "version": (0,1,0),
+    "version": (0,2,0),
     "blender": (2, 6, 0),
     "api": 41431,
-    "location": "View3D > Tool Shelf > PKHG_Test",
+    "location": "View3D > UI > Geodesic...",
     "description": "Choice for objects",
     "warning": "not yet finished",
     "wiki_url": "",
@@ -34,10 +34,10 @@
 """
 if "bpy" in locals():
     import imp
-    imp.reload(gui_pkhg)
+    imp.reload(third_domes_panel)
     
 else:
-    from geodesic_domes import gui_pkhg
+    from geodesic_domes import third_domes_panel
    
 import bpy
 from bpy.props import *

Modified: branches/geodesic_domes/geodesic_classes_259.py
===================================================================
--- branches/geodesic_domes/geodesic_classes_259.py	2011-11-25 17:04:57 UTC (rev 2657)
+++ branches/geodesic_domes/geodesic_classes_259.py	2011-11-25 18:32:07 UTC (rev 2658)
@@ -1,7 +1,8 @@
-from geodesic_domes.vefm_259 import *
+#werkt from geodesic_domes.vefm_259 import *
+from geodesic_domes.vefm_259 import mesh, vertex, edge, face
 
 import math
-from math import pi,acos,sin,cos,atan,tan,fabs
+from math import pi,acos,sin,cos,atan,tan,fabs, sqrt
 
 def check_contains(cl,name , print_value = False):
     dir_class = dir(cl)
@@ -113,6 +114,7 @@
 
 #PKHG 23.1    def config(self, frequency = 1): #???PKHG frequency problem  20 oct.
     def config(self): #???PKHG frequency problem  20 oct.
+#PKHG_OK        print("\n20-11 >>>>>>>>>DBG geodesic_classes_259 config L117 called")
         for i in range(len(self.vertskeleton)):
             self.vertskeleton[i].index = i
         for edges in self.edgeskeleton:
@@ -155,14 +157,14 @@
             self.sphericalverts.append([u,v])
 
     def sphere2cartesian(self):
-        check_contains(self,"sphereto self",True)
+#PKHG_TODOnot_now        check_contains(self,"sphereto self",True)
         for i in range(len(self.verts)):
             if self.cart:
 #PKHG test 20111030                        
 #                x = self.verts[i].x * self.radius * self.eccentricity
 #                y = self.verts[i].y * self.radius
 #                z = self.verts[i].z * self.radius * self.squish
-                x = self.verts[i].vrctor.x * self.radius * self.eccentricity
+                x = self.verts[i].vector.x * self.radius * self.eccentricity
                 y = self.verts[i].vector.y * self.radius
                 z = self.verts[i].vector.z * self.radius * self.squish
             else:

Added: branches/geodesic_domes/third_domes_panel.py
===================================================================
--- branches/geodesic_domes/third_domes_panel.py	                        (rev 0)
+++ branches/geodesic_domes/third_domes_panel.py	2011-11-25 18:32:07 UTC (rev 2658)
@@ -0,0 +1,837 @@
+import bpy
+from geodesic_domes import vefm_259 
+from geodesic_domes import forms_259
+from geodesic_domes import geodesic_classes_259 
+from bpy.props import EnumProperty, IntProperty, FloatProperty, StringProperty, BoolProperty
+import math
+from math import pi
+from mathutils import Vector #needed to check vertex.vector values
+try:
+    breakpoint = bpy.types.bp.bp
+except:
+    print("add breakpoint addon!")
+    pass    
+
+#not needed 22-11 PKHG
+#def get_name_selected(value, dictionary):
+#    return dictionary[value]
+########global######
+last_generated_object = None
+last_imported_mesh = None
+basegeodesic = None
+imported_hubmesh_to_use = None
+########global end######
+#PKHG checking objects
+def check_contains(cl,name , print_value = True):
+    dir_class = dir(cl)
+    for el in dir_class:
+        if el.startswith("_"):
+            pass
+        else:
+            if print_value:
+                tmp = getattr(cl,el)
+                print(name , " contains ==>",el," value = ", tmp)
+            else:
+                print(name , " contains ==>",el)
+    print("\ncheck_contains finished\n\n")
+
+########for debug######
+
+
+bpy.types.Scene.geodesic_not_yet_called = BoolProperty(name="geodesic_not_called",default = True)
+
+#class Geodesic_Domes_Operator_Panel(bpy.types.Operator):
+class Geodesic_Domes_Operator_Panel(bpy.types.Panel):
+    """show in the UI"""
+    bl_label = "New Geodesic Domes Operator Panel"
+#    bl_idname = "mesh.geodesicmain"
+    bl_region_type = "UI" #TOOLS possible too
+    bl_space_type = "VIEW_3D"
+#    bl_options = {'REGISTER','UNDO'}
+
+    def draw(self,context):
+        sce = context.scene
+        layout = self.layout
+        col = layout.column()
+        col.operator(GenerateGeodesicDome.bl_idname,"execute me!")
+
+class GenerateGeodesicDome(bpy.types.Operator):
+    bl_label = "Generate geodesic dome objects"
+    bl_idname = "mesh.generate_geodesic_dome"
+    bl_description = "Create object dependent on  selection"
+    bl_options = {'REGISTER','UNDO'}
+
+    mainpages = EnumProperty(
+    name="The Panels",
+    description="The 6 main Panels",
+    items=[("Main","Main","Main Panel"),
+           ("Formula","Formula","Formula Panel"),
+           ("Faces","Faces","Generate Faces"),
+           ("Struts","Struts","Generate Parabola"),
+           ("Hubs","Hubs","Generate Torus"),
+           ("Help","Help","Generate Sphere"),
+          ],
+    default='Main')
+
+#for Faces!
+    facetype_menu = EnumProperty(
+    name="Face Types",
+    description="choose a facetype",
+    items=[("0","strip","strip"),
+           ("1","open vertical","vertical"),
+           ("2","opwn slanted","slanted"),
+           ("3","closed point","closed point"),
+           ("4","pillow","pillow"),
+           ("5","closed vertical","closed vertical"),
+           ("6","stepped","stepped"),
+           ("7","spikes","spikes"),
+           ("8","boxed","boxed"),
+           ("9","diamond","diamond"),
+           ("10","bar","bar"),
+          ],
+    default='0')
+
+    facetoggle = BoolProperty(name="facetoggle", description = "with or without faces", default = False )
+    faceimporttoggle = BoolProperty(name="faceimporttoggle", default = False )
+    face_use_imported_object = BoolProperty(name="Use: imported ", default = False)
+    facewidth = FloatProperty(name="facewidth", min = 0.01, max = 4, default = .50)
+    fwtog = BoolProperty(name="fwtog", default = False )
+    faceheight = FloatProperty(name="faceheight", min = 0.001, max = 4, default = 1 )
+    fhtog = BoolProperty(name="fhtog", default = False )
+    face_detach = BoolProperty(name="face_detach", default = False )
+    fmeshname = StringProperty(name="fmeshname", default = "defaultface")
+
+
+    geodesic_types = EnumProperty(
+    name="Your choice",
+    description="Choose Geodesic, Grid, Cylinder,Parabola, Torus, Sphere, Import your mesh or Superparameters",
+    items=[("Geodesic","Geodesic","Generate Geodesic"),
+           ("Grid","Grid","Generate Grid"),
+           ("Cylinder","Cylinder","Generate Cylinder"),
+           ("Parabola","Parabola","Generate Parabola"),
+           ("Torus","Torus","Generate Torus"),
+           ("Sphere","Sphere","Generate Sphere"),
+           ("Import your mesh","Import your mesh","Import Your Mesh"),
+#           ("7","Apply Sform","Super parameters"),
+          ],
+    default='Geodesic')
+
+    base_type = EnumProperty(
+    name="BaseType",
+    description="Choose between Tetrahedron, Octahedron, Icosahedron ",
+    items=[("Tetrahedron","Tetrahedron","Generate Tetrahedron"),
+           ("Octahedron","Octahedron","Generate Octahedron"),
+           ("Icosahedron","Icosahedron","Generate Icosahedron"),
+          ],
+    default='Tetrahedron')
+
+    
+
+    orientation = EnumProperty(
+    name="Pointer",
+    description="Choose what type of top ",
+    items=[("PointUp","PointUp","Point up"),
+           ("EdgeUp","EdgeUp","Edge up"),
+           ("FaceUp","FaceUp","Face up"),
+           ],
+    default='PointUp')
+
+    geodesic_class = EnumProperty(
+    name="class",
+    description="which class ",
+    items=[("Class 1","Class 1","class one"),
+           ("Class 2","Class 2","class two"),
+           ],
+    default='Class 1')
+
+    tri_hex_star = EnumProperty(
+    name="tri hex star",
+    description="Choose between facetype",
+    items=[("tri","tri","tri faces"),
+           ("hex","hex","hex faces(by tri)"),
+           ("star","star","star faces(by tri)"),
+              ],
+    default='tri')
+
+    spherical_flat = EnumProperty(
+    name="spherical or flat",
+    description="Choose between spherical or flat ",
+    items=[("spherical","spherical","Generate spherical"),
+           ("flat","flat","Generate flat"),
+              ],
+    default='spherical')
+
+    use_imported_mesh = BoolProperty(name="use import",\
+                    description = "Use an imported mesh", default = False)
+
+#Cylinder
+    cyxres= IntProperty(name="cyxres", min = 3, max = 32, default = 5 )
+    cyyres= IntProperty(name="cyyres", min = 3, max = 32,  default = 5 )
+    cyxsz= FloatProperty(name="cyxsz", min = 0.01, max = 10, default = 1 )
+    cyysz= FloatProperty(name="cyysz", min = 0.01, max = 10, default = 1 )    
+    cyxell= FloatProperty(name="cyxell",  min = 0.001, max = 4, default = 1 )
+    cygap= FloatProperty(name="cygap",  min = -2, max = 2, default = 1 )
+    cygphase= FloatProperty(name="cygphase", min = -4, max = 4, default = 0 )
+#Parabola
+    paxres= IntProperty(name="paxres",  min = 3, max = 32, default = 5 )
+    payres= IntProperty(name="payres",  min = 3, max = 32, default = 5 )
+    paxsz= FloatProperty(name="paxsz", min = 0.001, max = 10, default = 0.30)
+    paysz= FloatProperty(name="paysz", min = 0.001, max = 10,  default = 1 )
+    paxell= FloatProperty(name="paxell", min = 0.001, max = 4, default = 1 )
+    pagap= FloatProperty(name="pagap", min = -2, max = 2,  default = 1 )
+    pagphase= FloatProperty(name="pagphase", min = -4, max = 4, default = 0 )
+#Torus            
+    ures= IntProperty(name="ures",min = 3, max = 32, default = 8 )
+    vres= IntProperty(name="vres", min = 3, max = 32, default = 8 )
+    urad= FloatProperty(name="urad", min = 0.001, max = 10, default = 1 )

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-extensions-cvs mailing list