graphic features refactor

examples/notebooks/linear_region_selector.ipynb

@@ -17,19 +17,20 @@
    "source": [
     "import fastplotlib as fpl\n",
     "import numpy as np\n",
-    "from ipywidgets import IntRangeSlider, FloatRangeSlider, VBox\n",
+    "# from ipywidgets import IntRangeSlider, FloatRangeSlider, VBox\n",
     "\n",
     "fig = fpl.Figure((2, 2))\n",
     "\n",
     "# preallocated size for zoomed data\n",
     "zoomed_prealloc = 1_000\n",
     "\n",
     "# data to plot\n",
-    "xs = np.linspace(0, 100, 1_000)\n",
-    "sine = np.sin(xs) * 20\n",
+    "xs = np.linspace(0, 10* np.pi, 1_000)\n",
+    "sine = np.sin(xs)\n",
+    "sine += 100\n",
     "\n",
     "# make sine along x axis\n",
-    "sine_graphic_x = fig[0, 0].add_line(sine)\n",
+    "sine_graphic_x = fig[0, 0].add_line(np.column_stack([xs, sine]), offset=(10, 0, 0))\n",
     "\n",
     "# just something that looks different for line along y-axis\n",
     "sine_y = sine\n",
@@ -47,7 +48,7 @@
     "ls_y = sine_graphic_y.add_linear_region_selector(axis=\"y\")\n",
     "\n",
     "# preallocate array for storing zoomed in data\n",
-    "zoomed_init = np.column_stack([np.arange(zoomed_prealloc), np.random.rand(zoomed_prealloc)])\n",
+    "zoomed_init = np.column_stack([np.arange(zoomed_prealloc), np.zeros(zoomed_prealloc)])\n",
     "\n",
     "# make line graphics for displaying zoomed data\n",
     "zoomed_x = fig[1, 0].add_line(zoomed_init)\n",
@@ -62,54 +63,54 @@
     "    # interpolate to preallocated size\n",
     "    return np.interp(x, xp, fp=subdata[:, axis])  # use the y-values\n",
     "\n",
-    "\n",
+    "@ls_x.add_event_handler(\"selection\")\n",
     "def set_zoom_x(ev):\n",
     "    \"\"\"sets zoomed x selector data\"\"\"\n",
-    "    selected_data = ev.pick_info[\"selected_data\"]\n",
-    "    zoomed_x.data = interpolate(selected_data, axis=1)  # use the y-values\n",
+    "    # get the selected data\n",
+    "    selected_data = ev.get_selected_data()\n",
+    "    if selected_data.size == 0:\n",
+    "        # no data selected\n",
+    "        zoomed_x.data[:, 1] = 0\n",
+    "\n",
+    "    # set the y-values\n",
+    "    zoomed_x.data[:, 1] = interpolate(selected_data, axis=1)\n",
     "    fig[1, 0].auto_scale()\n",
     "\n",
     "\n",
     "def set_zoom_y(ev):\n",
-    "    \"\"\"sets zoomed y selector data\"\"\"\n",
-    "    selected_data = ev.pick_info[\"selected_data\"]\n",
-    "    zoomed_y.data = -interpolate(selected_data, axis=0)  # use the x-values\n",
+    "    \"\"\"sets zoomed x selector data\"\"\"\n",
+    "    # get the selected data\n",
+    "    selected_data = ev.get_selected_data()\n",
+    "    if selected_data.size == 0:\n",
+    "        # no data selected\n",
+    "        zoomed_y.data[:, 0] = 0\n",
+    "\n",
+    "    # set the x-values\n",
+    "    zoomed_y.data[:, 0] = -interpolate(selected_data, axis=1)\n",
     "    fig[1, 1].auto_scale()\n",
     "\n",
     "\n",
-    "# update zoomed plots when bounds change\n",
-    "ls_x.selection.add_event_handler(set_zoom_x)\n",
-    "ls_y.selection.add_event_handler(set_zoom_y)\n",
-    "\n",
-    "fig.show()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "0bad4a35-f860-4f85-9061-920154ab682b",
-   "metadata": {},
-   "source": [
-    "### On the x-axis we have a 1-1 mapping from the data that we have passed and the line geometry positions. So the `bounds` min max corresponds directly to the data indices."
+    "fig.show(maintain_aspect=False)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "2c96a3ff-c2e7-4683-8097-8491e97dd6d3",
+   "id": "2f29e913-c4f8-44a6-8692-eb14436849a5",
    "metadata": {},
    "outputs": [],
    "source": [
-    "ls_x.selection()"
+    "sine_graphic_x.data[:, 1].ptp()"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "3ec71e3f-291c-43c6-a954-0a082ba5981c",
+   "id": "1947a477-5dd2-4df9-aecd-6967c6ab45fe",
    "metadata": {},
    "outputs": [],
    "source": [
-    "ls_x.get_selected_indices()"
+    "np.clip(-0.1, 0, 10)"
    ]
   },
   {

examples/notebooks/linear_selector.ipynb

@@ -5,7 +5,7 @@
    "id": "a06e1fd9-47df-42a3-a76c-19e23d7b89fd",
    "metadata": {},
    "source": [
-    "## `LinearSelector`, draggable selector that can optionally associated with an ipywidget."
+    "## `LinearSelector`, draggable selector that can also be linked to an ipywidget slider"
    ]
   },
   {
@@ -16,7 +16,6 @@
    "outputs": [],
    "source": [
     "import fastplotlib as fpl\n",
-    "from fastplotlib.graphics.selectors import Synchronizer\n",
     "\n",
     "import numpy as np\n",
     "from ipywidgets import VBox, IntSlider, FloatSlider\n",
@@ -35,16 +34,14 @@
     "selector2 = sine_graphic.add_linear_selector(20)\n",
     "selector3 = sine_graphic.add_linear_selector(40)\n",
     "\n",
-    "ss = Synchronizer(selector, selector2, selector3)\n",
-    "\n",
+    "# one of the selectors will change the line colors when it moves\n",
+    "@selector.add_event_handler(\"selection\")\n",
     "def set_color_at_index(ev):\n",
     "    # changes the color at the index where the slider is\n",
-    "    ix = ev.pick_info[\"selected_index\"]\n",
-    "    g = ev.pick_info[\"graphic\"].parent\n",
+    "    ix = ev.get_selected_index()\n",
+    "    g = ev.graphic.parent\n",
     "    g.colors[ix] = \"green\"\n",
     "\n",
-    "selector.selection.add_event_handler(set_color_at_index)\n",
-    "\n",
     "# fastplotlib LineSelector can make an ipywidget slider and return it :D \n",
     "ipywidget_slider = selector.make_ipywidget_slider()\n",
     "ipywidget_slider.description = \"slider1\"\n",
@@ -57,7 +54,15 @@
     "selector3.add_ipywidget_handler(ipywidget_slider3, step=0.1)\n",
     "\n",
     "fig[0, 0].auto_scale()\n",
-    "fig.show(add_widgets=[ipywidget_slider])"
+    "VBox([fig.show(), ipywidget_slider, ipywidget_slider2, ipywidget_slider3])"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "d83caca6-e9b6-45df-b93c-0dfe0498d20e",
+   "metadata": {},
+   "source": [
+    "Double click the first selctor, and then use `Shift` + Right/Left Arrow Key to move it!"
    ]
   },
   {
@@ -67,13 +72,16 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# this controls the step-size of arrow key movements\n",
     "selector.step = 0.1"
    ]
   },
   {
    "cell_type": "markdown",
    "id": "3b0f448f-bbe4-4b87-98e3-093f561c216c",
-   "metadata": {},
+   "metadata": {
+    "jp-MarkdownHeadingCollapsed": true
+   },
    "source": [
     "### Drag linear selectors with the mouse, hold \"Shift\" to synchronize movement of all the selectors"
    ]