Changeset 601 for trunk/src

Timestamp:

Apr 3, 2013, 1:39:53 PM (12 years ago)

Author:

sommeria

Message:

a few bugs corrected

Location:

trunk/src

Files:

• series.m (modified) (3 diffs)
• series/civ_series.m (modified) (5 diffs)
• uvmat.m (modified) (1 diff)

trunk/src/series.m

@@ -1342 +1342 @@
 
 %% select the Action modes
-RunModeList=get(handles.RunMode,'String');
-RunMode=RunModeList{get(handles.RunMode,'Value')};
+RunMode='local';%default
+if isfield(Series.Action,'RunMode')
+RunMode=Series.Action.RunMode;
+end
 ActionExt='.m';%default
 if isfield(Series.Action,'ActionExt')
@@ -1456 +1458 @@
     for iprocess=1:NbProcess
         if isempty(Series.IndexRange.NbSlice)
-            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength;
+            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
             if Series.IndexRange.first_i>last_i
                 break
             end
-            Series.IndexRange.last_i=min(first_i+(iprocess)*BlockLength-1,last_i);
+            Series.IndexRange.last_i=min(first_i+(iprocess)*BlockLength*incr_i-1,last_i);
         else
             Series.IndexRange.first_i= first_i+iprocess-1;
@@ -1509 +1511 @@
     for iprocess=1:NbProcess
         if isempty(Series.IndexRange.NbSlice)% process by blocks of i index
-            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength;
+            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
             if Series.IndexRange.first_i>last_i
                 NbProcess=iprocess-1;
                 break% leave the loop, we are at the end of the calculation
             end
-            Series.IndexRange.last_i=min(last_i,first_i+(iprocess)*BlockLength-1);
+            Series.IndexRange.last_i=min(last_i,first_i+(iprocess)*BlockLength*incr_i-1);
         else% process by slices of i index if NbSlice is defined, computation in a single process if NbSlice =1
             Series.IndexRange.first_i= first_i+iprocess-1;

trunk/src/series/civ_series.m

@@ -168 +168 @@
             %         if ~isfield(Param.Civ1,'ImageA')
             ImageName_A=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i1_series_Civ1(ifield),[],j1_series_Civ1(ifield));
-            [par_civ1.ImageA,MovieObject_A] = read_image(ImageName_A,FileType_A,MovieObject_A,FrameIndex_A_Civ1);
+            [par_civ1.ImageA,MovieObject_A] = read_image(ImageName_A,FileType_A,MovieObject_A,FrameIndex_A_Civ1(ifield));
             %         elseif ischar(Param.Civ1.ImageA)
             %             Param.Civ1.ImageA=regexprep(Param.Civ1.ImageA,'''','\');
@@ -175 +175 @@
             %         if ~isfield(Param.Civ1,'ImageB')
             ImageName_B=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i2_series_Civ1(ifield),[],j2_series_Civ1(ifield));
-            [par_civ1.ImageB,MovieObject_B] = read_image(ImageName_B,FileType_B,MovieObject_B,FrameIndex_B_Civ1);
+            [par_civ1.ImageB,MovieObject_B] = read_image(ImageName_B,FileType_B,MovieObject_B,FrameIndex_B_Civ1(ifield));
             %         elseif isfield(Param.Civ1,'ImageB')&& ischar(Param.Civ1.ImageB)
             %              Param.Civ1.ImageB=regexprep(Param.Civ1.ImageB,'''','\');
@@ -328 +328 @@
         ImageName_A_Civ2=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i1_series_Civ2(ifield),[],j1_series_Civ2(ifield));
 
-        if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A_Civ1,FrameIndex_A_Civ2)
+        if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A_Civ1(ifield),FrameIndex_A_Civ2)
             par_civ2.ImageA=par_civ1.ImageA;
         else
@@ -334 +334 @@
         end
         ImageName_B_Civ2=fullfile_uvmat(RootPath,SubDir,RootFile,FileExt,NomType,i2_series_Civ2(ifield),[],j2_series_Civ2(ifield));
-        if strcmp(ImageName_B_Civ2,ImageName_B) && isequal(FrameIndex_B_Civ1,FrameIndex_B_Civ2)
+        if strcmp(ImageName_B_Civ2,ImageName_B) && isequal(FrameIndex_B_Civ1(ifield),FrameIndex_B_Civ2)
             par_civ2.ImageB=par_civ1.ImageB;
         else
@@ -915 +915 @@
         NomTypeNc='_1-2';
     else
+        j1_series=j_series;
+        j2_series=j_series;
         NomTypeNc='_1-2_1';
     end

trunk/src/uvmat.m

@@ -544 +544 @@
 [RootPath,SubDir,RootFile,i1_series,i2_series,j1_series,j2_series,tild,FileType,FileInfo,MovieObject]=find_file_series(fullfile(RootPath,SubDir),[RootFile FileIndices FileExt]);
 % initiate the input file series and refresh the current field view: 
-update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,FileInfo,MovieObject,1);
+update_rootinfo(handles,i1_series,i2_series,j1_series,j2_series,FileType,MovieObject,1);
 
 %-----------------------------------------------------------------------