Added the ability to change source after epoch group is created

Author: cafarm

src/main/matlab/+symphonyui/+core/+persistent/+collections/EpochGroupSet.m

@@ -2,9 +2,6 @@
 
     properties
         label
-    end
-
-    properties (SetAccess = private)
         source
     end
 
@@ -38,6 +35,12 @@
                 s = obj.objects{1}.source;
             end
         end
+        
+        function set.source(obj, s)
+            for i = 1:obj.size
+                obj.get(i).source = s;
+            end
+        end
 
     end
 

src/main/matlab/+symphonyui/+core/+persistent/EpochGroup.m

@@ -2,10 +2,10 @@
 
     properties
         label
+        source
     end
 
     properties (SetAccess = private)
-        source
         epochGroups
         allEpochGroups
         epochBlocks
@@ -40,6 +40,10 @@ function applyPreset(obj, preset)
         function s = get.source(obj)
             s = symphonyui.core.persistent.Source(obj.cobj.Source);
         end
+        
+        function set.source(obj, s)
+            obj.cobj.Source = s.cobj;
+        end
 
         function g = get.epochGroups(obj)
             g = obj.cellArrayFromEnumerableOrderedBy(obj.cobj.EpochGroups, 'startTime', @symphonyui.core.persistent.EpochGroup);

src/main/matlab/+symphonyui/+ui/+presenters/DataManagerPresenter.m

@@ -64,6 +64,7 @@ function bind(obj)
             obj.addListener(v, 'BeginEpochGroup', @obj.onViewSelectedBeginEpochGroup);
             obj.addListener(v, 'EndEpochGroup', @obj.onViewSelectedEndEpochGroup);
             obj.addListener(v, 'SetEpochGroupLabel', @obj.onViewSetEpochGroupLabel);
+            obj.addListener(v, 'SelectedEpochGroupSource', @obj.onViewSelectedEpochGroupSource);
             obj.addListener(v, 'SelectedEpochSignal', @obj.onViewSelectedEpochSignal);
             obj.addListener(v, 'SetProperty', @obj.onViewSetProperty);
             obj.addListener(v, 'AddProperty', @obj.onViewSelectedAddProperty);
@@ -340,13 +341,15 @@ function updateEpochGroupNode(obj, group)
         end
 
         function populateDetailsForEpochGroupSet(obj, groupSet)
-            sourceSet = symphonyui.core.persistent.collections.SourceSet(groupSet.source);
-
+            allSources = obj.documentationService.getExperiment().allSources;
+            
             obj.view.enableEpochGroupLabel(groupSet.size == 1);
             obj.view.setEpochGroupLabel(groupSet.label);
             obj.view.setEpochGroupStartTime(strtrim(datestr(groupSet.startTime, 14)));
             obj.view.setEpochGroupEndTime(strtrim(datestr(groupSet.endTime, 14)));
-            obj.view.setEpochGroupSource(sourceSet.label);
+            obj.view.enableSelectEpochGroupSource(groupSet.size == 1);
+            obj.view.setEpochGroupSourceList(cellfun(@(s)s.label, allSources, 'UniformOutput', false), allSources);
+            obj.view.setSelectedEpochGroupSource(groupSet.source);
             obj.view.setCardSelection(obj.view.EPOCH_GROUP_CARD);
 
             obj.populateCommonDetailsForEntitySet(groupSet);
@@ -361,7 +364,19 @@ function onViewSetEpochGroupLabel(obj, ~, ~)
                 obj.view.showError(x.message);
                 return;
             end
-            obj.updateNodeNamesForEpochGroupSet(groupSet)
+            obj.updateNodeNamesForEpochGroupSet(groupSet);
+        end
+        
+        function onViewSelectedEpochGroupSource(obj, ~, ~)
+            groupSet = obj.getSelectedEntitySet();
+            try
+                groupSet.source = obj.view.getSelectedEpochGroupSource();
+            catch x
+                obj.log.debug(x.message, x);
+                obj.view.showError(x.message);
+                return;
+            end
+            obj.updateNodeNamesForEpochGroupSet(groupSet);
         end
 
         function updateNodeNamesForEpochGroupSet(obj, groupSet)

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

@@ -9,6 +9,7 @@
         BeginEpochGroup
         EndEpochGroup
         SetEpochGroupLabel
+        SelectedEpochGroupSource
         SelectedEpochSignal
         SetProperty
         AddProperty
@@ -260,11 +261,11 @@ function createUi(obj)
                 'Style', 'edit', ...
                 'Enable', 'off', ...
                 'HorizontalAlignment', 'left');
-            obj.epochGroupCard.sourceField = uicontrol( ...
+            obj.epochGroupCard.sourcePopupMenu = MappedPopupMenu( ...
                 'Parent', epochGroupGrid, ...
-                'Style', 'edit', ...
-                'Enable', 'off', ...
-                'HorizontalAlignment', 'left');
+                'String', {' '}, ...
+                'HorizontalAlignment', 'left', ...
+                'Callback', @(h,d)notify(obj, 'SelectedEpochGroupSource'));
             set(epochGroupGrid, ...
                 'Widths', [60 -1], ...
                 'Heights', [23 23 23 23]);
@@ -672,11 +673,24 @@ function setEpochGroupStartTime(obj, t)
         function setEpochGroupEndTime(obj, t)
             set(obj.epochGroupCard.endTimeField, 'String', t);
         end
-
-        function setEpochGroupSource(obj, s)
-            set(obj.epochGroupCard.sourceField, 'String', s);
+        
+        function enableSelectEpochGroupSource(obj, tf)
+            set(obj.epochGroupCard.sourcePopupMenu, 'Enable', appbox.onOff(tf));
+        end
+        
+        function s = getSelectedEpochGroupSource(obj)
+            s = get(obj.epochGroupCard.sourcePopupMenu, 'Value');
         end
 
+        function setSelectedEpochGroupSource(obj, s)
+            set(obj.epochGroupCard.sourcePopupMenu, 'Value', s);
+        end 
+        
+        function setEpochGroupSourceList(obj, names, values)
+            set(obj.epochGroupCard.sourcePopupMenu, 'String', names);
+            set(obj.epochGroupCard.sourcePopupMenu, 'Values', values);
+        end
+        
         function setEpochGroupNodeCurrent(obj, node)
             node.setIcon(symphonyui.app.App.getResource('icons/group_current.png'));
             menu = uicontextmenu('Parent', obj.figureHandle);
@@ -920,7 +934,7 @@ function enableSelectPreset(obj, tf)
         function setPresetList(obj, names, values)
             set(obj.presetPopupMenu, 'String', [{'Presets...', 'Add...', 'Manage...'} names]);
             set(obj.presetPopupMenu, 'Values', [{'Presets...', 'Add...', 'Manage...'} values]);
-            obj.presetPopupMenu.setSeparatorIndices([3]);
+            obj.presetPopupMenu.setSeparatorIndices(3);
         end
 
         function p = getSelectedPreset(obj)