legend: calls handler.scale_dimensions legend_handler: added scale_dimensions method and helpers

UTSC-SISYPHUS · UTSC-SISYPHUS · commit fae251176d25 · 2018-03-06T20:54:56.000-05:00
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -917,6 +917,7 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
         descent = 0.35 * self._approx_text_height() * (self.handleheight - 0.7)
         # 0.35 and 0.7 are just heuristic numbers and may need to be improved.
         height = self._approx_text_height() * self.handleheight - descent
+        width = self.handlelength * fontsize
         # each handle needs to be drawn inside a box of (x, y, w, h) =
         # (0, -descent, width, height).  And their coordinates should
         # be given in the display coordinates.
@@ -929,6 +930,7 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
 
         for orig_handle, lab in zip(handles, labels):
             handler = self.get_legend_handler(legend_handler_map, orig_handle)
+            #print(lab,"\norig handle ",type(orig_handle), "\nhandler: ", type(handler))#my change here
             if handler is None:
                 warnings.warn(
                     "Legend does not support {!r} instances.\nA proxy artist "
@@ -944,15 +946,20 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
                 textbox = TextArea(lab, textprops=label_prop,
                                    multilinebaseline=True,
                                    minimumdescent=True)
-                handlebox = DrawingArea(width=self.handlelength * fontsize,
-                                        height=height,
+
+                da_width, da_height = handler.scale_dimensions(self,
+                                                               width, height,
+                                                               orig_handle)
+                handlebox = DrawingArea(width=da_width,
+                                        height=da_height,
                                         xdescent=0., ydescent=descent)
 
                 text_list.append(textbox._text)
                 # Create the artist for the legend which represents the
                 # original artist/handle.
                 handle_list.append(handler.legend_artist(self, orig_handle,
                                                          fontsize, handlebox))
+                #print("new handle: ", type(handle_list[-1]),"\n")#my change here
                 handles_and_labels.append((handlebox, textbox))
 
         if handles_and_labels:
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -88,6 +88,16 @@ def adjust_drawing_area(self, legend, orig_handle,
         height = height - self._ypad * fontsize
         return xdescent, ydescent, width, height
 
+    def scale_dimensions(self, legend, width, height, orig_handle):
+        return (max(width, self.handle_width(legend, orig_handle)),
+                max(height, self.handle_height(legend, orig_handle)))
+
+    def handle_width(self, legend, orig_handle):
+        return -1
+
+    def handle_height(self, legend, orig_handle):
+        return -1
+
     def legend_artist(self, legend, orig_handle,
                       fontsize, handlebox):
         """
@@ -228,6 +238,26 @@ def __init__(self, marker_pad=0.3, numpoints=None, **kw):
         HandlerNpoints.__init__(self, marker_pad=marker_pad,
                                 numpoints=numpoints, **kw)
 
+    def handle_width(self, legend, orig_handle):
+        if isinstance(orig_handle, Line2D):
+            marker = orig_handle.get_marker()
+            marker_size = orig_handle.get_markersize()
+            if marker and marker_size > 0:
+                if legend.markerscale != 1:
+                    marker_size = marker_size * legend.markerscale
+                return marker_size
+        return -1
+
+    def handle_height(self, legend, orig_handle):
+        if isinstance(orig_handle, Line2D):
+            marker = orig_handle.get_marker()
+            marker_size = orig_handle.get_markersize()
+            if marker and marker_size > 0:
+                if legend.markerscale != 1:
+                    marker_size = marker_size * legend.markerscale
+                return marker_size
+        return -1
+
     def create_artists(self, legend, orig_handle,
                        xdescent, ydescent, width, height, fontsize,
                        trans):
@@ -656,6 +686,24 @@ def __init__(self, ndivide=1, pad=None, **kwargs):
         self._pad = pad
         HandlerBase.__init__(self, **kwargs)
 
+    def handle_width(self, legend, orig_handle):
+        handler_map = legend.get_legend_handler_map()
+        largest_width = -1
+        for handle1 in orig_handle:
+            handler = legend.get_legend_handler(handler_map, handle1)
+            largest_width = max(largest_width,
+                                handler.handle_width(legend, handle1))
+        return largest_width
+
+    def handle_height(self, legend, orig_handle):
+        handler_map = legend.get_legend_handler_map()
+        largest_height = -1
+        for handle1 in orig_handle:
+            handler = legend.get_legend_handler(handler_map, handle1)
+            largest_height = max(largest_height,
+                                handler.handle_height(legend, handle1))
+        return largest_height
+
     def create_artists(self, legend, orig_handle,
                        xdescent, ydescent, width, height, fontsize,
                        trans):
