@@ -485,6 +485,7 @@ def __init__(self, ax, cmap=None,
485485self .locator = None
486486self .formatter = None
487487self ._manual_tick_data_values = None
488+ self .__scale = None # linear, log10 for now. Hopefully more?
488489
489490if ticklocation == 'auto' :
490491ticklocation = 'bottom' if orientation == 'horizontal' else 'right'
@@ -611,11 +612,9 @@ def _use_auto_colorbar_locator(self):
611612 Return if we should use an adjustable tick locator or a fixed
612613 one. (check is used twice so factored out here...)
613614 """
614- contouring = ((self .boundaries is not None )and
615- (self .spacing == 'uniform' ))
616- return (((type (self .norm )== colors .Normalize )
617- or (type (self .norm )== colors .LogNorm ))
618- and not contouring )
615+ contouring = self .boundaries is not None and self .spacing == 'uniform'
616+ return (type (self .norm )in [colors .Normalize ,colors .LogNorm ]and
617+ not contouring )
619618
620619def _reset_locator_formatter_scale (self ):
621620"""
@@ -631,9 +630,14 @@ def _reset_locator_formatter_scale(self):
631630self .ax .set_xscale ('log' )
632631self .ax .set_yscale ('log' )
633632self .minorticks_on ()
633+ self .__scale = 'log'
634634else :
635635self .ax .set_xscale ('linear' )
636636self .ax .set_yscale ('linear' )
637+ if type (self .norm )is colors .Normalize :
638+ self .__scale = 'linear'
639+ else :
640+ self .__scale = 'manual'
637641
638642def update_ticks (self ):
639643"""
@@ -1123,13 +1127,13 @@ def _mesh(self):
11231127else :
11241128y = self ._proportional_y ()
11251129xmid = np .array ([0.5 ])
1126- try :
1130+ if self . __scale != 'manual' :
11271131y = norm .inverse (y )
11281132x = norm .inverse (x )
11291133xmid = norm .inverse (xmid )
1130- except ValueError :
1131- #occurs for norms that don 't havean inverse, in
1132- #which case manually scale:
1134+ else :
1135+ #if a norm doesn 't havea named scale, or
1136+ #we are not using a norm
11331137dv = self .vmax - self .vmin
11341138x = x * dv + self .vmin
11351139y = y * dv + self .vmin