Merge branch 'dev'

Author: k1o0

+dat/listSubjects.m

@@ -14,4 +14,4 @@
 mainPath = dat.reposPath('main', 'remote');
 
 dirs = unique(cellflat(rmEmpty(file.list(mainPath, 'dirs'))));
-subjects = dirs(~cellfun(@(d)startsWith(d, '@'), dirs)); % exclude misc directories
+subjects = dirs(~startsWith(dirs, '@')); % exclude misc directories

+dat/newExp.m

@@ -34,7 +34,8 @@
 
 % check the subject exists in the database
 exists = any(strcmp(dat.listSubjects, subject));
-assert(exists, sprintf('"%s" does not exist', subject));
+errMsg = sprintf('subject "%s" does not exist', subject);
+assert(exists, 'Rigbox:dat:newExp:subjectNotFound', errMsg);
 
 % retrieve list of experiments for subject
 [~, dateList, seqList] = dat.listExps(subject);
@@ -52,11 +53,23 @@
 % main repository is the reference location for which experiments exist
 [expPath, expRef] = dat.expPath(subject, floor(expDate), expSeq, 'main');
 % ensure nothing went wrong in making a "unique" ref and path to hold
-assert(~any(file.exists(expPath)), ...
-  sprintf('Something went wrong as experiment folders already exist for "%s".', expRef));
+present = file.exists(expPath);
+assert(~any(present), 'Rigbox:dat:newExp:expFoldersAlreadyExist', ...
+  'The following experiment folder(s) already exist(s) for "%s":\r\t%s', ...
+  expRef, strjoin(expPath(present), '\n\t'))
+
+try
+  % now make the folder(s) to hold the new experiment
+  created = cellfun(@mkdir, expPath);
+  assert(all(created))
+catch
+  % Delete any folders we just created and rethrow error
+  cellfun(@rmdir, expPath(created));  
+  error('Rigbox:dat:newExp:mkdirFailed', ...
+    'Failed to create the following directories:\r\t%s', ...
+    strjoin(expPath(~created), '\n\t'))
+end
 
-% now make the folder(s) to hold the new experiment
-assert(all(cellfun(@(p) mkdir(p), expPath)), 'Creating experiment directories failed');
 
 % if the parameters had an experiment definition function, save a copy in
 % the experiment's folder

+eui/AlyxPanel.m

@@ -59,20 +59,20 @@
     end
 
     methods
-        function obj = AlyxPanel(parent, active)
+        function obj = AlyxPanel(parent, url)
             % Constructor to build all the UI elements and set callbacks to
             % the relevant functions.  If a handle to parant UI object is
             % not specified, a seperate figure is created.  An optional
             % handle to a logging display panal may be provided, otherwise
-            % one is created. If the active flag is set to false, the panel
-            % is inactive and the instance of Alyx will be set to headless.
-            % The panel defaults to active only if the databaseURL field is
-            % populated in the paths.
+            % one is created. The panel will be rendered inactive and the
+            % instance of Alyx will be set to headless if an empty database
+            % URL is provided, or if no URL is provided and the databaseURL
+            % field is not populated in the paths.
             %
             % See also Alyx
-            
+            noParent = ~nargin || isempty(parent);
             obj.AlyxInstance = Alyx('','');
