Skip to content

Commit

Permalink
plot name change
Browse files Browse the repository at this point in the history
  • Loading branch information
jposada202020 committed Jul 28, 2023
1 parent 0693e3c commit a39ec1e
Show file tree
Hide file tree
Showing 43 changed files with 148 additions and 149 deletions.
6 changes: 3 additions & 3 deletions circuitpython_uplot/cartesian.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
try:
from typing import Optional, Union
from circuitpython_uplot.plot import Uplot
from circuitpython_uplot.plot import Plot
except ImportError:
pass
from bitmaptools import draw_line, fill_region
Expand All @@ -33,7 +33,7 @@ class Cartesian:

def __init__(
self,
plot: Uplot,
plot: Plot,
x: Union[list, np.linspace, np.ndarray],
y: Union[list, np.linspace, np.ndarray],
rangex: Optional[list] = None,
Expand All @@ -45,7 +45,7 @@ def __init__(
) -> None:
"""
:param Uplot plot: Plot object for the scatter to be drawn
:param Plot plot: Plot object for the scatter to be drawn
:param list|ulab.numpy.linspace|ulab.numpy.ndarray x: x points coordinates
:param list|ulab.numpy.linspace|ulab.numpy.ndarray y: y points coordinates
:param list|None rangex: x range limits. Defaults to None
Expand Down
6 changes: 3 additions & 3 deletions circuitpython_uplot/fillbetween.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
try:
from typing import Optional, Union
from circuitpython_uplot.plot import Uplot
from circuitpython_uplot.plot import Plot
except ImportError:
pass
from ulab import numpy as np
Expand All @@ -33,7 +33,7 @@ class Fillbetween:

def __init__(
self,
plot: Uplot,
plot: Plot,
x: Union[list, np.linspace, np.ndarray],
y1: Union[list, np.linspace, np.ndarray],
y2: Union[list, np.linspace, np.ndarray],
Expand All @@ -43,7 +43,7 @@ def __init__(
nudge: bool = True,
) -> None:
"""
:param Uplot plot: Plot object for the scatter to be drawn
:param Plot plot: Plot object for the scatter to be drawn
:param list|ulab.numpy.linspace|ulab.numpy.ndarray x: x points coordinates
:param list|ulab.numpy.linspace|ulab.numpy.ndarray y1: y1 points coordinates
:param list|ulab.numpy.linspace|ulab.numpy.ndarray y2: y2 points coordinates
Expand Down
14 changes: 7 additions & 7 deletions circuitpython_uplot/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
try:
from typing import Union
from circuitpython_uplot.plot import Uplot
from circuitpython_uplot.plot import Plot
except ImportError:
pass
from bitmaptools import draw_line, fill_region
Expand All @@ -32,7 +32,7 @@ class Logging:

def __init__(
self,
plot: Uplot,
plot: Plot,
x: Union[list, np.linspace, np.ndarray],
y: Union[list, np.linspace, np.ndarray],
rangex: list,
Expand All @@ -45,7 +45,7 @@ def __init__(
) -> None:
"""
:param Uplot plot: Plot object for the log to be drawn
:param Plot plot: Plot object for the log to be drawn
:param list|ulab.numpy.linspace|ulab.numpy.ndarray x: x points coordinates
:param list|ulab.numpy.linspace|ulab.numpy.ndarray y: y points coordinates
:param list|None rangex: x range limits. Defaults to None
Expand Down Expand Up @@ -140,10 +140,10 @@ def clear_plot(plot) -> None:
0,
)

def draw_points(self, plot: Uplot, x: list, y: list, fill: bool = False) -> None:
def draw_points(self, plot: Plot, x: list, y: list, fill: bool = False) -> None:
"""
Draws points in the plot
:param Uplot plot: plot object provided
:param Plot plot: plot object provided
:param list x: list of x values
:param list y: list of y values
:param bool fill: parameter to fill the plot graphic. Defaults to False
Expand All @@ -153,10 +153,10 @@ def draw_points(self, plot: Uplot, x: list, y: list, fill: bool = False) -> None

self.draw_new_lines(plot, x, y, fill)

def draw_new_lines(self, plot: Uplot, x: list, y: list, fill: bool = False) -> None:
def draw_new_lines(self, plot: Plot, x: list, y: list, fill: bool = False) -> None:
"""
Draw the plot lines
:param Uplot plot: plot object provided
:param Plot plot: plot object provided
:param list x: list of x values
:param list y: list of y values
:param bool fill: parameter to fill the plot graphic. Defaults to False
Expand Down
6 changes: 3 additions & 3 deletions circuitpython_uplot/map.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
try:
from circuitpython_uplot.plot import Uplot
from circuitpython_uplot.plot import Plot
except ImportError:
pass

Expand All @@ -34,14 +34,14 @@ class Map:

def __init__(
self,
plot: Uplot,
plot: Plot,
data_points: np.ndarray,
initial_color: int,
final_color: int,
) -> None:
"""
:param Uplot plot: Plot object for the scatter to be drawn
:param Plot plot: Plot object for the scatter to be drawn
:param np.array data_points: data points to create the color map
:param int initial_color: initial color to create the color map
:param int final_color: final color to create the color map
Expand Down
6 changes: 3 additions & 3 deletions circuitpython_uplot/pie.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"""
try:
from circuitpython_uplot.plot import Uplot
from circuitpython_uplot.plot import Plot
except ImportError:
pass

Expand All @@ -32,11 +32,11 @@ class Pie:
"""

def __init__(
self, plot: Uplot, data: list, x: int = 0, y: int = 0, radius: int = 40
self, plot: Plot, data: list, x: int = 0, y: int = 0, radius: int = 40
) -> None:
"""
:param Uplot plot: Plot object for the pie to be drawn
:param Plot plot: Plot object for the pie to be drawn
:param list data: data to make the pie
:param int x: pie center x coordinate
:param int y: pie center y coordinate
Expand Down
6 changes: 3 additions & 3 deletions circuitpython_uplot/polar.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
try:
from typing import Optional, Union
from circuitpython_uplot.plot import Uplot
from circuitpython_uplot.plot import Plot
except ImportError:
pass
from bitmaptools import draw_line, draw_circle
Expand All @@ -33,7 +33,7 @@ class Polar:

def __init__(
self,
plot: Uplot,
plot: Plot,
radius: Union[list, np.linspace, np.ndarray],
theta: Union[list, np.linspace, np.ndarray],
rangex: Optional[list] = None,
Expand All @@ -45,7 +45,7 @@ def __init__(
) -> None:
"""
:param Uplot plot: Plot object for the scatter to be drawn
:param Plot plot: Plot object for the scatter to be drawn
:param list|ulab.numpy.linspace|ulab.numpy.ndarray radius: radius points
:param list|ulab.numpy.linspace|ulab.numpy.ndarray theta: theta points
:param list|None rangex: x range limits. Defaults to None
Expand Down
4 changes: 2 additions & 2 deletions circuitpython_uplot/scatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"""
try:
from typing import Optional, Union
from circuitpython_uplot.plot import Uplot
from circuitpython_uplot.plot import Plot
except ImportError:
pass

Expand All @@ -36,7 +36,7 @@ class Scatter:

def __init__(
self,
plot: Uplot,
plot: Plot,
x: Union[list, np.linspace, np.ndarray],
y: Union[list, np.linspace, np.ndarray],
rangex: Optional[list] = None,
Expand Down
6 changes: 3 additions & 3 deletions circuitpython_uplot/shade.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
try:
from typing import Optional, Union
from circuitpython_uplot.plot import Uplot
from circuitpython_uplot.plot import Plot
except ImportError:
pass
from ulab import numpy as np
Expand All @@ -33,7 +33,7 @@ class shade:

def __init__(
self,
plot: Uplot,
plot: Plot,
x: Union[list, np.linspace, np.ndarray],
y1: list,
y2: list,
Expand All @@ -43,7 +43,7 @@ def __init__(
nudge: bool = True,
) -> None:
"""
:param Uplot plot: Plot object for the scatter to be drawn
:param Plot plot: Plot object for the scatter to be drawn
:param list|ulab.numpy.linspace|ulab.numpy.ndarray x: x points coordinates
:param list y1: y1 points coordinates
:param list y2: y2 points coordinates
Expand Down
6 changes: 3 additions & 3 deletions circuitpython_uplot/svg.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"""
try:
from circuitpython_uplot.plot import Uplot
from circuitpython_uplot.plot import Plot
except ImportError:
pass
from bitmaptools import draw_line
Expand All @@ -33,7 +33,7 @@ class to render svg images in the plot area

def __init__(
self,
plot: Uplot,
plot: Plot,
icon: dict,
x: int,
y: int,
Expand All @@ -42,7 +42,7 @@ def __init__(
) -> None:
"""
:param Uplot plot: Plot object for the log to be drawn
:param Plot plot: Plot object for the log to be drawn
:param dictionary icon: icon dictionary
:param int x: x position for the svg image
:param int y: y position for the svg image
Expand Down
2 changes: 1 addition & 1 deletion docs/api.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Uplot Library
==============

.. automodule:: circuitpython_uplot.uplot
.. automodule:: circuitpython_uplot.plot
:members:

.. automodule:: circuitpython_uplot.scatter
Expand Down
Loading

0 comments on commit a39ec1e

Please sign in to comment.