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

Support for spatial attributes #18

Merged
merged 4 commits into from
Jun 8, 2017
Merged

Conversation

mschoeffler
Copy link
Collaborator

feature described in #17

@mschoeffler
Copy link
Collaborator Author

Travis CI fails... I'll have a look within the next days.

@faroit
Copy link
Collaborator

faroit commented Jun 7, 2017

Travis CI fails... I'll have a look within the next days.

don't worry this is node.js package manager issue, nothing to do with your code. I'll will fix that

Copy link
Collaborator

@faroit faroit left a comment

Choose a reason for hiding this comment

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

just a quick look. See the comments, it's mostly the source code header and the resources files that would need to be fixed

# bezierInnerRight: [299,50,100]
# bezierOuterRight: [200,50,50]
# height: 100
# depth: 50
Copy link
Collaborator

Choose a reason for hiding this comment

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

remove comment

views:
- view: front
- view: top
# - view: 3d
Copy link
Collaborator

Choose a reason for hiding this comment

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

possible remove comment

@@ -0,0 +1,17 @@
/*************************************************************************
(C) Copyright AudioLabs 2015
Copy link
Collaborator

Choose a reason for hiding this comment

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

old header, please replace

@@ -0,0 +1,15 @@
/*************************************************************************
(C) Copyright AudioLabs 2015
Copy link
Collaborator

Choose a reason for hiding this comment

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

old header, please replace

@@ -0,0 +1,12 @@
/*************************************************************************
(C) Copyright AudioLabs 2015
Copy link
Collaborator

Choose a reason for hiding this comment

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

old header, please replace

* Returns a hash map with values to save.
*/
ASWObject.prototype.storeValues = function(_trial, _session, _trial_id) {
// var trial = this.session.getTrial(this.pageConfig.type, this.pageConfig.id);
Copy link
Collaborator

Choose a reason for hiding this comment

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

comment

@@ -0,0 +1,383 @@
/*************************************************************************
(C) Copyright AudioLabs 2015
Copy link
Collaborator

Choose a reason for hiding this comment

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

header

* Returns a hash map with values to save.
*/
LEVObject.prototype.storeValues = function(_trial, _session, _trial_id) {
// var trial = this.session.getTrial(this.pageConfig.type, this.pageConfig.id);
Copy link
Collaborator

Choose a reason for hiding this comment

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

comment

@@ -0,0 +1,73 @@
/*************************************************************************
(C) Copyright AudioLabs 2015
Copy link
Collaborator

Choose a reason for hiding this comment

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

header

@@ -0,0 +1,36 @@
/*************************************************************************
(C) Copyright AudioLabs 2015
Copy link
Collaborator

Choose a reason for hiding this comment

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

header

Copy link
Collaborator

@faroit faroit left a comment

Choose a reason for hiding this comment

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

looks good. Can you also bump up the version in https:/audiolabs/webMUSHRA/blob/master/package.json#L4 to 1.4.0 since this is a major new feature?

@faroit
Copy link
Collaborator

faroit commented Jun 8, 2017

Looks good to merge. I will fix the travis error tomorrow

@mschoeffler mschoeffler merged commit 3afe3ab into audiolabs:master Jun 8, 2017
@faroit
Copy link
Collaborator

faroit commented Jun 9, 2017

travis magically fixed itself

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants