Changeset 182 for trunk/src/set_object.m

Timestamp:

Jan 23, 2011, 6:55:29 PM (13 years ago)

Author:

sommeria

Message:

introduction of a button OK to close the status GUI in civ, bug repair for volume images .vol (uvmat and set_object)

File:

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

trunk/src/set_object.m

@@ -744 +744 @@
 projview='view_field';%default
 if strcmp(ListObject{IndexObj_1},ObjectName)% we are editing the object whose projection is viewed in the uvmat frame
-%    ObjectData.HandlesDisplay=hhuvmat.axes3;
-%     Object_set{iobj}.DisplayHandle_view_field
     IndexObj=IndexObj_1;
     projview='uvmat';
@@ -751 +749 @@
 elseif ~isempty(IndexObj_2) && IndexObj_2<=numel(ListObject)&& strcmp(ListObject{IndexObj_2},ObjectName)% we are editing the object whose projection is viewed in view_field  
     IndexObj=IndexObj_2;
-%     projview='view_field';
 else %new object 
     testnew=1;
@@ -759 +756 @@
         PlotHandles=guidata(hview_field);
         plotaxes=PlotHandles.axes3;%handle of axes3 in view_field
-%         ObjectData.HandlesDisplay=PlotHandles.axes3;%handle of axes3 in view_field
     end
 end
@@ -803 +799 @@
     ObjectData.DisplayHandle_uvmat=hhuvmat.axes3;
     ObjectData.DisplayHandle_view_field=[];
-elseif isfield(UvData.Object{IndexObj},'DisplayHandle_uvmat')% save the previous object graph handles
-    ObjectData.DisplayHandle_uvmat=UvData.Object{IndexObj}.DisplayHandle_uvmat;
-    ObjectData.DisplayHandle_view_field=UvData.Object{IndexObj}.DisplayHandle_view_field;
-else
-    ObjectData.DisplayHandle_uvmat=hhuvmat.axes3;
-    ObjectData.DisplayHandle_view_field=[];
+else
+    if isfield(UvData.Object{IndexObj},'DisplayHandle_uvmat')% save the previous object graph handles
+        ObjectData.DisplayHandle_uvmat=UvData.Object{IndexObj}.DisplayHandle_uvmat;
+    else
+        ObjectData.DisplayHandle_uvmat=hhuvmat.axes3;%there is no object handle, than the axes handles is used as input
+    end
+    if isfield(UvData.Object{IndexObj},'DisplayHandle_view_field')% save the previous object graph handles
+        ObjectData.DisplayHandle_view_field=UvData.Object{IndexObj}.DisplayHandle_view_field;
+    else
+        ObjectData.DisplayHandle_view_field=[];
+    end
 end
 UvData.Object{IndexObj}=ObjectData;%update the current object properties