# HG changeset patch
# User Konstantinos Poulios <logari81@googlemail.com>
# Date 1289127096 -3600
# Node ID 836427db633bc21f1f6f178cf6153fe395dbf44d
# Parent  d17cb8a1271d00dafa044375d5f00d1797ab3e83
Make colorbar function aware of dataaspect settings

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-07  Konstantinos Poulios  <logari81@googlemail.com>
+
+	* plot/colorbar.m: Make colorbar function aware of dataaspect settings.
+
 2010-11-06  Marco Caliari <marco.caliari@univr.it>
 
 	* polynomial/spline.m: Fit a parabola for input with 3
diff --git a/scripts/plot/colorbar.m b/scripts/plot/colorbar.m
--- a/scripts/plot/colorbar.m
+++ b/scripts/plot/colorbar.m
@@ -166,6 +166,8 @@
     addlistener (ax, "clim", {@update_colorbar_clim, hi, vertical})
     addlistener (ax, "plotboxaspectratio", {@update_colorbar_axis, cax, obj})
     addlistener (ax, "plotboxaspectratiomode", {@update_colorbar_axis, cax, obj})
+    addlistener (ax, "dataaspectratio", {@update_colorbar_axis, cax, obj})
+    addlistener (ax, "dataaspectratiomode", {@update_colorbar_axis, cax, obj})
     addlistener (ax, "position", {@update_colorbar_axis, cax, obj})
 
   endif
@@ -260,7 +262,8 @@
   pos = obj.position;
   sz = pos(3:4);
 
-  if (strcmpi (obj.plotboxaspectratiomode, "manual"))
+  if (strcmpi (obj.plotboxaspectratiomode, "manual")
+      || strcmpi (obj.dataaspectratiomode, "manual"))
     if (isempty (strfind (cbox, "outside")))
       scale = 1.0;
     else
@@ -334,7 +337,8 @@
 
   cpos = [origin, sz];
 
-  if (strcmpi (obj.plotboxaspectratiomode, "manual"))
+  if (strcmpi (obj.plotboxaspectratiomode, "manual")
+      || strcmpi (obj.dataaspectratiomode, "manual"))
     obj.position = pos;
     actual_pos = __actual_axis_position__ (obj);
     if (strfind (cbox, "outside"))