Changeset 932 for trunk/src/series

Timestamp:

Mar 15, 2016, 12:29:15 PM (9 years ago)

Author:

sommeria

Message:

writting access improved

Location:

trunk/src/series

Files:

• civ_input.m (modified) (1 diff)
• civ_series.m (modified) (1 diff)
• extract_rdvision.m (modified) (2 diffs)

trunk/src/series/civ_input.m

@@ -721 +721 @@
             numlist_a(index)=numod_a;
             numlist_b(index)=numod_b;
-            if size(time,2)>1 && ~checkframe
+            if size(time,2)>1 && ~checkframe && size(CivInputData.Time,1)>ref_i && size(CivInputData.Time,2)>numod_b
                 dt(numod_a,numod_b)=CivInputData.Time(ref_i+1,numod_b+1)-CivInputData.Time(ref_i+1,numod_a+1);%first time interval dt
                 displ_dt(index)=dt(numod_a,numod_b);

trunk/src/series/civ_series.m

@@ -890 +890 @@
         if isempty(errormsg)
             disp([ncfile_out ' written'])
+            [success,msg] = fileattrib(ncfile_out ,'+w','g');% allow writing access for the group of users, recursively in the folder
         else
             disp(errormsg)

trunk/src/series/extract_rdvision.m

@@ -451 +451 @@
 uid_Dtj=find(t,'ImaDoc/Camera/BurstTiming/Dtj');
 uid_content=get(t,uid_Dtj,'contents');
-Dtj=str2num(get(t,uid_content,'value'));
-nbfield2=numel(Dtj)+1;
-timestamp=(reshape(timestamp,nbfield2,[]))';
-diff_Dtj=diff(timestamp(1,:))-Dtj;
-if max(abs(diff_Dtj))>min(Dtj)/1000
-    disp(['Dtj from xml file differs from time stamp by ' num2str(max(abs(diff_Dtj))) ', '])%'
+Dtjstring=get(t,uid_content,'value');
+if isempty(Dtjstring)
+    timestamp=timestamp';
+    nbfield2=1;
 else
-    disp('Dtj OK');
-end
-
+    Dtj=str2num(get(t,uid_content,'value'));
+    nbfield2=numel(Dtj)+1;
+    timestamp=(reshape(timestamp,nbfield2,[]))';
+    diff_Dtj=diff(timestamp(1,:))-Dtj;
+    if max(abs(diff_Dtj))>min(Dtj)/1000
+        disp(['Dtj from xml file differs from time stamp by ' num2str(max(abs(diff_Dtj))) ', '])%'
+    else
+        disp('Dtj OK');
+    end
+end
 %% correct NbDti
 NbDti=size(timestamp,1); %default for series or burst
@@ -503 +508 @@
 
 save(t,newxml)
-
-
-
-
+       [success,msg] = fileattrib(newxml,'+w','g');% allow writing access for the group of users  
+        if success==0
+            msgbox_uvmat('WARNING',{['unable to set group write access to ' newxml ':']; msg1});%error message for directory creation
+        end
+
+
+