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

Feature/break actions #562

Merged
merged 31 commits into from
Nov 27, 2023
Merged

Feature/break actions #562

merged 31 commits into from
Nov 27, 2023

Conversation

BeritJanssen
Copy link
Collaborator

@BeritJanssen BeritJanssen commented Sep 27, 2023

Close #251 . Close #599 . Instead of introducing a new Sequential action, or adding information to the next_round array, I found a much less invasive way of accomplishing views with some either/or logic, such as Plink or SongSync: in the config of a Trial, pass along conditions under which the current next_round array is not handled to the end, but new round data requested from the server instead.

To do:

  • check scoring is correct
  • check that styles are correct
  • correct round numbering

@BeritJanssen BeritJanssen marked this pull request as draft September 27, 2023 06:51
@BeritJanssen BeritJanssen marked this pull request as ready for review October 31, 2023 13:07
@Evert-R Evert-R self-requested a review November 6, 2023 07:25
Copy link
Contributor

@Evert-R Evert-R left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SongSync with external files isn't working. In the SongSync wrapper the play_method isn't set, so it defaults to buffer. This was previously set in the config of SongSync, because playAudio was called from there.
In hooked.py this is set as a constant at the top of the file, so maybe we can add this as an argument for song_sync from there, so it can be set from the rules file.

@BeritJanssen
Copy link
Collaborator Author

Ah, good catch! In the meantime, I've started working on #561 - in there, I introduce logic that sets the play method based on the path / duration of the file, so hopefully these kind of oversights can be also prevented in the future.

@BeritJanssen BeritJanssen force-pushed the feature/break-actions branch from c7572a5 to 0b2211c Compare November 7, 2023 08:12
@BeritJanssen BeritJanssen force-pushed the feature/break-actions branch from 0b2211c to 6ad1253 Compare November 7, 2023 08:12
@Evert-R
Copy link
Contributor

Evert-R commented Nov 7, 2023

Styling bug:
In categorization the playbutton moves down everytime you push a button, except when a feedback smiley is presented.

@BeritJanssen
Copy link
Collaborator Author

Can you share a screen capture of this problem? I think this only occurs after passing the training phase, right?

@BeritJanssen
Copy link
Collaborator Author

I fixed the spacing of the buttons (the main difference with the current develop branch). Will make a separate issue of the jumping buttons - this is unrelated. It already happens in the current develop branch.

@BeritJanssen BeritJanssen merged commit 70e86b2 into develop Nov 27, 2023
1 check passed
@BeritJanssen BeritJanssen deleted the feature/break-actions branch November 27, 2023 13:46
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.

Fix styling changes Introduce a Sequential wrapper around Trials
2 participants