Changeset 872 for trunk/src

Timestamp:

Feb 16, 2015, 3:31:22 PM (10 years ago)

Author:

sommeria

Message:

bugs corrected

Location:

trunk/src

Files:

• plot_field.m (modified) (2 diffs)
• series.m (modified) (5 diffs)
• series/aver_stat.m (modified) (1 diff)
• series/time_series.m (modified) (1 diff)
• uvmat.fig (modified) (previous)

trunk/src/plot_field.m

@@ -202 +202 @@
     end       
     PlotParamOut.Axes=plot_profile(Data,CellInfo(index_1D),haxes,PlotParamOut.Axes,CheckHold);%
-    if isfield(PlotParamOut,'Vectors')
-        PlotParamOut=rmfield(PlotParamOut,'Vectors');
-    end
-    if isfield(PlotParamOut,'Scalar')
-        PlotParamOut=rmfield(PlotParamOut,'Scalar');
-    end   
+    if isempty(index_2D)
+        if isfield(PlotParamOut,'Vectors')
+            PlotParamOut=rmfield(PlotParamOut,'Vectors');
+        end
+        if isfield(PlotParamOut,'Scalar')
+            PlotParamOut=rmfield(PlotParamOut,'Scalar');
+        end
+    end
     if testzoomaxes
         [zoomaxes,PlotParamOut.Axes]=plot_profile(Data,CellInfo(index_1D),zoomaxes,PlotParamOut.Axes,CheckHold);
@@ -572 +574 @@
 %% give statistics for pdf
 ind_var=find(testplot);
-if numel(ind_var)==1 && isfield(data,'VarAttribute') && isfield(data.VarAttribute{ind_var},'Role') &&...
-        strcmp(data.VarAttribute{ind_var}.Role,'histo')
+if numel(ind_var)==1 && isfield(data,'VarAttribute') &&numel(data.VarAttribute)>=ind_var &&...
+        isfield(data.VarAttribute{ind_var},'Role') && strcmp(data.VarAttribute{ind_var}.Role,'histo')
     pdf_val=data.(data.ListVarName{ind_var});
     x=coord_x{1};

trunk/src/series.m

@@ -135 +135 @@
 [path_series,name,ext]=fileparts(which('series'));% path to the GUI series
 path_series_fct=fullfile(path_series,'series');%path of the functions in subdirectroy 'series'
-ActionExtList={'.m';'.sh';'.py (in dev.)'};% default choice of extensions (Matlab fct .m or compiled version .sh
+[code, message] = system...
+    ('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"'); 
+if code==0
+    ActionExtList={'.m';'.sh';'.py (in dev.)'};% default choice of extensions (Matlab fct .m or compiled version .sh
+else
+    ActionExtList={'.m';'.sh'};
+    disp('python library not installed')
+end
 ActionPathList=cell(NbBuiltinAction,1);%initiate the cell matrix of Action fct paths
 ActionPathList(:)={path_series_fct}; %set the default path to series fcts to all list members
@@ -175 +182 @@
     end
     %get the menu of actions
-    if isfield(h,'ActionExtListUser') && iscell(h.ActionExtListUser)
-        ActionExtList=[ActionExtList; h.ActionExtListUser];
-    end 
+%     if isfield(h,'ActionExtListUser') && iscell(h.ActionExtListUser)
+%         ActionExtList=[ActionExtList; h.ActionExtListUser];
+%     end 
     if isfield(h,'ActionListUser') && iscell(h.ActionListUser) && isfield(h,'ActionPathListUser') && iscell(h.ActionPathListUser)
         ActionList=[ActionList;h.ActionListUser];
@@ -1985 +1992 @@
     
     % record the file extension and extend the path list if it is a new extension
-    ActionExtList=get(handles.ActionExt,'String');
-    ActionExtIndex=find(strcmp(ActionExt,ActionExtList), 1);
-    if isempty(ActionExtIndex)
-        set(handles.ActionExt,'String',[ActionExtList;{ActionExt}])
-    end
+%     ActionExtList=get(handles.ActionExt,'String');
+%     ActionExtIndex=find(strcmp(ActionExt,ActionExtList), 1);
+%     if isempty(ActionExtIndex)
+%         set(handles.ActionExt,'String',[ActionExtList;{ActionExt}])
+%     end
 
     % remove old Action options in the menu (keeping a menu length <nb_builtin_ACTION+5)
@@ -2012 +2019 @@
         ActionListUser=ActionList(NbBuiltinAction+1:numel(ActionList)-1);
         ActionPathListUser=ActionPathList(NbBuiltinAction+1:numel(ActionList)-1);
-        ActionExtListUser={};
-        if numel(ActionExtList)>2
-            ActionExtListUser=ActionExtList(3:end);
-        end
+%         ActionExtListUser={};
+%         if numel(ActionExtList)>2
+%             ActionExtListUser=ActionExtList(3:end);
+%         end
         if exist(profil_perso,'file')
             save(profil_perso,'ActionListUser','ActionPathListUser','ActionExtListUser','-append')
@@ -3170 +3177 @@
     set(handles.RunMode,'Value',2)
 end
-% ActionList=get(handles.ActionName,'String');
-% ActionName=ActionList{get(handles.ActionName,'Value')};
 
 function num_NbProcess_Callback(hObject, eventdata, handles)

trunk/src/series/aver_stat.m

@@ -84 +84 @@
     end
     % introduce bin size for histograms
-    if Param.CheckObject
+    if isfield(Param,'CheckObject') && Param.CheckObject
         SeriesData=get(hseries,'UserData');
         if ismember(SeriesData.ProjObject.ProjMode,{'inside','outside'})

trunk/src/series/time_series.m

@@ -85 +85 @@
     end
     % introduce bin size for histograms
-    if Param.CheckObject
+    if isfield(Param,'CheckObject') &&Param.CheckObject
         SeriesData=get(hseries,'UserData');
-        if checkhisto
+        if ismember(SeriesData.ProjObject.ProjMode,{'inside','outside'})
              answer=msgbox_uvmat('INPUT_TXT','set bin size for histograms (or keep ''auto'' by default)?','auto');
             ParamOut.ActionInput.VarMesh=str2double(answer);