Changeset 491 for trunk/src/set_object.m

Timestamp:

Jul 11, 2012, 2:56:40 PM (12 years ago)

Author:

sommeria

Message:

fix the the way to deal with filter fields using tps
fix the main projection plane in uvmat

File:

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

trunk/src/set_object.m

@@ -468 +468 @@
     obj_handle=UvData.Object{IndexObj}.DisplayHandle.uvmat;
 end
-UvData.Object{IndexObj}=ObjectData;
+UvData.Object{IndexObj}=ObjectData;%record the current object properties in uvmat
 if check_handle
     UvData.Object{IndexObj}.DisplayHandle.uvmat=obj_handle; %preserve the object plot handle if valid
@@ -474 +474 @@
     UvData.Object{IndexObj}.DisplayHandle.uvmat=hhuvmat.axes3; %axes taken as object display handle by defualt
 end
-set(hhuvmat.edit_object,'Value',1)% set the current object to edit mode
-%     %IndexObj=numel(ListObject)+1;% append an object to the list in uvmat
-%     
-%     set(hhuvmat.ListObject,'String',[ListObject;{ObjectName}]);%complement the object list
-%     set(hhuvmat.ListObject_1,'String',[ListObject;{ObjectName}]);%complement the object list
-%     set(hhuvmat.ListObject,'Value',IndexObj)
-%     set(hhuvmat.ViewObject,'Value',1)% indicate that the currently selected objected is viewed on set_object
-%     UvData.Object{IndexObj}=[];%initiate a new object (empty yet)
-%     UvData.Object{IndexObj}.DisplayHandle.uvmat=hhuvmat.axes3; %axes taken as object display handle by defualt
-% end
+%set(hhuvmat.edit_object,'Value',1)% set the current object to edit mode
 
 %% plot the field projected on the object
@@ -497 +488 @@
     end   
     if isequal(IndexObj_1,IndexObj) % if  the projection is in uvmat
-        PlotType=plot_field(ProjData,hhuvmat.axes3,read_GUI(get(hhuvmat.axes3,'parent')));%update the current uvmat plot
-    else  % if the projection is in veiw_field
+         PlotType=plot_field(ProjData,hhuvmat.axes3,read_GUI(get(hhuvmat.axes3,'parent')));%update the current uvmat plot
+    else  % if the projection is in view_field
         hview_field=findobj(allchild(0),'tag','view_field');
         if isempty(hview_field)
@@ -519 +510 @@
             set(hview_field,'Position',Data.GUISize)
         end
-        set(hhuvmat.ViewField,'Value',1)% indicate that the field projection on the current object is plotted in view_field
+      %  set(hhuvmat.ViewField,'Value',1)% indicate that the field projection on the current object is plotted in view_field
     end
 end
@@ -528 +519 @@
 if isequal(IndexObj_1,IndexObj)
     %update the representation of the current object for projection field represented in view_field
-    %     UvData.Object{iobj}.DisplayHandle.view_field=...
-    %                       plot_object(UvData.Object{IndexObj},UvData.Object{IndexObj_1},UvData.Object{iobj}.DisplayHandle.uvmat,'m');
-    % update the representation of all objects in uvmat
     for iobj=1:numel(UvData.Object)
         UvData.Object{iobj}.DisplayHandle.uvmat=...
@@ -551 +539 @@
     end
 end
-% UvData.Object{IndexObj}.DisplayHandle.uvmat=plot_object(ObjectData,UvData.Object{IndexObj_1},hobject,'m');%draw the object in uvmat
-% if ~isempty(hview_field)
-%     if isfield(UvData.Object{IndexObj}.DisplayHandle,'view_field')
-%         hobject=UvData.Object{IndexObj}.DisplayHandle.view_field;
-%     end
-%     if isempty(hobject)
-%         hobject=haxes;
-%     end   
-%     %draw the object in view_field
-%     if ~isequal(IndexObj_1,IndexObj) % if  the projection is in uvmat
-%     UvData.Object{IndexObj}.DisplayHandle.view_field=plot_object(ObjectData,UvData.Object{IndexObj},hobject,'m');
-%     end
-% end
 set(huvmat,'UserData',UvData)
 
 %% update the GUI uvmat
-hhuvmat=guidata(huvmat);%handles of elements in the uvmat GUI
 set(hhuvmat.MenuEditObject,'enable','on')
 set(hhuvmat.edit_object,'Value',1) % set uvmat to object edit mode to allow further object update