1
0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-12 08:38:10 +00:00
Commit Graph

294 Commits

Author SHA1 Message Date
lgtst
0f07245e39 potential solution for variety of vertical and horizontal text alignments; 2022-06-28 02:04:07 +03:00
lgtst
431291e862 interpolation support for ImageStim; Resolved issue with shared resource usage; 2022-06-27 03:32:41 +03:00
Alain Pitiot
ae4a67756e NF: many new Shelf typed primitives; ENH: easier handling of Quest intensity and staircases; NF: floating point padding to simplify Py->JS transpilation 2022-06-23 10:16:03 +02:00
Alain Pitiot
173d08947d Camera: unified API with PsychoPy, Shelf: throttling 2022-06-23 10:09:56 +02:00
Alain Pitiot
8cc27b9cc9
Merge branch 'psychopy:2022.2.0' into 2022.2.0 2022-06-23 09:41:22 +02:00
Alain Pitiot
4937ab5308
Merge pull request #507 from lightest/CU-2da76e8_incorrect_size_on_rebuild
Incorrect behavior on textbox refresh when size attribute becomes negative
2022-06-23 09:13:20 +02:00
Alain Pitiot
10bebd2bbd
Merge pull request #508 from lightest/CU-2au7jhz_snap_slidermarker_to_cursor_on_pointerdown
Slider: improved pointer events handling
2022-06-23 09:12:33 +02:00
lgtst
d572a8b5b6 removed console.log; 2022-06-17 01:18:27 +03:00
lgtst
89ba4289cc fixed onchange method for color; 2022-06-17 01:16:55 +03:00
lgtst
30510c943f fox for backgroundSprite resize 2022-06-17 01:05:02 +03:00
lgtst
99d03ce3d9 corrected jsdoc comment; 2022-06-16 20:59:52 +03:00
lgtst
1e3d524192 even better pointerdown handling; 2022-06-16 20:29:02 +03:00
lgtst
d60e9273f1 improved handling of pointer events; 2022-06-16 20:10:04 +03:00
lgtst
b8bff3ca91 _getTextInputOptions() now takes into account possibility of negative size; size attr update on input only happens when fitToContent=true; 2022-06-16 17:37:26 +03:00
lgtst
7794420cff adding capacity for marker to snap to cursor started; 2022-06-16 16:18:13 +03:00
Alain Pitiot
88e7d127b3
Merge pull request #505 from lightest/CU-2e6yn8w-stim-depth-attribute-fix
Depth value negated to have proper zIndex functionality in PIXI
2022-06-15 14:18:54 +02:00
Alain Pitiot
460b564699
Merge pull request #501 from lightest/CU-2au7jh3_slider_start_val
Starting val doesn't appear online
2022-06-15 14:13:58 +02:00
lgtst
5f666e7e44 nested ternary expression replaced by if-else if statements; 2022-06-15 12:46:17 +03:00
Alain Pitiot
4d6f1e631c
Merge pull request #504 from lightest/CU-2au7jeu_orientation_for_slider
Proper orientation setter for Slider
2022-06-10 11:57:34 +02:00
lgtst
66a60460bd removed unnecessary variable creation; 2022-06-09 17:38:25 +03:00
Alain Pitiot
7630722147
Merge pull request #506 from lightest/CU-2da76e8_textbox_fixes
LanguageStyle support for TextBox
2022-06-09 13:19:23 +02:00
lgtst
15920e1b94 added languageStyle support for TextBox; 2022-06-08 16:18:22 +03:00
lgtst
1f1b259249 removed accidental identation change; 2022-06-06 23:17:41 +03:00
lgtst
0e58e6a7a4 Depth value negated to have proper zIndex functionality; 2022-06-06 23:15:14 +03:00
Alain Pitiot
195991eec3 Camera: unified API with PsychoPy, Shelf: throttling 2022-05-27 13:04:48 +02:00
lgtst
43e516d7a6 added proper orientation setter that also updates the rotation of labels; 2022-05-25 23:19:09 +03:00
lgtst
5d9e59861f removed accidental newline; 2022-05-25 18:41:08 +03:00
lgtst
c0c63accb5 radio buttons size set to match psychopy's; 2022-05-25 18:39:10 +03:00
lgtst
aaddd07065 added taking into account the availability of rating value when reconstructing the stim; 2022-05-24 23:42:57 +03:00
lgtst
24ceb40491 a bit more efficient solution that directly constructs slider with the desired state; 2022-05-24 23:09:12 +03:00
lgtst
1199b200dc Added startValue to Slider stim; 2022-05-24 22:23:33 +03:00
Alain Pitiot
b07d8f5b0e DOC updated the documentation 2022-05-23 12:31:01 +02:00
Alain Pitiot
bd1148fb63 Merge branch '2022.2.0' of github.com:apitiot/psychojs into 2022.2.0 2022-05-23 12:18:57 +02:00
Alain Pitiot
cafc34610d NF first incarnation of Shelf 2022-05-23 12:18:47 +02:00
lgtst
268dddf779 added docs for uAlpha uniform; better pixi check for setInterpolate method; 2022-05-11 22:20:56 +03:00
lgtst
51d57083a3 added coloring support for image based Gratings; added proper opacity support; 2022-05-11 21:52:40 +03:00
Alain Pitiot
93da98f9ab
Merge branch '2022.2.0' into 1yn08hm_gamma_and_grating_improvements 2022-05-10 10:02:41 +02:00
lgtst
908f52e941 added proper support for grating stim coloring; utils/Color extended with rgbFull(), which provides [-1, 1] rgb color space; 2022-05-07 22:16:56 +03:00
lgtst
a1effe6969 added per grating and per window contrast filter; added separate stimuli PIXI container as a result of workaround with background; added grating blend mode support; started work on grating colors; 2022-05-05 19:37:30 +03:00
lgtst
496154442f CU-1yn08hm - added contrast support; 2022-05-01 22:26:37 +03:00
lgtst
8f8867a560 Merge branch '2022.2.0' into 1yn08hm_gamma_and_grating_improvements 2022-05-01 22:16:34 +03:00
lgtst
e6a018d619 added font and letterHeight setters; 2022-05-01 01:26:32 +03:00
lgtst
112234c68a fixed text reset on add/remove from scene; added fitToContent functionality; 2022-05-01 00:25:41 +03:00
lgtst
45bcb3633c [WIP] fitToContent prototype; 2022-04-24 04:23:51 +03:00
lgtst
783047de12 removed redundant tab symbol; 2022-04-14 19:55:11 +03:00
lgtst
f7171287fc 22ybz82 "greedy" focus fix, also window#rootContainer now has sortableChildren=true; 2022-04-14 19:53:03 +03:00
lgtst
fb89db2b6c Merge branch '2022.2.0' of https://github.com/lightest/psychojs into 22ybvdr_textbox_parity 2022-04-12 14:31:59 +03:00
lgtst
c6aacad99c phase parameter for grating functions is now multiples of those function's periods 2022-04-12 14:29:55 +03:00
lgtst
e8d50104c4 added depth parameter and pointer-events:"none" for TextBox; 2022-04-07 00:00:17 +03:00
Nikita Agafonov
b0c7493a57
Merge branch 'psychopy:2022.2.0' into 2022.2.0 2022-04-06 23:46:22 +03:00
Alain Pitiot
837c6775e6 [BF] fix issue with saving to database 2022-03-31 13:29:54 +02:00
lgtst
d0ed55758b textBox#setAlignment method added to avoid complete reconstruction when changing text alignment 2022-03-30 23:56:54 +03:00
lgtst
08b71731d1 anchoring and alignment fixed; 2022-03-30 22:39:47 +03:00
lgtst
328601b0d2 indentation change - spaces to tabs 2022-03-30 14:08:34 +03:00
lgtst
5baa60dbee rebasing branches 2022-03-30 14:06:31 +03:00
lgtst
cb7b0617b6 Full set of signals for grating stim; Documentation test; 2022-03-30 14:03:52 +03:00
lgtst
ac13de28c3 added spatial frequency and phase support for image based grating stims; 2022-03-30 14:03:52 +03:00
lgtst
948b14bb41 removed unused uniform uMaskTex; 2022-03-30 14:03:52 +03:00
lgtst
e822675cde sin range chnged to [0, 1] for proper gabor patch; 2022-03-30 14:03:52 +03:00
lgtst
f032d4c34a GratingStim implementation first take; 2022-03-30 14:03:52 +03:00
lgtst
ea80090e6f Started Implementing GratingStim; 2022-03-30 14:03:52 +03:00
lgtst
3b57bd76b4 added onChange() callback to properly reflect changes of the _gamma value in adjustmentFilter; 2022-03-30 14:03:52 +03:00
lgtst
9c332e8dde gamma correction introduced; 2022-03-30 14:03:52 +03:00
Alain Pitiot
c63b5accc5
Merge pull request #4 from psychopy/2022.2.0
2022.2.0
2022-03-30 06:57:37 +02:00
lgtst
b7c7ae7381 TextBox fillColor, borderColor and color are now becoming transparent if no color specified, also undefined is the default color value; 2022-03-25 15:56:52 +03:00
Nikita Agafonov
7298de0fea
Merge branch '2022.x' into gamma_correction_implementation 2022-03-22 18:30:58 +03:00
lgtst
2ce87e2224 indentation change - spaces to tabs 2022-03-22 12:48:38 +03:00
lgtst
3ebd9c4943 new documentation for GratingStim, variables and methods renamed to match psychoPy 2022-03-21 23:28:54 +03:00
Alain Pitiot
d5d9d125d9
Merge pull request #487 from apitiot/2022.1.2
version 2022.1.2
2022-03-21 14:02:22 +01:00
Alain Pitiot
8407c8e90f version 2022.1.2 2022-03-21 14:00:34 +01:00
Todd
24829683b1 BF: Initialise ButtonStim with a numClicks attribute 2022-03-04 13:29:56 +00:00
lgtst
ff13338563 Full set of signals for grating stim; Documentation test; 2022-03-02 20:45:12 +03:00
Alain Pitiot
590911c1c3 BF: importConditions with a selection consisting of a string, e.g. '1,2,3' 2022-02-22 10:54:00 +01:00
Alain Pitiot
08a39b3b45 version 2022.1.1 2022-02-18 11:10:58 +01:00
Alain Pitiot
5c2b87d950 BF: make sure that the OK button of the startup dialog box is active when the experiment has no resources to load 2022-02-16 13:24:36 +01:00
Alain Pitiot
86dee66770 FF completed the information available in the experiment data for MultiStairHandler 2022-02-11 11:01:13 +01:00
lgtst
88b7345535 added spatial frequency and phase support for image based grating stims; 2022-02-10 19:54:52 +03:00
lgtst
3594405efe added onChange() callback to properly reflect changes of the _gamma value in adjustmentFilter; 2022-01-28 23:51:47 +03:00
lgtst
f7e4b2ec53 gamma correction introduced; 2022-01-28 19:33:05 +03:00
lgtst
120060cbab removed unused uniform uMaskTex; 2022-01-28 18:06:28 +03:00
lgtst
e4eb6f04c8 sin range chnged to [0, 1] for proper gabor patch; 2022-01-28 16:13:25 +03:00
lgtst
821725a45e Merge branch 'main' into GratingStim_class_implementation 2022-01-26 00:32:26 +03:00
lgtst
e050eaf906 GratingStim implementation first take; 2022-01-26 00:31:03 +03:00
Alain Pitiot
3424b24b43 Merge branch '2022.1.0' of github.com:apitiot/psychojs into 2022.1.0 2022-01-25 11:40:44 +01:00
Alain Pitiot
e9ebcba5fb ENH: prepareResources can now be use concurrently, with several batches of resources 2022-01-25 11:34:29 +01:00
Alain Pitiot
57720d6456
Merge pull request #473 from psychopy/main
BF: _pixi.rotation should be set to -this._ori to match PsychoPy (clock) ori
2022-01-25 11:31:59 +01:00
Jon Peirce
adf8a392fd BF: _pixi.rotation should be set to -this._ori to match PsychoPy (clock) ori
In PsychoPy @peircej chose to use clock/compass convention for ori rather than
engineering/maths convention, so +ve changes move clockwise not anti.

