HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-12 08:38:10 +00:00
Code Actions Packages Releases Activity
797 Commits 51 Branches 0 Tags 15 MiB
756c4986fa
Commit Graph

294 Commits

Author SHA1 Message Date
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
Alain Pitiot
ff9f94865c _ 2021-07-26 15:03:06 +02:00
Alain Pitiot
87ff0ea98c
Merge branch '2021.3.0' into 2021.3.0 2021-07-26 14:41:44 +02:00
Alain Pitiot
9c3c27201d added MultiStairHandler 2021-07-26 14:32:09 +02:00
Alain Pitiot
a814c972aa
Merge pull request #437 from thewhodidthis/bf435-dialog 
css: override ui-dialog inline styles, use percentage height on body
 2021-07-26 13:17:31 +02:00
Alain Pitiot
dd0c46ccd0 improved documentation for FaceDetector, Camera, and QuestHandler 2021-07-23 08:33:09 +02:00
Alain Pitiot
b6125d5b16 polished up QuestHandler, various comestic improvements, small fixes to Camera 2021-07-23 08:00:20 +02:00
Alain Pitiot
7975dd8df0
Merge branch 'master' into main 2021-07-23 07:42:29 +02:00
Sotiri Bakagiannis
636506e43e css: override ui-dialog element inline styles, use percentage height on body 2021-07-15 19:48:38 +01:00
Alain Pitiot
0a7d15077c added a first prototype of the Quest Trial Handler 2021-07-14 14:52:03 +02:00
Sotiri Bakagiannis
9992bbde93 util/Pixi: import missing Util.to_px 2021-07-14 11:07:34 +01:00
Alain Pitiot
86cbc73c94 added FaceDetector with linking to MovieStim, little fixed here and there 2021-07-12 08:54:13 +02:00
Sotiri Bakagiannis
f96cff27d3 core: format 2021-07-09 14:09:14 +01:00
Sotiri Bakagiannis
27d08ba42f data: enforce formatting rules 2021-07-09 14:08:08 +01:00
Sotiri Bakagiannis
5468898716 sound: enforce formatting rules 2021-07-09 14:07:55 +01:00
Sotiri Bakagiannis
57a590c536 util: enforce formatting rules 2021-07-09 14:07:40 +01:00
Sotiri Bakagiannis
c9cb3c8412 visual: enforce consistent formatting 2021-07-09 14:07:04 +01:00
Sotiri Bakagiannis
67873dabd4 visual: fix import paths 2021-07-09 13:50:36 +01:00
Sotiri Bakagiannis
7f6b37d720 sound: fix import paths 2021-07-09 13:47:36 +01:00
Sotiri Bakagiannis
24f43ccbbb data: fix import paths 2021-07-09 13:45:56 +01:00
Sotiri Bakagiannis
904c6e216d core: fix import paths 2021-07-09 13:44:22 +01:00
Sotiri Bakagiannis
9d37366d5d util: fix import paths 2021-07-09 13:12:54 +01:00
Sotiri Bakagiannis
6b856e99c3 util/Util: add more unit tests 2021-07-09 13:00:55 +01:00
Sotiri Bakagiannis
a5dbe83a3d util/visual: separate out PIXI specific util and adjust imports 2021-07-09 12:34:06 +01:00
Sotiri Bakagiannis
4a94508c46 util/Util: add toNumeric unit test 2021-07-09 08:47:20 +01:00
Sotiri Bakagiannis
b02d907964 sound/TonePlayer: replace $.isNumeric 2021-07-08 17:52:36 +01:00
Sotiri Bakagiannis
c2b38cb550 util/Util: add custom isNumeric func 2021-07-08 17:52:12 +01:00
Sotiri Bakagiannis
b1af859427 Merge branch 'main' into bf#384--text-input 2021-07-08 14:44:06 +01:00
Sotiri Bakagiannis
ebc128a2b6
Merge pull request #420 from thewhodidthis/bf#209+210--css 
core/GUI: clean up dialog pane sizing parts, use css
 2021-07-07 14:58:11 +01:00
Sotiri Bakagiannis
966e7a5b39 core/ServerManager: do import Clock 2021-07-07 14:42:34 +01:00
Alain Pitiot
7e63f88aa4 _ 2021-06-25 08:23:09 +02:00
Alain Pitiot
d8283885c5
Merge branch 'psychopy:main' into master 2021-06-25 07:39:31 +02:00
Alain Pitiot
89892ff545 Added more features to AudioClip and AudioClipPlayer; fixed import of JSON resource files 2021-06-25 07:38:21 +02:00
Sotiri Bakagiannis
9038281dc9 css: give dialogs a max width for screens < 500 2021-06-23 16:29:22 +01:00
Sotiri Bakagiannis
9f2c16f2a9 core/GUI: clean up dialog sizing extras 2021-06-23 16:28:24 +01:00
Sotiri Bakagiannis
ffb75f996c css: drop scaling of dialog boxes, clean up 2021-06-23 16:11:41 +01:00
Alain Pitiot
392c124054
Merge pull request #412 from thewhodidthis/bf#411--slider 
visual/Slider: bring style symbols inline with PsychoPy
 2021-06-23 09:19:03 +02:00
