Skip to content

Commit 9750fce

Browse files
jackbrookesjackbrookes
committed
info bar tidy up
1 parent 8ddce01 commit 9750fce

File tree

3 files changed

+82
-52
lines changed

3 files changed

+82
-52
lines changed

‎Assets/DevelopmentScene.unity‎

Lines changed: 76 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -298,182 +298,182 @@ Prefab:
298298
propertyPath: m_RootOrder
299299
value: 2
300300
objectReference: {fileID: 0}
301-
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
301+
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
302302
type: 2}
303303
propertyPath: m_AnchorMax.x
304304
value: 1
305305
objectReference: {fileID: 0}
306-
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
306+
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
307307
type: 2}
308308
propertyPath: m_AnchorMax.y
309309
value: 1
310310
objectReference: {fileID: 0}
311-
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
311+
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
312312
type: 2}
313313
propertyPath: m_AnchorMax.x
314314
value: 1
315315
objectReference: {fileID: 0}
316-
- target: {fileID: 224130118367839794, guid: 0a3b6392f04558844bd340e68ced1ff9,
316+
- target: {fileID: 224550780365075244, guid: 0a3b6392f04558844bd340e68ced1ff9,
317317
type: 2}
318318
propertyPath: m_AnchorMax.y
319319
value: 1
320320
objectReference: {fileID: 0}
321-
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
321+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
322322
type: 2}
323323
propertyPath: m_AnchorMin.y
324324
value: 1
325325
objectReference: {fileID: 0}
326-
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
326+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
327327
type: 2}
328328
propertyPath: m_AnchorMax.y
329329
value: 1
330330
objectReference: {fileID: 0}
331-
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
331+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
332332
type: 2}
333333
propertyPath: m_AnchoredPosition.x
334-
value: 12
334+
value: 171.125
335335
objectReference: {fileID: 0}
336-
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
336+
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
337337
type: 2}
338338
propertyPath: m_AnchoredPosition.y
339339
value: -10
340340
objectReference: {fileID: 0}
341-
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
341+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
342342
type: 2}
343343
propertyPath: m_AnchorMin.y
344344
value: 1
345345
objectReference: {fileID: 0}
346-
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
346+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
347347
type: 2}
348348
propertyPath: m_AnchorMax.y
349349
value: 1
350350
objectReference: {fileID: 0}
351-
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
351+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
352352
type: 2}
353353
propertyPath: m_AnchoredPosition.x
354-
value: 29
354+
value: 488.375
355355
objectReference: {fileID: 0}
356-
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
356+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
357357
type: 2}
358358
propertyPath: m_AnchoredPosition.y
359359
value: -10
360360
objectReference: {fileID: 0}
361-
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
361+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
362362
type: 2}
363363
propertyPath: m_AnchorMin.y
364364
value: 1
365365
objectReference: {fileID: 0}
366-
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
366+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
367367
type: 2}
368368
propertyPath: m_AnchorMax.y
369369
value: 1
370370
objectReference: {fileID: 0}
371-
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
371+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
372372
type: 2}
373373
propertyPath: m_AnchoredPosition.x
374-
value: 166.875
374+
value: 805.625
375375
objectReference: {fileID: 0}
376-
- target: {fileID: 224661754932301978, guid: 0a3b6392f04558844bd340e68ced1ff9,
376+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
377377
type: 2}
378378
propertyPath: m_AnchoredPosition.y
379379
value: -10
380380
objectReference: {fileID: 0}
381-
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
381+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
382382
type: 2}
383383
propertyPath: m_AnchorMin.y
384384
value: 1
385385
objectReference: {fileID: 0}
386-
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
386+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
387387
type: 2}
388388
propertyPath: m_AnchorMax.y
389389
value: 1
390390
objectReference: {fileID: 0}
391-
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
391+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
392392
type: 2}
393393
propertyPath: m_AnchoredPosition.x
394-
value: 475.625
394+
value: 1122.875
395395
objectReference: {fileID: 0}
396-
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
396+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
397397
type: 2}
398398
propertyPath: m_AnchoredPosition.y
399399
value: -10
400400
objectReference: {fileID: 0}
401-
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
401+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
402402
type: 2}
403403
propertyPath: m_AnchorMin.y
404404
value: 1
405405
objectReference: {fileID: 0}
406-
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
406+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
407407
type: 2}
408408
propertyPath: m_AnchorMax.y
409409
value: 1
410410
objectReference: {fileID: 0}
411-
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
411+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
412412
type: 2}
413413
propertyPath: m_AnchoredPosition.x
414-
value: 784.375
414+
value: 12
415415
objectReference: {fileID: 0}
416-
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
416+
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
417417
type: 2}
418418
propertyPath: m_AnchoredPosition.y
419419
value: -10
420420
objectReference: {fileID: 0}
421-
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
421+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
422422
type: 2}
423423
propertyPath: m_AnchorMin.y
424424
value: 1
425425
objectReference: {fileID: 0}
426-
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
426+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
427427
type: 2}
428428
propertyPath: m_AnchorMax.y
429429
value: 1
430430
objectReference: {fileID: 0}
431-
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
431+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
432432
type: 2}
433433
propertyPath: m_AnchoredPosition.x
434-
value: 1093.125
434+
value: 33
435435
objectReference: {fileID: 0}
436-
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
436+
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
437437
type: 2}
438438
propertyPath: m_AnchoredPosition.y
439439
value: -10
440440
objectReference: {fileID: 0}
441-
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
441+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
442442
type: 2}
443443
propertyPath: m_AnchorMin.y
444444
value: 1
445445
objectReference: {fileID: 0}
446-
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
446+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
447447
type: 2}
448448
propertyPath: m_AnchorMax.y
449449
value: 1
450450
objectReference: {fileID: 0}
451-
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
451+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
452452
type: 2}
453453
propertyPath: m_AnchoredPosition.x
454454
value: 12
455455
objectReference: {fileID: 0}
456-
- target: {fileID: 224231604053429628, guid: 0a3b6392f04558844bd340e68ced1ff9,
456+
- target: {fileID: 224122663873552442, guid: 0a3b6392f04558844bd340e68ced1ff9,
457457
type: 2}
458458
propertyPath: m_AnchoredPosition.y
459459
value: -10
460460
objectReference: {fileID: 0}
461-
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
461+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
462462
type: 2}
463463
propertyPath: m_AnchorMin.y
464464
value: 1
465465
objectReference: {fileID: 0}
466-
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
466+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
467467
type: 2}
468468
propertyPath: m_AnchorMax.y
469469
value: 1
470470
objectReference: {fileID: 0}
471-
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
471+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
472472
type: 2}
473473
propertyPath: m_AnchoredPosition.x
474-
value: 33
474+
value: 29
475475
objectReference: {fileID: 0}
476-
- target: {fileID: 224586871144432848, guid: 0a3b6392f04558844bd340e68ced1ff9,
476+
- target: {fileID: 224977750288414410, guid: 0a3b6392f04558844bd340e68ced1ff9,
477477
type: 2}
478478
propertyPath: m_AnchoredPosition.y
479479
value: -10
@@ -521,7 +521,7 @@ Prefab:
521521
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
522522
type: 2}
523523
propertyPath: m_AnchoredPosition.x
524-
value: 713
524+
value: 730
525525
objectReference: {fileID: 0}
526526
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
527527
type: 2}
@@ -531,7 +531,7 @@ Prefab:
531531
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
532532
type: 2}
533533
propertyPath: m_SizeDelta.x
534-
value: 1260
534+
value: 1294
535535
objectReference: {fileID: 0}
536536
- target: {fileID: 224025734146448884, guid: 0a3b6392f04558844bd340e68ced1ff9,
537537
type: 2}
@@ -551,7 +551,7 @@ Prefab:
551551
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
552552
type: 2}
553553
propertyPath: m_AnchoredPosition.x
554-
value: 1381.5
554+
value: 1415.5
555555
objectReference: {fileID: 0}
556556
- target: {fileID: 224999085726949720, guid: 0a3b6392f04558844bd340e68ced1ff9,
557557
type: 2}
@@ -598,9 +598,39 @@ Prefab:
598598
propertyPath: m_SizeDelta.y
599599
value: 5
600600
objectReference: {fileID: 0}
601+
- target: {fileID: 224146843657791948, guid: 0a3b6392f04558844bd340e68ced1ff9,
602+
type: 2}
603+
propertyPath: m_RootOrder
604+
value: 2
605+
objectReference: {fileID: 0}
606+
- target: {fileID: 224155073134331500, guid: 0a3b6392f04558844bd340e68ced1ff9,
607+
type: 2}
608+
propertyPath: m_RootOrder
609+
value: 3
610+
objectReference: {fileID: 0}
611+
- target: {fileID: 224321436090849264, guid: 0a3b6392f04558844bd340e68ced1ff9,
612+
type: 2}
613+
propertyPath: m_RootOrder
614+
value: 1
615+
objectReference: {fileID: 0}
616+
- target: {fileID: 1321011041162378, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
617+
propertyPath: m_Name
618+
value: Folder
619+
objectReference: {fileID: 0}
620+
- target: {fileID: 114543364493683420, guid: 0a3b6392f04558844bd340e68ced1ff9,
621+
type: 2}
622+
propertyPath: folder
623+
value:
624+
objectReference: {fileID: 1214648920}
601625
m_RemovedComponents: []
602626
m_ParentPrefab: {fileID: 100100000, guid: 0a3b6392f04558844bd340e68ced1ff9, type: 2}
603627
m_IsPrefabParent: 0
628+
--- !u!114 &1214648920 stripped
629+
MonoBehaviour:
630+
m_PrefabParentObject: {fileID: 114531160504100936, guid: 0a3b6392f04558844bd340e68ced1ff9,
631+
type: 2}
632+
m_PrefabInternal: {fileID: 1214648919}
633+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
604634
--- !u!1 &1538133409
605635
GameObject:
606636
m_ObjectHideFlags: 0

‎Assets/UXF/Prefabs/[UXF_Rig].prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ GameObject:
556556
- component: {fileID: 222018038411044730}
557557
- component: {fileID: 114531160504100936}
558558
m_Layer: 5
559-
m_Name: PPID
559+
m_Name: Folder
560560
m_TagString: Untagged
561561
m_Icon: {fileID: 0}
562562
m_NavMeshLayer: 0
@@ -4721,7 +4721,7 @@ MonoBehaviour:
47214721
m_HorizontalOverflow: 1
47224722
m_VerticalOverflow: 0
47234723
m_LineSpacing: 1
4724-
m_Text: 'PPID: None'
4724+
m_Text: experiment/ppid/S000
47254725
--- !u!114 &114535399967479660
47264726
MonoBehaviour:
47274727
m_ObjectHideFlags: 1
@@ -4828,7 +4828,7 @@ MonoBehaviour:
48284828
m_EditorClassIdentifier:
48294829
session: {fileID: 114916036141644208}
48304830
trialStatus: {fileID: 114343438554048266}
4831-
ppid: {fileID: 114531160504100936}
4831+
folder: {fileID: 114531160504100936}
48324832
blockNum: {fileID: 114231761504221568}
48334833
trialNum: {fileID: 114741870969616342}
48344834
--- !u!114 &114545143169975566

‎Assets/UXF/Scripts/UI/InfoBarController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class InfoBarController : MonoBehaviour
1212

1313
public Session session;
1414

15-
public Text trialStatus, ppid, blockNum, trialNum;
15+
public Text trialStatus, folder, blockNum, trialNum;
1616

1717
/// <summary>
1818
/// Awake is called when the script instance is being loaded.
@@ -36,7 +36,7 @@ void OnValidate()
3636

3737
void ResetToNormal()
3838
{
39-
ppid.text = "PPID: None";
39+
folder.text = "experiment/ppid/S000";
4040
trialStatus.text = "Awaiting session start";
4141
trialNum.text = FormatProgress("Trial", 0, 0);
4242
blockNum.text = FormatProgress("Block", 0, 0);
@@ -45,7 +45,7 @@ void ResetToNormal()
4545
void SessionBegin(Session session)
4646
{
4747
trialStatus.text = "Awaiting trial start";
48-
ppid.text = "PPID: " + session.ppid;
48+
folder.text = session.experimentName + "\\" + session.ppid + "\\" + session.folderName;
4949
}
5050

5151
void TrialBegin(Trial trial)

0 commit comments

Comments
 (0)