Changeset 173

Timestamp:

Jan 5, 2011, 12:42:15 AM (14 years ago)

Author:

sommeria

Message:

small bug repair in uvmat, proj_field (.Mesh for mouse) and civ (undefined callbacks)

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (1 diff)
• mouse_motion.m (modified) (1 diff)
• proj_field.m (modified) (1 diff)

trunk/src/civ.m

@@ -3458 +3458 @@
 end
 
-%------------------------------------------------------------------------
-function mask_civ1_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-set(handles.mask_civ1,'UserData',[])
-set(handles.mask_civ1,'String','')
-
-%------------------------------------------------------------------------
-function mask_civ2_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-set(handles.mask_civ2,'UserData',[])
-set(handles.mask_civ2,'String','')
-
-%------------------------------------------------------------------------
-function mask_fix1_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-set(handles.mask_fix1,'UserData',[])
-set(handles.mask_fix1,'String','')
-
-%------------------------------------------------------------------------
-function mask_fix2_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-set(handles.mask_fix2,'UserData',[])
-set(handles.mask_fix2,'String','')
+% %------------------------------------------------------------------------
+% function mask_civ1_Callback(hObject, eventdata, handles)
+% %------------------------------------------------------------------------
+% set(handles.mask_civ1,'UserData',[])
+% set(handles.mask_civ1,'String','')
+% 
+% %------------------------------------------------------------------------
+% function mask_civ2_Callback(hObject, eventdata, handles)
+% %------------------------------------------------------------------------
+% set(handles.mask_civ2,'UserData',[])
+% set(handles.mask_civ2,'String','')
+% 
+% %------------------------------------------------------------------------
+% function mask_fix1_Callback(hObject, eventdata, handles)
+% %------------------------------------------------------------------------
+% set(handles.mask_fix1,'UserData',[])
+% set(handles.mask_fix1,'String','')
+% 
+% %------------------------------------------------------------------------
+% function mask_fix2_Callback(hObject, eventdata, handles)
+% %------------------------------------------------------------------------
+% set(handles.mask_fix2,'UserData',[])
+% set(handles.mask_fix2,'String','')
 
 %------------------------------------------------------------------------

trunk/src/mouse_motion.m

@@ -365 +365 @@
                 hh=findobj('Tag','calib_points');%look for handle of calibration points
                if ~isempty(hh) && ~isempty(get(hh,'UserData')) && get(hh_geometry_calib.edit_append,'Value') 
-                    index_point=get(hh,'UserData')
+                    index_point=get(hh,'UserData');
                     XCoord(index_point)=xy(1,1);
                     YCoord(index_point)=xy(1,2);

trunk/src/proj_field.m

@@ -998 +998 @@
 ProjData.ListVarName={};
 ProjData.VarDimName={};
+if ~isequal(DX,0)&& ~isequal(DY,0)
+    ProjData.Mesh=sqrt(DX*DY);%define typical data mesh, useful for mouse selection in plots
+elseif isfield(FieldData,'Mesh')
+    ProjData.Mesh=FieldData.Mesh;
+end
 
 error=0;%default