-            if ~nargin % No parant object: create new figure
+            if noParent % No parant object: create new figure
                 f = figure('Name', 'alyx GUI',...
                     'MenuBar', 'none',...
                     'Toolbar', 'none',...
@@ -91,15 +91,18 @@
                 % be set by any other GUI that instantiates this object (e.g.
                 % MControl using this as a panel.
                 obj.NewExpSubject.addlistener('SelectionChanged', @(src, evt)obj.dispWaterReq(src, evt));
+            else
+              % We'll need the figure handle for adding a context menu
+              f = ancestor(parent, 'Figure');
             end
 
             % Check to see if there is a remote database url defined in
             % the paths, if so activate AlyxPanel
             if nargin < 2
               url = char(getOr(dat.paths, 'databaseURL', ''));
-              active = ~isempty(url);
             end
 
+            obj.AlyxInstance.BaseURL = url;
             obj.RootContainer = uix.Panel('Parent', parent, 'Title', 'Alyx');
             alyxbox = uiextras.VBox('Parent', obj.RootContainer);
 
@@ -114,8 +117,8 @@
                 'Callback', @(~,~)obj.login);
             loginbox.Widths = [-1 75];
 
-            % If active flag set as false, make Alyx headless
-            if ~active
+            % If URL is empty, make Alyx headless
+            if isempty(url)
                 obj.AlyxInstance.Headless = true;
                 set(obj.LoginButton, 'Enable', 'off')
             end
@@ -195,7 +198,7 @@
                 'Enable', 'off',...
                 'Callback', @(~,~)obj.launchSessionURL);
 
-            if ~nargin
+            if noParent
                 % logging message area
                 obj.LoggingDisplay = uicontrol('Parent', parent, 'Style', 'listbox',...
                     'Enable', 'inactive', 'String', {});
@@ -204,6 +207,12 @@
                 % Use parent's logging display
                 obj.LoggingDisplay = findobj('Tag', 'Logging Display');
             end
+            obj.log('using database %s', obj.AlyxInstance.BaseURL)
+            % Add context menu for changing database
+            c = uicontextmenu(f);
+            obj.RootContainer.UIContextMenu = c;
+            uimenu(c, 'Label', 'Change database URL', ...
+              'MenuSelectedFcn', @(~,~)obj.changeURL());
         end
 
         function delete(obj)
@@ -301,6 +310,25 @@ function login(obj, varargin)
             obj.dispWaterReq()
         end
 
+        function changeURL(obj, url)
+            % Sets the database URL of the AlyxInstance.  When called with
+            % no inputs, the user is prompted to type in a new URL.  If
+            % logged in, the current token is deleted before changing URL
+            % (unless the new URL is identical).
+            current = obj.AlyxInstance.BaseURL;
+            if nargin == 1 % Prompt user for input
+              prompt = sprintf(['Please enter a database URL to connect to.\n'...
+                'This will log you out of the current database.\n']);
+              url = newid(prompt,'Database URL', [1 50], {current});
+            end
+            % Return if user pressed 'Close' or 'x', or url unchanged
+            if isempty(url) || strcmpi(url, current), return, end
+            % Clear current token, if there is one
+            if obj.AlyxInstance.IsLoggedIn, obj.login; end
+            obj.AlyxInstance.BaseURL = url; % Change URL
+            obj.log('using database %s', obj.AlyxInstance.BaseURL)
+        end
+        
         function giveWater(obj)
             % Callback to the give water button.  Posts the value entered
             % in the text box as either liquid or gel depending on the

+eui/SignalsTest.m

@@ -196,10 +196,21 @@
 
         InitializePsychSound
         d = PsychPortAudio('GetDevices');
-        d = d([d.NrOutputChannels] == 2);
-        [~,I] = min([d.LowOutputLatency]);
-        obj.Hardware.audioDevices = d(I);
-        obj.Hardware.audioDevices.DeviceName = 'default';
+        
+        % Keep output devices
+        d = d([d.NrOutputChannels] > 0);
+        obj.Hardware.audioDevices = d([d.NrOutputChannels] > 0);
+        
+        % Select the lowest latency stereo output as the default
+        stereo = [d.NrOutputChannels] == 2;
+        [~,I] = min([d(stereo).LowOutputLatency]);
+        I = I + sum(~stereo(1:I));
+        if isempty(I)
+          warning('Rigbox:eui:SignalsTest:NoStereoOutput', ...
+            'No stereo output audio devices detected; default unassigned')
+        else
+          obj.Hardware.audioDevices(I).DeviceName = 'default';
+        end
       else
         obj.Hardware = rig;
       end