Skip to content

Commit

Permalink
Move circular bullseyes
Browse files Browse the repository at this point in the history
  • Loading branch information
JorisVincent committed Mar 22, 2023
1 parent 66ce116 commit 1900455
Show file tree
Hide file tree
Showing 2 changed files with 192 additions and 161 deletions.
192 changes: 192 additions & 0 deletions docs/reference/demos/stimuli/bullseyes.md
@@ -0,0 +1,192 @@
---
jupytext:
formats: md:myst
text_representation:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.14.5
kernelspec:
display_name: Python 3 (ipykernel)
language: python
name: python3
---

```{important}
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/computational-psychology/stimupy/HEAD?urlpath=lab/tree/docs/reference/demos/stimuli/bullseyes.md)
to get interactivity
```

# Stimuli - Bullseyes
{py:mod}`stimupy.stimuli.bullseyes`

```{code-cell} ipython3
:tags: [remove-cell]
import IPython
import ipywidgets as iw
from stimupy.utils import plot_stim
```

## Circular
{py:func}`stimupy.stimuli.bullseyes.circular`

```{code-cell} ipython3
from stimupy.stimuli.bullseyes import circular
# Define widgets
w_height = iw.IntSlider(value=10, min=1, max=20, description="height [deg]")
w_width = iw.IntSlider(value=10, min=1, max=20, description="width [deg]")
w_ppd = iw.IntSlider(value=20, min=1, max=40, description="ppd")
w_freq = iw.FloatSlider(value=1, min=0, max=2, description="frequency [cpd]")
w_phase = iw.FloatSlider(value=0, min=0, max=360, description="phase shift [deg]")
w_int1 = iw.FloatSlider(value=1, min=0, max=1, description="int-ring1")
w_int2 = iw.FloatSlider(value=0, min=0, max=1, description="int-ring2")
w_int_back = iw.FloatSlider(value=0.5, min=0, max=1, description="int background")
w_ori = iw.Dropdown(value="mean", options=['mean', 'corner', 'center'], description="origin")
w_clip = iw.ToggleButton(value=False, disabled=False, description="clip")
w_mask = iw.Dropdown(value=None, options=[None, 'target_mask', 'ring_mask'], description="add mask")
w_tint = iw.FloatSlider(value=0.5, min=0, max=1, description="target int")
# Layout
b_im_size = iw.HBox([w_height, w_width, w_ppd])
b_geometry = iw.HBox([w_freq, w_phase])
b_intensities = iw.HBox([w_int1, w_int2, w_int_back])
b_add = iw.HBox([w_ori, w_clip, w_mask])
b_target = iw.HBox([w_tint])
ui = iw.VBox([b_im_size, b_geometry, b_intensities, b_target, b_add])
# Function for showing stim
def show_bullseye(
height=None,
width=None,
ppd=None,
frequency=None,
phase_shift=None,
int1=None,
int2=None,
intensity_background=None,
origin=None,
clip=False,
add_mask=False,
intensity_target=None,
):
stim = circular(
visual_size=(height, width),
ppd=ppd,
frequency=frequency,
phase_shift=phase_shift,
intensity_rings=(int1, int2),
intensity_background=intensity_background,
origin=origin,
clip=clip,
intensity_target=intensity_target,
)
plot_stim(stim, mask=add_mask)
# Set interactivity
out = iw.interactive_output(
show_bullseye,
{
"height": w_height,
"width": w_width,
"ppd": w_ppd,
"frequency": w_freq,
"phase_shift": w_phase,
"int1": w_int1,
"int2": w_int2,
"intensity_background": w_int_back,
"origin": w_ori,
"clip": w_clip,
"add_mask": w_mask,
"intensity_target": w_tint,
},
)
# Show
display(ui, out)
```


## Circular, Two-sided
{py:func}`stimupy.stimuli.bullseyes.circular_two_sided`

