Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plotting: Add line markers #363

Merged
merged 32 commits into from
May 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2ced76e
initial work on markers
EmbersArc May 9, 2021
0d09622
clippy fix
EmbersArc May 9, 2021
10ffbfc
simplify marker
EmbersArc May 11, 2021
edd7e17
Merge branch 'master' into plot-markers
EmbersArc May 11, 2021
4ad97f3
use option for color
EmbersArc May 11, 2021
5fb8820
prepare for more demo plots
EmbersArc May 11, 2021
ee5fd49
more improvements for markers
EmbersArc May 11, 2021
99cba8a
some small adjustments
EmbersArc May 11, 2021
10e56e0
better highlighting
EmbersArc May 14, 2021
75c5c1a
don't draw transparent lines
EmbersArc May 14, 2021
90622a5
use transparent color instead of option
EmbersArc May 14, 2021
729ce17
don't brighten curves when highlighting
EmbersArc May 14, 2021
c5945f2
Merge branch 'master' into plot-markers
EmbersArc May 16, 2021
1d7b252
update changelog
EmbersArc May 16, 2021
e62a816
avoid allocations and use line_segment
EmbersArc May 21, 2021
a4a3793
compare against transparent color
EmbersArc May 21, 2021
e4a7e56
Merge remote-tracking branch 'upstream/master' into plot-markers
EmbersArc May 21, 2021
ae00424
create new Points primitive
EmbersArc May 24, 2021
773be05
fix doctest
EmbersArc May 24, 2021
6831302
some cleanup and fix hover
EmbersArc May 24, 2021
4ee57fd
common interface for lines and points
EmbersArc May 24, 2021
4c375f0
clippy fixes
EmbersArc May 24, 2021
95bfbbf
reduce visibilities
EmbersArc May 24, 2021
88fae19
Update egui/src/widgets/plot/mod.rs
EmbersArc May 26, 2021
8bc576b
Update egui/src/widgets/plot/mod.rs
EmbersArc May 26, 2021
c6423be
Update egui_demo_lib/src/apps/demo/plot_demo.rs
EmbersArc May 26, 2021
3aeb354
Update egui_demo_lib/src/apps/demo/plot_demo.rs
EmbersArc May 26, 2021
e76a679
changes based on review
EmbersArc May 26, 2021
8576e2a
Merge remote-tracking branch 'upstream/master' into plot-markers
EmbersArc May 26, 2021
43b4539
fix test
EmbersArc May 26, 2021
c541952
dynamic plot size
EmbersArc May 26, 2021
4197bd1
remove height
EmbersArc May 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ NOTE: [`eframe`](eframe/CHANGELOG.md), [`egui_web`](egui_web/CHANGELOG.md) and [
## Unreleased

### Added ⭐
* [Line markers for plots](https://github.com/emilk/egui/pull/363).
* Add right and bottom panels (`SidePanel::right` and `Panel::bottom`).
* Add resizable panels.
* Add an option to overwrite frame of a `Panel`.
Expand All @@ -18,6 +19,7 @@ NOTE: [`eframe`](eframe/CHANGELOG.md), [`egui_web`](egui_web/CHANGELOG.md) and [
* `TextEdit` now supports edits on a generic buffer using `TextBuffer`.

### Changed 🔧
* Plot: Changed `Curve` to `Line`.
* `TopPanel::top` is now `TopBottomPanel::top`.
* `SidePanel::left` no longet takes the default width by argument, but by a builder call.

Expand Down
Loading