Changeset 178


Ignore:
Timestamp:
Jan 7, 2011, 6:28:11 PM (10 years ago)
Author:
sommeria
Message:

condition on status in civ, change of viw_field by uvmat, bug correction in uvmat in case of input file

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r177 r178  
    783783set(handles.BATCH,'Enable','On')
    784784set(handles.BATCH,'BackgroundColor',[1 0 0])
     785if isfield(handles,'status')
    785786set(handles.status,'Value',0);%suppress status display
    786787status_Callback(hObject, eventdata, handles)
     788end
    787789
    788790%% store the root input filename for future opening
     
    15631565
    15641566% start status callback to visualise results
     1567if isfield(handles,'status')
    15651568set(handles.status,'Value',1);%suppress status display
    15661569status_Callback(hObject, eventdata, handles)
     1570end
    15671571
    15681572%------------------------------------------------------------------------
     
    15781582
    15791583% start status callback to visualise results
     1584if isfield(handles,'status')
    15801585set(handles.status,'Value',1);%suppress status display
    15811586status_Callback(hObject, eventdata, handles)
     1587end
    15821588%------------------------------------------------------------------------
    15831589% --- Lauch command called by RUN and BATCH: remote processing
     
    16331639
    16341640%% reinitialise status callback
     1641if isfield(handles,'status')
    16351642set(handles.status,'Value',0);%suppress status display
    16361643status_Callback(hObject, eventdata, handles)
     1644end
    16371645
    16381646%% set the list of files and check them
     
    47154723     ind_dot=findstr(filename,'...');
    47164724     filename=filename(1:ind_dot-1);
    4717       filename=fullfile(rootroot,filename);
     4725      filename=fullfile(rootroot,filename)
    47184726      if exist(filename,'file')%visualise the vel field if it exists
    4719         [Field,VelTypeOut]=read_civxdata(filename);
    4720         view_field(Field)
     4727        %[Field,VelTypeOut]=read_civxdata(filename);
     4728        %view_field(Field)
     4729        uvmat(filename)
     4730        set(gcbo,'Value',1)
    47214731      end
    47224732
  • trunk/src/uvmat.m

    r177 r178  
    304304set(handles.transform_fct,'String',menu_str)
    305305set(handles.transform_fct,'UserData',fct_handle)% store the list of path in UserData of ACTION
    306  
     306set(handles.uvmat,'UserData',UvData)
    307307%initiates menu of vector colors
    308308list_menu=calc_field;
     
    347347        display_file_name(hObject, eventdata, handles,inputfile)
    348348        testinputfield=1;
    349     else
    350         UvData.TestInputFile=0;
     349%     else
     350%         UvData.TestInputFile=0;
    351351    end
    352352    if ~isempty(Field)
     
    356356       
    357357        % set the colorbar position on the interface:
    358         UvData.PosColorbar=[0.805 0.022 0.019 0.445];
     358       % UvData.PosColorbar=[0.805 0.022 0.019 0.445];
    359359    elseif ischar(input)
    360360        scan_i_Callback(handles.scan_i, eventdata, handles);       
     
    374374   end
    375375end
    376 UvData.NewSeries=1;
    377 set(hObject,'UserData',UvData)
     376% UvData.NewSeries=1;
     377set(handles.uvmat,'UserData',UvData)
    378378if testinputfield
    379379    %delete drawn objects
Note: See TracChangeset for help on using the changeset viewer.