ddshape - npm Package Compare versions

Comparing version 0.34 to 0.35

ddshape/bshell.py

@@ -6,13 +6,12 @@ # -*- encoding:utf-8 -*-
 
-def bshell(index=1, data="", center=(0, 0, 0), offset=(0, 0, 0), out_radius=25, shell=3, cutoff=(0, 0, 0, 0, 0, 0)):
+def bshell(index=1, data="", center=(0, 0, 0), out_radius=25, shell=3, cutoff=(0, 0, 0, 0, 0, 0)):
     """
-    main function to create data with a intersection operation of A sphere(main) and B sphere(used to bool with A)
+    the main function to write hollow sphere
     :param index: a number which indicate the line numbers of main shape data
     :param data: string with all shape data combined
-    :param center: center of the break sphere
-    :param offset: center of the sphere will be used in a bool operation with real sphere
-    :param out_radius: the out radius of sphere
-    :param shell: the thickness of the sphere
-    :param cutoff: remove some part of shell according the cord = (-x,x,-y,y,-z,z)
-    :return: int, float
+    :param center: center of the hollow sphere
+    :param out_radius: out radius of sphere
+    :param shell: shell thickness of sphere
+    :param cutoff: remove some part of break shell
+    :return: int, string
     """
@@ -22,3 +21,4 @@ for j in range(-1 * out_radius+cutoff[0], out_radius + 1-cutoff[1]):
             for m in range(-1 * out_radius+cutoff[4], out_radius + 1-cutoff[5]):
-                if verify((j, k, m), center, offset, out_radius, shell):
+                sqrt_acc = j ** 2 + k ** 2 + m ** 2
+                if (out_radius - shell) ** 2 <= sqrt_acc <= out_radius ** 2:
                     data += inc.print_line(index, center, (j, k, m))
@@ -29,32 +29,5 @@ index += 1
 
-def verify(relative_point=(0, 0, 0), center=(0, 0, 0), offset_center=(0, 0, 0), out_radius=25, shell=3):
-    """
-    the function that check if the point can be write
-    :param relative_point: the relative point of the A sphere without add center point
-    :param center: center of A sphere(main sphere)
-    :param offset_center: offset center means the center of B sphere
-    :param out_radius: the out radius of A sphere
-    :param shell: the thickness of A sphere
-    :return: bool
-    """
-    sqrt_sum = relative_point[0] ** 2 + relative_point[1] ** 2 + relative_point[2] ** 2
-    # if point not in main sphere, return false
-    if not (out_radius - shell) ** 2 <= sqrt_sum <= out_radius ** 2:
-        return False
-    point = (relative_point[0] + center[0], relative_point[1] + center[1], relative_point[2] + center[2])
-    offset_sum = (point[0] - offset_center[0]) ** 2 + (point[1] - offset_center[1]) ** 2 + \
-                 (point[2] - offset_center[2]) ** 2
-    if offset_sum <= out_radius ** 2:
-        return False
-    return True
+#index, data = bshell(cutoff=(0, 0, 15, 15, 25, 0), shell=5)
+#inc.write_shape((50, 50, 50), index, data)
 
 
-
-
-# examples of the usage of this module
-# ----
-# from ddshape import *
-# index_1, data_1 = bsphere.bsphere(center=(-25, 0, 0), offset=(18, 0, 0))
-# index_2, data_2 = bsphere.bsphere(index=index1, center=(25, 0, 0), offset=(-18, 0, 0))
-# inc.writeshape(25, index_2, data_1 + data_2)
-

PKG-INFO

 Metadata-Version: 1.0
 Name: ddshape
-Version: 0.34
+Version: 0.35
 Summary: this is a package which include some modules that you can use them to create shape.dat used by ddscat
@@ -18,4 +18,8 @@ Home-page: https://github.com/xingtingyang/ddshape
             Add module bshell to make breakshell:20150520
+            remove bug of bshell:20150520<br/>
             remove bug of bshell:20150520
         
+        
+        
+        
 Platform: UNKNOWN

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

No metric changes