Changeset 316 for trunk/src

Timestamp:

Dec 4, 2011, 5:54:17 PM (13 years ago)

Author:

sommeria

Message:

a few more bugs corrected, now the new civ_matlab works for civ1,fix1, patch1

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (7 diffs)
• civ_matlab.m (modified) (6 diffs)
• read_civdata.m (modified) (1 diff)
• uvmat.m (modified) (4 diffs)

trunk/src/civ.m

@@ -23 +23 @@
 %TODO: search range
 
-% Last Modified by GUIDE v2.5 03-Dec-2011 16:08:25
+% Last Modified by GUIDE v2.5 04-Dec-2011 08:42:47
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
@@ -268 +268 @@
 %set(handles.thresh_patch1,'Visible','off')
 % set(handles.thresh_text1,'Visible','off')
-% set(handles.num_MaxDiff,'Visible','off')
-% set(handles.thresh_text2,'Visible','off')
+set(handles.num_MaxDiff,'Visible','off')
+set(handles.title_MaxDiff,'Visible','off')
 set(handles.num_Rho,'Style','edit')
 set(handles.num_Rho,'String','1')
@@ -281 +281 @@
 set(handles.MenuMatlab,'checked','on')
 set(handles.MenuCivX,'checked','off')
-if get(handles.CheckPatch1,'Value')
-    set(handles.thresh_patch1,'Visible','on')
-    set(handles.thresh_text1,'Visible','on')
-end
-if get(handles.CheckPatch2,'Value')
-    set(handles.num_MaxDiff,'Visible','on')
-    set(handles.thresh_text2,'Visible','on')
-end
+% if get(handles.CheckPatch1,'Value')
+set(handles.num_MaxDiff,'Visible','on')
+set(handles.title_MaxDiff,'Visible','on')
+
+% end
 set(handles.num_Rho,'Style','popupmenu')
 set(handles.num_Rho,'Value',1)
@@ -868 +865 @@
             lastfield='';
             % check the content  netcdf file
-            Data=nc2struct(civ_files{ifile},'ListGlobalAttribute','patch2','fix2','civ2','patch','fix');
-            if ~isempty(Data.patch2) && isequal(Data.patch2,1)
-                option=6;
-                option_str='patch2';
-            elseif ~isempty(Data.fix2) && isequal(Data.fix2,1)
-                option=5;
-                option_str='fix2';
-            elseif ~isempty(Data.civ2) && isequal(Data.civ2,1);
-                option=4;
-                option_str='civ2';
-            elseif ~isempty(Data.patch) && isequal(Data.patch,1);
-                option=3;
-                option_str='patch1';
-            elseif ~isempty(Data.fix) && isequal(Data.fix,1);
-                option=2;
-                option_str='fix1';
+            Data=nc2struct(civ_files{ifile},'ListGlobalAttribute','CivStage','patch2','fix2','civ2','patch','fix');
+            option_list={'civ1','fix1','patch1','civ2','fix2','patch2'};
+            if ~isempty(Data.CivStage)
+                option=Data.CivStage;
             else
-                option=1;
-                option_str='civ1';
-            end
+                if ~isempty(Data.patch2) && isequal(Data.patch2,1)
+                    option=6;
+                    %                 option_str='patch2';
+                elseif ~isempty(Data.fix2) && isequal(Data.fix2,1)
+                    option=5;
+                    %                 option_str='fix2';
+                elseif ~isempty(Data.civ2) && isequal(Data.civ2,1);
+                    option=4;
+                    %                 option_str='civ2';
+                elseif ~isempty(Data.patch) && isequal(Data.patch,1);
+                    option=3;
+                    %                 option_str='patch1';
+                elseif ~isempty(Data.fix) && isequal(Data.fix,1);
+                    option=2;
+                    %                 option_str='fix1';
+                else
+                    option=1;
+                    %                 option_str='civ1';
+                end
+            end
+            option_str=option_list{option};
         end
         if option >= option_civ
@@ -3717 +3720 @@
 end
 if testmask
-    stage=1;%default
-    switch parent_tag
-%         case 'Fix1'
-%             stage=2;
-        case 'Civ2'
-             stage=3;
-%         case 'Fix2'
-%             stage=4;
-    end
-    set(handles.txt_Mask(stage:end),'Visible','on')
-    set(handles.txt_Mask(stage:end),'String',filemask)
-    set(handles.CheckMask(stage:end),'Value',1)
+%     stage=4;%default
+    if strcmp(parent_tag,'Civ1')
+            set(handles.txt_Mask,'Visible','on')
+        set(handles.txt_Mask,'String',filemask)
+    set(handles.CheckMask,'Value',1)
+    end
+%     switch parent_tag
+% %         case 'Fix1'
+% %             stage=2;
+%         case 'Civ2'
+%              stage=3;
+% %         case 'Fix2'
+% %             stage=4;
+%     end
+%     set(handles.txt_Mask(stage:end),'Visible','on')
+%     set(handles.txt_Mask(stage:end),'String',filemask)
+%     set(handles.CheckMask(stage:end),'Value',1)
 else
     set(hObject,'Value',0);
