Index: /issm/trunk/src/m/classes/public/plot/applyoptions.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/applyoptions.m	(revision 2379)
+++ /issm/trunk/src/m/classes/public/plot/applyoptions.m	(revision 2380)
@@ -104,43 +104,5 @@
 
 %colorbar
-if ~isnan(options_structure.colorbar),
-	%color bar ON
-	if options_structure.colorbar==1,
-		c=colorbar;set(c,'FontSize',fontsize);
-		if ~isnan(options_structure.wrapping)
-			lim=get(c,'Ylim');
-			lim=[lim(1) lim(1)+(lim(2)-lim(1))/options_structure.wrapping];
-			set(c,'Ylim',lim);
-		end
-		if ~isnan(options_structure.colorbarpos),
-			set(c,'Position',options_structure.colorbarpos);
-		end
-		if ~isnan(options_structure.log),
-			logvalue=options_structure.log;
-
-			scalestring=get(c,'YTickLabel');
-			scalevalues=get(c,'YTick');
-			scaleminmax=caxis;
-			numvalues=length(scalevalues);
-
-			scalestring=[];
-			for i=1:numvalues,
-				 fraction=(scalevalues(i)-scaleminmax(1))/(scaleminmax(2)-scaleminmax(1));
-				 scalevalues(i)=round_ice(logvalue^scalevalues(i),2);
-				 scalestring=[scalestring; sprintf('%8.4g',scalevalues(i))];
-			 end
-			 set(c,'YTickLabel',scalestring);
-			 set(c,'FontSize',fontsize);
-		end
-		if ~isnan(options_structure.colorbartitle),
-			backup=gca;
-			axes(c);lab=ylabel(options_structure.colorbartitle);set(lab,'Rotation',-90);set(lab,'VerticalAlignment','bottom');
-			axes(backup);
-		end
-	%colorbar OFF
-	elseif options_structure.colorbar==0,
-		colorbar('off');
-	end
-else
+if options_structure.colorbar~=0,
 	c=colorbar;set(c,'FontSize',fontsize);
 	if ~isnan(options_structure.wrapping)
@@ -152,4 +114,21 @@
 		set(c,'Position',options_structure.colorbarpos);
 	end
+	if ~isnan(options_structure.log),
+		logvalue=options_structure.log;
+
+		scalestring=get(c,'YTickLabel');
+		scalevalues=get(c,'YTick');
+		scaleminmax=caxis;
+		numvalues=length(scalevalues);
+
+		scalestring=[];
+		for i=1:numvalues,
+			fraction=(scalevalues(i)-scaleminmax(1))/(scaleminmax(2)-scaleminmax(1));
+			scalevalues(i)=round_ice(logvalue^scalevalues(i),2);
+			scalestring=[scalestring; sprintf('%8.4g',scalevalues(i))];
+		end
+		set(c,'YTickLabel',scalestring);
+		set(c,'FontSize',fontsize);
+	end
 	if ~isnan(options_structure.colorbartitle),
 		backup=gca;
@@ -157,4 +136,7 @@
 		axes(backup);
 	end
+%colorbar OFF
+else options_structure.colorbar==0,
+	colorbar('off');
 end