Changeset 642 for trunk/src

Timestamp:

May 23, 2013, 12:33:04 AM (12 years ago)

Author:

sommeria

Message:

civ_input improved and small bug corrections

Location:

trunk/src/series

Files:

• civ_input.fig (modified) (previous)
• civ_input.m (modified) (6 diffs)
• merge_proj.m (modified) (5 diffs)
• sub_background.m (modified) (1 diff)

trunk/src/series/civ_input.m

@@ -97 +97 @@
 NomTypeNc='';
 switch FileType
-         case {'image','multimage','video','mmreader'}
-          NomTypeImaA=NomTypeInput; 
+    case {'image','multimage','video','mmreader'}
+        NomTypeImaA=NomTypeInput;
+        iview_image=1;%line # for the input images
     case 'civdata'
         if ~strcmp(Param.Action.ActionName,'civ_series')
@@ -111 +112 @@
         else
             set(handles.ListCompareMode,'Value',1)
-%            set(handles.RootFile_1,'Visible','Off');
+            %            set(handles.RootFile_1,'Visible','Off');
         end
         imageinput='';
@@ -117 +118 @@
         [PathCiv1_ImageA,Civ1_ImageA,FileExtA]=fileparts(Data.Civ1_ImageA);
         [PathCiv1_ImageB,Civ1_ImageB,FileExtA]=fileparts(Data.Civ1_ImageB);
-%         set(handles.Civ1_ImageA,'String',Civ1_ImageA)
-%         set(handles.Civ1_ImageB,'String',Civ1_ImageB)
+        %         set(handles.Civ1_ImageA,'String',Civ1_ImageA)
+        %         set(handles.Civ1_ImageB,'String',Civ1_ImageB)
         if ~isempty(Data.Civ2_ImageA)
-        [PathCiv2_ImageA,Civ2_ImageA,FileExtA]=fileparts(Data.Civ2_ImageA);
-        [PathCiv2_ImageB,Civ2_ImageB,FileExtA]=fileparts(Data.Civ2_ImageB);
-%         set(handles.Civ2_ImageA,'String',Civ2_ImageA)
-%         set(handles.Civ2_ImageB,'String',Civ2_ImageB)
+            [PathCiv2_ImageA,Civ2_ImageA,FileExtA]=fileparts(Data.Civ2_ImageA);
+            [PathCiv2_ImageB,Civ2_ImageB,FileExtA]=fileparts(Data.Civ2_ImageB);
+            %         set(handles.Civ2_ImageA,'String',Civ2_ImageA)
+            %         set(handles.Civ2_ImageB,'String',Civ2_ImageB)
         end
         hhseries=guidata(gcbf);
         if size(Param.InputTable,1)==1
-        series('display_file_name',hhseries,Data.Civ1_ImageA,'append');
-        end
-    if isfield(Data,'Txt')
-        errormsg=Data.Txt;
-        return
-        %TODO: introduce the image in the input table of series
-    end
+            series('display_file_name',hhseries,Data.Civ1_ImageA,'append');
+        end
+        if isfield(Data,'Txt')
+            errormsg=Data.Txt;
+            return
+            %TODO: introduce the image in the input table of series
+        end
         [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaA]=fileparts_uvmat(Data.Civ1_ImageA);
         [RootPath,SubDir,RootFile,i1,i2,j1,j2,FileExt,NomTypeImaB]=fileparts_uvmat(Data.Civ1_ImageB);
+        iview_image=2;%line # for the input images
     case 'civxdata'% case of  civx data,
         NomTypeNc=NomTypeInput;
@@ -142 +144 @@
         msgbox_uvmat('ERROR','old civX convention, use the GUI civ')
         return
-     
 end
 
@@ -193 +194 @@
 
 %%  set the menus of image pairs and default selection for civ_input   %%%%%%%%%%%%%%%%%%%
-MaxIndex_i=Param.IndexRange.MaxIndex_i(1);
-MinIndex_i=Param.IndexRange.MinIndex_i(1);
+MaxIndex_i=Param.IndexRange.MaxIndex_i(iview_image);
+MinIndex_i=Param.IndexRange.MinIndex_i(iview_image);
 MaxIndex_j=1;%default
 MinIndex_j=1;
 if isfield(Param.IndexRange,'MaxIndex_j')&&isfield(Param.IndexRange,'MinIndex_j')
-MaxIndex_j=Param.IndexRange.MaxIndex_j(1);
-MinIndex_j=Param.IndexRange.MinIndex_j(1);
+MaxIndex_j=Param.IndexRange.MaxIndex_j(iview_image);
+MinIndex_j=Param.IndexRange.MinIndex_j(iview_image);
 end
 CivInputData.MaxIndex_i=MaxIndex_i;
@@ -1251 +1252 @@
             end
         end
+        
     end
     [dtsort,indsort]=sort(dt);

trunk/src/series/merge_proj.m

@@ -161 +161 @@
 NomTypeOut=NomType;% output file index will indicate the first and last ref index in the series
 
+%% mask (TODO: case of multilevels)
+if Param.CheckMask
+    MaskData=cell(NbView,1);
+    MaskSubDir=regexprep(Param.InputTable{iview,2},'\..*','');%take the root part of SubDir, before the first dot '.'
+    MaskName=fullfile(Param.InputTable{iview,1},[MaskSubDir '.mask'],'mask_1.png');
+    if exist(MaskName,'file')
+        [MaskData{iview},tild,errormsg] = read_field(MaskName,'image');
+        if ~isempty(transform_fct) && nargin(transform_fct)>=2
+            MaskData{iview}=transform_fct(MaskData,XmlData{iview});
+        end
+    end
+end
+
 %% Set field names and velocity types
 %use Param.InputFields for all views
@@ -174 +187 @@
 for index=1:NbField
         update_waitbar(WaitbarHandle,index/NbField)
-    if ~isempty(RUNHandle) &&ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+    if ~isempty(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
         return
@@ -196 +209 @@
             Data{iview}.ZIndex=mod(i1_series{iview}(index)-1,NbSlice_calib{iview})+1;%Zindex for phys transform
         end
-
+        
         %% transform the input field (e.g; phys) if requested (no transform involving two input fields)
         if ~isempty(transform_fct)
@@ -206 +219 @@
         end
         
-         %% calculate tps coefficients if needed
+        %% calculate tps coefficients if needed
         check_proj_tps= isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps');
         Data{iview}=tps_coeff_field(Data{iview},check_proj_tps);
-
+        
         %% projection on object (gridded plane)
         if Param.CheckObject
@@ -220 +233 @@
         
         %% mask
-        if isfield(Param,'Mask')
-            %TODO: introduce a table of masks for multiple views
-            [MaskData{iview},tild,errormsg] = read_field(Param.Mask,'image');
-            if ~isempty(transform_fct) && nargin(transform_fct)>=2
-                    MaskData{iview}=transform_fct(MaskData,XmlData{iview});
-            end
-            [Data{iview},errormsg]=mask_proj(Data{iview},MaskData{iview});
+        if Param.CheckMask && ~isempty(MaskData{iview})
+             [Data{iview},errormsg]=mask_proj(Data{iview},MaskData{iview});
         end
     end

trunk/src/series/sub_background.m

@@ -113 +113 @@
     CheckImage=~isempty(find(strcmp(FileType,ImageTypeOptions), 1));% =1 for images
     if ~CheckImage
-        msgbox_uvmat('ERROR',['invalid file type input: ' FileType{1} ' not an image'])
+        msgbox_uvmat('ERROR',['invalid file type input: ' FileType ' not an image'])
         return
     end