Changeset 150 for trunk/src/plot_field.m

Timestamp:

Dec 3, 2010, 12:16:51 PM (13 years ago)

Author:

sommeria

Message:

various corrections for plotting and using view_field and get_field. The current field of uvmat or view_field is now stored in the structure userdata.axes3. Introduction of live correlation to test PIV (civ1)

File:

• trunk/src/plot_field.m (modified) (9 diffs)

trunk/src/plot_field.m

@@ -231 +231 @@
 end
 
-% set graph aspect ratio
-if isfield(AxeData,'Mesh')
-    Data.Mesh=AxeData.Mesh;
-end
+% % set graph aspect ratio
+% if isfield(AxeData,'Mesh')
+%     Data.Mesh=AxeData.Mesh;
+% end
 
 %set(haxes,'UserData',AxeData)
@@ -448 +448 @@
             hlegend=legend(legend_str);
             txt=ver('MATLAB');
-            Release=txt.Release
-            relnumb=str2num(Release(3:4));% should be changed to Version for better compatibility
+            Release=txt.Release;
+            relnumb=str2double(Release(3:4));% should be changed to Version for better compatibility
             if relnumb >= 14
                 set(hlegend,'Interpreter','none')% desable tex interpreter
@@ -474 +474 @@
     txt=ver('MATLAB');
     Release=txt.Release;
-    relnumb=str2num(Release(3:4));
+    relnumb=str2double(Release(3:4));
     if relnumb >= 14
         set(htitle,'Interpreter','none')% desable tex interpreter
@@ -928 +928 @@
     vec_U=reshape(vec_U,1,numel(vec_U));
     vec_V=reshape(vec_V,1,numel(vec_V));
-    MinMaxX=max(vec_X)-min(vec_X);
-    MinMaxY=max(vec_Y)-min(vec_Y);
-    AxeData.Mesh=sqrt((MinMaxX*MinMaxY)/length(vec_X));
+     MinMaxX=max(vec_X)-min(vec_X);
+%     MinMaxY=max(vec_Y)-min(vec_Y);
+%     AxeData.Mesh=sqrt((MinMaxX*MinMaxY)/length(vec_X));
     if  ~isfield(PlotParam.Vectors,'AutoVec') || isequal(PlotParam.Vectors.AutoVec,0)|| ~isfield(PlotParam.Vectors,'VecScale')...
                ||isempty(PlotParam.Vectors.VecScale)||~isa(PlotParam.Vectors.VecScale,'double') %automatic vector scale
@@ -937 +937 @@
             indsel=find(AxeData.FF==0);%indsel =indices of good vectors
         else     
-            indsel=[1:numel(vec_X)];%
+            indsel=1:numel(vec_X);%
         end
         if isempty(vec_U)
@@ -977 +977 @@
     
     %decimate by a factor 2 in vector mesh(4 in nbre of vectors)
-    if isfield(PlotParam.Vectors,'decimate4')&isequal(PlotParam.Vectors.decimate4,1)
+    if isfield(PlotParam.Vectors,'decimate4') && isequal(PlotParam.Vectors.decimate4,1)
         diffy=diff(vec_Y); %difference dy=vec_Y(i+1)-vec_Y(i)
         dy_thresh=max(abs(diffy))/2; 
@@ -983 +983 @@
         ind_sel=1:ind_jump(1);%select the first line
         for i=2:2:length(ind_jump)-1
-            ind_sel=[ind_sel [ind_jump(i)+1:ind_jump(i+1)]];% select the odd lines
+            ind_sel=[ind_sel (ind_jump(i)+1:ind_jump(i+1))];% select the odd lines
         end
         nb_sel=length(ind_sel);
@@ -1042 +1042 @@
     AxeData.F=[];
      AxeData.FF=[];
-    AxeData.Mesh=[];
+%     AxeData.Mesh=[];
     PlotParamOut=rmfield(PlotParamOut,'Vectors');
 end
@@ -1169 +1169 @@
       hx = [x1;x2;x3];
       hy = [y1;y2;y3];
-    tri=reshape([1:3*length(uc)],3,[])';
+    tri=reshape(1:3*length(uc),3,[])';
     d = tri(:,[1 2 3 1])';