Changeset 17 for trunk/src/series.m

Timestamp:

Feb 18, 2010, 7:37:48 PM (14 years ago)

Author:

sommeria

Message:

possibilite de créer une grille physique dans geometry_calib (le faire apres avoir introduit les points sur l'image avec la souris)
petites corrections mineures sur les autres fichiers

File:

• trunk/src/series.m (modified) (2 diffs)

trunk/src/series.m

@@ -1677 +1677 @@
 if ~isequal(path_series,PathName)
     CurrentPath=fileparts(which(ACTION));
-    if ~isequal(PathName,CurrentPath)
+    if ~isequal(CurrentPath,PathName)&&~isequal(CurrentPath,fullfile(PathName,'private'))
         addpath(PathName) 
         errormsg=check_functions;
@@ -4399 +4399 @@
             last_j2 =last_j +ind_shift(2);
             siz=size(SeriesData.Time{1});
-            if siz(1)>=last_i2 & siz(2)>=last_j2
+            if first_i1>=1 && first_j1
+                >=1 && siz(1)>=last_i2 && siz(2)>=last_j2
                 time_first=(time(first_i1,first_j1)+time(first_i2,first_j2))/2;
                 time_last=(time(last_i1,last_j1)+time(last_i2,last_j2))/2;