Changeset 1745

Timestamp:

08/18/09 11:55:04 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed plot_quiver with colorbar

Location:

issm/trunk/src/m/classes/public/plot

Files:

• applyoptions.m (modified) (2 diffs)
• plot_manager.m (modified) (1 diff)
• plot_quiver.m (modified) (2 diffs)
• plotdoc.m (modified) (1 diff)

issm/trunk/src/m/classes/public/plot/applyoptions.m

@@ -106 +106 @@
 %colorbar
 if ~isnan(options_structure.colorbar),
-        if options_structure.colorbar,
+        %color bar ON
+        if options_structure.colorbar==1,
                 c=colorbar;set(c,'FontSize',fontsize);
                 if ~isnan(options_structure.wrapping)
@@ -133 +134 @@
                          set(c,'FontSize',fontsize);
                 end
-        elseif ~options_structure.colorbar,
+        %colorbar OFF
+        elseif options_structure.colorbar==0,
                 colorbar('off');
         end

issm/trunk/src/m/classes/public/plot/plot_manager.m

@@ -127 +127 @@
         options_structure.shading='interp';
 end
+if isquiver & ~strcmpi(options_structure.colorbar,'off'),
+        options_structure.colorbar=2;
+end
 applyoptions(md,data,options_structure);

issm/trunk/src/m/classes/public/plot/plot_quiver.m

@@ -44 +44 @@
 if numcolors==2;
         %blue and red
-        c=[0 0 1;1 0 0];
+        c=colormap([0 0 1;1 0 0]);
 elseif numcolors==3,
         %blue yellow and red
-        c=[0 0 1;1 1 0;1 0 0];
+        c=colormap([0 0 1;1 1 0;1 0 0]);
 else
         %let jet choose
@@ -68 +68 @@
 
 %take care of colorbar
-if  0 & ~strcmpi(options_structure.colorbar,'off'),
+if  ~strcmpi(options_structure.colorbar,'off'),
+        hcb=colorbar('peer',gca,'location','EastOutside');
+        tickn=cell(1,length(levels));
         for i=1:length(levels),
-                scalevalues(i)=levels(i);
-                scalestring=[scalestring; sprintf('%8.4g',levels(i))];
+                tickn{i}=num2str(levels(i));
         end
-        set(colorbar,'YTickLabel',scalestring,'YTick',scalevalues);
-        error('debug')
+        set(hcb,'YTickLabel',tickn,'YTick',1:numcolors+1);
+        %position
+        if ~isnan(options_structure.colorbarpos),
+                set(hcb,'Position',options_structure.colorbarpos);
+        end
+        %fontsize
+        if ~isnan(options_structure.fontsize),
+                fontsize=options_structure.fontsize;
+        else
+                fontsize=14;
+        end
+        set(hcb,'FontSize',fontsize);
 end
+
+%Now no colorbar done by 

issm/trunk/src/m/classes/public/plot/plotdoc.m

@@ -81 +81 @@
 disp('       ''highres'': resolution of overlayed radar amplitude image (default is 0, high resolution is 1).');
 disp('       ''alpha'': transparency coefficient (the higher, the more transparent). Default is 1.5');
+disp('       ''scaling'': scaling factor used by quiver plots. Default is 0.4');
 disp('       ''expdisp'': plot exp file on top of a data plot. provide exp file as an argument (use a cell of strings if more than one)');
 disp('       ''expstyle'': marker style for expdisp plot (use a cell of strings if more than one)');