[Bf-extensions-cvs] [fe37465a] master: Revert Remove: rBAC2b80d4ed8437 fix panel tab name T63750

meta-androcto noreply at git.blender.org
Mon Apr 22 12:04:21 CEST 2019


Commit: fe37465a84fdcadcb0465888d58bed2f87c36ce5
Author: meta-androcto
Date:   Mon Apr 22 20:04:04 2019 +1000
Branches: master
https://developer.blender.org/rBACfe37465a84fdcadcb0465888d58bed2f87c36ce5

Revert Remove: rBAC2b80d4ed8437 fix panel tab name T63750

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

A	add_mesh_clusters/__init__.py
A	add_mesh_clusters/add_mesh_cluster.py

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

diff --git a/add_mesh_clusters/__init__.py b/add_mesh_clusters/__init__.py
new file mode 100644
index 00000000..980a914d
--- /dev/null
+++ b/add_mesh_clusters/__init__.py
@@ -0,0 +1,403 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+#
+#  Main author       : Clemens Barth (Blendphys at root-1.de)
+#  Authors           : Clemens Barth, Christine Mottet (Icosahedra), ...
+#
+#  Homepage(Wiki)    : http://development.root-1.de/Atomic_Blender.php
+#
+#  Start of project              : 2012-03-25 by Clemens Barth
+#  First publication in Blender  : 2012-05-27 by Clemens Barth
+#  Last modified                 : 2019-03-19
+#
+#
+#
+#  To do:
+#  ======
+#
+#  1. Include other shapes: dodecahedron, ...
+#  2. Skin option for parabolic shaped clusters
+#  3. Skin option for icosahedron
+#  4. Icosahedron: unlimited size ...
+#
+
+bl_info = {
+    "name": "Atomic Blender - Cluster",
+    "description": "Creating nanoparticles/clusters formed by atoms",
+    "author": "Clemens Barth",
+    "version": (0, 5),
+    "blender": (2, 80, 0),
+    "location": "Panel: View 3D - Tools (right side)",
+    "warning": "",
+    "wiki_url": "... will be updated asap ...",
+    "category": "Add Mesh"}
+
+import os
+import io
+import bpy
+from bpy.types import Operator, Panel
+from bpy_extras.io_utils import ImportHelper, ExportHelper
+from bpy.props import (StringProperty,
+                       BoolProperty,
+                       EnumProperty,
+                       IntProperty,
+                       FloatProperty)
+
+from . import add_mesh_cluster
+
+ATOM_Cluster_PANEL = 0
+
+# -----------------------------------------------------------------------------
+#                                                                           GUI
+
+
+class CLASS_ImportCluster(bpy.types.Operator):
+    bl_idname = "mesh.cluster"
+    bl_label = "Atom cluster"
+    bl_options = {'REGISTER', 'UNDO', 'PRESET'}
+
+    def execute(self, context):
+
+        global ATOM_Cluster_PANEL
+        ATOM_Cluster_PANEL = 1
+
+        return {'FINISHED'}
+
+
+class CLASS_PT_atom_cluster_panel(Panel):
+    bl_label       = "Atomic Blender - Cluster"
+    bl_space_type  = "VIEW_3D"
+    bl_region_type = "UI"
+    bl_category = "Create"
+    bl_options = {'DEFAULT_CLOSED'}
+
+    @classmethod
+    def poll(self, context):
+        global ATOM_Cluster_PANEL
+
+        if ATOM_Cluster_PANEL == 0:
+            return False
+
+        return True
+
+    def draw(self, context):
+        layout = self.layout
+
+        scn = context.scene.atom_cluster
+
+        row = layout.row()
+        row.label(text="Cluster properties")
+        box = layout.box()
+        row = box.row()
+        row.prop(scn, "shape")
+
+        if scn.shape in ["parabolid_square","parabolid_ab","parabolid_abc"]:
+            row = box.row()
+            row.prop(scn, "parabol_diameter")
+            row = box.row()
+            row.prop(scn, "parabol_height")
+        elif scn.shape in ["icosahedron"]:
+            row = box.row()
+            row.prop(scn, "icosahedron_size")
+        else:
+            row = box.row()
+            row.prop(scn, "size")
+            row = box.row()
+            row.prop(scn, "skin")
+
+        row = box.row()
+        row.prop(scn, "lattice_parameter")
+        row = box.row()
+        row.prop(scn, "element")
+        row = box.row()
+        row.prop(scn, "radius_type")
+        row = box.row()
+        row.prop(scn, "scale_radius")
+        row = box.row()
+        row.prop(scn, "scale_distances")
+
+        row = layout.row()
+        row.label(text="Load cluster")
+        box = layout.box()
+        row = box.row()
+        row.operator("atom_cluster.load")
+        row = box.row()
+        row.label(text="Number of atoms")
+        row = box.row()
+        row.prop(scn, "atom_number_total")
+        row = box.row()
+        row.prop(scn, "atom_number_drawn")
+
+
+# The properties (gadgets) in the panel. They all go to scene
+# during initialization (see end)
+class CLASS_atom_cluster_Properties(bpy.types.PropertyGroup):
+
+    def Callback_radius_type(self, context):
+        scn = bpy.context.scene.atom_cluster
+        DEF_atom_cluster_radius_type(scn.radius_type,
+                                     scn.radius_how,)
+
+    size: FloatProperty(
+        name = "Size", default=30.0, min=0.1,
+        description = "Size of cluster in Angstroem")
+    skin: FloatProperty(
+        name = "Skin", default=1.0, min=0.0, max = 1.0,
+        description = "Skin of cluster in % of size (skin=1.0: show all atoms, skin=0.1: show only the outer atoms)")
+    parabol_diameter: FloatProperty(
+        name = "Diameter", default=30.0, min=0.1,
+        description = "Top diameter in Angstroem")
+    parabol_height: FloatProperty(
+        name = "Height", default=30.0, min=0.1,
+        description = "Height in Angstroem")
+    icosahedron_size: IntProperty(
+        name = "Size", default=1, min=1, max=13,
+        description = "Size n: 1 (13 atoms), 2 (55 atoms), 3 (147 atoms), 4 (309 atoms), 5 (561 atoms), ..., 13 (8217 atoms)")
+    shape: EnumProperty(
+        name="",
+        description="Choose the shape of the cluster",
+        items=(('sphere_square',  "Sphere - square",   "Sphere with square lattice"),
+               ('sphere_hex_ab',  "Sphere - hex ab",  "Sphere with hexagonal ab-lattice"),
+               ('sphere_hex_abc', "Sphere - hex abc", "Sphere with hexagonal abc-lattice"),
+               ('pyramide_square',  "Pyramide - Square",    "Pyramide: square (abc-lattice)"),
+               ('pyramide_hex_abc', "Pyramide - Tetraeder", "Pyramide: tetraeder (abcabc-lattice)"),
+               ('octahedron',           "Octahedron",           "Octahedron"),
+               ('truncated_octahedron', "Truncated octahedron", "Truncated octahedron"),
+               ('icosahedron', "Icosahedron", "Icosahedron"),
+               ('parabolid_square', "Paraboloid: square",  "Paraboloid with square lattice"),
+               ('parabolid_ab',     "Paraboloid: hex ab",  "Paraboloid with ab-lattice"),
+               ('parabolid_abc',    "Paraboloid: hex abc", "Paraboloid with abc-lattice")),
+               default='sphere_square',)
+    lattice_parameter: FloatProperty(
+        name = "Lattice", default=4.08, min=1.0,
+        description = "Lattice parameter in Angstroem")
+    element: StringProperty(name="Element",
+        default="Gold", description = "Enter the name of the element")
+    radius_type: EnumProperty(
+        name="Radius",
+        description="Which type of atom radii?",
+        items=(('0',"predefined", "Use pre-defined radii"),
+               ('1',"atomic", "Use atomic radii"),
+               ('2',"van der Waals","Use van der Waals radii")),
+               default='0',)
+    scale_radius: FloatProperty(
+        name = "Scale R", default=1.0, min=0.0,
+        description = "Scale radius of atoms")
+    scale_distances: FloatProperty(
+        name = "Scale d", default=1.0, min=0.0,
+        description = "Scale distances")
+
+    atom_number_total: StringProperty(name="Total",
+        default="---", description = "Number of all atoms in the cluster")
+    atom_number_drawn: StringProperty(name="Drawn",
+        default="---", description = "Number of drawn atoms in the cluster")
+
+
+# The button for reloading the atoms and creating the scene
+class CLASS_atom_cluster_load_button(Operator):
+    bl_idname = "atom_cluster.load"
+    bl_label = "Load"
+    bl_description = "Load the cluster"
+
+    def execute(self, context):
+        scn    = context.scene.atom_cluster
+
+        add_mesh_cluster.DEF_atom_read_atom_data()
+        del add_mesh_cluster.ATOM_CLUSTER_ALL_ATOMS[:]
+
+        if scn.shape in ["parabolid_ab", "parabolid_abc", "parabolid_square"]:
+            parameter1 = scn.parabol_height
+            parameter2 = scn.parabol_diameter
+        elif scn.shape == "pyramide_hex_abc":
+            parameter1 = scn.size * 1.6
+            parameter2 = scn.skin
+        elif scn.shape == "pyramide_square":
+            parameter1 = scn.size * 1.4
+            parameter2 = scn.skin
+        elif scn.shape in ["octahedron", "truncated_octahedron"]:
+            parameter1 = scn.size * 1.4
+            parameter2 = scn.skin
+        elif scn.shape in ["icosahedron"]:
+            parameter1 = scn.icosahedron_size
+        else:
+            parameter1 = scn.size
+            parameter2 = scn.skin
+
+        if scn.shape in ["octahedron", "truncated_octahedron", "sphere_square", "pyramide_square", "parabolid_square"]:
+            numbers = add_mesh_cluster.create_square_lattice(
+                                scn.shape,
+                                parameter1,
+                                parameter2,
+                                (scn.lattice_parameter/2.0))
+
+        if scn.shape in ["sphere_hex_ab", "parabolid_ab"]:
+            numbers = add_mesh_cluster.create_hexagonal_abab_lattice(
+                                scn.shape,
+                                parameter1,
+                                parameter2,
+                                scn.lattice_parameter)
+
+        if scn.shape in ["sphere_hex_abc", "pyramide_hex_abc", "parabolid_abc"]:
+            numbers = add_mesh_cluster.create_hexagonal_abcabc_lattice(
+                                scn.shape,
+                                parameter1,
+                                parameter2,
+                           

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list