Skip to content

Commit 705a5c0

Browse files
committed
Merge branch 'develop' of https://github.com/VirtualBrainLab/Pinpoint into develop
2 parents 5218446 + 4afbdd7 commit 705a5c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1383
-996
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"csharpier": {
6-
"version": "1.0.3",
6+
"version": "1.2.1",
77
"commands": [
88
"csharpier"
99
],

.idea/.idea.Pinpoint/.idea/copilot.data.migration.ask.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.Pinpoint/.idea/copilot.data.migration.ask2agent.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scripts/Models/MainReducers.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ namespace Models
88
/// </summary>
99
public static class MainReducers
1010
{
11+
public static MainState SetIsAutomationEnabledReducer(MainState state, IAction<bool> action)
12+
{
13+
return state with { IsAutomationEnabled = action.payload };
14+
}
15+
1116
public static MainState SetMainSplitViewStateReducer(
1217
MainState state,
1318
IAction<SplitView.State> action
@@ -27,6 +32,9 @@ IAction<int> action
2732

2833
public static class MainActions
2934
{
35+
public static readonly ActionCreator<bool> SET_IS_AUTOMATION_ENABLED =
36+
$"{SliceNames.MAIN_SLICE}/SetIsAutomationEnabled";
37+
3038
public static readonly ActionCreator<SplitView.State> SET_MAIN_SPLIT_VIEW_STATE =
3139
$"{SliceNames.MAIN_SLICE}/SetMainSplitViewState";
3240

Assets/Scripts/Models/MainState.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ namespace Models
66
[Serializable]
77
public record MainState
88
{
9+
public bool IsAutomationEnabled;
10+
911
public SplitView.State MainSplitViewState;
1012

1113
public int LeftSidePanelTabIndex;

Assets/Scripts/Models/Scene/ManipulatorState.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,33 @@ public record ManipulatorState
4242
public bool ManualControlEnabled;
4343

4444
#endregion
45+
46+
#region Automation
47+
48+
public AutomationProgressState AutomationProgressState;
49+
50+
public string TargetInsertionProbeName;
51+
52+
/// <summary>
53+
/// Manipulator depth when at the surface coordinate (mm).
54+
/// </summary>
55+
public float DuraDepth;
56+
57+
/// <summary>
58+
/// Atlas coordinate of the surface coordinate at the point of calibration (entry).
59+
/// </summary>
60+
public Vector4 DuraCoordinate;
61+
62+
/// <summary>
63+
/// Base insertion speed (µm/s).
64+
/// </summary>
65+
public int InsertionSpeed;
66+
67+
/// <summary>
68+
/// Drive past target distance (µm).
69+
/// </summary>
70+
public int DrivePastDistance;
71+
72+
#endregion
4573
}
4674
}

Assets/Scripts/Models/Scene/ProbeState.cs

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public record ProbeState
2121
public ProbeColor Color = ProbeColor.DarkBlue;
2222
public Color ColorValue => ProbeProperties.ProbeColors[(int)Color];
2323

24-
public ProbeDisplayType ProbeDisplayType = ProbeDisplayType.Opaque;
24+
public ProbeDisplayType ProbeDisplayType = ProbeDisplayType.Transparent;
2525

2626
public bool Locked;
2727

@@ -66,45 +66,5 @@ public record ProbeState
6666
public bool UIVisible = true;
6767

6868
#endregion
69-
70-
#region Ephys Link Control
71-
72-
public bool IsEphysLinkControlled;
73-
74-
public int NumAxes;
75-
76-
public string ManipulatorID;
77-
78-
public Vector3 Dimensions;
79-
80-
public bool IsRightHanded;
81-
82-
#endregion
83-
84-
#region Automation
85-
86-
public AutomationProgressState AutomationProgressState;
87-
88-
public Vector4 ReferenceCoordinateOffset;
89-
90-
public string SelectedTargetInsertionProbeName;
91-
92-
public float DuraDepth;
93-
94-
public Vector3 DuraCoordinate;
95-
96-
public bool Drop2SurfaceWithDepth;
97-
98-
/// <summary>
99-
/// Base insertion speed (µm/s).
100-
/// </summary>
101-
public int InsertionBaseSpeed;
102-
103-
/// <summary>
104-
/// Drive past target distance (µm).
105-
/// </summary>
106-
public int DrivePastDistance;
107-
108-
#endregion
10969
}
11070
}

0 commit comments

Comments
 (0)