Skip to content

Commit

Permalink
Merge pull request #2 from EoinTravers/dev
Browse files Browse the repository at this point in the history
Merging dev into master for a release
  • Loading branch information
EoinTravers committed Nov 17, 2014
2 parents 94431b7 + 6226d3e commit 863d62b
Show file tree
Hide file tree
Showing 36 changed files with 1,158 additions and 752 deletions.
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,29 @@ var response = get_keyboard_response('abc');
```
A definite improvement!

Similarly,

---------------------
```javascript
var divs_to_hide = ['probe_text', 'probe_image', 'feedback_text']
for(var i=0; i<divs_to_hide.length; i++){
document.getElementById(divs_to_hide[i]).style.display = "none";
};
```

###Demos
To see some of PsychScript in action, check out the following demos:
- [Keyboard Response](http://www3.qub.ac.uk/researchingreasoning/psychscript/keyboard_response/)
- [Click Response](http://www3.qub.ac.uk/researchingreasoning/psychscript/click_response/)
- [Mouse-tracking](http://www3.qub.ac.uk/researchingreasoning/psychscript/mouse_tracking/)
becomes
```javascript
hide(['probe_text', 'probe_image', 'feedback_text'])
```

You should get the idea by now.

---------------------

###Progress

Please note that this project is in development, and is **not yet ready for use**.
###Demos
To see some of PsychScript in action, check out these demos:
- [Keyboard Response](http://www3.qub.ac.uk/researchingreasoning/psychscript/keyboard_response/)
- [Click Response](http://www3.qub.ac.uk/researchingreasoning/psychscript/click_response/)

However, there are a number of templates which are fully functional, specifically versions of the classic lexical decision task, using either keyboard responses, onscreen buttons, or (in Beta) mouse-tracking.
There will be online demos of these features available in the near future.

---------------------

Expand All @@ -66,8 +71,3 @@ The immediate problems to be solved include:
- Making it easier to create HTML as required by the experimenter (hopefully using existing open tools).
- Testing and benchmarking, especially with regard to timing accuracy.
- Creating templates for more common paradigms.

Looking further ahead, it might be nice someday to include the following:
- A GUI for building experiments (like [OpenSesame](http://osdoc.cogsci.nl) or EPrime)
- Mobile support
- A [Behavior Research Methods](http://www.springer.com/psychology/cognitive+psychology/journal/13428) paper?
196 changes: 0 additions & 196 deletions js/PsychScript.js

This file was deleted.

Loading

0 comments on commit 863d62b

Please sign in to comment.