Skip to content

Commit b10bf53

Browse files
committed
Changed epoch group folder to epoch groupS folder to be consistent
1 parent 3efb622 commit b10bf53

File tree

2 files changed

+35
-36
lines changed

2 files changed

+35
-36
lines changed

src/main/matlab/+symphonyui/+ui/+views/DataManagerView.m

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ function createUi(obj)
134134
groups = uiextras.jTree.TreeNode( ...
135135
'Parent', root, ...
136136
'Name', 'Epoch Groups', ...
137-
'Value', struct('entity', [], 'type', EntityNodeType.EPOCH_GROUP_FOLDER));
137+
'Value', struct('entity', [], 'type', EntityNodeType.EPOCH_GROUPS_FOLDER));
138138
groups.setIcon(symphonyui.app.App.getResource('icons', 'folder.png'));
139139
groupsMenu = uicontextmenu('Parent', obj.figureHandle);
140140
uimenu( ...
@@ -597,11 +597,11 @@ function enableAddSourceMenu(obj, node, tf) %#ok<INUSL>
597597
menu = obj.addEntityContextMenus(menu);
598598
set(n, 'UIContextMenu', menu);
599599
end
600-
600+
601601
function setSourceNodeNormal(obj, node) %#ok<INUSL>
602602
node.setIcon(symphonyui.app.App.getResource('icons', 'source.png'));
603603
end
604-
604+
605605
function setSourceNodeWarn(obj, node) %#ok<INUSL>
606606
node.setIcon(symphonyui.app.App.getResource('icons', 'source_warn.png'));
607607
end
@@ -625,11 +625,11 @@ function setExperimentNode(obj, name, entity)
625625
'Name', name, ...
626626
'Value', value);
627627
end
628-
628+
629629
function setExperimentNodeNormal(obj, node) %#ok<INUSL>
630630
node.setIcon(symphonyui.app.App.getResource('icons', 'experiment.png'));
631631
end
632-
632+
633633
function setExperimentNodeWarn(obj, node) %#ok<INUSL>
634634
node.setIcon(symphonyui.app.App.getResource('icons', 'experiment_warn.png'));
635635
end
@@ -682,7 +682,7 @@ function setExperimentEndTime(obj, t)
682682
menu = obj.addEpochGroupContextMenus(menu);
683683
set(n, 'UIContextMenu', menu);
684684
end
685-
685+
686686
function setEpochGroupNodeCurrent(obj, node)
687687
node.setIcon(symphonyui.app.App.getResource('icons', 'group_current.png'));
688688
menu = uicontextmenu('Parent', obj.figureHandle);
@@ -704,7 +704,7 @@ function setEpochGroupNodeNormal(obj, node)
704704
menu = obj.addEpochGroupContextMenus(menu);
705705
set(node, 'UIContextMenu', menu);
706706
end
707-
707+
708708
function setEpochGroupNodeWarn(obj, node)
709709
node.setIcon(symphonyui.app.App.getResource('icons', 'group_warn.png'));
710710
menu = uicontextmenu('Parent', obj.figureHandle);
@@ -775,11 +775,11 @@ function enableEndEpochGroupMenu(obj, node, tf) %#ok<INUSL>
775775
menu = obj.addEntityContextMenus(menu);
776776
set(n, 'UIContextMenu', menu);
777777
end
778-
778+
779779
function setEpochBlockNodeNormal(obj, node) %#ok<INUSL>
780780
node.setIcon(symphonyui.app.App.getResource('icons', 'block.png'));
781781
end
782-
782+
783783
function setEpochBlockNodeWarn(obj, node) %#ok<INUSL>
784784
node.setIcon(symphonyui.app.App.getResource('icons', 'block_warn.png'));
785785
end
@@ -812,11 +812,11 @@ function setEpochBlockEndTime(obj, t)
812812
menu = obj.addEntityContextMenus(menu);
813813
set(n, 'UIContextMenu', menu);
814814
end
815-
815+
816816
function setEpochNodeNormal(obj, node) %#ok<INUSL>
817817
node.setIcon(symphonyui.app.App.getResource('icons', 'epoch.png'));
818818
end
819-
819+
820820
function setEpochNodeWarn(obj, node) %#ok<INUSL>
821821
node.setIcon(symphonyui.app.App.getResource('icons', 'epoch_warn.png'));
822822
end
@@ -833,7 +833,7 @@ function setEpochDataXLabel(obj, label)
833833
xlabel(obj.epochCard.axes, label, ...
834834
'Interpreter', 'tex');
835835
end
836-
836+
837837
function setEpochDataYLabel(obj, label, lr)
838838
if nargin < 3
839839
lr = 'left';
@@ -842,7 +842,7 @@ function setEpochDataYLabel(obj, label, lr)
842842
ylabel(obj.epochCard.axes, label, ...
843843
'Interpreter', 'tex');
844844
end
845-
845+
846846
function setEpochDataYAxisVisible(obj, tf, lr)
847847
if nargin < 3
848848
lr = 'left';
@@ -869,7 +869,7 @@ function addEpochDataLine(obj, x, y, color, lr)
869869
function addEpochDataLegend(obj, str)
870870
legend(obj.epochCard.axes, str);
871871
end
872-
872+
873873
function enableSelectEpochSignal(obj, tf)
874874
set(obj.epochCard.signalListBox, 'Enable', appbox.onOff(tf));
875875
end
@@ -882,15 +882,15 @@ function setEpochSignalList(obj, names, values)
882882
set(obj.epochCard.signalListBox, 'String', names);
883883
set(obj.epochCard.signalListBox, 'Values', values);
884884
end
885-
885+
886886
function enableEpochSignalConfiguration(obj, tf)
887887
set(obj.epochCard.grid, 'Enable', tf);
888888
end
889-
889+
890890
function setEpochSignalConfiguration(obj, fields)
891891
set(obj.epochCard.grid, 'Properties', fields);
892892
end
893-
893+
894894
function updateEpochSignalConfiguration(obj, fields)
895895
obj.epochCard.grid.UpdateProperties(fields);
896896
end
@@ -906,11 +906,11 @@ function setEpochProtocolParameters(obj, fields)
906906
function setNodeName(obj, node, name) %#ok<INUSL>
907907
set(node, 'Name', name);
908908
end
909-
909+
910910
function i = getNodeIndex(obj, node) %#ok<INUSL>
911911
i = find(node.Parent.Children == node, 1);
912912
end
913-
913+
914914
function setNodeTooltip(obj, node, t) %#ok<INUSL>
915915
set(node, 'TooltipString', t);
916916
end
@@ -1047,7 +1047,7 @@ function onSelectedPreset(obj, control, ~)
10471047
notify(obj, 'SelectedPreset');
10481048
end
10491049
end
1050-
1050+
10511051
function menu = addEpochGroupContextMenus(obj, menu)
10521052
uimenu( ...
10531053
'Parent', menu, ...
Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
classdef EntityNodeType
2-
2+
33
enumeration
44
SOURCES_FOLDER
55
SOURCE
66
EXPERIMENT
7-
EPOCH_GROUP_FOLDER
7+
EPOCH_GROUPS_FOLDER
88
EPOCH_GROUP
99
EPOCH_BLOCK
1010
EPOCH
1111
end
12-
12+
1313
methods
14-
14+
1515
function c = char(obj)
1616
import symphonyui.ui.views.EntityNodeType;
17-
17+
1818
switch obj
1919
case EntityNodeType.SOURCES_FOLDER
2020
c = 'Sources Folder';
2121
case EntityNodeType.SOURCE
2222
c = 'Source';
2323
case EntityNodeType.EXPERIMENT
2424
c = 'Experiment';
25-
case EntityNodeType.EPOCH_GROUP_FOLDER
26-
c = 'Epoch Group Folder';
25+
case EntityNodeType.EPOCH_GROUPS_FOLDER
26+
c = 'Epoch Groups Folder';
2727
case EntityNodeType.EPOCH_GROUP
2828
c = 'Epoch Group';
2929
case EntityNodeType.EPOCH_BLOCK
@@ -34,28 +34,27 @@
3434
c = 'Unknown';
3535
end
3636
end
37-
37+
3838
function tf = isSourcesFolder(obj)
3939
tf = obj == symphonyui.ui.views.EntityNodeType.SOURCES_FOLDER;
4040
end
41-
41+
4242
function tf = isSource(obj)
4343
tf = obj == symphonyui.ui.views.EntityNodeType.SOURCE;
4444
end
45-
45+
4646
function tf = isExperiment(obj)
4747
tf = obj == symphonyui.ui.views.EntityNodeType.EXPERIMENT;
4848
end
49-
49+
5050
function tf = isEpochGroupFolder(obj)
51-
tf = obj == symphonyui.ui.views.EntityNodeType.EPOCH_GROUP_FOLDER;
51+
tf = obj == symphonyui.ui.views.EntityNodeType.EPOCH_GROUPS_FOLDER;
5252
end
53-
53+
5454
function tf = isEpochGroup(obj)
5555
tf = obj == symphonyui.ui.views.EntityNodeType.EPOCH_GROUP;
5656
end
57-
57+
5858
end
59-
60-
end
6159

60+
end

0 commit comments

Comments
 (0)