diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-04-21 17:53:24 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-04-21 17:53:24 -0700 |
| commit | d5af4e2ff918d18e329b4753435728feae98b226 (patch) | |
| tree | f35032d8ef9227a12d0396a85a35ae6338fe426c | |
| parent | 2aabcf398a5624c3ff75f7090b70e7038bbeb017 (diff) | |
| download | subsurface-d5af4e2ff918d18e329b4753435728feae98b226.tar.gz | |
Simplistic filtering by tags
This only allows for a logical "AND" - so only dives that all of the
selected tags are displayed.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | dive.h | 1 | ||||
| -rw-r--r-- | divelist-gtk.c | 3 | ||||
| -rw-r--r-- | gtk-gui.c | 7 |
3 files changed, 9 insertions, 2 deletions
@@ -53,6 +53,7 @@ /* defined in statistics.c */ extern char *dtag_names[DTAG_NR]; extern int dtag_shown[DTAG_NR]; +extern int dive_mask; /* * Some silly typedefs to make our units very explicit. diff --git a/divelist-gtk.c b/divelist-gtk.c index 2f6e12de7..f523805c1 100644 --- a/divelist-gtk.c +++ b/divelist-gtk.c @@ -695,7 +695,8 @@ static void fill_dive_list(void) while (--i >= 0) { struct dive *dive = get_dive(i); dive_trip_t *trip; - if ((dive->dive_tags & DTAG_INVALID) && !prefs.display_invalid_dives) + if (((dive->dive_tags & DTAG_INVALID) && !prefs.display_invalid_dives) || + (dive->dive_tags & dive_mask) != dive_mask) continue; trip = dive->divetrip; @@ -46,7 +46,7 @@ const char *existing_filename; typedef enum { PANE_INFO, PANE_PROFILE, PANE_LIST, PANE_THREE } pane_conf_t; static pane_conf_t pane_conf; -int dtag_shown[DTAG_NR]; +int dive_mask, dtag_shown[DTAG_NR]; static struct device_info *holdnicknames = NULL; static GtkWidget *dive_profile_widget(void); static void import_files(GtkWidget *, gpointer); @@ -1159,6 +1159,11 @@ static void selecttags_dialog(GtkWidget *w, gpointer data) repaint_dive(); } gtk_widget_destroy(dialog); + dive_mask = 0; + for (i = 0; i < DTAG_NR; i++) + if (dtag_shown[i]) + dive_mask |= (1 << i); + dive_list_update_dives(); } static void selectevents_dialog(GtkWidget *w, gpointer data) |