Skip to content

Commit 9852200

Browse files
committed
axes_types
1 parent 9914a7f commit 9852200

File tree

1 file changed

+59
-36
lines changed

1 file changed

+59
-36
lines changed

uplot.py

Lines changed: 59 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
from vectorio import Circle
2727
from ulab import numpy as np
2828

29-
3029
__version__ = "0.0.0+auto.0"
3130
__repo__ = "https://github.com/adafruit/CircuitPython_uplot.git"
3231

@@ -43,6 +42,8 @@ def __init__(self, x=0, y=0, width=None, height=None, padding=15):
4342
super().__init__(x=x, y=y, scale=1)
4443
np.set_printoptions(threshold=200)
4544

45+
self._axesparams = "box"
46+
4647
self.padding = padding
4748
self._newxmin = padding
4849
self._newxmax = width - 1 * padding
@@ -70,41 +71,62 @@ def __init__(self, x=0, y=0, width=None, height=None, padding=15):
7071
self._plotbitmap, pixel_shader=self._plot_palette, x=x, y=y
7172
)
7273
)
73-
self._drawbox()
74+
75+
def axs_params(self, axstype="box"):
76+
"""
77+
:param axs:
78+
:return: none
79+
80+
"""
81+
print("aca", axstype)
82+
self._axesparams = axstype
7483

7584
def _drawbox(self):
76-
draw_line(
77-
self._plotbitmap,
78-
self.padding,
79-
self.padding,
80-
self._width - self.padding,
81-
self.padding,
82-
1,
83-
)
84-
draw_line(
85-
self._plotbitmap,
86-
self.padding,
87-
self.padding,
88-
self.padding,
89-
self._height - self.padding,
90-
1,
91-
)
92-
draw_line(
93-
self._plotbitmap,
94-
self._width - self.padding,
95-
self.padding,
96-
self._width - self.padding,
97-
self._height - self.padding,
98-
1,
99-
)
100-
draw_line(
101-
self._plotbitmap,
102-
self.padding,
103-
self._height - self.padding,
104-
self._width - self.padding,
105-
self._height - self.padding,
106-
1,
107-
)
85+
print(self._axesparams)
86+
if self._axesparams == "cartesian":
87+
draw_box = [True, True, False, False]
88+
elif self._axesparams == "line":
89+
draw_box = [False, True, False, False]
90+
else:
91+
draw_box = [True, True, True, True]
92+
93+
if draw_box[0]:
94+
# y axes line
95+
draw_line(
96+
self._plotbitmap,
97+
self.padding,
98+
self.padding,
99+
self.padding,
100+
self._height - self.padding,
101+
1,
102+
)
103+
if draw_box[1]:
104+
draw_line(
105+
self._plotbitmap,
106+
self.padding,
107+
self._height - self.padding,
108+
self._width - self.padding,
109+
self._height - self.padding,
110+
1,
111+
)
112+
if draw_box[2]:
113+
draw_line(
114+
self._plotbitmap,
115+
self._width - self.padding,
116+
self.padding,
117+
self._width - self.padding,
118+
self._height - self.padding,
119+
1,
120+
)
121+
if draw_box[3]:
122+
draw_line(
123+
self._plotbitmap,
124+
self.padding,
125+
self.padding,
126+
self._width - self.padding,
127+
self.padding,
128+
1,
129+
)
108130

109131
def draw_circle(self, radius=5, x=100, y=100):
110132
"""
@@ -130,8 +152,8 @@ def normalize(oldrangemin, oldrangemax, newrangemin, newrangemax, value):
130152
:return: converted value
131153
"""
132154
return (
133-
((value - oldrangemin) * (newrangemax - newrangemin))
134-
/ (oldrangemax - oldrangemin)
155+
((value - oldrangemin) * (newrangemax - newrangemin))
156+
/ (oldrangemax - oldrangemin)
135157
) + newrangemin
136158

137159
def draw_plot(self, x, y):
@@ -143,6 +165,7 @@ def draw_plot(self, x, y):
143165
:return: None
144166
145167
"""
168+
self._drawbox()
146169

147170
x = np.array(x)
148171
y = np.array(y)

0 commit comments

Comments
 (0)