update for changes in pygfx@main (#443)

clewis7 · clewis7 · commit ff9b7dba54cd · 2024-03-22T21:27:57.000-04:00
* update points material kwarg

* update scatter examples &amp; screenshots
diff --git a/examples/desktop/scatter/scatter_cmap.py b/examples/desktop/scatter/scatter_cmap.py
@@ -26,11 +26,7 @@
 
 
 scatter_graphic = plot.add_scatter(
-    data=data[:, :-1],
-    sizes=15,
-    alpha=0.7,
-    cmap="Set1",
-    cmap_values=agg.labels_
+    data=data[:, :-1], sizes=15, alpha=0.7, cmap="Set1", cmap_values=agg.labels_
 )
 
 plot.show()
diff --git a/examples/desktop/scatter/scatter_dataslice.py b/examples/desktop/scatter/scatter_dataslice.py
@@ -34,7 +34,7 @@
 scatter_graphic.data[2] = np.array([[5.2, 2.7, 1.7]])
 
 scatter_graphic.data[10:15] = scatter_graphic.data[0:5] + np.array([1, 1, 1])
-scatter_graphic.data[50:100:2] = scatter_graphic.data[100:150:2] + np.array([1,1,0])
+scatter_graphic.data[50:100:2] = scatter_graphic.data[100:150:2] + np.array([1, 1, 0])
 
 
 if __name__ == "__main__":
diff --git a/examples/desktop/scatter/scatter_size.py b/examples/desktop/scatter/scatter_size.py
@@ -12,28 +12,23 @@
 grid_shape = (2, 1)
 
 # you can give string names for each subplot within the gridplot
-names = [
-    ["scalar_size"],
-    ["array_size"]
-]
+names = [["scalar_size"], ["array_size"]]
 
 # Create the grid plot
-plot = fpl.GridPlot(
-    shape=grid_shape,
-    names=names,
-    size=(1000, 1000)
-)
+plot = fpl.GridPlot(shape=grid_shape, names=names, size=(1000, 1000))
 
 # get y_values using sin function
-angles = np.arange(0, 20*np.pi+0.001, np.pi / 20)
-y_values = 30*np.sin(angles) # 1 thousand points
+angles = np.arange(0, 20 * np.pi + 0.001, np.pi / 20)
+y_values = 30 * np.sin(angles)  # 1 thousand points
 x_values = np.array([x for x in range(len(y_values))], dtype=np.float32)
 
 data = np.column_stack([x_values, y_values])
 
-plot["scalar_size"].add_scatter(data=data, sizes=5, colors="blue") # add a set of scalar sizes
+plot["scalar_size"].add_scatter(
+    data=data, sizes=5, colors="blue"
+)  # add a set of scalar sizes
 
-non_scalar_sizes = np.abs((y_values / np.pi)) # ensure minimum size of 5
+non_scalar_sizes = np.abs((y_values / np.pi))  # ensure minimum size of 5
 plot["array_size"].add_scatter(data=data, sizes=non_scalar_sizes, colors="red")
 
 for graph in plot:
diff --git a/examples/desktop/screenshots/scatter.png b/examples/desktop/screenshots/scatter.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd38399b77e09d915c5bb1e7ee022f936ae90682f598357bc774a95c372dc78f
-size 25231
+oid sha256:8d840f02d1c4be5ea11adfc224481a5b8b306cbc904e099af4d3fdd5ab7f383f
+size 26683
diff --git a/examples/desktop/screenshots/scatter_cmap.png b/examples/desktop/screenshots/scatter_cmap.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e712693b403166909dcaa65256131eacba0a15892cd144ad97fdecb6b9835e93
-size 57273
+oid sha256:e9aba2f37c7682d68569e1bac7afac5f243afb98ab94d9957de4b59f9d3dd1c0
+size 57257
diff --git a/examples/desktop/screenshots/scatter_colorslice.png b/examples/desktop/screenshots/scatter_colorslice.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c620cad9976f390e44a5b037f3ff61fb80e6487e17f4be8118be5df55f276a35
-size 23664
+oid sha256:39c49529552d6ace3d67b37f0c660e9734fcb763bdc165484f356ad8cffc908e
+size 25218
diff --git a/examples/desktop/screenshots/scatter_dataslice.png b/examples/desktop/screenshots/scatter_dataslice.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69d2f0999b0bb334e48320702095fc76444f4d89d43a51ac6c5c8f49e1df96ac
-size 25999
+oid sha256:20757e215c4c208e08027f8e2b798691f421ce7662dc86be3615dc41084686f3
+size 27392
diff --git a/examples/desktop/screenshots/scatter_present.png b/examples/desktop/screenshots/scatter_present.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e45c1a936771e569e562ed3496421e498e725325093e84243ab494c0718ead3a
-size 23639
+oid sha256:7a8ceb8f3d7203f0569374993784f2229448ace08b0abee94910e6ae71ceca29
+size 24587
diff --git a/examples/desktop/screenshots/scatter_size.png b/examples/desktop/screenshots/scatter_size.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10533aa5831a50a0f9b38c0a60b89a9b6c33311ecb3a569c5e0b4c82379dc20a
-size 66037
+oid sha256:a184ce0a202bc03fa61b3f4149109e44160bfd326c26f46db3b83ce0cf1699a6
+size 67710
diff --git a/fastplotlib/graphics/scatter.py b/fastplotlib/graphics/scatter.py
@@ -93,7 +93,7 @@ def __init__(
             pygfx.Geometry(
                 positions=self.data(), sizes=self.sizes(), colors=self.colors()
             ),
-            material=pygfx.PointsMaterial(color_mode="vertex", vertex_sizes=True),
+            material=pygfx.PointsMaterial(color_mode="vertex", size_mode="vertex"),
         )
 
         self._set_world_object(world_object)

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ def __init__(`
`93`	`93`	`pygfx.Geometry(`
`94`	`94`	`positions=self.data(), sizes=self.sizes(), colors=self.colors()`
`95`	`95`	`),`
`96`		`- material=pygfx.PointsMaterial(color_mode="vertex", vertex_sizes=True),`
	`96`	`+ material=pygfx.PointsMaterial(color_mode="vertex", size_mode="vertex"),`
`97`	`97`	`)`
`98`	`98`
`99`	`99`	`self._set_world_object(world_object)`