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

- removed some VisPy patches that now are incorporated in the v 0.9 of VisPy; bumped the VisPy requirement to 0.9.0

Browse Source
This commit is contained in:
Marius Stanciu
2021-10-03 03:01:22 +03:00
committed by Marius
parent 594e91f17b
commit 337d4af249
4 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appGUI/PlotCanvas.py
View File

@@ -138,9 +138,9 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
# self.v_line = InfiniteLine(pos=0, color=(0.70, 0.3, 0.3, 0.8), vertical=True,
# parent=self.view.scene)
self.v_line = InfiniteLine(pos=0, color=axis_color, vertical=True,
self.v_line = InfiniteLine(pos=0, color=axis_color, vertical=True, line_width=1.5,
parent=self.view.scene)
self.h_line = InfiniteLine(pos=0, color=axis_color, vertical=False,
self.h_line = InfiniteLine(pos=0, color=axis_color, vertical=False, line_width=1.5,
parent=self.view.scene)
self.line_parent = None

72
appGUI/VisPyPatches.py
View File

@@ -15,23 +15,23 @@ import numpy as np
def apply_patches():
# Patch MarkersVisual to have crossed lines marker
cross_lines = """
float cross(vec2 pointcoord, float size)
{
//vbar
float r1 = abs(pointcoord.x - 0.5)*size;
float r2 = abs(pointcoord.y - 0.5)*size - $v_size/2;
float vbar = max(r1,r2);
//hbar
float r3 = abs(pointcoord.y - 0.5)*size;
float r4 = abs(pointcoord.x - 0.5)*size - $v_size/2;
float hbar = max(r3,r4);
return min(vbar, hbar);
}
"""
markers._marker_dict['++'] = cross_lines
markers.marker_types = tuple(sorted(list(markers._marker_dict.copy().keys())))
# cross_lines = """
# float cross(vec2 pointcoord, float size)
# {
# //vbar
# float r1 = abs(pointcoord.x - 0.5)*size;
# float r2 = abs(pointcoord.y - 0.5)*size - $v_size/2;
# float vbar = max(r1,r2);
# //hbar
# float r3 = abs(pointcoord.y - 0.5)*size;
# float r4 = abs(pointcoord.x - 0.5)*size - $v_size/2;
# float hbar = max(r3,r4);
# return min(vbar, hbar);
# }
# """
#
# markers._marker_dict['++'] = cross_lines
# markers.marker_types = tuple(sorted(list(markers._marker_dict.copy().keys())))
# # Add clear_data method to LineVisual to have possibility of clearing data
# def clear_data(self):
@@ -57,25 +57,25 @@ def apply_patches():
Grid._update_clipper = _update_clipper
# Patch InfiniteLine visual to 1.5px width
def _prepare_draw(self, view=None):
"""This method is called immediately before each draw.
The *view* argument indicates which view is about to be drawn.
"""
self.update_gl_state(line_smooth=False)
px_scale = self.transforms.pixel_scale
width = px_scale * 1.5
self.update_gl_state(line_width=max(width, 1.0))
if self._changed['pos']:
self.pos_buf.set_data(self._pos)
self._changed['pos'] = False
if self._changed['color']:
self._program.vert['color'] = self._color
self._changed['color'] = False
InfiniteLineVisual._prepare_draw = _prepare_draw
# def _prepare_draw(self, view=None):
# """This method is called immediately before each draw.
# The *view* argument indicates which view is about to be drawn.
# """
#
# self.update_gl_state(line_smooth=False)
# px_scale = self.transforms.pixel_scale
# width = px_scale * 1.5
# self.update_gl_state(line_width=max(width, 1.0))
#
# if self._changed['pos']:
# self.pos_buf.set_data(self._pos)
# self._changed['pos'] = False
#
# if self._changed['color']:
# self._program.vert['color'] = self._color
# self._changed['color'] = False
#
# InfiniteLineVisual._prepare_draw = _prepare_draw
# Patch AxisVisual to have less axis labels
def _get_tick_frac_labels(self):