Changeset 6638

Timestamp:

11/23/10 07:56:48 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added redblue colormap support for overlay

Location:

issm/trunk/src/m/model/plot

Files:

• applyoptions.m (modified) (1 diff)
• plot_overlay.m (modified) (2 diffs)

issm/trunk/src/m/model/plot/applyoptions.m

@@ -117 +117 @@
                 c = c (32:end,:);
         elseif strcmpi(cname,'redblue'),
-                m = 30;
-                n = fix(0.5*m);
-                r = [(0:1:n-1)/n,ones(1,n)];
-                g = [(0:n-1)/n, (n-1:-1:0)/n];
-                b = [ones(1,n),(n-1:-1:0)/n];
-                c = [r(:), g(:), b(:)]; 
+                %m = 30;
+                %n = fix(0.5*m);
+                %r = [(0:1:n-1)/n,ones(1,n)];
+                %g = [(0:n-1)/n, (n-1:-1:0)/n];
+                %b = [ones(1,n),(n-1:-1:0)/n];
+                %c = [r(:), g(:), b(:)]; 
+
+                c = hsv(64);
+                c = rgb2hsv(c);
+                c(:,2) = max(min( abs(c(:,1)-0.5)/0.5 ,1),0);
+                c(1:32,1)   = 0.7;
+                c(33:end,1) = 1;
+                c = hsv2rgb(c);
+
         elseif strcmpi(cname,'Rignot'),
                 c = hsv;

issm/trunk/src/m/model/plot/plot_overlay.m

@@ -59 +59 @@
 transparency=getfieldvalue(options,'alpha',1);
 data_grid(data_nan)=data_min; 
-%hue (H)
-h_data=(data_grid-data_min)/(data_max-data_min);
-%saturation (S)
-s_data=max(min((0.1+h_data).^(1/transparency),1),0);
+
+colorm=getfieldvalue(options,'colormap','Rignot');
+if strcmpi(colorm,'Rignot'),
+        %hue (H)
+        h_data=(data_grid-data_min)/(data_max-data_min);
+        %saturation (S)
+        s_data=max(min((0.1+h_data).^(1/transparency),1),0);
+elseif strcmpi(colorm,'redblue')
+        data_mean=data_min+(data_max-data_min)/2;
+        %hue (H)
+        h_data=0.7*ones(size(data_grid));
+        h_data(find(data_grid>data_mean))=1;
+        %saturation (S)
+        s_data=max(min(abs(data_grid-data_mean)/(data_max-data_mean) ,1),0);
+else
+        error('colormap not supported yet. (''Rignot'' and ''redblue'' are the only cupported colormaps)');
+end
+
+%Saturation is 0 in NaNs
 s_data(data_nan)=0;
 %intensity (V)
@@ -94 +109 @@
 
 %Apply options, without colorbar and without grid
-options=changefieldvalue(options,'colormap','Rignot');         %We used an HSV colorbar
+options=changefieldvalue(options,'colormap',colorm);           %We used an HSV colorbar
 options=changefieldvalue(options,'caxis',[data_min data_max]); %force caxis so that the colorbar is ready
 options=addfielddefault(options,'axis','equal off');           %default axis