Skip to content

Commit 52e438e

Browse files
dbirmandbirman
committed
Attempting WebGL fix for copy2text button
1 parent fc1257d commit 52e438e

5 files changed

Lines changed: 48 additions & 69 deletions

File tree

‎Assets/Prefabs/ProbeQuickSettings.prefab‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2661,7 +2661,7 @@ GameObject:
26612661
- component: {fileID: 522056221171154655}
26622662
m_Layer: 5
26632663
m_Name: Text2ClipboardButton
2664-
m_TagString: Untagged
2664+
m_TagString: UIEvent
26652665
m_Icon: {fileID: 0}
26662666
m_NavMeshLayer: 0
26672667
m_StaticEditorFlags: 0
@@ -5431,7 +5431,7 @@ MonoBehaviour:
54315431
m_fontMaterials: []
54325432
m_fontColor32:
54335433
serializedVersion: 2
5434-
rgba: 4294072178
5434+
rgba: 4284518640
54355435
m_fontColor: {r: 0.9411765, g: 0.5647059, b: 0.3764706, a: 1}
54365436
m_enableVertexGradient: 0
54375437
m_colorMode: 3
@@ -7006,6 +7006,9 @@ MonoBehaviour:
70067006
toggleEvent:
70077007
m_PersistentCalls:
70087008
m_Calls: []
7009+
showEvent:
7010+
m_PersistentCalls:
7011+
m_Calls: []
70097012
--- !u!114 &2758057629132474612 stripped
70107013
MonoBehaviour:
70117014
m_CorrespondingSourceObject: {fileID: 6971998645313022581, guid: a642237fba6123046ab20d241657cad1, type: 3}

‎Assets/Scenes/TrajectoryPlanner.unity‎

