Skip to content

Commit 2a5908f

Browse files
committed
feat: adding a setting to change probe panel height
- Also went down a rabbit hole and changed how settings works in a few places - Also added SpikeGLX toggle setting - Found some serializefield bugs in settings as well that need to be fixed
1 parent 5161b96 commit 2a5908f

File tree

8 files changed

+1011
-243
lines changed

8 files changed

+1011
-243
lines changed

Assets/Prefabs/UI/SettingsMenu/Menus/GraphicsMenu.prefab

Lines changed: 371 additions & 3 deletions
Large diffs are not rendered by default.

Assets/Prefabs/main.prefab

Lines changed: 108 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ GameObject:
1515
- component: {fileID: 8016510558008620337}
1616
- component: {fileID: 8016510558008620336}
1717
- component: {fileID: 8016510558008620339}
18+
- component: {fileID: 7425579377242974598}
1819
m_Layer: 0
1920
m_Name: main
2021
m_TagString: Untagged
@@ -49,7 +50,6 @@ MonoBehaviour:
4950
m_Script: {fileID: 11500000, guid: d93ba8ff78b44b64b806ea677c9151d0, type: 3}
5051
m_Name:
5152
m_EditorClassIdentifier:
52-
heightPerToggle: 20
5353
loadBerylDepth: 0
5454
overrideNetwork: 1
5555
brainRegionMaterials:
@@ -75,27 +75,32 @@ MonoBehaviour:
7575
m_Script: {fileID: 11500000, guid: 0e3da6b77c935b441931d7f2baa3b435, type: 3}
7676
m_Name:
7777
m_EditorClassIdentifier:
78+
_probesChangedEvent:
79+
m_PersistentCalls:
80+
m_Calls: []
81+
_probeAddedOrRemovedEvent:
82+
m_PersistentCalls:
83+
m_Calls: []
84+
_activeProbeChangedEvent:
85+
m_PersistentCalls:
86+
m_Calls: []
7887
_modelControl: {fileID: 0}
7988
_vdmanager: {fileID: 0}
80-
_localPrefs: {fileID: 8016510558008620337}
81-
_brainModel: {fileID: 0}
89+
_probeParentT: {fileID: 0}
8290
_util: {fileID: 8016510558008620342}
83-
_acontrol: {fileID: 0}
8491
_accountsManager: {fileID: 0}
92+
_probePanelManager: {fileID: 0}
8593
_probePrefabs:
8694
- {fileID: 4368194536080577051, guid: 61b9881781d2c0844a324a8271642e17, type: 3}
8795
- {fileID: 4456597164778458636, guid: 5a989b1f005f06940b1c2a2cdfbfd705, type: 3}
8896
- {fileID: 8943063119080654577, guid: c6cbe13bba479184aa05bff7d11023f5, type: 3}
8997
- {fileID: 8943063119080654577, guid: ff3683f32bd116e439d7151532626d56, type: 3}
90-
_probePrefabIDs: 01000000020000000400000008000000
91-
_recRegionSlider: {fileID: 0}
9298
_ccfCollider: {fileID: 0}
9399
_inPlaneSlice: {fileID: 0}
94100
_probeQuickSettings: {fileID: 0}
95101
_relCoordPanel: {fileID: 0}
96102
_sliceRenderer: {fileID: 0}
97103
_searchControl: {fileID: 0}
98-
_searchInput: {fileID: 0}
99104
_settingsPanel: {fileID: 0}
100105
_collisionPanelGo: {fileID: 0}
101106
_collisionMaterial: {fileID: 2100000, guid: 1ea6edd2a7b9f3f4195eb54f7d735bb7, type: 2}
@@ -105,13 +110,10 @@ MonoBehaviour:
105110
_meshCenterText: {fileID: 0}
106111
_canvasParent: {fileID: 0}
107112
_qDialogue: {fileID: 0}
113+
_logPanelGO: {fileID: 0}
114+
_blDistance: {fileID: 0}
108115
_surfaceDebugGo: {fileID: 0}
109-
_whiteUIText:
110-
- {fileID: 0}
111-
- {fileID: 0}
112-
- {fileID: 0}
113-
_probePanelAcronymTextFontSize: 24
114-
_probePanelAreaTextFontSize: 14
116+
_craniotomyPanel: {fileID: 0}
115117
--- !u!114 &8016510558008620342
116118
MonoBehaviour:
117119
m_ObjectHideFlags: 0
@@ -137,23 +139,89 @@ MonoBehaviour:
137139
m_Name:
138140
m_EditorClassIdentifier:
139141
_collisionsToggle: {fileID: 0}
140-
_recordingRegionToggle: {fileID: 0}
141-
_acronymToggle: {fileID: 0}
142-
_depthToggle: {fileID: 0}
142+
DetectCollisionsChangedEvent:
143+
m_PersistentCalls:
144+
m_Calls: []
143145
_probeAxisToggle: {fileID: 0}
144-
_slice3dDropdown: {fileID: 0}
145-
_inplaneToggle: {fileID: 0}
146-
_invivoDropdown: {fileID: 0}
146+
ConvertAPML2ProbeChangedEvent:
147+
m_PersistentCalls:
148+
m_Calls: []
147149
_iblAngleToggle: {fileID: 0}
148-
_surfaceToggle: {fileID: 0}
149-
_ephysLinkServerIpInput: {fileID: 0}
150-
_ephysLinkServerPortInput: {fileID: 0}
150+
UseIBLAnglesChangedEvent:
151+
m_PersistentCalls:
152+
m_Calls: []
151153
_axisControlToggle: {fileID: 0}
152-
_showAllProbePanelsToggle: {fileID: 0}
154+
AxisControlChangedEvent:
155+
m_PersistentCalls:
156+
m_Calls: []
157+
_acronymToggle: {fileID: 0}
158+
UseAcronymsChangedEvent:
159+
m_PersistentCalls:
160+
m_Calls: []
153161
_useBerylToggle: {fileID: 0}
154-
_displayUmToggle: {fileID: 0}
162+
UseBerylChangedEvent:
163+
m_PersistentCalls:
164+
m_Calls: []
165+
_surfaceToggle: {fileID: 0}
166+
SurfaceCoordChangedEvent:
167+
m_PersistentCalls:
168+
m_Calls: []
169+
_inplaneToggle: {fileID: 0}
170+
ShowInPlaneChangedEvent:
171+
m_PersistentCalls:
172+
m_Calls: []
155173
_ghostInactiveProbesToggle: {fileID: 0}
174+
GhostInactiveProbesChangedEvent:
175+
m_PersistentCalls:
176+
m_Calls: []
156177
_ghostInactiveAreasToggle: {fileID: 0}
178+
GhostInactiveAreasChangedEvent:
179+
m_PersistentCalls:
180+
m_Calls: []
181+
_displayUmToggle: {fileID: 0}
182+
DisplayUMChangedEvent:
183+
m_PersistentCalls:
184+
m_Calls: []
185+
_showAllProbePanelsToggle: {fileID: 0}
186+
ShowAllProbePanelsChangedEvent:
187+
m_PersistentCalls:
188+
m_Calls: []
189+
_probePanelHeightSlider: {fileID: 0}
190+
ProbePanelHeightChangedEvent:
191+
m_PersistentCalls:
192+
m_Calls: []
193+
_slice3dDropdown: {fileID: 0}
194+
Slice3DChangedEvent:
195+
m_PersistentCalls:
196+
m_Calls: []
197+
RelativeCoordinateChangedEvent:
198+
m_PersistentCalls:
199+
m_Calls: []
200+
_invivoDropdown: {fileID: 0}
201+
InvivoTransformChangedEvent:
202+
m_PersistentCalls:
203+
m_Calls: []
204+
_blSlider: {fileID: 0}
205+
BregmaLambdaChangedEvent:
206+
m_PersistentCalls:
207+
m_Calls: []
208+
EphysLinkServerIpChangedEvent:
209+
m_PersistentCalls:
210+
m_Calls: []
211+
EphysLinkServerPortChangedEvent:
212+
m_PersistentCalls:
213+
m_Calls: []
214+
_ephysLinkServerIpInput: {fileID: 0}
215+
_ephysLinkServerPortInput: {fileID: 0}
216+
_stayLoggedInToggle: {fileID: 0}
217+
_openEphysDataToggle: {fileID: 0}
218+
OpenEphysDataToggleEvent:
219+
m_PersistentCalls:
220+
m_Calls: []
221+
_spikeGLXDataToggle: {fileID: 0}
222+
SpikeGLXDataToggleEvent:
223+
m_PersistentCalls:
224+
m_Calls: []
157225
--- !u!114 &8016510558008620336
158226
MonoBehaviour:
159227
m_ObjectHideFlags: 0
@@ -166,6 +234,8 @@ MonoBehaviour:
166234
m_Script: {fileID: 11500000, guid: 5e87526a9529a5046892704c80bce5ab, type: 3}
167235
m_Name:
168236
m_EditorClassIdentifier:
237+
utils: {fileID: 0}
238+
coverageURL: {fileID: 0}
169239
--- !u!114 &8016510558008620339
170240
MonoBehaviour:
171241
m_ObjectHideFlags: 0
@@ -181,3 +251,17 @@ MonoBehaviour:
181251
addressablesStorageRemotePath: https://data.virtualbrainlab.org/AddressablesStorage
182252
buildVersion: 0.2.2
183253
delayCatalogLoad: 0
254+
--- !u!114 &7425579377242974598
255+
MonoBehaviour:
256+
m_ObjectHideFlags: 0
257+
m_CorrespondingSourceObject: {fileID: 0}
258+
m_PrefabInstance: {fileID: 0}
259+
m_PrefabAsset: {fileID: 0}
260+
m_GameObject: {fileID: 8016510558008620298}
261+
m_Enabled: 1
262+
m_EditorHideFlags: 0
263+
m_Script: {fileID: 11500000, guid: 0b4e617602841734dbcd7b99c53da7fd, type: 3}
264+
m_Name:
265+
m_EditorClassIdentifier:
266+
_collisionPanelGO: {fileID: 0}
267+
_collisionMaterial: {fileID: 2100000, guid: 1ea6edd2a7b9f3f4195eb54f7d735bb7, type: 2}

0 commit comments

Comments
 (0)