Changeset b9f6d83 in sasview for src/sans/plottools/PlotPanel.py

Timestamp:

Apr 1, 2014 5:23:29 AM (10 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

aba5876

Parents:

b099388

Message:

Re #216 Merging wx30 branch

File:

• src/sans/plottools/PlotPanel.py (modified) (3 diffs)

src/sans/plottools/PlotPanel.py

@@ -1107 +1107 @@
         self._onEVT_FUNC_PROPERTY(False)
         # Check if zoomed
-        toolbar_zoomed = self.toolbar.GetToolEnabled(self.toolbar._NTB2_BACK)
+        try: tb = self.toolbar.wx_ids['Back']
+        except AttributeError: tb = self.toolbar._NTB2_BACK # Cruft
+        toolbar_zoomed = self.toolbar.GetToolEnabled(tb)
+
         if self.is_zoomed or toolbar_zoomed:
             # Recover the x,y limits
@@ -1259 +1262 @@
                 handles2, labels2 = zip(*hl)
                 self.line_collections_list = handles2
-                self.legend = ax.legend(handles2, labels2, numpoints=1,
+                try:
+                    self.legend = ax.legend(handles2, labels2, numpoints=1,
+                                prop=FontProperties(size=10),
+                                handletextsep=.05, loc=self.legendLoc)
+                except TypeError:  # Cruft
+                    # older MPL uses handletextsep instead of handletextpad
+                    self.legend = ax.legend(handles2, labels2, numpoints=1,
                                 prop=FontProperties(size=10),
                                 handletextsep=.05, loc=self.legendLoc)
@@ -1268 +1277 @@
                 
             except:
-                self.legend = ax.legend(prop=FontProperties(size=10),
+                try:
+                    self.legend = ax.legend(prop=FontProperties(size=10),
+                                        numpoints=1, handletextpad=.05,
+                                        loc=self.legendLoc)
+                except TypeError:  # Cruft
+                    # older MPL uses handletextsep instead of handletextpad
+                    self.legend = ax.legend(prop=FontProperties(size=10),
                                         numpoints=1, handletextsep=.05,
                                         loc=self.legendLoc)