fix add graphic methods

clewis7 · clewis7 · commit b82a07b8bae2 · 2023-06-26T08:50:25.000-04:00
diff --git a/fastplotlib/layouts/graphic_methods_mixin.py b/fastplotlib/layouts/graphic_methods_mixin.py
@@ -1,8 +1,10 @@
 from typing import *
+
 import numpy
-from ..graphics import *
 import weakref
 
+from ..graphics import *
+
 
 class GraphicMethodsMixin:
     def __init__(self):
@@ -70,7 +72,7 @@ def add_heatmap(self, data: Any, vmin: int = None, vmax: int = None, cmap: str =
             plot.show()
         
         """
-        g = HeatmapGraphic(*args, **kwargs)
+        g = HeatmapGraphic(data=data, *args, **kwargs)
         self.add_graphic(g)
 
         return weakref.proxy(g)
@@ -103,7 +105,7 @@ def add_histogram(self, data: numpy.ndarray = None, bins: Union[int, str] = 'aut
             passed to Graphic
         
         """
-        g = HistogramGraphic(*args, **kwargs)
+        g = HistogramGraphic(data=data, *args, **kwargs)
         self.add_graphic(g)
 
         return weakref.proxy(g)
@@ -165,9 +167,7 @@ def add_image(self, data: Any, vmin: int = None, vmax: int = None, cmap: str = '
             plot.show()
         
         """
-        print(args)
-        print(kwargs)
-        g = ImageGraphic(*args, **kwargs)
+        g = ImageGraphic(data=data, *args, **kwargs)
         self.add_graphic(g)
 
         return weakref.proxy(g)
@@ -286,7 +286,7 @@ def add_line_collection(self, data: List[numpy.ndarray], z_position: Union[List[
 
         
         """
-        g = LineCollection(*args, **kwargs)
+        g = LineCollection(data=data, *args, **kwargs)
         self.add_graphic(g)
 
         return weakref.proxy(g)
@@ -340,7 +340,7 @@ def add_line(self, data: Any, thickness: float = 2.0, colors: Union[str, numpy.n
 
         
         """
-        g = LineGraphic(*args, **kwargs)
+        g = LineGraphic(data=data, *args, **kwargs)
         self.add_graphic(g)
 
         return weakref.proxy(g)
@@ -451,7 +451,7 @@ def add_line_stack(self, data: List[numpy.ndarray], z_position: Union[List[float
 
         
         """
-        g = LineStack(*args, **kwargs)
+        g = LineStack(data=data, *args, **kwargs)
         self.add_graphic(g)
 
         return weakref.proxy(g)
@@ -505,7 +505,7 @@ def add_scatter(self, data: numpy.ndarray, sizes: Union[int, numpy.ndarray, list
 
         
         """
-        g = ScatterGraphic(*args, **kwargs)
+        g = ScatterGraphic(data=data, *args, **kwargs)
         self.add_graphic(g)
 
         return weakref.proxy(g)
@@ -533,7 +533,7 @@ def add_text(self, text: str, position: Tuple[int] = (0, 0, 0), size: int = 10,
             name of graphic, passed to Graphic
         
         """
-        g = TextGraphic(*args, **kwargs)
+        g = TextGraphic(text=text, *args, **kwargs)
         self.add_graphic(g)
 
         return weakref.proxy(g)
diff --git a/fastplotlib/utils/generate_add_methods.py b/fastplotlib/utils/generate_add_methods.py
@@ -1,7 +1,10 @@
 import inspect
 import sys
-from fastplotlib.graphics import *
 import pathlib
+
+from fastplotlib.graphics import *
+
+
 modules = list()
 
 for name, obj in inspect.getmembers(sys.modules[__name__]):
@@ -16,10 +19,10 @@ def generate_add_graphics_methods():
 
     f = open(current_module.joinpath('layouts/graphic_methods_mixin.py'), 'w')
 
-    f.write('from typing import *\n')
+    f.write('from typing import *\n\n')
     f.write('import numpy\n')
-    f.write('from ..graphics import *\n')
     f.write('import weakref\n\n')
+    f.write('from ..graphics import *\n\n')
 
     f.write("\nclass GraphicMethodsMixin:\n")
     f.write("    def __init__(self):\n")
@@ -33,7 +36,7 @@ def generate_add_graphics_methods():
         f.write('        """\n')
         f.write(f'        {class_name.__init__.__doc__}\n')
         f.write('        """\n')
-        f.write(f"        g = {class_name.__name__}(*args, **kwargs)\n")
+        f.write(f"        g = {class_name.__name__}(data=data, *args, **kwargs)\n")
         f.write(f'        self.add_graphic(g)\n\n')
 
         f.write(f'        return weakref.proxy(g)\n\n')