Alain Pitiot
b9228bc65f fromSnapshot now creates a global variable for the trial, such that loop.thisTrial['field'] === thisLoop['field'] 2021-06-21 14:33:22 +02:00
Alain Pitiot
8b15ac5fcc try and keep the size of the licensee logo reasonable in the pop up experiment window 2021-06-21 07:08:53 +02:00
Alain Pitiot
2c3e571193 minor corrections to TrialHandler.setSeed 2021-06-21 07:06:22 +02:00
Alain Pitiot
fc80e8ade9 added skeleton of AudioClip Player 2021-06-18 16:55:34 +02:00
Sotiri Bakagiannis
2acbca7fd0 visual/Slider: bring style symbols inline with PsychoPy 2021-06-18 13:31:57 +01:00
Sotiri Bakagiannis
b8956f5c4f
Merge pull request #394 from thewhodidthis/bf#322--slider 
Do support Form.Types.SLIDER
 2021-06-16 16:11:54 +01:00
Alain Pitiot
9cecf2984f
Merge pull request #406 from thewhodidthis/bf#404--textbox 
visual/TextBox: add clear method, tweak reset to take editable into account
 2021-06-15 19:28:34 +02:00
Sotiri Bakagiannis
25a49771e5 visual/TextBox: add clear method, tweak reset to take editable into account 2021-06-15 17:13:19 +01:00
Sotiri Bakagiannis
c41554c1ef visual/Slider: add lineColor option, borderColor alias 2021-06-15 16:24:00 +01:00
Alain Pitiot
7a9cdcfd27 Merge branch 'psychopy:main' into master 2021-06-15 16:15:46 +02:00
Alain Pitiot
198becd71e getSnapshot / fromSnapshot now also store/restore the trial attributes 2021-06-15 16:11:33 +02:00
Sotiri Bakagiannis
e868f941f9 visual/TextInput: access a text value, only disable text substitution when multiline 2021-06-15 14:33:07 +01:00
Sotiri Bakagiannis
d3e3a67a80 visual/TextBox: pass text value on to text input 2021-06-15 14:32:23 +01:00
Alain Pitiot
6ecb96b561
Merge branch 'main' into bf#348--no-moment 2021-06-15 14:49:10 +02:00
Alain Pitiot
3d9eb73840 changed the API of Microphone to be consistent with the other Stimuli, i.e. passing Window instead of PsychoJS; handled transcription error in AudioClip 2021-06-15 11:15:50 +02:00
Sotiri Bakagiannis
29795025b9 visual/TextInput: upgrade to PIXI.TextInput latest, with patches applied 2021-06-14 21:06:52 +01:00
Sotiri Bakagiannis
77cdfa9646 visual/Form: clean up slider options merging 2021-06-11 20:57:51 +01:00
Sotiri Bakagiannis
f372162553 visual/Form: add granularity per item override 2021-06-11 20:45:53 +01:00
Sotiri Bakagiannis
19c062c77c visual/Form: add Form.Type.SLIDER support 2021-06-11 20:38:37 +01:00
Sotiri Bakagiannis
2776ad417f visual/Form: no need to alias RADIO as CHOICE type in Form.Types 2021-06-11 20:31:59 +01:00
Alain Pitiot
9865eaba4a fromSnapshot now handles thisTrial as well 2021-06-11 15:29:36 +02:00
Alain Pitiot
598fa080ee added a getter for finished in TrialHandler 2021-06-11 15:16:02 +02:00
Alain Pitiot
cad60bb964
Merge pull request #390 from thewhodidthis/bf#322--slider 
visual/Slider: provide fillColor aliases for markerColor
 2021-06-11 10:19:18 +02:00
Alain Pitiot
c753469e1c
Merge pull request #385 from thewhodidthis/bf#341--textbox-scroll 
visual/TextInput: permanently disable substitute text
 2021-06-11 10:18:22 +02:00
Alain Pitiot
c9b19c657b added the notion of dependent stimuli to Slider, in order to accommodate a more standard way of rendering Form in the generated .js code, i.e. form.setAutoDraw(true), rather than the historically correct form.draw() 2021-06-11 10:12:59 +02:00
Sotiri Bakagiannis
0e3a23f5d0 visual/Slider: provide fillColor aliases for markerColor 2021-06-11 08:45:05 +01:00
Alain Pitiot
94264e3e75
Merge pull request #387 from apitiot/master 
added fromSnapshot static method to TrialHandler
 2021-06-11 07:24:33 +02:00
Alain Pitiot
fcd7642bee added fromSnapshot static method to TrialHandler to restore internal state from snapshot; should fix the nested loop thisN issue 2021-06-11 07:20:30 +02:00
Sotiri Bakagiannis
13461b9169 visual/TextInput: permanently disable substitute text 2021-06-10 18:38:54 +01:00
Alain Pitiot
b9aee09474
Merge pull request #382 from tpronk/fix_seedrandom 
BF: Make seedrandom work again
 2021-06-10 15:26:00 +02:00
