Changeset 80 for trunk/src

Timestamp:

Apr 6, 2010, 4:37:59 AM (15 years ago)

Author:

sommeria

Message:

aver_stat and time_series.sform Bug correction for phys transform
various bug corrections

Location:

trunk/src

Files:

• get_field.fig (modified) (previous)
• get_field/PLOT.m (modified) (1 diff)
• plot_field.m (modified) (3 diffs)
• read_get_field.m (modified) (1 diff)
• series/aver_stat.m (modified) (1 diff)
• series/time_series.m (modified) (2 diffs)

trunk/src/get_field/PLOT.m

@@ -5 +5 @@
 [SubField,errormsg]=read_get_field(hget_field);
 if ~isempty(errormsg)
-    msgbox_uvmat('ERROR',['error in get_field/PLOT input:' errormsg])
+    msgbox_uvmat('ERROR',['error in read_get_field/PLOT input:' errormsg])
     return
 end

trunk/src/plot_field.m

@@ -324 +324 @@
 coord_x_index=[];
 test_newplot=1;
+hh=findobj(haxes,'tag','plot_line');
+num_curve=numel(hh);
+icurve=0;
 for icell=1:length(CellVarIndex)
     testfalse=0;
@@ -377 +380 @@
              end
         end
-    end
-    hh=findobj(haxes,'tag','plot_line');
-    if isequal(numel(hh),numel(find(testplot(VarIndex))))%update existing curves
-        icurve=0;
-        test_newplot=0;
-        if ~isempty(VarType{icell}.discrete')
-            charplot_0='+';
-            LineStyle='none';
-        else
-            charplot_0='none';
-            LineStyle='-';
-        end
-        for ivar=1:length(VarIndex)
-            if testplot(VarIndex(ivar))
-                icurve=icurve+1;
-                VarName=data.ListVarName{VarIndex(ivar)};
-                eval(['data.' VarName '=squeeze(data.' VarName ');'])
-                set(hh(icurve),'LineStyle',LineStyle)
-                set(hh(icurve),'Marker',charplot_0)
-%                 if isequal(VarName,'A')
-%                     set(hh(icurve),'LineStyle','-');
-%                 else
-%                     set(hh(icurve),'LineStyle',charplot_0);
-%                 end
-                set(hh(icurve),'XData',coord_x{icell})
-                eval(['yy=data.' VarName ';'])
-                set(hh(icurve),'YData',yy);
-%                 eval(['nbcomponent2=size(data.' VarName ',2);']);
-%                 eval(['nbcomponent1=size(data.' VarName ',1);']);
-%                 if numel(coord_x{icell})==2
-%                     coord_x{icell}=linspace(coord_x{icell}(1),coord_x{icell}(2),nbcomponent1);
-%                 end
-%                 eval(['varmean=mean(double(data.' VarName '));']);%mean value
-%                 textmean=[textmean; {[VarName 'mean= ' num2str(varmean,4)]}];
-%                 if nbcomponent1==1| nbcomponent2==1
-%                     legend_str=[legend_str {VarName}]; %variable with one component
-%                 else  %variable with severals  components
-%                     for ic=1:min(nbcomponent1,nbcomponent2)
-%                         legend_str=[legend_str [VarName '_' num2str(ic)]]; %variable with severals  components 
-%                     end                                                   % labeled by their index (e.g. color component)
-%                 end
-            end
-        end
-    else% new plot
+    end  
+%     test_newplot=0;%default
+%     if num_curve>=icurve+numel(find(testplot(VarIndex)))%update existing curves
+%         if ~isempty(VarType{icell}.discrete')
+%             charplot_0='+';
+%             LineStyle='none';
+%         else
+%             charplot_0='none';
+%             LineStyle='-';
+%         end
+%         for ivar=1:length(VarIndex)
+%             if testplot(VarIndex(ivar))
+%                 icurve=icurve+1;
+%                 VarName=data.ListVarName{VarIndex(ivar)};
+%                 eval(['data.' VarName '=squeeze(data.' VarName ');'])
+%                 set(hh(icurve),'LineStyle',LineStyle)
+%                 set(hh(icurve),'Marker',charplot_0)
+%                 set(hh(icurve),'XData',coord_x{icell})
+%                 eval(['yy=data.' VarName ';'])
+%                 set(hh(icurve),'YData',yy);
+%             end
+%         end
+%     else% new plot
         if ~isempty(VarType{icell}.discrete')
             charplot_0='''+''';
@@ -452 +434 @@
             end
         end
-    end
+%     end
 end
 if test_newplot && ~isequal(plotstr,'hhh=plot(')
-    plotstr=[plotstr '''tag'',''plot_line'');']
+    plotstr=[plotstr '''tag'',''plot_line'');'];
                 %execute plot (instruction  plotstr)  
     eval(plotstr)

trunk/src/read_get_field.m

@@ -81 +81 @@
     else
         dimname_x=Field.VarDimName{VarIndex};
-        if numel(dimname_x)~=1
+        if iscell(dimname_x) && numel(dimname_x)~=1
             errormsg='abscissa must be a one-dimensional variable';
             return

trunk/src/series/aver_stat.m

@@ -360 +360 @@
                     end
                 else
-                    Data{1}=transform_fct(Data{1},XmlData);
+                    Data{1}=transform_fct(Data{1},XmlData{1});
                 end
              end     

trunk/src/series/time_series.m

@@ -387 +387 @@
                     end
                 else
-                    Data{1}=transform_fct(Data{1},XmlData);
+                    Data{1}=transform_fct(Data{1},XmlData{1});
                 end
             end     
@@ -552 +552 @@
     delete(hget_field)
 end
+RecordData
+
 get_field(filemean,RecordData)