@@ -4009 +4017 @@
 %         set(handles.thresh_text1,'Visible','off')
 %         set(handles.num_MaxDiff,'Visible','off')
-%         set(handles.thresh_text2,'Visible','off')
+%         set(handles.title_MaxDiff,'Visible','off')
 %         set(handles.num_Rho,'Style','edit')
 %         set(handles.num_Rho,'String','1')
@@ -4114 +4122 @@
 filename=regexprep(filename,'.nc','');
 MaskName_string='';%default
-if Param.(fixname).CheckMask
-    MaskName_string=[' -maskName "' Param.(fixname).MaskName '"'];
-end
+% if Param.(fixname).CheckMask
+%     MaskName_string=[' -maskName "' Param.(fixname).Mask '"'];
+% end
 MaxVel_string='';%default
 if ~isempty(Param.(fixname).MaxVel)

trunk/src/civ_matlab.m

@@ -105 +105 @@
         eval(['Data.' ListName '=Param.Fix1.' ParamName ';'])
     end
-%     Data.ListGlobalAttribute=[Data.ListGlobalAttribute {'Fix1_WarnFlags','Fix1_TreshCorr','Fix1_TreshVel','Fix1_UpperBoundTest'}];
-%     Data.Fix1_WarnFlags=Param.Fix1.WarnFlags;
-%     Data.Fix1_ThreshCorr=Param.Fix1.ThreshCorr;
-%     Data.Fix1_ThreshVel=Param.Fix1.ThreshVel;
-%     Data.Fix1_UpperBoundTest=Param.Fix1.UpperBoundTest;
-
     if check_civx
         if ~isfield(Data,'fix')
@@ -131 +125 @@
 if isfield (Param,'Patch1')
     check_patch1=1;
+    Param.Patch1
     Data.ListGlobalAttribute=[Data.ListGlobalAttribute {'Patch1_Rho','Patch1_Threshold','Patch1_SubDomain'}];
