smoothing cpp updates

Author: tomvanmele

src/compas/datastructures/mixins/filters.py

@@ -32,9 +32,9 @@ def vertices_where(self, conditions, data=False):
             The next vertex that matches the condition.
         2-tuple
             The next vertex and its attributes, if ``data=True``.
-    
+
         """
-        # keys = []
+        # turn this inside out
         for key, attr in self.vertices(True):
             is_match = True
             for name, value in conditions.items():
@@ -55,8 +55,6 @@ def vertices_where(self, conditions, data=False):
                     yield key, attr
                 else:
                     yield key
-        #         keys.append(key)
-        # return keys
 
 
 class EdgeFilter(object):

src/compas/geometry/algorithms/_smoothing_cpp/smoothing.dll

@@ -47,9 +47,9 @@ void smooth_centroid(int v, int *nbrs, int *fixed, double **vertices, int **neig
                 cz += xyz[n][2];
             }
 
-            vertices[i][0] = cx / nbrs[i];
-            vertices[i][1] = cy / nbrs[i];
-            vertices[i][2] = cz / nbrs[i];
+            vertices[i][0] = cx / (float)nbrs[i];
+            vertices[i][1] = cy / (float)nbrs[i];
+            vertices[i][2] = cz / (float)nbrs[i];
         }
 
         func(k);

src/compas/geometry/algorithms/_smoothing_cpp/src/main.cpp

@@ -44,6 +44,9 @@ def smooth_centroid_cpp(vertices, adjacency, fixed, kmax=100, callback=None, cal
     # --------------------------------------------------------------------------
     if callback:
         assert callable(callback), 'The provided callback is not callable.'
+    else:
+        def callback(k, xyz):
+            pass
 
     v = len(vertices)
     nbrs = [len(adjacency[i]) for i in range(v)]
@@ -58,14 +61,7 @@ def smooth_centroid_cpp(vertices, adjacency, fixed, kmax=100, callback=None, cal
     c_callback = CFUNCTYPE(None, c_int)
 
     def wrapper(k):
-        print(k)
-
-        xyz = c_vertices.cdata
-
-        if k < kmax - 1:
-            xyz[18][0] = 0.1 * (k + 1)
-
-        callback(xyz)
+        callback(k, c_vertices.cdata)
 
     smoothing.smooth_centroid.argtypes = [
         c_int,
@@ -101,6 +97,8 @@ def wrapper(k):
     from compas.plotters import MeshPlotter
     from compas.geometry import smooth_centroid_cpp
 
+    kmax = 50
+
     # make a mesh
     # and set the default vertex and edge attributes
 
@@ -112,13 +110,20 @@ def wrapper(k):
     adjacency = [mesh.vertex_neighbours(key) for key in mesh.vertices()]
     fixed     = [int(mesh.vertex_degree(key) == 2) for key in mesh.vertices()]
 
+    slider = list(mesh.vertices_where({'x': (-0.1, 0.1), 'y': (9.9, 10.1)}))[0]
+
     # make a plotter for (dynamic) visualization
     # and define a callback function
     # for plotting the intermediate configurations
 
     plotter = MeshPlotter(mesh, figsize=(10, 7))
 
-    def callback(xyz):
+    def callback(k, xyz):
+        print(k)
+
+        if k < kmax - 1:
+            xyz[slider][0] = 0.1 * (k + 1)
+
         plotter.update_vertices()
         plotter.update_edges()
         plotter.update(pause=0.001)
@@ -152,7 +157,7 @@ def callback(xyz):
 
     # run the smoother
 
-    xyz = smooth_centroid_cpp(vertices, adjacency, fixed, kmax=50, callback=callback)
+    xyz = smooth_centroid_cpp(vertices, adjacency, fixed, kmax=kmax, callback=callback)
 
     # keep the plot alive
 

src/compas/geometry/algorithms/smoothing_cpp.py

@@ -62,16 +62,15 @@ class LinesConduit(Conduit):
                 del conduit
 
     """
-    def __init__(self, lines, thickness=1.0, color=None, **kwargs):
+    def __init__(self, lines=None, thickness=1.0, color=None, **kwargs):
         super(LinesConduit, self).__init__(**kwargs)
-        self.lines = lines
-        self.n = len(lines)
+        self.lines = lines or []
         self.thickness = thickness
         color = color or (255, 255, 255)
         self.color = FromArgb(*color)
 
     def DrawForeground(self, e):
-        lines = List[Line](self.n)
+        lines = List[Line](len(self.lines))
         for start, end in self.lines:
             lines.Add(Line(Point3d(*start), Point3d(*end)))
         e.Display.DrawLines(lines, self.color, self.thickness)

src/compas_rhino/cameras/__init__.py

@@ -26,10 +26,10 @@
 
 class PointsConduit(Conduit):
     """"""
-    def __init__(self, points, radius=3, color=None, **kwargs):
+    def __init__(self, points=None, radius=3, color=None, **kwargs):
         super(PointsConduit, self).__init__(**kwargs)
-        self.points = points
-        self.n = len(points)
+        self.points = points or []
+        self.n = len(self.points)
         self.radius = radius
         color = color or (255, 0, 0)
         self.color = FromArgb(*color)

src/compas_rhino/conduits/lines.py

@@ -79,36 +79,36 @@ def screenshot_current_view(path,
     return result
 
 
-def add_gui_helpers(helpers, overwrite=False, protected=False):
-    def decorate(cls):
-        # attr = {}
-        for helper in helpers:
-            # for name, value in helper.__dict__.items():
-            for name, value in inspect.getmembers(helper):
-                # magic methods
-                if name.startswith('__') and name.endswith('__'):
-                    continue
-                # protected / private methods
-                if not protected and name.startswith('_'):
-                    continue
-                # existing methods
-                if not overwrite:
-                    if hasattr(cls, name):
-                        continue
-                # attr[name] = value
-                # try:
-                #     setattr(cls, name, value.__func__)
-                # except:
-                #     setattr(cls, name, value)
-                # inspect.ismethoddescriptor
-                # inspect.isdatadescriptor
-                if inspect.ismethod(value):
-                    setattr(cls, name, value.__func__)
-                else:
-                    setattr(cls, name, value)
-        # cls = type(cls.__name__, (cls, ), attr)
-        return cls
-    return decorate
+# def add_gui_helpers(helpers, overwrite=False, protected=False):
+#     def decorate(cls):
+#         # attr = {}
+#         for helper in helpers:
+#             # for name, value in helper.__dict__.items():
+#             for name, value in inspect.getmembers(helper):
+#                 # magic methods
+#                 if name.startswith('__') and name.endswith('__'):
+#                     continue
+#                 # protected / private methods
+#                 if not protected and name.startswith('_'):
+#                     continue
+#                 # existing methods
+#                 if not overwrite:
+#                     if hasattr(cls, name):
+#                         continue
+#                 # attr[name] = value
+#                 # try:
+#                 #     setattr(cls, name, value.__func__)
+#                 # except:
+#                 #     setattr(cls, name, value)
+#                 # inspect.ismethoddescriptor
+#                 # inspect.isdatadescriptor
+#                 if inspect.ismethod(value):
+#                     setattr(cls, name, value.__func__)
+#                 else:
+#                     setattr(cls, name, value)
+#         # cls = type(cls.__name__, (cls, ), attr)
+#         return cls
+#     return decorate
 
 
 def wait():