Changeset 12391

Timestamp:

06/08/12 12:16:17 (13 years ago)

Author:

Mathieu Morlighem

Message:

Easier way to handle colormaps

Location:

issm/trunk-jpl/src/m/model/plot

Files:

• applyoptions.m (modified) (1 diff)
• getcolormap.m (added)
• plot_gridded.m (modified) (4 diffs)
• plot_overlay.m (modified) (1 diff)

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

@@ -117 +117 @@
 
 %colormap
-if exist(options,'colormap'),
-        cname=getfieldvalue(options,'colormap');
-        if strcmpi(cname,'Ala'),
-                c = jet(64);
-                c = c (32:end,:);
-        elseif strcmpi(cname,'redblue'),
-                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(252);
-                c = rgb2hsv(c);
-                alpha=getfieldvalue(options,'alpha',1);
-                c(:,2) = max(min( (0.1+c(:,1)).^(1/alpha) ,1),0);
-                c = hsv2rgb(c);
-        elseif strcmpi(cname,'Rignot2'),
-                c = hsv(252);
-                c = rgb2hsv(c);
-                alpha=getfieldvalue(options,'alpha',1);
-                c(:,2) = max(min( (0.1+c(:,1)).^(1/alpha) ,1),0);
-                c = hsv2rgb(c);
-                c=flipud(c);
-        elseif strcmpi(cname,'Seroussi'),
-                c = hsv(252);
-                c = flipud(c);
-                c = c(1:floor(0.7*size(c,1)),:);
-                c = rgb2hsv(c);
-                alpha=getfieldvalue(options,'alpha',1);
-                c(:,2) = max(min( (0.1+c(:,1)).^(1/alpha) ,1),0);
-                c = hsv2rgb(c);
-                %c = flipud(c);
-        else
-                c = cname;
-        end
-        h=colormap(c);
-else
-        h=colormap(jet(60));
-end
+c = getcolormap(options);
+h=colormap(c);
 
 %wrapping

issm/trunk-jpl/src/m/model/plot/plot_gridded.m

@@ -6 +6 @@
 %
 %   See also: PLOTMODEL
-
-whitepos=getfieldvalue(options,'whitepos',2); %1: up, 2: down, else: none
 
 %process mesh and data
@@ -29 +27 @@
 end
 
+%Get and change colormap
+map    = getcolormap(options);
+lenmap = size(map,1);
+map    = [1 1 1; map];
+options=changefieldvalue(options,'colormap',map);
+
 %Process data_grid: add white in NaN and correct caxis accordingly
 if exist(options,'caxis'),
@@ -40 +44 @@
         data_max=max(data_grid(:));
 end
-options=changefieldvalue(options,'cbYLim',[data_min data_max]);
-if whitepos==1,
-        white  =data_max + (data_max-data_min)/55;
-        options=changefieldvalue(options,'caxis',[data_min white]);
-        data_grid(isnan(data_grid))=white;
-elseif whitepos==2,
-        white  =data_min - (data_max-data_min)/55;
-        options=changefieldvalue(options,'caxis',[white data_max]);
-        data_grid(isnan(data_grid))=white;
-end
+options = changefieldvalue(options,'cbYLim',[data_min data_max]);
+white   = data_min - (data_max-data_min)/(lenmap);
+options = changefieldvalue(options,'caxis',[white data_max]);
+data_grid(isnan(data_grid))=white;
 
 %Select plot area 
@@ -56 +54 @@
 %shading interp;
 h=imagesc(xlim,ylim,data_grid);set(gca,'YDir','normal');
-map=getfieldvalue(options,'colormap',jet);
-if whitepos==1,
-        map(end,:)=[1 1 1];
-elseif whitepos==2,
-        map(1,:)=[1 1 1];
-end
-options=changefieldvalue(options,'colormap',map);
 
 %last step: mesh gridded?

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

@@ -112 +112 @@
         image_rgb=hsv2rgb(image_hsv);
 else
-        if ischar(colorm),
-                eval(['colorm = ' colorm ';']);
-        end
+        colorm = getcolormap(options);
         len = size(colorm,1);
 
-        ind = floor((len-1)*(data_grid-data_min)/(data_max - data_min + eps) +1);
+        ind = round((len-1)*(data_grid-data_min)/(data_max - data_min + eps) +1);
+        ind(find(ind>len))=len;
         image_rgb=zeros(size(data_grid,1),size(data_grid,2),3);
         r=colorm(:,1); image_rgb(:,:,1)=r(ind); clear r;