Changeset 388 for trunk/src/uvmat.m

Timestamp:

Apr 6, 2012, 4:37:12 PM (12 years ago)

Author:

sommeria

Message:

several bugs corrected
file indexing, color images...

File:

• trunk/src/uvmat.m (modified) (5 diffs)

trunk/src/uvmat.m

@@ -1631 +1631 @@
             ref_j=ref_j+increment;
         end
-    else% free increment
+    else % free increment
         if isequal(get(handles.runplus,'BackgroundColor'),[1 1 0])% if runplus is activated
             step=1;
@@ -1662 +1662 @@
     end
     if get(handles.scan_i,'Value')==1% case of scanning along index i
-        i1_subseries=UvData.i1_series{1}(ref_i+1,:,:);
+        i1_subseries=UvData.i1_series{1}(ref_i+1,ref_j+1,:);
     else
-        i1_subseries=UvData.i1_series{1}(:,ref_j+1,:);
+        i1_subseries=UvData.i1_series{1}(ref_i+1,ref_j+1,:);
     end
     i1_subseries=i1_subseries(i1_subseries>0);
@@ -1674 +1674 @@
     if ~isempty(UvData.i2_series{1})
         if get(handles.scan_i,'Value')==1% case of scanning along index i
-            i2_subseries=UvData.i2_series{1}(ref_i+1,:,:);
+            i2_subseries=UvData.i2_series{1}(ref_i+1,ref_j+1,:);
         else
-            i2_subseries=UvData.i2_series{1}(:,ref_j+1,:);
+            i2_subseries=UvData.i2_series{1}(ref_i+1,ref_j+1,:);
         end
         i2_subseries=i2_subseries(i2_subseries>0);
@@ -1683 +1683 @@
     if ~isempty(UvData.j1_series{1})
         if get(handles.scan_i,'Value')==1% case of scanning along index i
-            j1_subseries=UvData.j1_series{1}(ref_i+1,:,:);
+            j1_subseries=UvData.j1_series{1}(ref_i+1,ref_j+1,:);
         else
-            j1_subseries=UvData.j1_series{1}(:,ref_j+1,:);
+            j1_subseries=UvData.j1_series{1}(ref_i+1,ref_j+1,:);
         end
         j1_subseries=j1_subseries(j1_subseries>0);
@@ -1692 +1692 @@
     if ~isempty(UvData.j2_series{1})
         if get(handles.scan_i,'Value')==1% case of scanning along index i
-            j2_subseries=UvData.j2_series{1}(ref_i+1,:,:);
+            j2_subseries=UvData.j2_series{1}(ref_i+1,ref_j+1,:);
         else
-            j2_subseries=UvData.j2_series{1}(:,ref_j+1,:);
+            j2_subseries=UvData.j2_series{1}(ref_i+1,ref_j+1,:);
         end
         j2_subseries=j2_subseries(j2_subseries>0);