Skip to content

Commit bd70327

Browse files
committed
Merge branch 'dev'
2 parents beb33b2 + e9a132f commit bd70327

11 files changed

Lines changed: 1261 additions & 164 deletions

File tree

config/paths.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
'devices' : os.path.join(top_dir, 'devices'),
1212
'tasks' : os.path.join(top_dir, 'tasks'),
1313
'experiments' : os.path.join(top_dir, 'experiments'),
14-
'data' : os.path.join(top_dir, 'data')
14+
'data' : os.path.join(top_dir, 'data'),
15+
'gui' : os.path.join(top_dir, 'gui')
1516
}
1617

1718
# User paths - When paths.py is imported on opening GUI, load any
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{
2+
"blinker": {
3+
"blink_rate": {
4+
"label": "\u23f1\ufe0fBlink rate",
5+
"widget": "slider",
6+
"min": 1,
7+
"max": 15,
8+
"step": 0.5,
9+
"suffix": "Hz",
10+
"hint": "Rate which LED blinks"
11+
},
12+
"green_enabled": {
13+
"label": "\ud83d\udfe2Green active",
14+
"widget": "checkbox",
15+
"min": "",
16+
"max": "",
17+
"step": "",
18+
"suffix": "",
19+
"hint": "some"
20+
},
21+
"green_count": {
22+
"label": "\ud83d\udfe2Green count",
23+
"widget": "spinbox",
24+
"min": 0,
25+
"max": 10,
26+
"step": 1,
27+
"suffix": "blinks",
28+
"hint": "more"
29+
},
30+
"red_enabled": {
31+
"label": "\ud83d\udd34Red active",
32+
"widget": "checkbox",
33+
"min": "",
34+
"max": "",
35+
"step": "",
36+
"suffix": "",
37+
"hint": "hints"
38+
},
39+
"red_count": {
40+
"label": "\ud83d\udd34Red count",
41+
"widget": "spinbox",
42+
"min": 0,
43+
"max": 10,
44+
"step": 1,
45+
"suffix": "blinks",
46+
"hint": "shown"
47+
},
48+
"ordered_inputs": [
49+
"blink_rate",
50+
"green_enabled",
51+
"green_count",
52+
"red_enabled",
53+
"red_count"
54+
]
55+
},
56+
"ordered_tabs": [
57+
"blinker"
58+
]
59+
}
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"\ud83d\udfe2green": {
3+
"green_enabled": {
4+
"label": "enabled",
5+
"widget": "checkbox",
6+
"min": "",
7+
"max": "",
8+
"step": "",
9+
"suffix": "",
10+
"hint": "green enabled hint"
11+
},
12+
"green_count": {
13+
"label": "count",
14+
"widget": "spinbox",
15+
"min": 0,
16+
"max": 10,
17+
"step": 1,
18+
"suffix": "blinks",
19+
"hint": "green count hint"
20+
},
21+
"ordered_inputs": [
22+
"green_enabled",
23+
"green_count"
24+
]
25+
},
26+
"\ud83d\udd34red": {
27+
"red_enabled": {
28+
"label": "enabled",
29+
"widget": "checkbox",
30+
"min": "",
31+
"max": "",
32+
"step": "",
33+
"suffix": "",
34+
"hint": "another hint"
35+
},
36+
"red_count": {
37+
"label": "count",
38+
"widget": "spinbox",
39+
"min": 1,
40+
"max": 10,
41+
"step": 1,
42+
"suffix": "blinks",
43+
"hint": "see this when hovering"
44+
},
45+
"ordered_inputs": [
46+
"red_enabled",
47+
"red_count"
48+
]
49+
},
50+
"ordered_tabs": [
51+
"\ud83d\udfe2green",
52+
"\ud83d\udd34red"
53+
]
54+
}

0 commit comments

Comments
 (0)