Skip to content

some filter improvements #5378

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

Merged
merged 1 commit into from
Jan 9, 2024

Conversation

JorisGoosen
Copy link
Contributor

@JorisGoosen JorisGoosen commented Jan 8, 2024

The text will now look like (as suggested in jasp-stats/jasp-issues#2515 (comment)):

# Add filters using R syntax here. By default the non-R filter(s) are passed with generatedFilter.
# To include generated filters, append clauses with "&": generatedFilter & ...
# Click the (i) icon in the lower right corner for further help.

generatedFilter

What do you think @EJWagenmakers @JohnnyDoorn ?

It is now also translatable, which it wasnt before.

This PR also fixes https://github.com/jasp-stats/INTERNAL-jasp/issues/2462 in that the statusbar now gives sensible feedback. It also is translatable now.

I was also annoyed that I couldnt run rcode in the filter and computed column windows by pressing ctrl/cmd+return.
So I added that too

And then there was the fact that filtererrors were being ignored by the desktop... This is now also fixed.

For the kicker I also added the is.na function to the filter/compcolconstructor function lists as suggested in jasp-stats/jasp-issues#2493

@JorisGoosen JorisGoosen requested a review from boutinb January 8, 2024 17:43
@JorisGoosen JorisGoosen force-pushed the betterRFilterText branch 2 times, most recently from ad95625 to 1027b4f Compare January 8, 2024 17:50
@EJWagenmakers
Copy link
Contributor

Maybe it is clear in context. For me, right now, I am a little confused about the following:
"By default the non-R filter(s) are passed with generatedFilter." -> OK This is already a little confusing to me. We are in the R filter functionality, right?
"To include generated filters, append clauses with "&": generatedFilter & ..." -> What are "generated filters"?
EJ

@JorisGoosen
Copy link
Contributor Author

JorisGoosen commented Jan 9, 2024

@EJWagenmakers here, some context:
image

@EJWagenmakers
Copy link
Contributor

Is the drag-and-drop filter also a non-R filter?

@JorisGoosen
Copy link
Contributor Author

Is the drag-and-drop filter also a non-R filter?

Yes

@JorisGoosen
Copy link
Contributor Author

image

->

image

@JorisGoosen JorisGoosen changed the base branch from development to stable January 9, 2024 11:13
…s/jasp-issues#2515 (comment)

ctrl/cmd+enter should run r code
also adds is.na to constructors

just replace the DEFAULT_FILTER define with the correct function calls and see what happens

make filter error show up again...

fix statusbar jasp-stats/INTERNAL-jasp#2462

slightly less computersciency tooltip
@JorisGoosen JorisGoosen merged commit 2d300f4 into jasp-stats:stable Jan 9, 2024
@JorisGoosen JorisGoosen deleted the betterRFilterText branch January 9, 2024 11:38
@tomtomme
Copy link
Member

Would be cool if it could be explained like this:
generatedFilter = Filter created in JASP by point & click interface = non-R filters

Or just stick to one of the three, if possible. Becaus it is confusing to have 3 names for the same thing here.
Also, the latest screenshot shows the code of the generated filter in light grey on dark grey. This will be missed by most people. More contrast please. Thx!

@JorisGoosen
Copy link
Contributor Author

How about

# Above you see the code that JASP generates for both value filtering and the drag&drop filter.
# This default result is stored in 'generatedFilter' and can be replaced or combined with a custom filter.
# To combine you can append clauses using '&': 'generatedFilter & customFilter & perhapsAnotherFilter'
# Click the (i) icon in the lower right corner for further help.

generatedFilter

@EJWagenmakers
Copy link
Contributor

Yes, this is very clear!

@JorisGoosen
Copy link
Contributor Author

Haha ok nice

@JorisGoosen
Copy link
Contributor Author

Ill see how hard it is to get the comment highlighted as comment

@JorisGoosen
Copy link
Contributor Author

afbeelding afbeelding

JorisGoosen added a commit that referenced this pull request Jan 10, 2024
Also use code font and better readability for generatedFilter
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants