Skip to content

Commit

Permalink
Merge branch 'main' into erpPlotDocumentation
Browse files Browse the repository at this point in the history
  • Loading branch information
vladdez authored Oct 24, 2023
2 parents 1dc2b35 + 9d29edc commit b6ffa34
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ The supportet visualizations are:

![grafik](https://github.com/unfoldtoolbox/UnfoldMakie.jl/assets/10183650/af2801e5-cd64-4932-b84d-9abc1d8470ee)


## Code Notes
## Structure
### Code Notes

The code files can be found in the `src` folder.

## Documentation Notes
### Documentation Notes

The documentation can be found in the `doc` folder. We use `Documenter.jl` and plan to use `Literate.jl` for future usage.
In the `src` folder contained within it exists as "raw" `.md` files and in the `build` folder contained within it exists as `.html` after running the `make.jl` file.
Expand Down
2 changes: 2 additions & 0 deletions docs/src/tutorials/butterfly.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ Default is `(:labels, :label, :topoLabels, :sensor, :nothing)`

## Configurations for Butterfly Plots


Here we look into possible options for configuring the butterfly plot visualization using `(...; <name>=<value>, ...)`.
This is the list of unique configuration (key values):


- topoLegend (boolean)

### topoLegend (boolean)
Expand Down
4 changes: 2 additions & 2 deletions docs/src/tutorials/designmatrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ plot_designmatrix(designmatrix(uf))

# kwargs `plot_designmatrix(...; ...)`.


- sortData (boolean,false) - Indicating whether the data is sorted; using sortslices() of Base Julia.


Expand All @@ -39,9 +40,8 @@ plot_designmatrix(designmatrix(uf); sortData=true)
```

- standardizeData (boolean, false) - Indicating whether the data is standardized, mapping the values between 0 and 1.


- xTicks (number, nothing)

Indicating the number of labels on the x-axis. Behavior if specified in configuration:
- xTicks = 0: no labels are placed.
- xTicks = 1: first possible label is placed.
Expand Down
3 changes: 2 additions & 1 deletion src/plot_topoplot.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
function plot_topoplot!(f::Union{GridPosition, Figure}, plotData, ; positions=nothing, labels=nothing, kwargs...)
function plot_topoplot(plotData, ; positions=nothing, labels=nothing, kwargs...)
function plot_topoplot(plotData,; positions=nothing, labels=nothing, kwargs...)
Plot a topo plot.
## Arguments:
Expand Down
8 changes: 2 additions & 6 deletions src/plot_topoplotseries.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
"""
function plot_topoplotseries!(f::Union{GridPosition, Figure}, plotData::DataFrame, Δbin::Real; kwargs...)
using GeometryBasics: attributes
using Base: concatenate_setindex!
using GeometryBasics: attributes
using Base: _fieldnames
function plot_topoplotseries!(plotData::DataFrame, Δbin::Real; kwargs...)
Expand All @@ -14,7 +10,7 @@ Plot a Topoplot Series.
- `Δbin::Real`: A number for how large one bin should be. Δbin is in units of the `plotData.time` column
- `useColorbar`: (default `true`) - show colorbar.
### kwargs
### key arguments
- `combinefun` (default `mean`) can be used to specify how the samples within `Δbin` are combined.
- `rasterize_heatmaps` (deault `true`) - enforce rasterization of the plot heatmap when saving in svg format.
Expand Down Expand Up @@ -49,14 +45,14 @@ function plot_topoplotseries!(

# resolve columns with data
config.mapping = resolveMappings(plotData, config.mapping)

positions = getTopoPositions(; positions = positions, labels = labels)


if "label" names(plotData)
plotData.label = plotData.channel
end


ftopo = eeg_topoplot_series!(
f,
plotData,
Expand Down
3 changes: 2 additions & 1 deletion test/test_toposeries.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ end
Δbin=80
UnfoldMakie.plot_topoplotseries(df, Δbin; positions=positions, layout = (; useColorbar=true))


end

@testset "testing with colorbar" begin
Expand Down Expand Up @@ -44,4 +45,4 @@ end

f

end
en

0 comments on commit b6ffa34

Please sign in to comment.