Changeset 701 for trunk/src/uvmat.m

Timestamp:

Dec 13, 2013, 10:51:21 PM (10 years ago)

Author:

sommeria

Message:

several bugs repaired

File:

• trunk/src/uvmat.m (modified) (4 diffs)

trunk/src/uvmat.m

@@ -1953 +1953 @@
         Field_a=transform(Field_a,UvData.XmlData{index});%the first field has been stored without transform
         end
+        if nargin(transform)>=2
         Field_b=transform(Field_b,UvData.XmlData{index});
+        else
+          Field_b=transform(Field_b);
+        end
     end
 end
@@ -4242 +4246 @@
 if get(handles.CheckEditObject,'Value') 
     %suppress the other options 
+    set(handles.MenuObject,'checked','off')
     set(handles.CheckZoom,'Value',0)
     CheckZoom_Callback(hObject, eventdata, handles)
@@ -4390 +4395 @@
             if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0)
                 ObjectData=get(hdisplay(iview),'UserData');
-                if isfield(ObjectData,'SubObject') && ishandle(ObjectData.SubObject)
-                    delete(ObjectData.SubObject);% delete the graphic 'sub-objects (e.g. projection bounds)
+                if isfield(ObjectData,'SubObject') && ~isempty(ObjectData.SubObject)
+                    delete(ObjectData.SubObject(ishandle(ObjectData.SubObject)));% delete the graphic 'sub-objects (e.g. projection bounds)
                 end
-                check_suppress= isfield(ObjectData,'DeformPoint') && ishandle(ObjectData.DeformPoint);
-                delete(ObjectData.DeformPoint(check_suppress));% delete the graphic deformation points 
-                delete(hdisplay(iview))% delete the main graphic representation of the object
+                if isfield(ObjectData,'DeformPoint')&& ~isempty(ObjectData.DeformPoint)
+                    delete(ObjectData.DeformPoint(ishandle(ObjectData.DeformPoint)));% delete the graphic deformation points
+                    delete(hdisplay(iview))% delete the main graphic representation of the object
+                end
             end
             ishandle(hdisplay(iview))
@@ -4713 +4719 @@
 set(handles.CheckZoomFig,'Value',0) %desactivate zoom sub fig
 set(handles.CheckZoom,'Value',0)    %desactivate the zoom action
+set(handles.MenuObject,'checked','on')% indicate object creation for mouse pointer display
 if ishandle(handles.UVMAT_title)
     delete(handles.UVMAT_title)     %delete the initial display of uvmat if no field has been entered yet