Thomas Pronk
fb0b231014 RF: follow PsychoJS style guide 2021-06-10 13:13:41 +01:00
Thomas Pronk
170cf423d3 RF: leverage _setAttribute, rename rng to randomNumberGenerator 2021-06-09 16:04:57 +01:00
Thomas Pronk
6c292ea2d9 RF: use seed getter and setter via _addAttribute 2021-06-09 14:32:52 +01:00
Thomas Pronk
148dda46ff BF: Make seedrandom work again 
This bug-fix consists of modifications to util.shuffle and TrialHandler:
1) util.shuffle supports an optional second argument, rng, which defaults to Math.random
2) TrialHandler now has a getter and setter for the seed attrbute. On setting this attribute it constructs a random number generator (rng) using seedrandom using the seed provided. This rng is passed to to util.shuffle when preparing a sequence with method RANDOM or FULL_RANDOM
 2021-06-09 13:57:28 +01:00
Alain Pitiot
bad98abde7
Merge pull request #378 from thewhodidthis/bf#318--textbox 
visual/TextInput: use nullish coalescing operator for stroke styling fallbacks
 2021-06-09 14:00:07 +02:00
Sotiri Bakagiannis
92d97f1f83 core/ServerManager: drop preloadjs import 2021-06-09 07:26:53 +01:00
Sotiri Bakagiannis
e2a9d08de8 visual/TextInput: use nullish coalescing operator for stroke styling 
fallbacks
 2021-06-08 19:03:17 +01:00
Alain Pitiot
db9b6dd69e
Merge branch 'main' into bf#367--movie-preload 2021-06-08 13:52:21 +02:00
Thomas Pronk
d9c5f816ee Check more carefully whether the error properties exist 2021-06-07 12:17:16 +01:00
Sotiri Bakagiannis
e77688ce56 core/ServerManager: import PreloadJS for side effects 2021-06-07 11:38:13 +01:00
Sotiri Bakagiannis
4c1426dea5 util/Clock: split date formatting and parsing into separate funcs, drop moment import 2021-06-04 11:50:20 +01:00
Thomas Pronk
f11e356653 RF: clean up improved error logging 2021-06-03 18:13:36 +01:00
Thomas Pronk
e1813c2e03 BF: properly log errors thrown by PsychoJS itself 2021-06-03 18:06:39 +01:00
Thomas Pronk
ccfc44a4ce ENH: Add error logging for unhandled rejections 2021-06-03 11:56:34 +01:00
Sotiri Bakagiannis
5b202eb396 Merge branch 'main' into bf#348--no-moment 2021-06-02 13:51:28 +01:00
Sotiri Bakagiannis
7d3a264818 data: comment out the Shelf 2021-06-02 13:20:08 +01:00
Sotiri Bakagiannis
3ce93c9642 Merge branch 'main' into bf#357-bundling 2021-06-02 13:12:18 +01:00
Alain Pitiot
725e5ca28f updated version number 2021-06-02 13:53:50 +02:00
Sotiri Bakagiannis
bf4fe0b3db sound: drop Transcriber export for now 2021-06-01 17:44:55 +01:00
Alain Pitiot
9e10fa489a _ 2021-06-01 13:35:51 +02:00
Alain Pitiot
823834d904 _ 2021-06-01 13:32:21 +02:00
Alain Pitiot
ba8d6f5092 _ 2021-06-01 13:28:36 +02:00
Alain Pitiot
0bac3ee235 Merge branch 'master' of github.com:apitiot/psychojs 2021-06-01 11:04:53 +02:00
Alain Pitiot
7ebca99430 _ 2021-06-01 11:04:48 +02:00
Alain Pitiot
27ffab0447 Merge branch 'psychopy:main' into master 2021-06-01 11:03:50 +02:00
Alain Pitiot
ef08c44c02 added missing docs 2021-05-31 13:49:13 +02:00
Alain Pitiot
4cf0367468
Merge branch 'main' into bf#334--font 2021-05-31 13:04:09 +02:00
Alain Pitiot
f9df73b4fe Merge branch 'main' into bf#334--font 2021-05-31 13:04:09 +02:00
Alain Pitiot
e4aec61fcd
Merge pull request #354 from thewhodidthis/bf#300-gui 
core/GUI: restore warning about required fields
 2021-05-31 13:00:06 +02:00
Alain Pitiot
b0a97cf3e6 Merge pull request #354 from thewhodidthis/bf#300-gui 
core/GUI: restore warning about required fields
 2021-05-31 13:00:06 +02:00
Alain Pitiot
f5b06bff0b
Merge pull request #340 from tpronk/textbox_stay_on_resize 
BF: Retain entered text (and placeholder) upon resize
 2021-05-31 12:46:19 +02:00
Alain Pitiot
04b21a4274 Merge pull request #340 from tpronk/textbox_stay_on_resize 
BF: Retain entered text (and placeholder) upon resize
 2021-05-31 12:46:19 +02:00
Alain Pitiot
56655a1d85
Merge branch 'main' into nf#335--deps 2021-05-31 11:59:19 +02:00
Alain Pitiot
811c7fee11 Merge branch 'main' into nf#335--deps 2021-05-31 11:59:19 +02:00