Changeset 1170 for trunk/src/series

Timestamp:

Jan 17, 2025, 10:47:01 PM (3 weeks ago)

Author:

sommeria

Message:

Library Teleops infrared camera added

Location:

trunk/src/series

Files:

• civ_input.m (modified) (2 diffs)
• civ_series.m (modified) (2 diffs)

trunk/src/series/civ_input.m

@@ -877 +877 @@
 ref_j=[];
 if isequal(mode_selected,'pair j1-j2')%|isequal(mode,'st_pair j1-j2')
-    ref_j=0;
+     ref_j=0;
+    MinIndex_j=str2num(get(handles.MinIndex_j,'String'));
+        MaxIndex_j=str2num(get(handles.MaxIndex_j,'String'));
+        if MaxIndex_j-MinIndex_j>10
+            mode_selected= 'series(Dj)';
+           ref_j= str2double(get(handles.ref_j,'String'));
+        end
 elseif strcmp(get(handles.ref_j,'Visible'),'on')
     ref_j=str2double(get(handles.ref_j,'String'));
@@ -935 +941 @@
         end
     case 'pair j1-j2'%case of pairs
-        MinIndex_j=str2num(get(handles.MinIndex_j,'String'));
-        MaxIndex_j=str2num(get(handles.MaxIndex_j,'String'));
+%         MinIndex_j=str2num(get(handles.MinIndex_j,'String'));
+%         MaxIndex_j=str2num(get(handles.MaxIndex_j,'String'));
+%         if MaxIndex_j-MinIndex_j>10
+%             disp('too many pairs, switch to mode series(Dj)')
+%             return
+%         end
         index_pair=0;
         %get all the Time intervals in bursts

trunk/src/series/civ_series.m

@@ -73 +73 @@
     Data.OutputFileMode='NbInput_i';% one output file expected per value of i index (used for waitbar)
     Data.CheckOverwriteVisible='on'; % manage the overwrite of existing files (default=1)
-    if isfield(Data,'ActionInput') && isfield(Data.ActionInput,'PairIndices') && strcmp(Data.ActionInput.PairIndices.ListPairMode,'pair j1-j2')
+    if isfield(Data,'ActionInput') && isfield(Data.ActionInput,'PairIndices') && isequal(Data.ActionInput.PairIndices.ListPairMode,'pair j1-j2')
         Data.IndexRange_j='off';%no j index display in series
     else
@@ -346 +346 @@
                     [FileInfo_A,VideoObject_A]=get_file_info(ImageName_A);
                     FileType_A=FileInfo_A.FileType;
-                    if isempty(Time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video','cine_phantom'}), 1))% case of video input
-                        Time=zeros(FileInfo_A.NumberOfFrames+1,2);
+                    if isempty(Time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video','cine_phantom','telopsIR'}), 1))% case of video input
+                        Time=zeros(FileInfo_A.NumberOfFrames+1,2);                  
                         Time(:,2)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate)';
+                           if ~isempty(j1_series_Civ1) && j1_series_Civ1~=1
+                               Time=Time';
+                           end
                     end
                     if ~isempty(FileType_A) && isempty(Time)% Time = index i +0.001 index j by default