Mercurial > octave

diff scripts/gui/uigetdir.m @ 19833:9fc020886ae9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Clean up m-files to follow Octave coding conventions. Try to trim long lines to < 80 chars. Use '##' for single line comments. Use '(...)' around tests for if/elseif/switch/while. Abut cell indexing operator '{' next to variable. Abut array indexing operator '(' next to variable. Use space between negation operator '!' and following expression. Use two newlines between endfunction and start of %!test or %!demo code. Remove unnecessary parens grouping between short-circuit operators. Remove stray extra spaces (typos) between variables and assignment operators. Remove stray extra spaces from ends of lines.
author Rik <rik@octave.org>
date Mon, 23 Feb 2015 14:54:39 -0800
parents a9952a647d52
children 9b7ca334a104
line wrap: on
line diff
--- a/scripts/gui/uigetdir.m	Mon Feb 23 16:42:25 2015 +0000
+++ b/scripts/gui/uigetdir.m	Mon Feb 23 14:54:39 2015 -0800
@@ -20,9 +20,10 @@
 ## @deftypefn  {Function File} {@var{dirname} =} uigetdir ()
 ## @deftypefnx {Function File} {@var{dirname} =} uigetdir (@var{init_path})
 ## @deftypefnx {Function File} {@var{dirname} =} uigetdir (@var{init_path}, @var{dialog_name})
-## Open a GUI dialog for selecting a directory.  If @var{init_path} is not
-## given the current working directory is used.  @var{dialog_name} may be
-## used to customize the dialog title.
+## Open a GUI dialog for selecting a directory.
+##
+## If @var{init_path} is not given the current working directory is used.
+## @var{dialog_name} may be used to customize the dialog title.
 ## @seealso{uigetfile, uiputfile}
 ## @end deftypefn
 
@@ -30,17 +31,15 @@
 
 function dirname = uigetdir (init_path = pwd, dialog_name = "Select Directory to Open")
 
-  funcname = __get_funcname__ (mfilename ());
-
   if (nargin > 2)
     print_usage ();
   endif
 
-  if (!ischar (init_path) || !ischar (dialog_name))
+  if (! ischar (init_path) || ! ischar (dialog_name))
     error ("uigetdir: INIT_PATH and DIALOG_NAME must be string arguments");
   endif
 
-  if (!isdir (init_path))
+  if (! isdir (init_path))
     init_path = fileparts (init_path);
   endif
 
@@ -55,8 +54,10 @@
                                      default_file_name, dialog_position,
                                      dialog_mode, init_path);
   else
+    funcname = __get_funcname__ (mfilename ());
     dirname = feval (funcname, init_path, dialog_name);
   endif
+
 endfunction