Skip to content

Fix double filtering in psevents when using -q option #9086

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.

Sign up for GitHub

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

Merged
Esteban82 merged 4 commits into from
Jul 5, 2026
Merged

Fix double filtering in psevents when using -q option #9086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8654454
Update psvents.c and fix typo.
Esteban82 Jul 3, 2026
0d512e2
Merge branch 'master' into fix-8460
Esteban82 Jul 3, 2026
15c204d
Add Claude's suggestions
Esteban82 Jul 3, 2026
927043e
Merge branch 'master' into fix-8460
Esteban82 Jul 4, 2026
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: 1 addition & 1 deletion src/gmt_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ struct GMT_COMMON {
char string[2][GMT_LEN64];
unsigned int col; /* When +c<col> sets a specific data column */
unsigned int mode; /* 1 for in row-range check, 2 for in time check, 3 for out-row check, 4 for out-time check */
uint64_t *rec; /* POinter to the relevant record counter (dataset, table, segment) */
uint64_t *rec; /* Pointer to the relevant record counter (dataset, table, segment) */
} q;
struct s { /* -s[r] */
bool active;
Expand Down
19 changes: 18 additions & 1 deletion src/psevents.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,10 @@ EXTERN_MSC int GMT_psevents (void *V_API, int mode, void *args) {

bool do_coda, finite_duration, has_text, out_segment = false, have_previous_point = false;

/* Save state for -q option to prevent double filtering in internal calls. Fixes #8460. */
bool q_active_in_save, q_active_out_save = false;
unsigned int q_mode_save = 0;

int error;

enum gmt_col_enum time_type, end_type;
Expand Down Expand Up @@ -1390,6 +1394,14 @@ Do_txt: if (Ctrl->E.active[PSEVENTS_TEXT] && has_text) { /* Also plot trailing
if (fp_symbols) fclose (fp_symbols); /* Close the file so symbol output is flushed */
if (fp_labels) fclose (fp_labels); /* Close the file so label output is flushed */
gmt_disable_bghio_opts (GMT); /* Do not want any -b -g -h -i -o to affect the reading from temp files in psxy or pstext below */
/* Save current -q state and disable it temporarily. This prevents the internal psxy/pstext calls
* from applying the -q filter a second time to the already filtered temporary files (Fixes #8460). */
q_mode_save = GMT->common.q.mode;
q_active_in_save = GMT->common.q.active[GMT_IN];
q_active_out_save = GMT->common.q.active[GMT_OUT];
GMT->common.q.mode = 0; /* Disable row/time range checks */
GMT->common.q.active[GMT_IN] = false; /* Disable input filtering */
GMT->common.q.active[GMT_OUT] = false;/* Disable output filtering */
}

if (gmt_map_setup (GMT, GMT->common.R.wesn)) { /* Set up map projection */
Expand Down Expand Up @@ -1466,8 +1478,13 @@ Do_txt: if (Ctrl->E.active[PSEVENTS_TEXT] && has_text) { /* Also plot trailing
Return (GMT_RUNTIME_ERROR);
}
}
if (fp_symbols || fp_labels) /* Recover settings provided by user (if -b -g -h -i were used at all) */
if (fp_symbols || fp_labels) { /* Recover settings provided by user (if -b -g -h -i were used at all) */
gmt_reenable_bghio_opts (GMT);
/* Restore original -q state before re-enabling other I/O options (Fixes #8460). */
GMT->common.q.mode = q_mode_save;
GMT->common.q.active[GMT_IN] = q_active_in_save;
GMT->common.q.active[GMT_OUT] = q_active_out_save;
}

/* Finalize plot and we are done */

Expand Down
Loading