Changeset 491 for trunk/src/set_object.m


Ignore:
Timestamp:
Jul 11, 2012, 2:56:40 PM (9 years ago)
Author:
sommeria
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/set_object.m

    r477 r491  
    468468    obj_handle=UvData.Object{IndexObj}.DisplayHandle.uvmat;
    469469end
    470 UvData.Object{IndexObj}=ObjectData;
     470UvData.Object{IndexObj}=ObjectData;%record the current object properties in uvmat
    471471if check_handle
    472472    UvData.Object{IndexObj}.DisplayHandle.uvmat=obj_handle; %preserve the object plot handle if valid
     
    474474    UvData.Object{IndexObj}.DisplayHandle.uvmat=hhuvmat.axes3; %axes taken as object display handle by defualt
    475475end
    476 set(hhuvmat.edit_object,'Value',1)% set the current object to edit mode
    477 %     %IndexObj=numel(ListObject)+1;% append an object to the list in uvmat
    478 %     
    479 %     set(hhuvmat.ListObject,'String',[ListObject;{ObjectName}]);%complement the object list
    480 %     set(hhuvmat.ListObject_1,'String',[ListObject;{ObjectName}]);%complement the object list
    481 %     set(hhuvmat.ListObject,'Value',IndexObj)
    482 %     set(hhuvmat.ViewObject,'Value',1)% indicate that the currently selected objected is viewed on set_object
    483 %     UvData.Object{IndexObj}=[];%initiate a new object (empty yet)
    484 %     UvData.Object{IndexObj}.DisplayHandle.uvmat=hhuvmat.axes3; %axes taken as object display handle by defualt
    485 % end
     476%set(hhuvmat.edit_object,'Value',1)% set the current object to edit mode
    486477
    487478%% plot the field projected on the object
     
    497488    end   
    498489    if isequal(IndexObj_1,IndexObj) % if  the projection is in uvmat
    499         PlotType=plot_field(ProjData,hhuvmat.axes3,read_GUI(get(hhuvmat.axes3,'parent')));%update the current uvmat plot
    500     else  % if the projection is in veiw_field
     490         PlotType=plot_field(ProjData,hhuvmat.axes3,read_GUI(get(hhuvmat.axes3,'parent')));%update the current uvmat plot
     491    else  % if the projection is in view_field
    501492        hview_field=findobj(allchild(0),'tag','view_field');
    502493        if isempty(hview_field)
     
    519510            set(hview_field,'Position',Data.GUISize)
    520511        end
    521         set(hhuvmat.ViewField,'Value',1)% indicate that the field projection on the current object is plotted in view_field
     512      %  set(hhuvmat.ViewField,'Value',1)% indicate that the field projection on the current object is plotted in view_field
    522513    end
    523514end
     
    528519if isequal(IndexObj_1,IndexObj)
    529520    %update the representation of the current object for projection field represented in view_field
    530     %     UvData.Object{iobj}.DisplayHandle.view_field=...
    531     %                       plot_object(UvData.Object{IndexObj},UvData.Object{IndexObj_1},UvData.Object{iobj}.DisplayHandle.uvmat,'m');
    532     % update the representation of all objects in uvmat
    533521    for iobj=1:numel(UvData.Object)
    534522        UvData.Object{iobj}.DisplayHandle.uvmat=...
     
    551539    end
    552540end
    553 % UvData.Object{IndexObj}.DisplayHandle.uvmat=plot_object(ObjectData,UvData.Object{IndexObj_1},hobject,'m');%draw the object in uvmat
    554 % if ~isempty(hview_field)
    555 %     if isfield(UvData.Object{IndexObj}.DisplayHandle,'view_field')
    556 %         hobject=UvData.Object{IndexObj}.DisplayHandle.view_field;
    557 %     end
    558 %     if isempty(hobject)
    559 %         hobject=haxes;
    560 %     end   
    561 %     %draw the object in view_field
    562 %     if ~isequal(IndexObj_1,IndexObj) % if  the projection is in uvmat
    563 %     UvData.Object{IndexObj}.DisplayHandle.view_field=plot_object(ObjectData,UvData.Object{IndexObj},hobject,'m');
    564 %     end
    565 % end
    566541set(huvmat,'UserData',UvData)
    567542
    568543%% update the GUI uvmat
    569 hhuvmat=guidata(huvmat);%handles of elements in the uvmat GUI
    570544set(hhuvmat.MenuEditObject,'enable','on')
    571545set(hhuvmat.edit_object,'Value',1) % set uvmat to object edit mode to allow further object update
Note: See TracChangeset for help on using the changeset viewer.