A previous change ( f12ccafff3 ) to the setOri function doesn't appear to have any
effect on the stimuli using the current rendering method
2022-01-24 17:16:55 +00:00
Alain Pitiot
16f84872c6 added user-specified filenames, opening and closing of sessions uses gitlab Id in order to benefit from the speed-up provided by the database indexes 2022-01-19 11:04:15 +01:00
lgtst
a0eb577d19 Started Implementing GratingStim; 2022-01-18 00:57:25 +03:00
Alain Pitiot
aeca039240 estimate of download speed 2022-01-14 11:41:29 +01:00
RebeccaHirst
96903e0266 add linspace to util.js 2022-01-06 16:39:08 +00:00
Alain Pitiot
988d1c69e6
Merge pull request #468 from apitiot/2022.1.0
2022.1.0
2021-12-08 08:16:31 +01:00
Alain Pitiot
874743105a _ 2021-12-07 11:09:07 +01:00
Alain Pitiot
2d6f994180
Merge branch 'psychopy:2021.3.0' into 2021.3.0 2021-09-30 08:23:58 +02:00
Alain Pitiot
5dbac82d73 various fixed to Slider, add intensity to MultiStairHandler, improved background download of resources, faster TextStim 2021-09-30 08:22:47 +02:00
Alain Pitiot
fdbb2c076a
Merge pull request #458 from apitiot/2021.3.0
2021.3.0
2021-08-30 11:32:38 +02:00
Alain Pitiot
860cf1f51d much tighter bounding box calculations in TextStim 2021-08-30 11:31:31 +02:00
Todd
8833043f02 FF: Select random index rather than shuffling and indexing -1 2021-08-19 16:22:39 +01:00
Todd
146cf55f23 NF: Add util.randchoice to mirror Python
In Python, we import `numpy.random.choice` as `randchoice`, so this adds an equivalent function to the JS side.
2021-08-16 09:25:56 +01:00
Thomas Pronk
cbf475723a ENH: Converted any string values for method to corresponding QuestHandler.Method values 2021-07-28 08:45:25 +02:00