bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- improved rendering performance for lines (with help from David Hoese from the VisPy team)

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-26 17:11:33 +03:00
parent c8763f9c8f
commit a33f492e29
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -15,6 +15,7 @@ CHANGELOG for FlatCAM beta
- fixed a Qt6 derived issue where dragging tabs outside the app crashed the app - fixed a Qt6 derived issue where dragging tabs outside the app crashed the app
- updated the Chinese translation, by 俊霄 余 - updated the Chinese translation, by 俊霄 余
- fixed bug in Cutout Plugin that when no object is loaded and the Generate Rectangular Geometry is clicked, the app will hard crash - fixed bug in Cutout Plugin that when no object is loaded and the Generate Rectangular Geometry is clicked, the app will hard crash
- improved rendering performance for lines (with help from David Hoese from the VisPy team)
25.08.2021 25.08.2021

32
appGUI/VisPyVisuals.py
View File

@@ -16,16 +16,16 @@ import numpy as np
from appGUI.VisPyTesselators import GLUTess from appGUI.VisPyTesselators import GLUTess
class FlatCAMLineVisual(LineVisual): # class FlatCAMLineVisual(LineVisual):
def __init__(self, pos=None, color=(0.5, 0.5, 0.5, 1), width=1, connect='strip', method='gl', antialias=False): # def __init__(self, pos=None, color=(0.5, 0.5, 0.5, 1), width=1, connect='strip', method='gl', antialias=False):
LineVisual.__init__(self, pos=pos, color=color, width=width, connect=connect, # LineVisual.__init__(self, pos=pos, color=color, width=width, connect=connect,
method=method, antialias=True) # method=method, antialias=True)
#
def clear_data(self): # def clear_data(self):
self._bounds = None # self._bounds = None
self._pos = None # self._pos = None
self._changed['pos'] = True # self._changed['pos'] = True
self.update() # self.update()
def _update_shape_buffers(data, triangulation='glu'): def _update_shape_buffers(data, triangulation='glu'):
@@ -240,7 +240,7 @@ class ShapeCollectionVisual(CompoundVisual):
self._meshes = [MeshVisual() for _ in range(0, layers)] self._meshes = [MeshVisual() for _ in range(0, layers)]
# self._lines = [LineVisual(antialias=True) for _ in range(0, layers)] # self._lines = [LineVisual(antialias=True) for _ in range(0, layers)]
self._lines = [FlatCAMLineVisual(antialias=True) for _ in range(0, layers)] self._lines = [LineVisual(antialias=True) for _ in range(0, layers)]
self._line_width = linewidth self._line_width = linewidth
self._triangulation = triangulation self._triangulation = triangulation
@@ -468,6 +468,7 @@ class ShapeCollectionVisual(CompoundVisual):
if new_line_color and new_line_color != '': if new_line_color and new_line_color != '':
for i, line in enumerate(self._lines): for i, line in enumerate(self._lines):
if len(line_pts[i]) > 0: if len(line_pts[i]) > 0:
line.visible = True
try: try:
line._color = np.asarray(line_colors[i]) line._color = np.asarray(line_colors[i])
line._changed['color'] = True line._changed['color'] = True
@@ -476,8 +477,8 @@ class ShapeCollectionVisual(CompoundVisual):
print("VisPyVisuals.ShapeCollectionVisual.update_color(). " print("VisPyVisuals.ShapeCollectionVisual.update_color(). "
"Apply line colors --> Data error. %s" % str(e)) "Apply line colors --> Data error. %s" % str(e))
else: else:
line.clear_data() # line.clear_data()
# line.visible = False line.visible = False
self.update_lock.release() self.update_lock.release()
@@ -525,14 +526,15 @@ class ShapeCollectionVisual(CompoundVisual):
# Updating lines # Updating lines
for i, line in enumerate(self._lines): for i, line in enumerate(self._lines):
if len(line_pts[i]) > 0: if len(line_pts[i]) > 0:
line.visible = True
line.set_data( line.set_data(
pos=np.asarray(line_pts[i]), pos=np.asarray(line_pts[i]),
color=np.asarray(line_colors[i]), color=np.asarray(line_colors[i]),
width=self._line_width, width=self._line_width,
connect='segments') connect='segments')
else: else:
line.clear_data() # line.clear_data()
# line.visible = False line.visible = False
line._bounds_changed() line._bounds_changed()