Changeset 872 for trunk


Ignore:
Timestamp:
Feb 16, 2015, 3:31:22 PM (6 years ago)
Author:
sommeria
Message:

bugs corrected

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/plot_field.m

    r871 r872  
    202202    end       
    203203    PlotParamOut.Axes=plot_profile(Data,CellInfo(index_1D),haxes,PlotParamOut.Axes,CheckHold);%
    204     if isfield(PlotParamOut,'Vectors')
    205         PlotParamOut=rmfield(PlotParamOut,'Vectors');
    206     end
    207     if isfield(PlotParamOut,'Scalar')
    208         PlotParamOut=rmfield(PlotParamOut,'Scalar');
    209     end   
     204    if isempty(index_2D)
     205        if isfield(PlotParamOut,'Vectors')
     206            PlotParamOut=rmfield(PlotParamOut,'Vectors');
     207        end
     208        if isfield(PlotParamOut,'Scalar')
     209            PlotParamOut=rmfield(PlotParamOut,'Scalar');
     210        end
     211    end
    210212    if testzoomaxes
    211213        [zoomaxes,PlotParamOut.Axes]=plot_profile(Data,CellInfo(index_1D),zoomaxes,PlotParamOut.Axes,CheckHold);
     
    572574%% give statistics for pdf
    573575ind_var=find(testplot);
    574 if numel(ind_var)==1 && isfield(data,'VarAttribute') && isfield(data.VarAttribute{ind_var},'Role') &&...
    575         strcmp(data.VarAttribute{ind_var}.Role,'histo')
     576if numel(ind_var)==1 && isfield(data,'VarAttribute') &&numel(data.VarAttribute)>=ind_var &&...
     577        isfield(data.VarAttribute{ind_var},'Role') && strcmp(data.VarAttribute{ind_var}.Role,'histo')
    576578    pdf_val=data.(data.ListVarName{ind_var});
    577579    x=coord_x{1};
  • trunk/src/series.m

    r869 r872  
    135135[path_series,name,ext]=fileparts(which('series'));% path to the GUI series
    136136path_series_fct=fullfile(path_series,'series');%path of the functions in subdirectroy 'series'
    137 ActionExtList={'.m';'.sh';'.py (in dev.)'};% default choice of extensions (Matlab fct .m or compiled version .sh
     137[code, message] = system...
     138    ('LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | pyp "p.split('':'') |... [s for s in p if ''matlab'' not in s] | '':''.join(p)") python -c "import fluiddyn"');
     139if code==0
     140    ActionExtList={'.m';'.sh';'.py (in dev.)'};% default choice of extensions (Matlab fct .m or compiled version .sh
     141else
     142    ActionExtList={'.m';'.sh'};
     143    disp('python library not installed')
     144end
    138145ActionPathList=cell(NbBuiltinAction,1);%initiate the cell matrix of Action fct paths
    139146ActionPathList(:)={path_series_fct}; %set the default path to series fcts to all list members
     
    175182    end
    176183    %get the menu of actions
    177     if isfield(h,'ActionExtListUser') && iscell(h.ActionExtListUser)
    178         ActionExtList=[ActionExtList; h.ActionExtListUser];
    179     end
     184%     if isfield(h,'ActionExtListUser') && iscell(h.ActionExtListUser)
     185%         ActionExtList=[ActionExtList; h.ActionExtListUser];
     186%     end
    180187    if isfield(h,'ActionListUser') && iscell(h.ActionListUser) && isfield(h,'ActionPathListUser') && iscell(h.ActionPathListUser)
    181188        ActionList=[ActionList;h.ActionListUser];
     
    19851992   
    19861993    % record the file extension and extend the path list if it is a new extension
    1987     ActionExtList=get(handles.ActionExt,'String');
    1988     ActionExtIndex=find(strcmp(ActionExt,ActionExtList), 1);
    1989     if isempty(ActionExtIndex)
    1990         set(handles.ActionExt,'String',[ActionExtList;{ActionExt}])
    1991     end
     1994%     ActionExtList=get(handles.ActionExt,'String');
     1995%     ActionExtIndex=find(strcmp(ActionExt,ActionExtList), 1);
     1996%     if isempty(ActionExtIndex)
     1997%         set(handles.ActionExt,'String',[ActionExtList;{ActionExt}])
     1998%     end
    19921999
    19932000    % remove old Action options in the menu (keeping a menu length <nb_builtin_ACTION+5)
     
    20122019        ActionListUser=ActionList(NbBuiltinAction+1:numel(ActionList)-1);
    20132020        ActionPathListUser=ActionPathList(NbBuiltinAction+1:numel(ActionList)-1);
    2014         ActionExtListUser={};
    2015         if numel(ActionExtList)>2
    2016             ActionExtListUser=ActionExtList(3:end);
    2017         end
     2021%         ActionExtListUser={};
     2022%         if numel(ActionExtList)>2
     2023%             ActionExtListUser=ActionExtList(3:end);
     2024%         end
    20182025        if exist(profil_perso,'file')
    20192026            save(profil_perso,'ActionListUser','ActionPathListUser','ActionExtListUser','-append')
     
    31703177    set(handles.RunMode,'Value',2)
    31713178end
    3172 % ActionList=get(handles.ActionName,'String');
    3173 % ActionName=ActionList{get(handles.ActionName,'Value')};
    31743179
    31753180function num_NbProcess_Callback(hObject, eventdata, handles)
  • trunk/src/series/aver_stat.m

    r871 r872  
    8484    end
    8585    % introduce bin size for histograms
    86     if Param.CheckObject
     86    if isfield(Param,'CheckObject') && Param.CheckObject
    8787        SeriesData=get(hseries,'UserData');
    8888        if ismember(SeriesData.ProjObject.ProjMode,{'inside','outside'})
  • trunk/src/series/time_series.m

    r871 r872  
    8585    end
    8686    % introduce bin size for histograms
    87     if Param.CheckObject
     87    if isfield(Param,'CheckObject') &&Param.CheckObject
    8888        SeriesData=get(hseries,'UserData');
    89         if checkhisto
     89        if ismember(SeriesData.ProjObject.ProjMode,{'inside','outside'})
    9090             answer=msgbox_uvmat('INPUT_TXT','set bin size for histograms (or keep ''auto'' by default)?','auto');
    9191            ParamOut.ActionInput.VarMesh=str2double(answer);
Note: See TracChangeset for help on using the changeset viewer.