Changeset 185

Timestamp:

Jan 27, 2011, 9:50:39 PM (14 years ago)

Author:

sommeria

Message:

bug repqir for reqding times zith Dtk, coord units displyed in uv,qt

Location:

trunk/src

Files:

• imadoc2struct.m (modified) (1 diff)
• plot_field.m (modified) (11 diffs)
• uvmat.fig (modified) (previous)

trunk/src/imadoc2struct.m

@@ -103 +103 @@
                 else
                     for kblock=1:NbDtk+1
-                        Time_val=Time_val+(kblock-1)*Dtk;
-                        s.Time=[s.Time;Time_val];
+                        Time_val_k=Time_val+(kblock-1)*Dtk;
+                        s.Time=[s.Time;Time_val_k];
                     end
                 end

trunk/src/plot_field.m

@@ -201 +201 @@
     end
 end
-
 if isempty(errormsg)
     set(haxes,'UserData',Data)
@@ -521 +520 @@
             eval(['vec_U=Data.' Data.ListVarName{ivar_U} ';']) 
             eval(['vec_V=Data.' Data.ListVarName{ivar_V} ';']) 
-            if ~isempty(ivar_X) && ~isempty(ivar_Y)% 2D field (with unstructured coordinates or structured ones (then ivar_X and ivar_Y empty)     
-                eval(['vec_X=Data.' Data.ListVarName{ivar_X} ';']) 
-                eval(['vec_Y=Data.' Data.ListVarName{ivar_Y} ';'])
+            if ~isempty(ivar_X) && ~isempty(ivar_Y)% 2D field (with unstructured coordinates or structured ones (then ivar_X and ivar_Y empty)
+                XName=Data.ListVarName{ivar_X};
+                YName=Data.ListVarName{ivar_Y};
+                eval(['vec_X=Data.' XName ';']) 
+                eval(['vec_Y=Data.' YName ';'])
             elseif numel(VarType.coord)==2 && ~isequal(VarType.coord,[0 0]);%coordinates defines by dimension variables
                 eval(['y=Data.' Data.ListVarName{VarType.coord(1)} ';']) 
@@ -572 +573 @@
             if isfield(Data,'VarAttribute')
                 if numel(Data.VarAttribute)>=ivar_X && isfield(Data.VarAttribute{ivar_X},'units')
-                    x_units=['(' Data.VarAttribute{ivar_X}.units ')'];
+                    x_units=[' (' Data.VarAttribute{ivar_X}.units ')'];
                 end
                 if numel(Data.VarAttribute)>=ivar_Y && isfield(Data.VarAttribute{ivar_Y},'units')
-                    y_units=['(' Data.VarAttribute{ivar_Y}.units ')'];
+                    y_units=[' (' Data.VarAttribute{ivar_Y}.units ')'];
                 end
             end        
@@ -587 +588 @@
             if isfield(Data,'VarAttribute')
                 if numel(Data.VarAttribute)>=VarType.coord(2) && isfield(Data.VarAttribute{VarType.coord(2)},'units')
-                    x_units=['(' Data.VarAttribute{VarType.coord(2)}.units ')'];
+                    x_units=Data.VarAttribute{VarType.coord(2)}.units;
                 end
                 if numel(Data.VarAttribute)>=VarType.coord(1) && isfield(Data.VarAttribute{VarType.coord(1)},'units')
-                    y_units=['(' Data.VarAttribute{VarType.coord(1)}.units ')'];
+                    y_units=Data.VarAttribute{VarType.coord(1)}.units;
                 end
             end  
@@ -639 +640 @@
             return
         end
-          %x_label=[Data.ListVarName{ivar_X} '(' x_units ')'];
-    end          
+    end
+    %define coordinates as CoordUnits, if not defined as attribute for each variable
+    if isfield(Data,'CoordUnit')
+        if isempty(x_units)
+            x_units=Data.CoordUnit;
+        end
+        if isempty(y_units)
+            y_units=Data.CoordUnit;
+        end
+    end
+        
 end 
 
@@ -795 +805 @@
         end           
         % create new image if there  no image handle is found
-        if isempty(hima)
-           % axes(haxes)% set haxes the current axes for image creation
-         %   set(hfig,'CurrentAxes',haxes) % set haxes the current axes for image creation 
+        if isempty(hima) 
             tag=get(haxes,'Tag');
             if MinA<MaxA
@@ -823 +831 @@
         AxeData=[];
     end
-%     AxeData.A=A;
-%     AxeData.AX=[AX(1) AX(end)];
-%     AxeData.AY=[AY(1) AY(end)];
     test_ima=1;
     
@@ -925 +930 @@
         vec_C=ones(1,numel(vec_X));
     end
-%     AxeData.X=vec_X';
-%     AxeData.Y=vec_Y';
-%     AxeData.U=vec_U';
-%     AxeData.V=vec_V';
-%     AxeData.C=vec_C';
-%     if isempty(ivar_F)
-%         AxeData.F=[];
-%     else
-%         AxeData.F=vec_F';
-%     end
-%     if isempty(ivar_FF)
-%         AxeData.FF=[];
-%     else
-%         AxeData.FF=vec_FF';
-%     end
     
     %decimate by a factor 2 in vector mesh(4 in nbre of vectors)
@@ -999 +989 @@
         delete(hvec);
     end
-%     AxeData.X=[];
-%     AxeData.Y=[];
-%     AxeData.U=[];
-%     AxeData.V=[];
-%     AxeData.C=[];
-%     AxeData.W=[];
-%     AxeData.F=[];
-%      AxeData.FF=[];
-%     AxeData.Mesh=[];
     PlotParamOut=rmfield(PlotParamOut,'Vectors');
 end
-% if isfield(Data,'Z')
-%     AxeData.Z=Data.Z;% A REVOIR
-% end
-listfields={'AY','AX','A','X','Y','U','V','C','W','F','FF'};
-listdim={'AY','AX',{'AY','AX'},'nb_vectors','nb_vectors','nb_vectors','nb_vectors','nb_vectors','nb_vectors','nb_vectors','nb_vectors'};
-Role={'coord_y','coord_x','scalar','coord_x','coord_y','vector_x','vector_y','scalar','vector_z','warnflag','errorflag'};
+
+%listfields={'AY','AX','A','X','Y','U','V','C','W','F','FF'};
+%listdim={'AY','AX',{'AY','AX'},'nb_vectors','nb_vectors','nb_vectors','nb_vectors','nb_vectors','nb_vectors','nb_vectors','nb_vectors'};
+%Role={'coord_y','coord_x','scalar','coord_x','coord_y','vector_x','vector_y','scalar','vector_z','warnflag','errorflag'};
 %ind_select=[];
 nbvar=0;
-% AxeData.ListVarName={};
-% AxeData.VarDimName={};
-% AxeData.VarAttribute={};
-% for ilist=1:numel(listfields)
-%     eval(['testvar=isfield(AxeData,listfields{ilist}) && ~isempty(AxeData.' listfields{ilist} ');'])
-%     if testvar
-%         nbvar=nbvar+1;
-%         AxeData.ListVarName{nbvar}=listfields{ilist};
-%         AxeData.VarDimName{nbvar}=listdim{ilist};
-%         AxeData.VarAttribute{nbvar}.Role=Role{ilist};
-%     end
-% end
+
 %store the coordinate extrema occupied by the field
 test_lim=0;
@@ -1064 +1032 @@
 end
 set(haxes,'YDir','normal') 
-set(get(haxes,'XLabel'),'String',[XName x_units]);
-set(get(haxes,'YLabel'),'String',[YName y_units]);
+set(get(haxes,'XLabel'),'String',[XName ' (' x_units ')']);
+set(get(haxes,'YLabel'),'String',[YName ' (' y_units ')']);
+PlotParamOut.x_units=x_units;
+PlotParamOut.y_units=y_units;
 
 %-------------------------------------------------------------------
@@ -1132 +1102 @@
     matyar=reshape(matyar,1,4*n(2));
     %draw the line or modify the existing ones
-      hx = [x1;x2;x3];
-      hy = [y1;y2;y3];
+  %    hx = [x1;x2;x3];
+  %    hy = [y1;y2;y3];
     tri=reshape(1:3*length(uc),3,[])';
-    d = tri(:,[1 2 3 1])'; 
+    %d = tri(:,[1 2 3 1])'; 
     
     isn=isnan(colorlist(icolor,:));%test if color NaN