Changeset 128 for trunk/src/read_geometry_calib.m

Timestamp:

Nov 21, 2010, 10:06:11 PM (14 years ago)

Author:

sommeria

Message:

series: give writting access to the group for all subdirectories produced
uvmat.fig: change of vect and scalar frames (to be consistent with view_field)
uvmat: various cleaning
plot_field: various cleaning to improve axes definition and avoid blinking
geometry_calib: improved dispay of point coordiantes, improved link with dataview for REPLICATE.
struct2nc: repair bug , file was not closed.
cell2tab: cleaning
dataview: improve the browser
civ: solve pb of image naming

File:

• trunk/src/read_geometry_calib.m (modified) (1 diff)

trunk/src/read_geometry_calib.m

@@ -9 +9 @@
     k=findstr('|',coord_str);%find separators '|'
     if length(k)>=4 % test for separators '|'
-        data1=str2num(coord_str(1:k(1)-5));
-        data2=str2num(coord_str(k(1)+5:k(2)-5));
-        data3=str2num(coord_str(k(2)+5:k(3)-5));
-        data4=str2num(coord_str(k(3)+5:k(4)-5));
-        data5=str2num(coord_str(k(4)+5:end));
-        if ~isempty(data1)||~isempty(data2)||~isempty(data3)||~isempty(data4)||~isempty(data5)
+        data1=str2double(coord_str(1:k(1)-2));
+        data2=str2double(coord_str(k(1)+2:k(2)-2));
+        data3=str2double(coord_str(k(2)+2:k(3)-2));
+        data4=str2double(coord_str(k(3)+2:k(4)-2));
+        data5=str2double(coord_str(k(4)+2:end));
+        if ~isnan(data1)||~isnan(data2)||~isnan(data3)||~isnan(data4)||~isnan(data5)
             iline=iline+1;
-            if ~isempty(data1)
+            if ~isnan(data1)
                 data.Coord(iline,1)=data1;
             end    
-            if ~isempty(data2)
+            if ~isnan(data2)
                 data.Coord(iline,2)=data2;
             end
-            if ~isempty(data3)
+            if ~isnan(data3)
                 data.Coord(iline,3)=data3;
             end
-            if ~isempty(data4)
+            if ~isnan(data4)
                 data.Coord(iline,4)=data4;
             end
-            if isempty(data5)
+            if isnan(data5)
                 data.Coord(iline,5)=0;
             else