Changeset 307 for trunk/src/set_object.m

Timestamp:

Nov 28, 2011, 8:43:30 PM (13 years ago)

Author:

sommeria

Message:

bug fixed in the browser of civ + bug fix for the plot of objects

File:

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

trunk/src/set_object.m

@@ -672 +672 @@
 hhuvmat=guidata(huvmat);%handles in the uvmat GUI
 ObjectName=get(handles.TITLE,'String');%name of the current object 
-ListObject=get(hhuvmat.list_object_1,'String');%position in the objet list
-IndexObj_1=get(hhuvmat.list_object_1,'Value');
-if isequal(get(hhuvmat.list_object_2,'Visible'),'on')
-    IndexObj_2=get(hhuvmat.list_object_2,'Value');
-    List2=get(hhuvmat.list_object_2,'String');
+ListObject=get(hhuvmat.ListObject,'String');%position in the objet list
+IndexObj=get(hhuvmat.ListObject,'Value');
+IndexObj_1=IndexObj(1);
+% if isequal(get(hhuvmat.list_object_2,'Visible'),'on')
+%     IndexObj_2=get(hhuvmat.list_object_2,'Value');
+%     List2=get(hhuvmat.list_object_2,'String');
+if numel(IndexObj)==2
+    IndexObj_2=IndexObj(2);
 else
     IndexObj_2=[];
@@ -729 +732 @@
 end
 ListObject{IndexObj,1}=ObjectName;
-set(hhuvmat.list_object_1,'String',ListObject)
-set(hhuvmat.list_object_2,'String',ListObject)
+set(hhuvmat.ListObject,'String',ListObject)
+% set(hhuvmat.list_object_2,'String',ListObject)
 
 %% update the object plot and projection field
 if testnew 
-    set(hhuvmat.list_object_2,'Value',IndexObj)
+   set(hhuvmat.ListObject,'Value',IndexObj) 
+%     set(hhuvmat.list_object_2,'Value',IndexObj)
     ObjectData.DisplayHandle_uvmat=hhuvmat.axes3;
     ObjectData.DisplayHandle_view_field=[];
 else
-    if isfield(UvData.Object{IndexObj},'DisplayHandle_uvmat')% save the previous object graph handles
+    IndexObj
+    UvData.Object{IndexObj}
+    if IndexObj<=length(UvData.Object) && isfield(UvData.Object{IndexObj},'DisplayHandle_uvmat')% save the previous object graph handles
         ObjectData.DisplayHandle_uvmat=UvData.Object{IndexObj}.DisplayHandle_uvmat;
     else