Download as
Browse Code »

Commit bb368c35e969a963862f4e3152340c1e1296356b

Authored by Thiago Franco de Moraes
1 parent 2f95d283
Exists in casmoothing_cython

Using a casmoothing written in cython

Showing 3 changed files with 13 additions and 6 deletions   Show diff stats
invesalius/data/surface.py
  Diff comments   View file @bb368c3
@@ -533,11 +533,6 @@ class SurfaceManager(): @@ -533,11 +533,6 @@ class SurfaceManager():
533 # polydata.SetSource(None) 533 # polydata.SetSource(None)
534 del polydata_append 534 del polydata_append
535 535
536 - w = vtk.vtkPLYWriter()  
537 - w.SetInputData(polydata)  
538 - w.SetFileName('/home/tfmoraes/Meshes/PLY/0051_bin.ply')  
539 - w.Write()  
540 -  
541 if algorithm == 'ca_smoothing': 536 if algorithm == 'ca_smoothing':
542 normals = vtk.vtkPolyDataNormals() 537 normals = vtk.vtkPolyDataNormals()
543 normals_ref = weakref.ref(normals) 538 normals_ref = weakref.ref(normals)
invesalius/gui/dialogs.py
  Diff comments   View file @bb368c3
@@ -1276,7 +1276,7 @@ class CAOptions(wx.Panel): @@ -1276,7 +1276,7 @@ class CAOptions(wx.Panel):
1276 max_val=100.0, increment=0.1, 1276 max_val=100.0, increment=0.1,
1277 digits=2) 1277 digits=2)
1278 1278
1279 - self.min_weight = floatspin.FloatSpin(self, -1, value=0.2, min_val=0.0, 1279 + self.min_weight = floatspin.FloatSpin(self, -1, value=0.5, min_val=0.0,
1280 max_val=1.0, increment=0.1, 1280 max_val=1.0, increment=0.1,
1281 digits=1) 1281 digits=1)
1282 1282
@@ -56,6 +56,11 @@ elif sys.platform == 'win32': @@ -56,6 +56,11 @@ elif sys.platform == 'win32':
56 Extension("invesalius.data.floodfill", ["invesalius/data/floodfill.pyx"], 56 Extension("invesalius.data.floodfill", ["invesalius/data/floodfill.pyx"],
57 include_dirs=[numpy.get_include()], 57 include_dirs=[numpy.get_include()],
58 language='c++',), 58 language='c++',),
  59 +
  60 + Extension("invesalius.data.cy_mesh", ["invesalius/data/cy_mesh.pyx"],
  61 + include_dirs=[numpy.get_include()],
  62 + extra_compile_args=['/openmp',],
  63 + language='c++',),
59 ]) 64 ])
60 ) 65 )
61 66
@@ -81,5 +86,12 @@ else: @@ -81,5 +86,12 @@ else:
81 Extension("invesalius.data.floodfill", ["invesalius/data/floodfill.pyx"], 86 Extension("invesalius.data.floodfill", ["invesalius/data/floodfill.pyx"],
82 include_dirs=[numpy.get_include()], 87 include_dirs=[numpy.get_include()],
83 language='c++',), 88 language='c++',),
  89 +
  90 + Extension("invesalius.data.cy_mesh", ["invesalius/data/cy_mesh.pyx"],
  91 + include_dirs=[numpy.get_include()],
  92 + extra_compile_args=['-fopenmp', '-std=c++11'],
  93 + extra_link_args=['-fopenmp', '-std=c++11'],
  94 + language='c++',),
  95 +
84 ]) 96 ])
85 ) 97 )