Changeset 1188 for trunk/src/series/civ_input.m

Timestamp:

Dec 11, 2025, 8:45:31 AM (3 days ago)

Author:

sommeria

Message:

file relabeling implemented for civ_series

File:

• trunk/src/series/civ_input.m (modified) (5 diffs)

trunk/src/series/civ_input.m

@@ -163 +163 @@
         MaxIndex_i=find(SeriesData.i1_series{iview_image}(1,2,:),1,'last' )-1;%max ref index i detected in the series (corresponding to the last non-zero value of i1_series)
     else
-        ref_i=squeeze(max(SeriesData.i1_series{iview_image}(1,:,:),[],2));% select ref_j index for each ref_i
-        ref_j=squeeze(max(SeriesData.j1_series{iview_image}(1,:,:),[],3));% select ref_i index for each ref_j
-        MinIndex_i=min(find(ref_i))-1;
-        MaxIndex_i=max(find(ref_i))-1;
-        MaxIndex_j=max(find(ref_j))-1;
-        MinIndex_j=min(find(ref_j))-1;
+        
+        if ndims(SeriesData.j1_series{iview_image})==3% usuual file series input
+            ref_i=squeeze(max(SeriesData.i1_series{iview_image}(1,:,:),[],2));% select ref_j index for each ref_i
+            ref_j=squeeze(max(SeriesData.j1_series{iview_image}(1,:,:),[],3));% select ref_i index for each ref_j
+            MinIndex_i=min(find(ref_i))-1;
+            MaxIndex_i=max(find(ref_i))-1;
+            MaxIndex_j=max(find(ref_j))-1;
+            MinIndex_j=min(find(ref_j))-1;
+        else %case with relabeling
+            MinIndex_i=1;
+            MaxIndex_i=numel(SeriesData.i1_series{iview_image});% case relabel
+            MinIndex_j=1;
+            MaxIndex_j=max(1,numel(SeriesData.j1_series{iview_image}));% =1 if j1_series empty
+        end
     end
 end
@@ -176 +184 @@
 time=[];
 TimeUnit='frame'; %default
-CoordUnit='';%default
-pxcm_search=1;
+% CoordUnit='';%default
+% pxcm_search=1;
 if isfield(SeriesData,'Time') &&numel(SeriesData.Time')>=1 && ~isempty(SeriesData.Time{1})
     time=SeriesData.Time{1};
@@ -184 +192 @@
     TimeUnit=Param.IndexRange.TimeUnit;
 end 
-if isfield(SeriesData,'GeometryCalib')
-    tsai=SeriesData.GeometryCalib;
-    if isfield(tsai,'fx_fy')
-        pxcm_search=max(tsai.fx_fy(1),tsai.fx_fy(2));%pixels:cm estimated for the search range
-    end
-    if isfield(tsai,'CoordUnit')
-        CoordUnit=tsai.CoordUnit;
-    end
-end
+% if isfield(SeriesData,'GeometryCalib')
+%     tsai=SeriesData.GeometryCalib;
+%     if isfield(tsai,'fx_fy')
+%         pxcm_search=max(tsai.fx_fy(1),tsai.fx_fy(2));%pixels:cm estimated for the search range
+%     end
+%     if isfield(tsai,'CoordUnit')
+%         CoordUnit=tsai.CoordUnit;
+%     end
+% end
 
 %% timing display
@@ -824 +832 @@
 %reproduce by default the chosen pair in the checkciv2 menu
 set(handles.ListPairCiv2,'Value',get(handles.ListPairCiv1,'Value'))%civ2 selection the same as civ1 by default
-%ListPairCiv2_Callback(hObject, eventdata, handles)
 
 % %------------------------------------------------------------------------
@@ -978 +985 @@
         end
         if index_pair ~=0
-        [tild,indsort]=sort(dt);
+        [~,indsort]=sort(dt);
         displ_pair=displ_pair(indsort);
         displ_pair_dt=displ_pair_dt(indsort);