-    Data.Patch1_Rho=str2double(Param.Patch1.Rho);
-    Data.Patch1_Threshold=str2double(Param.Patch1.Threshold);
-    Data.Patch1_SubDomain=str2double(Param.Patch1.SubDomain);
+    Data.Patch1_Rho=Param.Patch1.SmoothingParam;
+    Data.Patch1_Threshold=Param.Patch1.MaxDiff;
+    Data.Patch1_SubDomain=Param.Patch1.SubdomainSize;
     Data.ListVarName=[Data.ListVarName {'Civ1_U_Diff','Civ1_V_Diff','Civ1_X_SubRange','Civ1_Y_SubRange','Civ1_NbSites','Civ1_X_tps','Civ1_Y_tps','Civ1_U_tps','Civ1_V_tps'}];
     Data.VarDimName=[Data.VarDimName {'NbVec1','NbVec1',{'NbSubDomain1','Two'},{'NbSubDomain1','Two'},'NbSubDomain1',...
@@ -146 +141 @@
         ind_good=find(Data.Civ1_FF==0);
     else
+        
         ind_good=1:numel(Data.Civ1_X);
     end
@@ -171 +167 @@
     isx2=ibx2+2;
     isy2=iby2+2;
+
     %get the previous guess for displacement
+    
     if ~check_patch1
-        [Guess,VelType]=read_civdata(ObjectName,InputField,ParamIn.VelType);%TO DEVELOP
-    else
-        Data.Civ1_U_Diff=zeros(size(Data.Civ1_X));
-        Data.Civ1_V_Diff=zeros(size(Data.Civ1_X));
-        if isfield(Data,'Civ1_FF')
-            ind_good=find(Data.Civ1_FF==0);
-        else
-            ind_good=1:numel(Data.Civ1_X);
-        end
-            [Data.Civ1_X_SubRange,Data.Civ1_Y_SubRange,Data.Civ1_NbSites,FFres,Ures, Vres,Data.Civ1_X_tps,Data.Civ1_Y_tps,Data.Civ1_U_tps,Data.Civ1_V_tps]=...
-                                patch(Data.Civ1_X(ind_good)',Data.Civ1_Y(ind_good)',Data.Civ1_U(ind_good)',Data.Civ1_V(ind_good)',Data.Patch1_Rho,Data.Patch1_Threshold,Data.Patch1_SubDomain);
-        end 
+        [Data,VelType]=read_civdata(ObjectName,InputField,ParamIn.VelType);%TO DEVELOP
+    end
+    
+    Guess =interp_tps(Data,X,Y)
+%         Data.Civ1_U_Diff=zeros(size(Data.Civ1_X));
+%         Data.Civ1_V_Diff=zeros(size(Data.Civ1_X));
+%         if isfield(Data,'Civ1_FF')
+%             ind_good=find(Data.Civ1_FF==0);
+%         else
+%             ind_good=1:numel(Data.Civ1_X);
+%         end
+%             [Data.Civ1_X_SubRange,Data.Civ1_Y_SubRange,Data.Civ1_NbSites,FFres,Ures, Vres,Data.Civ1_X_tps,Data.Civ1_Y_tps,Data.Civ1_U_tps,Data.Civ1_V_tps]=...
+%                                 patch(Data.Civ1_X(ind_good)',Data.Civ1_Y(ind_good)',Data.Civ1_U(ind_good)',Data.Civ1_V(ind_good)',Data.Patch1_Rho,Data.Patch1_Threshold,Data.Patch1_SubDomain);
+%         end 
 %     shiftx=str2num(par_civ1.shiftx);
 %     shifty=str2num(par_civ1.shifty);
@@ -597 +597 @@
     FF=FF==1 | C<Param.MinCorr;
 end
-if isfield (Param,'MinVel')||(isfield (Param,'MaxVel')&&~isempty(Param.MaxVel))
+if (isfield(Param,'MinVel')&&~isempty(Param.MinVel))||(isfield (Param,'MaxVel')&&~isempty(Param.MaxVel))
     Umod= U.*U+V.*V;
-    if isfield (Param,'MinVel')
+    if isfield (Param,'MinVel')&&~isempty(Param.MinVel)
         FF=FF==1 | Umod<(Param.MinVel*Param.MinVel);
     end
@@ -722 +722 @@
 CentreY=linspace(MinY+SizY/2,MaxY-SizY/2,NbSubDomainY);
 [CentreX,CentreY]=meshgrid(CentreX,CentreY);
-CentreY=reshape(CentreY,1,[]);
-CentreX=reshape(CentreX,1,[]);
+CentreY=reshape(CentreY,1,[]);% Y positions of subdomain centres
+CentreX=reshape(CentreX,1,[]);% X positions of subdomain centres
 rho=SizX*SizY*Rho/1000000;%optimum rho increase as the area of the subdomain (division by 10^6 to reach good values with the default GUI input)
 U_tps_sub=zeros(length(X),NbSubDomain);%default spline

trunk/src/read_civdata.m

@@ -76 +76 @@
 end
 var_ind=find(vardetect);
-for ivar=1:length(var_ind)
+for ivar=1:min(numel(var_ind),numel(Field.VarAttribute))
     Field.VarAttribute{ivar}.Role=role{var_ind(ivar)};
     Field.VarAttribute{ivar}.Unit=units{var_ind(ivar)};

trunk/src/uvmat.m

@@ -2552 +2552 @@
 %PlotParam{1}=read_plot_param(handles);%read plotting parameters on the uvmat interfac
 PlotParam{1}=read_GUI(handles.uvmat);
+if ~isfield(PlotParam{1},'Vectors')
+    PlotParam{1}.Vectors.MaxVec=1;
+    PlotParam{1}.Vectors.MinVec=0;
+    PlotParam{1}.Vectors.CheckFixVecColor=1;
+    PlotParam{1}.Vectors.ColCode1=0.33;
+    PlotParam{1}.Vectors.ColCode2=0.66;
+     PlotParam{1}.Vectors.ListColorScalar={'ima_cor'};
+     PlotParam{1}.Vectors.ListColorCode= {'rgb'};
+end
 keeplim(1)=get(handles.CheckFixLimits,'Value');% test for fixed graph limits
 PosColorbar{1}=UvData.OpenParam.PosColorbar;%prescribe the colorbar position on the uvmat interface
@@ -2572 +2581 @@
     iobj=IndexObj(imap);
     [ObjectData,errormsg]=proj_field(UvData.Field,UvData.Object{iobj});% project field on the object
-    if testnewseries && isfield(ObjectData,'CoordUnit')&& isfield(PlotParam{imap},'Coordinates')
-        PlotParam{imap}.Coordinates=rmfield(PlotParam{imap}.Coordinates,'CheckFixEqual'); %set FixEqual to depend on the field (=1 if Data.CoordUnit=1 in plot_field)
-    end 
+
     if ~isempty(errormsg)
         return
+    end
+    %     if testnewseries && isfield(ObjectData,'CoordUnit')&& isfield(PlotParam{imap},'Coordinates')
+%         PlotParam{imap}.Coordinates=rmfield(PlotParam{imap}.Coordinates,'CheckFixEqual'); %set FixEqual to depend on the field (=1 if Data.CoordUnit=1 in plot_field)
+%     end 
+    if testnewseries && isfield(ObjectData,'CoordUnit')
+        PlotParam{imap}.Coordinates.CheckFixEqual=1;
     end
     %use of mask (TODO: check)
@@ -3870 +3883 @@
     Amax=double(max(max(max(FieldHisto))));%max of image
     if isequal(Amin,Amax)
-        msgbox_uvmat('WARNING',['uniform field =' num2str(Amin)]);
+        %msgbox_uvmat('WARNING',['uniform field =' num2str(Amin)]);
+        cla(haxes)
     else
         Histo.ListVarName={FieldName,'histo'};
@@ -4077 +4091 @@
 %------------------------------------------------------------------------
 set(handles.CheckFixVecColor,'Value',1)
-AutoVecColor_Callback(hObject, eventdata, handles)
+CheckFixVecColor_Callback(hObject, eventdata, handles)
 min_val=str2num(get(handles.num_MinVec,'String'));
 max_val=str2num(get(handles.num_MaxVec,'String'));