Changeset 885 for trunk/src

Timestamp:

Mar 25, 2015, 9:28:10 AM (10 years ago)

Author:

sommeria

Message:

bug corrected in civ_input

Location:

trunk/src

Files:

• series/civ_input.m (modified) (2 diffs)
• series/civ_series.m (modified) (2 diffs)
• uvmat.fig (modified) (previous)

trunk/src/series/civ_input.m

@@ -322 +322 @@
             set(handle_title_dx,'Visible','off');
         end
+    end
+    if isfield(Param.ActionInput,'Civ2')
+       CheckDeformation_Callback(hObject, eventdata, handles)
     end
 end
@@ -1144 +1147 @@
 set(handles.ConfigSource,'String','NEW')
 set(handles.OK,'BackgroundColor',[1 0 1])
-if get(handles.CheckDeformation,'Value')
-    set(handles.num_CorrSmooth,'Visible','off')
-else
-    set(handles.num_CorrSmooth,'Visible','on')
+handles_CoorSmooth=findobj(get(handles.Civ2,'children'),'Tag','num_CorrSmooth');
+if get(handles.CheckDeformation,'Value')   
+    set(handles_CoorSmooth,'Visible','off')
+else
+    set(handles_CoorSmooth,'Visible','on')
 end
 

trunk/src/series/civ_series.m

@@ -977 +977 @@
 if CheckDeformation
     mesh=0.25;%mesh in pixels for subpixel image interpolation (x 4 in each direction)
+    par_civ.CorrSmooth=2;% use SUBPIX2DGAUSS (take into account more points near the max)
 end
 
@@ -1044 +1045 @@
                     image2_crop=interp2(image2_crop,xi,yi,'*spline');
                     image2_crop(isnan(image2_crop))=0;
-                    par_civ.CorrSmooth=2;% use SUBPIX2DGAUSS (take into account more points near the max)
                 end
                 sum_square=sum(sum(image1_crop.*image1_crop));