Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
ScreenScale
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vespr
ScreenScale
Commits
199b2e5d
Commit
199b2e5d
authored
4 years ago
by
Wakefield Morys-Carter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
norm units for text
parent
8c849ca6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
html/screen scale-legacy-browsers.js
html/screen scale-legacy-browsers.js
+2
-2
html/screen scale.js
html/screen scale.js
+2
-2
screen scale.psyexp
screen scale.psyexp
+3
-3
No files found.
html/screen scale-legacy-browsers.js
View file @
199b2e5d
...
...
@@ -196,8 +196,8 @@ function experimentInit() {
name
:
'
text_2
'
,
text
:
'
Fin
'
,
font
:
'
Arial
'
,
units
:
undefined
,
pos
:
[
0
,
0
],
height
:
0.1
,
wrapWidth
:
undefined
,
ori
:
0
,
units
:
'
norm
'
,
pos
:
[
0
,
0
],
height
:
0.1
,
wrapWidth
:
1.8
,
ori
:
0
,
color
:
new
util
.
Color
(
'
white
'
),
opacity
:
1
,
depth
:
0.0
});
...
...
This diff is collapsed.
Click to expand it.
html/screen scale.js
View file @
199b2e5d
...
...
@@ -207,8 +207,8 @@ function experimentInit() {
name
:
'
text_2
'
,
text
:
'
Fin
'
,
font
:
'
Arial
'
,
units
:
undefined
,
pos
:
[
0
,
0
],
height
:
0.1
,
wrapWidth
:
undefined
,
ori
:
0
,
units
:
'
norm
'
,
pos
:
[
0
,
0
],
height
:
0.1
,
wrapWidth
:
1.8
,
ori
:
0
,
color
:
new
util
.
Color
(
'
white
'
),
opacity
:
1
,
depth
:
0.0
});
...
...
This diff is collapsed.
Click to expand it.
screen scale.psyexp
View file @
199b2e5d
...
...
@@ -183,7 +183,7 @@
<Param
name=
"pos"
updates=
"constant"
val=
"(0, 0)"
valType=
"code"
/>
<Param
name=
"saveStartStop"
updates=
"None"
val=
"False"
valType=
"bool"
/>
<Param
name=
"shape"
updates=
"constant"
val=
"rectangle"
valType=
"str"
/>
<Param
name=
"size"
updates=
"set every repeat"
val=
"
$
(10*x_scale, 10*y_scale)"
valType=
"code"
/>
<Param
name=
"size"
updates=
"set every repeat"
val=
"(10*x_scale, 10*y_scale)"
valType=
"code"
/>
<Param
name=
"startEstim"
updates=
"None"
val=
""
valType=
"code"
/>
<Param
name=
"startType"
updates=
"None"
val=
"time (s)"
valType=
"str"
/>
<Param
name=
"startVal"
updates=
"None"
val=
"0.0"
valType=
"code"
/>
...
...
@@ -233,8 +233,8 @@
<Param
name=
"stopVal"
updates=
"constant"
val=
""
valType=
"code"
/>
<Param
name=
"syncScreenRefresh"
updates=
"None"
val=
"True"
valType=
"bool"
/>
<Param
name=
"text"
updates=
"constant"
val=
"Fin"
valType=
"extendedStr"
/>
<Param
name=
"units"
updates=
"None"
val=
"
from exp settings
"
valType=
"str"
/>
<Param
name=
"wrapWidth"
updates=
"constant"
val=
""
valType=
"code"
/>
<Param
name=
"units"
updates=
"None"
val=
"
norm
"
valType=
"str"
/>
<Param
name=
"wrapWidth"
updates=
"constant"
val=
"
1.8
"
valType=
"code"
/>
</TextComponent>
</Routine>
</Routines>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment