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

Timestamp:

Feb 17, 2015, 1:46:13 AM (9 years ago)

Author:

sommeria

Message:

civ improved at mask edge

File:

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

trunk/src/series/civ_input.m

@@ -373 +373 @@
 
 %% Civ1 parameters
+Param.CheckCiv1=1;
 Param.Civ1.CorrBoxSize=[25 25];
 Param.Civ1.SearchBoxSize=[55 55];
@@ -381 +382 @@
 Param.Civ1.CheckGrid=0;
 Param.Civ1.CheckMask=0;
+Param.Civ1.Mask='';
 Param.Civ1.CheckThreshold=0;
 Param.Civ1.TestCiv1=0;
 
 %% Fix1 parameters
+Param.CheckFix1=1;
 Param.Fix1.CheckFmin2=1;
 Param.Fix1.CheckF3=1;
@@ -390 +393 @@
 
 %% Patch1 parameters
+Param.CheckPatch1=1;
 Param.Patch1.FieldSmooth=10;
 Param.Patch1.MaxDiff=1.5000;
@@ -396 +400 @@
 
 %% Civ2 parameters
+Param.CheckCiv2=1;
 Param.Civ2.CorrBoxSize=[21 21];
 Param.Civ2.SearchBoxSize=[27 27];
@@ -403 +408 @@
 Param.Civ2.CheckGrid=0;
 Param.Civ2.CheckMask=0;
+Param.Civ2.Mask='';
 Param.Civ2.CheckThreshold=0;
 Param.Civ2.TestCiv2=0;
 
 %% Fix2 parameters
+Param.CheckFix2=1;
 Param.Fix2.CheckFmin2=1;
 Param.Fix2.CheckF4=1;
@@ -413 +420 @@
 
 %% Patch2 parameters
+Param.CheckPatch2=1;
 Param.Patch2.FieldSmooth=2;
 Param.Patch2.MaxDiff=1.5000;
@@ -419 +427 @@
 
 fill_GUI(Param,handles.civ_input)% fill the elements of the GUI series with the input parameters
+update_CivOptions(handles,0)
 
 % -----------------------------------------------------------------------
@@ -1129 +1138 @@
 % --- Executes on selection in menu CorrSmooth.
 function num_CorrSmooth_Callback(hObject, eventdata, handles)
-set(handles.configSource,'String','NEW')
+set(handles.ConfigSource,'String','NEW')
 set(handles.OK,'BackgroundColor',[1 0 1])
 %------------------------------------------------------------------------
@@ -1473 +1482 @@
 end
 set(hObject,'BackgroundColor',[1 0 1])
-set(handles.configSource,'String','NEW')
+set(handles.ConfigSource,'String','NEW')
 set(handles.OK,'BackgroundColor',[1 0 1])
 %------------------------------------------------------------------------
@@ -1518 +1527 @@
     set(handle_txtbox,'Visible','off')
 end
-set(handles.configSource,'String','NEW')
-set(handles.configSource,'BackgroundColor',[1 0 1])
+set(handles.ConfigSource,'String','NEW')
+set(handles.ConfigSource,'BackgroundColor',[1 0 1])
 
 % %------------------------------------------------------------------------
@@ -1735 +1744 @@
     set(obj,'Visible','off')
 end
-set(handles.configSource,'String','NEW')
+set(handles.ConfigSource,'String','NEW')
 set(handles.OK,'BackgroundColor',[1 0 1])
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1748 +1757 @@
 if get(handles.TestCiv1,'Value')
     set(handles.TestCiv1,'BackgroundColor',[1 1 0])% paint TestCiv1 button to yellow to confirm civ launch  
-    %Param.Action.RUN=1;
-    
+    set(handles.CheckFix1,'value',0)% desactivate next step
+    set(handles.CheckPatch1,'value',0)% desactivate next step
+    set(handles.CheckCiv2,'value',0)% desactivate next step
+    set(handles.CheckFix2,'value',0)% desactivate next step
+    set(handles.CheckPatch2,'value',0)% desactivate next step
+    update_CivOptions(handles,0)
       hseries=findobj(allchild(0),'Tag','series');
      Param=read_GUI(hseries);
@@ -1887 +1900 @@
     end
     figure(1)
-    hold on
-    semilogx(SmoothingParam,DiffVel,'b',SmoothingParam,NbExclude,'r')
+    semilogx(SmoothingParam,DiffVel,'b',SmoothingParam,NbExclude,'r',SmoothingParam,0.2*ones(size(SmoothingParam)),'m')
     grid on
-    legend('rms velocity diff. Patch1-Civ1 (pixels)','proportion of excluded vectors (between 0 to 1)')
+    legend('rms velocity diff. Patch1-Civ1 (pixels)','proportion of excluded vectors (between 0 to 1)','recommended diff Patch1-Civ1')
     xlabel('smoothing parameter')
     ylabel('smoothing effect')
@@ -1912 +1924 @@
 if get(handles.TestCiv2,'Value')
     set(handles.TestCiv2,'BackgroundColor',[1 1 0])% paint TestCiv1 button to yellow to confirm civ launch
+    set(handles.CheckFix2,'value',0)% desactivate next step
+    set(handles.CheckPatch2,'value',0)% desactivate next step
+    update_CivOptions(handles,0)
       hseries=findobj(allchild(0),'Tag','series');
      Param=read_GUI(hseries);
@@ -2065 +2080 @@
     end
     figure(1)
-    hold on
-    semilogx(SmoothingParam,DiffVel,'b',SmoothingParam,NbExclude,'r')
+    semilogx(SmoothingParam,DiffVel,'b',SmoothingParam,NbExclude,'r',SmoothingParam,0.1*ones(size(SmoothingParam)),'m')
     grid on
-    legend('rms velocity diff. Patch2-Civ2 (pixels)','proportion of excluded vectors (between 0 to 1)')
+    legend('rms velocity diff. Patch2-Civ2 (pixels)','proportion of excluded vectors (between 0 to 1)','recommended value diff. Patch2-Civ2')
     xlabel('smoothing parameter')
     ylabel('smoothing effect')