Changeset 425 for trunk

Timestamp:

May 17, 2012, 10:55:41 AM (13 years ago)

Author:

sommeria

Message:

improvement of object management

Location:

trunk/src

Files:

• mouse_down.m (modified) (2 diffs)
• mouse_up.m (modified) (1 diff)
• update_obj.m (modified) (1 diff)
• uvmat.m (modified) (4 diffs)
• view_field.m (modified) (1 diff)

trunk/src/mouse_down.m

@@ -324 +324 @@
         end
         UvData.Object{IndexObj}=ObjectData;
-        ListObject=get(hhuvmat.ListObject_1,'String');
+        ListObject=get(hhuvmat.ListObject,'String');
         UvData.Object{IndexObj}.DisplayHandle_uvmat=AxeData.CurrentObject;
         ObjectNameNew=ObjectData.Name;
@@ -353 +353 @@
         %set(hhuvmat.ListObject,'Value',[IndexObj_old(1) IndexObj])
         set(hhuvmat.ListObject,'Value',IndexObj)
+        set(hhuvmat.ViewObject,'Value',1)
         %             if isempty(object_name)
         %                 list_str{IndexObj}=[num2str(IndexObj) '-' ObjectData.Type];

trunk/src/mouse_up.m

@@ -173 +173 @@
 
             end
+            set(hhuvmat.ViewField,'Value',1);%
             set(hhuvmat.edit_object,'BackgroundColor',[1 1 0]);% paint the edit text in yellow
             set(hhuvmat.edit_object,'Value',1);%

trunk/src/update_obj.m

@@ -25 +25 @@
 %plot uvmat
 for iobj=1:length(Object_out) %change the view of all existing objects on the updated current object #IndexObj_1
-     hobject=[];
+    hobject=[];
     if isfield(Object_out{iobj},'DisplayHandle_uvmat') && ~isempty(Object_out{iobj}.DisplayHandle_uvmat) && ishandle(Object_out{iobj}.DisplayHandle_uvmat)
         hobject=Object_out{iobj}.DisplayHandle_uvmat;%graphic handle of object #iobj in the uvmat plot
     end
-    Object_out{iobj}.DisplayHandle_uvmat=plot_object(Object_out{iobj},Object_out{IndexObj_1},hobject,'m');%update the object representation of Object_out{iobj} on Object_out{IndexObj_1}
+    if ~isequal(iobj,IndexObj_1)% object not visible when projected on itself
+        Object_out{iobj}.DisplayHandle_uvmat=plot_object(Object_out{iobj},Object_out{IndexObj_1},hobject,'m');%update the object representation of Object_out{iobj} on Object_out{IndexObj_1}
+        if isempty(Object_out{iobj}.DisplayHandle_uvmat)&&~isempty(hobject)
+            delete(hobject)
+        end
+    end
 end
 % plot view_field

trunk/src/uvmat.m

@@ -3942 +3942 @@
 function ListObject_1_Callback(hObject, eventdata, handles)
 list_str=get(handles.ListObject_1,'String');
-IndexObj=get(handles.ListObject_1,'Value');
 UvData=get(handles.uvmat,'UserData');
 ObjectData=UvData.Object{get(handles.ListObject_1,'Value')};
@@ -3949 +3948 @@
 ProjData= proj_field(UvData.Field,ObjectData);%project the current interface field on UvData.Object{IndexObj(1)}
 plot_field(ProjData,handles.axes3,read_GUI(handles.uvmat));%read plotting parameters on the uvmat interfacPlotHandles);
+Object_out=update_obj(UvData,get(handles.ListObject_1,'Value'),[])
 
 %% display the object parameters if the GUI set_object is already opened
-hset_object=findobj(allchild(0),'tag','set_object');
-if ~isempty(hset_object)
+% hset_object=findobj(allchild(0),'tag','set_object');
+%if ~isempty(hset_object)
+if ~get(handles.ViewObject,'Value')
 %     delete(hset_object)% delete to refesh the content
     ZBounds=0; % default
@@ -3959 +3960 @@
         ZBounds(2)=UvData.Field.ZMax;%maximum for the Z slider
     end
-    ObjectData.Name=list_str{IndexObj};
+    ObjectData.Name=list_str{get(handles.ListObject_1,'Value')};
     set_object(ObjectData,[],ZBounds);
     set(handles.ViewObject,'Value',1)% show that the selected object in ListObject_1 is currently visualised
@@ -4473 +4474 @@
     delete(handles.UVMAT_title)%delete the initial display of uvmat if no field has been entered
 end
-set(handles.ListObject,'Visible','on')
-set(handles.ViewField,'Visible','on')
-set(handles.ViewField,'Value',1) % indicate that the object selected in ListObject (projection oin view_field) is visualised
-set(handles.ViewObject,'Value',0)% then the object selected in ListObject_1 is not visualised
+
+%set(handles.ViewField,'Value',1) % indicate that the object selected in ListObject (projection oin view_field) is visualised
+%set(handles.ViewObject,'Value',1)% then the object selected in ListObject_1 is not visualised
 hset_object=set_object(data,handles);% call the set_object interface
 hhset_object=guidata(hset_object);

trunk/src/view_field.m

@@ -113 +113 @@
 if ~isempty(huvmat)
     hhuvmat=guidata(huvmat);
-    set(hhuvmat.edit_object,'Value',0)
-    set(hhuvmat.edit_object,'BackgroundColor',[0.7 0.7 0.7])%put unactivated buttons to gree
+    set(hhuvmat.ViewField,'Value',0)
+    %set(hhuvmat.edit_object,'BackgroundColor',[0.7 0.7 0.7])%put unactivated buttons to gree
     % deselect the object in ListObject when view_field is closed
     if isempty(findobj(allchild(0),'Tag','set_object'))