Lines changed: 23 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,38 +1663,6 @@ MonoBehaviour:
16631663
m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3}
16641664
m_Name:
16651665
m_EditorClassIdentifier:
1666-
--- !u!1 &1894360979 stripped
1667-
GameObject:
1668-
m_CorrespondingSourceObject: {fileID: 3655096002408039145, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
1669-
m_PrefabInstance: {fileID: 341190943874437988}
1670-
m_PrefabAsset: {fileID: 0}
1671-
--- !u!114 &1894360984
1672-
MonoBehaviour:
1673-
m_ObjectHideFlags: 0
1674-
m_CorrespondingSourceObject: {fileID: 0}
1675-
m_PrefabInstance: {fileID: 0}
1676-
m_PrefabAsset: {fileID: 0}
1677-
m_GameObject: {fileID: 1894360979}
1678-
m_Enabled: 1
1679-
m_EditorHideFlags: 0
1680-
m_Script: {fileID: 11500000, guid: aec1a1bfb58262f4facfd3c50da492ee, type: 3}
1681-
m_Name:
1682-
m_EditorClassIdentifier:
1683-
onPointerDown:
1684-
m_PersistentCalls:
1685-
m_Calls:
1686-
- m_Target: {fileID: 2108153954}
1687-
m_TargetAssemblyTypeName: TrajectoryPlanner.TrajectoryPlannerManager, trajectoryplanner.core
1688-
m_MethodName: CopyText
1689-
m_Mode: 1
1690-
m_Arguments:
1691-
m_ObjectArgument: {fileID: 0}
1692-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
1693-
m_IntArgument: 0
1694-
m_FloatArgument: 0
1695-
m_StringArgument:
1696-
m_BoolArgument: 0
1697-
m_CallState: 2
16981666
--- !u!1 &2085964517 stripped
16991667
GameObject:
17001668
m_CorrespondingSourceObject: {fileID: 341190945420745089, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
@@ -1882,15 +1850,15 @@ PrefabInstance:
18821850
objectReference: {fileID: 1703646459}
18831851
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
18841852
propertyPath: m_AnchorMax.y
1885-
value: 0
1853+
value: 1
18861854
objectReference: {fileID: 0}
18871855
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
18881856
propertyPath: m_AnchorMin.y
1889-
value: 0
1857+
value: 1
18901858
objectReference: {fileID: 0}
18911859
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
18921860
propertyPath: m_AnchoredPosition.x
1893-
value: 0
1861+
value: 169.88
18941862
objectReference: {fileID: 0}
18951863
- target: {fileID: 341190943836276264, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
18961864
propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -1986,19 +1954,19 @@ PrefabInstance:
19861954
objectReference: {fileID: 1445581475}
19871955
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
19881956
propertyPath: m_AnchorMax.y
1989-
value: 0
1957+
value: 1
19901958
objectReference: {fileID: 0}
19911959
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
19921960
propertyPath: m_AnchorMin.y
1993-
value: 0
1961+
value: 1
19941962
objectReference: {fileID: 0}
19951963
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
19961964
propertyPath: m_AnchoredPosition.x
1997-
value: 0
1965+
value: 354.84
19981966
objectReference: {fileID: 0}
19991967
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
20001968
propertyPath: m_AnchoredPosition.y
2001-
value: 0
1969+
value: -15
20021970
objectReference: {fileID: 0}
20031971
- target: {fileID: 341190944083206642, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
20041972
propertyPath: m_Name
@@ -2190,19 +2158,19 @@ PrefabInstance:
21902158
objectReference: {fileID: 0}
21912159
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
21922160
propertyPath: m_AnchorMax.y
2193-
value: 0
2161+
value: 1
21942162
objectReference: {fileID: 0}
21952163
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
21962164
propertyPath: m_AnchorMin.y
2197-
value: 0
2165+
value: 1
21982166
objectReference: {fileID: 0}
21992167
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
22002168
propertyPath: m_AnchoredPosition.x
2201-
value: 0
2169+
value: 384.91998
22022170
objectReference: {fileID: 0}
22032171
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
22042172
propertyPath: m_AnchoredPosition.y
2205-
value: 0
2173+
value: -15
22062174
objectReference: {fileID: 0}
22072175
- target: {fileID: 341190944411999430, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
22082176
propertyPath: m_AnchorMax.y
@@ -2608,6 +2576,10 @@ PrefabInstance:
26082576
propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
26092577
value:
26102578
objectReference: {fileID: 1703646459}
2579+
- target: {fileID: 341190945403315022, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
2580+
propertyPath: m_RaycastTarget
2581+
value: 0
2582+
objectReference: {fileID: 0}
26112583
- target: {fileID: 341190945424324216, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
26122584
propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
26132585
value:
@@ -3528,6 +3500,10 @@ PrefabInstance:
35283500
propertyPath: m_AnchoredPosition.x
35293501
value: 18.579987
35303502
objectReference: {fileID: 0}
3503+
- target: {fileID: 4876736312871957850, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
3504+
propertyPath: m_RaycastTarget
3505+
value: 0
3506+
objectReference: {fileID: 0}
35313507
- target: {fileID: 5128760724450901418, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
35323508
propertyPath: m_AnchorMax.y
35333509
value: 1
@@ -3980,6 +3956,10 @@ PrefabInstance:
39803956
propertyPath: m_IsActive
39813957
value: 0
39823958
objectReference: {fileID: 0}
3959+
- target: {fileID: 8017547552066817447, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
3960+
propertyPath: m_RaycastTarget
3961+
value: 0
3962+
objectReference: {fileID: 0}
39833963
- target: {fileID: 8017547552346178718, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
39843964
propertyPath: m_AnchorMax.y
39853965
value: 0

‎Assets/Scripts/TrajectoryPlanner/TP_InPlaneSlice.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ public void UpdateInPlaneSlice()
127127

128128
public void InPlaneSliceHover(Vector2 pointerData)
129129
{
130+
if (ProbeManager.ActiveProbeManager == null)
131+
return;
132+
130133
Vector3 inPlanePosition = CalculateInPlanePosition(pointerData);
131134

132135
int annotation = VolumeDatasetManager.AnnotationDataset.ValueAtIndex(Mathf.RoundToInt(inPlanePosition.x), Mathf.RoundToInt(inPlanePosition.y), Mathf.RoundToInt(inPlanePosition.z));

‎Assets/Scripts/TrajectoryPlanner/TP_UIClickHandler.cs‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,31 @@ void Update()
2929
PointerEventData pointerData = new PointerEventData(EventSystem.current);
3030
GameObject uiTarget = GetUIRaycastTarget(pointerData);
3131

32-
3332
// Check if the element they are over is the in-plane slice element
3433
if (uiTarget != null)
3534
{
3635
// check if this is the in-plane slice panel
3736
if (uiTarget.name == "InPlaneSlicePanel")
3837
{
39-
if (ProbeManager.ActiveProbeManager != null)
40-
_inPlaneSlice.InPlaneSliceHover(pointerData.position);
38+
_inPlaneSlice.InPlaneSliceHover(pointerData.position);
4139
}
42-
else
40+
else if (Input.GetMouseButtonDown(0))
4341
{
44-
// If the user clicks while over a UI element, check to see if it's a probe panel and activate that probe
45-
if (Input.GetMouseButtonDown(0))
42+
#if UNITY_EDITOR
43+
Debug.Log("Mouse button down over UI element");
44+
#endif
45+
switch (uiTarget.tag)
4646
{
47-
switch (uiTarget.tag)
48-
{
49-
case "ProbePanel":
50-
_tpmanager.SetActiveProbe(uiTarget.GetComponent<TP_ProbePanel>().GetProbeController());
51-
break;
52-
case "AreaPanel":
53-
_tpmanager.ClickSearchArea(uiTarget);
54-
break;
55-
}
47+
case "ProbePanel":
48+
_tpmanager.SetActiveProbe(uiTarget.GetComponent<TP_ProbePanel>().GetProbeController());
49+
break;
50+
case "AreaPanel":
51+
_tpmanager.ClickSearchArea(uiTarget);
52+
break;
53+
case "UIEvent":
54+
if (uiTarget.name.Equals("Text2ClipboardButton"))
55+
_tpmanager.CopyText();
56+
break;
5657
}
5758
}
5859
}

‎ProjectSettings/TagManager.asset‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,18 @@
44
TagManager:
55
serializedVersion: 2
66
tags:
7-
- MinPanels
8-
- PanelLabels
9-
- Stimulus
10-
- StimWindow
117
- BrainImage
12-
- SpikesPlot
13-
- ElectrodeSite
148
- ProbeModel
159
- Probe
1610
- Neuron
17-
- BrainRoot
1811
- TooltipCanvas
19-
- UIDraggable
2012
- BrainRegion
2113
- OntologyToggle
22-
- VideoWindow
2314
- ProbePanel
2415
- ProbeAreaText
2516
- BrainRotatorMiniControls
2617
- AreaPanel
18+
- UIEvent
2719
layers:
2820
- Default
2921
- TransparentFX

0 commit comments

Comments
 (0)