Changeset 709 for trunk

Timestamp:

Feb 16, 2014, 9:09:13 AM (10 years ago)

Author:

sommeria

Message:

improve check svn with command "&"
improve import config in series

Location:

trunk/src

Files:

• check_files.m (modified) (1 diff)
• series.m (modified) (1 diff)
• uvmat.m (modified) (2 diffs)

trunk/src/check_files.m

@@ -167 +167 @@
         svn_info.cur_rev=str2double(t.rev); %version nbre of the current package
     end
-    [tild,result]=system(['svn info -r ''HEAD'' '  pathuvmat]);
+    [tild,result]=system(['svn info -r ''HEAD'' '  pathuvmat ' &']);
     t=regexp(result,'R.vision\s*:\s*(?<rev>\d+)','names');
     if ~isempty(t)
         svn_info.rep_rev=str2double(t.rev); % version nbre available on the svn repository
     end
-    [tild,result]=system(['svn status '  pathuvmat]);
+    [tild,result]=system(['svn status '  pathuvmat ' &']);% '&' prevents the program to stop when the system asks password
     svn_info.status=result;
     checkmsg =[checkmsg {['SVN revision : ' num2str(svn_info.cur_rev)]}];%display version nbre of the current uvmat package

trunk/src/series.m

@@ -243 +243 @@
 
 %% introduce the input file name(s) if defined from input Param
-if isfield(Param,'FileName')
+if isfield(Param,'FileName')&&~isempty(Param.FileName)
     %InputTable={'','','','',''}; % refresh the file input table
     InputTable={}

trunk/src/uvmat.m

@@ -1870 +1870 @@
     if isequal(FieldName,'image')
         index=2;
-        [RootPath,tild,RootFile,FileIndex_1,Ext,NomType]=read_file_boxes_1(handles);
+        [RootPath,SubDir,RootFile,FileIndex_1,Ext,NomType]=read_file_boxes_1(handles);% get info from the second input line
     else
         msgbox_uvmat('ERROR','an image or movie must be first introduced as input')
@@ -1909 +1909 @@
 if isempty(num_i2)
     num_i2=num_i1;%repeat the index i1 by default
+end
+if isempty(num_j1)
+    num_j1=1;
+end
+if isempty(num_j2)
+    num_j2=num_j1;%repeat the index i1 by default
 end
 imaname_1=fullfile_uvmat(RootPath,SubDir,RootFile,Ext,NomType,num_i2,[],num_j2);