Plot frame#313

kushalkolar

closes #310 closes #342 closes #268

This PR adds a Frame class that manages how plots are shown. Plot and Gridplot, and any future flexilbe gridplot, inherit from Frame.

How this works:

Toolbars

Refactored ipywidget Toolbar that is common between Plot, Gridplot and any future gridplots

Output Contexts

These are classes that "hold" the output of a Plot/Gridplot. They determine how the canvas, toolbar, and any additional widgets are shown. When Plot.show() is called, they return an instance of one of the following output contexts based on the curent plot canvas.

JupyterOutputContext
- Inherits from ipywidgets.VBox and contains the canvas, toolbar, and any other widgets. Manages sidecar if desired.
QOutputContext
- Inherits from QWidget, contains the canvas, qt toolbar, and any other widgets.
If the canvas is not jupyter or qt (ex. if it's glfw or offscreen like in our test suite), the output context is just the plot canvas itself.

This cleans up the messy show() calls we previously had everywhere, and cleans up other stuff too. Now the output context manages closing plots too.

BTW, the QOutputContext can also be used in notebooks with if you execute %gui qt before creating plots 😄

clewis7

#310

kushalkolar

This is working now with JupyterOutputContext! Also fixed the wonky issue with auto-scale and center scene when you had a single controller controlling multiple cameras for diff subplots.

Now onto Qt output context and toolbar.

kushalkolar

Everything works on my end, I tested every combination with ipywidgets, sidecar/no sidecar, Qt, and with ImageWidget.

Right now the toolbar implementations are quite repetitive, we can make that nicer in a future PR after we have some time to think about it. Someone must have made a common interface between ipywidgets and Qt that we can use.

qt.mp4

what if ImageWidget? where is logic for if plot type is imagewidget?

ImageWidget just uses the Gridplot context:

    def show(self, toolbar: bool = True, sidecar: bool = False, sidecar_kwargs: dict = None):
        """
        Show the widget

        Returns
        -------
        OutputContext
        """
        if self.gridplot.canvas.__class__.__name__ == "JupyterWgpuCanvas":
            self._image_widget_toolbar = IpywidgetImageWidgetToolbar(self)

        elif self.gridplot.canvas.__class__.__name__ == "QWgpuCanvas":
            self._image_widget_toolbar = QToolbarImageWidget(self)

        return self.gridplot.show(
            toolbar=toolbar,
            sidecar=sidecar,
            sidecar_kwargs=sidecar_kwargs,
            add_widgets=[self._image_widget_toolbar]
        )

clewis7

did you update the requirements file?

clewis7

Another thing I see is that when I have two subplots in an imagewidget and the camera y_scales are opposite that when I change click between subplots the flip button is not changing in accordance with the camera y_scale...just stays the same

kushalkolar

did you update the requirements file?

No dependency changes here.

kushalkolar

Another thing I see is that when I have two subplots in an imagewidget and the camera y_scales are opposite that when I change click between subplots the flip button is not changing in accordance with the camera y_scale...just stays the same

In ipywidgets or Qt?

clewis7

Another thing I see is that when I have two subplots in an imagewidget and the camera y_scales are opposite that when I change click between subplots the flip button is not changing in accordance with the camera y_scale...just stays the same

In ipywidgets or Qt?

ipwidgets

clewis7

did you update the requirements file?

No dependency changes here.

not even if someone only wants qt? they would need to have pyqt6 installed right?

kushalkolar

did you update the requirements file?

No dependency changes here.

not even if someone only wants qt? they would need to have pyqt6 installed right?

Qt land is a bit complicated, so they will have to install Qt themselves separately. We can do toggles later, because to do this properly we need to give users the option of PySide etc and decide how broad we want this support.

kushalkolar

Another thing I see is that when I have two subplots in an imagewidget and the camera y_scales are opposite that when I change click between subplots the flip button is not changing in accordance with the camera y_scale...just stays the same

In ipywidgets or Qt?

ipwidgets

I think now I see what you mean, it is wonky! So this is because in ImageWidget all cameras are under one controller. I did not decide how to deal with flipping when controllers are diff. What I will do is if the flip button is clicked, it will flip the camera for the current subplot but also any camera that has the same controller (similar to what I did for panzoom and maintain_aspect).

clewis7 mentioned this pull request Oct 11, 2023

manual annotation of ethograms hantman-lab/animal-soup#60

Merged

kushalkolar mentioned this pull request Sep 24, 2023

Roadmap Fall 2023 #130

Closed

17 tasks

This was referenced Oct 25, 2023

add polygon button to gridplot toolbar #334

Merged

make sidecar=False the default? #342

Closed

WIP on plot frame

88f33c3

kushalkolar force-pushed the plot-frame branch from 0d6b766 to 88f33c3 Compare October 29, 2023 20:47

kushalkolar marked this pull request as ready for review October 29, 2023 20:48

kushalkolar added 2 commits October 29, 2023 19:01

create Output context classes, basic layout of Frame, not tested yet

34ff9a2

plot frame system working for jupyter

80a3fb2

kushalkolar added 10 commits October 29, 2023 21:06

make it work with imagewidget

7943697

update demo nbs

57e0fe9

fix finding if imagegraphic is present

4c0002b

fix finding images again

dbcedf8

update desk image screenshots

9c222dd

update screenshot

6dd2f1a

qt works with toolbar

5e11f87

qt context works with image widget

6da3517

comments

b1e7bda

bugfix with flipping

81df69f

clewis7 reviewed Oct 30, 2023

View reviewed changes

remove junk files

6f85ced

kushalkolar added 8 commits October 30, 2023 20:33

fix flip, image widget can reset vmin vmax based on currently display… …

5bed8a1

…ed frame

hlut autoscales plot area when set_data() called

45a752e

return buffer

2b276a5

reset hlut button

232e902

add reset hlut button to QToolbar

ae9b47e

add wiget property to imagewidget, fix gridplot kwargs handling

3cfe184

qt toolbar layouting

059cb9f

add standalone qt image widget example

3c9f4a9

kushalkolar merged commit 932454f into main Oct 31, 2023

kushalkolar mentioned this pull request Oct 31, 2023

Embedding in PyQt #340

Closed

kushalkolar deleted the plot-frame branch October 31, 2023 04:29

+                          self.output = (frame.canvas, *add_widgets)
+                      if make_toolbar:  # make toolbar and stack canvas, toolbar, add_widgets
+                          self.toolbar = IpywidgetToolBar(frame)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Plot frame#313

Plot frame#313kushalkolar merged 22 commits intomainfastplotlib/fastplotlib:mainfrom plot-framefastplotlib/fastplotlib:plot-frameCopy head branch name to clipboard

Conversation

kushalkolar commented Oct 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How this works:

Toolbars

Output Contexts

Uh oh!

clewis7 commented Oct 3, 2023

Uh oh!

kushalkolar commented Oct 29, 2023

Uh oh!

kushalkolar commented Oct 30, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

clewis7 Oct 30, 2023

Choose a reason for hiding this comment

Uh oh!

kushalkolar Oct 30, 2023

Choose a reason for hiding this comment

Uh oh!

clewis7 commented Oct 30, 2023

Uh oh!

clewis7 commented Oct 30, 2023

Uh oh!

kushalkolar commented Oct 30, 2023

Uh oh!

kushalkolar commented Oct 30, 2023

Uh oh!

clewis7 commented Oct 30, 2023

Uh oh!

clewis7 commented Oct 30, 2023

Uh oh!

kushalkolar commented Oct 30, 2023

Uh oh!

kushalkolar commented Oct 31, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Footer

Footer navigation

Plot frame#313
kushalkolar merged 22 commits into
mainfrom
plot-frame

kushalkolar commented Oct 3, 2023 •
edited
Loading