summaryrefslogtreecommitdiff
path: root/meme
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-02-14 21:40:35 (GMT)
committerWerner Almesberger <werner@almesberger.net>2016-02-14 21:40:35 (GMT)
commitf367f0a6c5fdee0dbf6ccc97051307f17d08914f (patch)
treea67e0d2ab319ddba9a74796f178074241bab01a9 /meme
parent43831d54bfff78c6ec91e703e4647610af59b901 (diff)
downloadmisc-f367f0a6c5fdee0dbf6ccc97051307f17d08914f.zip
misc-f367f0a6c5fdee0dbf6ccc97051307f17d08914f.tar.gz
misc-f367f0a6c5fdee0dbf6ccc97051307f17d08914f.tar.bz2
meme/gui.c (gui), README: O also toggles markers (in addition to overlays)
Diffstat (limited to 'meme')
-rw-r--r--meme/README4
-rw-r--r--meme/gui.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/meme/README b/meme/README
index 81e6fa8..20148e7 100644
--- a/meme/README
+++ b/meme/README
@@ -35,7 +35,7 @@ Keyboard
- M: toggle mesh display
- N: cancel measurements and start new one at location of second measurement
point (or at cursor, if there was no second measurement)
-- O: toggle overlay; see below
+- O: toggle overlay and marker; see below
- P: toggle profiles display, see below
- Q: quit
- R: reload all overlays
@@ -105,7 +105,7 @@ Marker
Makers are similar to overlays and are used to indicate measurements or
to mark features in the mesh. Markers are read from the file specified
-with the -m option.
+with the -m option. O toggles displaying of markers.
A marker only consisting of text is defined with the line
x y text
diff --git a/meme/gui.c b/meme/gui.c
index 7ee2281..915ed3b 100644
--- a/meme/gui.c
+++ b/meme/gui.c
@@ -1452,10 +1452,11 @@ time_start(&t);
draw(surf);
time_stop(&t);
fprintf(stderr, "%.3f s @ zoom %d\n", time_ms(&t)/1000.0, zoom);
- if (show_overlay)
+ if (show_overlay) {
draw_overlay(surf, overlay);
+ draw_marker(surf);
+ }
SDL_UnlockSurface(surf);
- draw_marker(surf);
SDL_UpdateRect(surf, 0, 0, 0, 0);
show_markers(surf);