```{code-cell} ipython3
from stimupy.stimuli.bullseyes import circular_two_sided
# Define widgets
w_height = iw.IntSlider(value=10, min=1, max=20, description="height [deg]")
w_width = iw.IntSlider(value=10, min=1, max=20, description="width [deg]")
w_ppd = iw.IntSlider(value=20, min=1, max=40, description="ppd")
w_freq = iw.FloatSlider(value=1, min=0, max=2, description="frequency [cpd]")
w_phase = iw.FloatSlider(value=0, min=0, max=360, description="phase shift [deg]")
w_int1 = iw.FloatSlider(value=1, min=0, max=1, description="int-ring1")
w_int2 = iw.FloatSlider(value=0, min=0, max=1, description="int-ring2")
w_int_back = iw.FloatSlider(value=0.5, min=0, max=1, description="int background")
w_ori = iw.Dropdown(value="mean", options=['mean', 'corner', 'center'], description="origin")
w_mask = iw.Dropdown(value=None, options=[None, 'target_mask', 'ring_mask'], description="add mask")
w_tint = iw.FloatSlider(value=0.5, min=0, max=1, description="target int")
# Layout
b_im_size = iw.HBox([w_height, w_width, w_ppd])
b_geometry = iw.HBox([w_freq, w_phase])
b_intensities = iw.HBox([w_int1, w_int2, w_int_back])
b_add = iw.HBox([w_ori, w_mask])
b_target = iw.HBox([w_tint])
ui = iw.VBox([b_im_size, b_geometry, b_intensities, b_target, b_add])
# Function for showing stim
def show_two_sided_bullseye(
height=None,
width=None,
ppd=None,
frequency=None,
phase_shift=None,
int1=None,
int2=None,
intensity_background=None,
origin=None,
add_mask=False,
intensity_target=None,
):
stim = circular_two_sided(
visual_size=(height, width),
ppd=ppd,
frequency=frequency,
phase_shift=phase_shift,
intensity_rings=(int1, int2),
intensity_background=intensity_background,
origin=origin,
intensity_target=intensity_target,
)
plot_stim(stim, mask=add_mask)
# Set interactivity
out = iw.interactive_output(
show_two_sided_bullseye,
{
"height": w_height,
"width": w_width,
"ppd": w_ppd,
"frequency": w_freq,
"phase_shift": w_phase,
"int1": w_int1,
"int2": w_int2,
"intensity_background": w_int_back,
"origin": w_ori,
"add_mask": w_mask,
"intensity_target": w_tint,
},
)
# Show
display(ui, out)
```
161 changes: 0 additions & 161 deletions docs/reference/demos/stimuli/circulars.md
Expand Up @@ -198,164 +198,3 @@ out = iw.interactive_output(
display(ui, out)
```

## Bullseye
{py:func}`stimupy.stimuli.circulars.bullseye`

```{code-cell} ipython3
from stimupy.stimuli.circulars import bullseye
# Define widgets
w_height = iw.IntSlider(value=10, min=1, max=20, description="height [deg]")
w_width = iw.IntSlider(value=10, min=1, max=20, description="width [deg]")
w_ppd = iw.IntSlider(value=20, min=1, max=40, description="ppd")
w_freq = iw.FloatSlider(value=1, min=0, max=2, description="frequency [cpd]")
w_phase = iw.FloatSlider(value=0, min=0, max=360, description="phase shift [deg]")
w_int1 = iw.FloatSlider(value=1, min=0, max=1, description="int-ring1")
w_int2 = iw.FloatSlider(value=0, min=0, max=1, description="int-ring2")
w_int_back = iw.FloatSlider(value=0.5, min=0, max=1, description="int background")
w_ori = iw.Dropdown(value="mean", options=['mean', 'corner', 'center'], description="origin")
w_clip = iw.ToggleButton(value=False, disabled=False, description="clip")
w_mask = iw.Dropdown(value=None, options=[None, 'target_mask', 'ring_mask'], description="add mask")
w_tint = iw.FloatSlider(value=0.5, min=0, max=1, description="target int")
# Layout
b_im_size = iw.HBox([w_height, w_width, w_ppd])
b_geometry = iw.HBox([w_freq, w_phase])
b_intensities = iw.HBox([w_int1, w_int2, w_int_back])
b_add = iw.HBox([w_ori, w_clip, w_mask])
b_target = iw.HBox([w_tint])
ui = iw.VBox([b_im_size, b_geometry, b_intensities, b_target, b_add])
# Function for showing stim
def show_bullseye(
height=None,
width=None,
ppd=None,
frequency=None,
phase_shift=None,
int1=None,
int2=None,
intensity_background=None,
origin=None,
clip=False,
add_mask=False,
intensity_target=None,
):
stim = bullseye(
visual_size=(height, width),
ppd=ppd,
frequency=frequency,
phase_shift=phase_shift,
intensity_rings=(int1, int2),
intensity_background=intensity_background,
origin=origin,
clip=clip,
intensity_target=intensity_target,
)
plot_stim(stim, mask=add_mask)
# Set interactivity
out = iw.interactive_output(
show_bullseye,
{
"height": w_height,
"width": w_width,
"ppd": w_ppd,
"frequency": w_freq,
"phase_shift": w_phase,
"int1": w_int1,
"int2": w_int2,
"intensity_background": w_int_back,
"origin": w_ori,
"clip": w_clip,
"add_mask": w_mask,
"intensity_target": w_tint,
},
)
# Show
display(ui, out)
```

## Two-sided rings
{py:func}`stimupy.stimuli.circulars.two_sided_bullseye`

```{code-cell} ipython3
from stimupy.stimuli.circulars import two_sided_bullseye
# Define widgets
w_height = iw.IntSlider(value=10, min=1, max=20, description="height [deg]")
w_width = iw.IntSlider(value=10, min=1, max=20, description="width [deg]")
w_ppd = iw.IntSlider(value=20, min=1, max=40, description="ppd")
w_freq = iw.FloatSlider(value=1, min=0, max=2, description="frequency [cpd]")
w_phase = iw.FloatSlider(value=0, min=0, max=360, description="phase shift [deg]")
w_int1 = iw.FloatSlider(value=1, min=0, max=1, description="int-ring1")
w_int2 = iw.FloatSlider(value=0, min=0, max=1, description="int-ring2")
w_int_back = iw.FloatSlider(value=0.5, min=0, max=1, description="int background")
w_ori = iw.Dropdown(value="mean", options=['mean', 'corner', 'center'], description="origin")
w_mask = iw.Dropdown(value=None, options=[None, 'target_mask', 'ring_mask'], description="add mask")
w_tint = iw.FloatSlider(value=0.5, min=0, max=1, description="target int")
# Layout
b_im_size = iw.HBox([w_height, w_width, w_ppd])
b_geometry = iw.HBox([w_freq, w_phase])
b_intensities = iw.HBox([w_int1, w_int2, w_int_back])
b_add = iw.HBox([w_ori, w_mask])
b_target = iw.HBox([w_tint])
ui = iw.VBox([b_im_size, b_geometry, b_intensities, b_target, b_add])
# Function for showing stim
def show_two_sided_bullseye(
height=None,
width=None,
ppd=None,
frequency=None,
phase_shift=None,
int1=None,
int2=None,
intensity_background=None,
origin=None,
add_mask=False,
intensity_target=None,
):
stim = two_sided_bullseye(
visual_size=(height, width),
ppd=ppd,
frequency=frequency,
phase_shift=phase_shift,
intensity_rings=(int1, int2),
intensity_background=intensity_background,
origin=origin,
intensity_target=intensity_target,
)
plot_stim(stim, mask=add_mask)
# Set interactivity
out = iw.interactive_output(
show_two_sided_bullseye,
{
"height": w_height,
"width": w_width,
"ppd": w_ppd,
"frequency": w_freq,
"phase_shift": w_phase,
"int1": w_int1,
"int2": w_int2,
"intensity_background": w_int_back,
"origin": w_ori,
"add_mask": w_mask,
"intensity_target": w_tint,
},
)
# Show
display(ui, out)
```

0 comments on commit 1900455

Please sign in to comment.