New subplottool and various fixes #2112

rhoef · 2013-06-02T09:42:09Z

This pull request summarises three commits:

subplottool customized
-) new subplottool, sliders are all vertially arranged, buttons for tight layout and reset (new files: a ui file to compile formsubplottool.py using pyrcc)
-) fix: subplottool is now modal dialog, was previously a QMainWindow, leaving the SPT open if one closed the plotwindow
function col2hex could not handle different color representations of mpl. Further the hexcodes in the dict COLORS did not correspond to the hexcodes for the default colors (quick workaround since default colors are defined somewhere else.)

I also change the labeling of untitled axes figureoptions dialog.
Use the subplots_demo.py (at4 backend) to overview the changes.

efiring · 2013-06-02T18:38:21Z

I think a critical functionality of the subplot tool must be to show the numeric values. This allows one to use the tool to find good values, and then use those values in a script. I don't know when this functionality was lost on the qt backend, but I hope you will restore it. This should be facilitated by the layout in your PR, which is closer to the original and generic mpl subplot tool--which is functionally quite good.

rhoef · 2013-06-03T00:08:39Z

Here it is. the button also update the the labels.
What exactly went wrong with the commit 629d11c?

efiring · 2013-06-03T02:51:12Z

Thank you--looks good! I haven't tested it or looked closely at the code.

What did you use to generate the .ui file?

The Travis failure looks completely unrelated.

rhoef · 2013-06-06T06:52:24Z

I used the command
pyuic4 -o ui_myGUI.py myGUI.ui

pyuic4 comes with PyQt4. (or pyqt4-dev-tools on debian based systems) .

efiring · 2013-06-06T19:15:55Z

Right, that generates the .py file from the .ui file. Presumably you used Qt Designer to generate the .ui file. Does the PyQt4 tool write code that is immediately usable with pyside? We need to keep everything working with both pyqt4 and pyside.

rhoef · 2013-06-09T09:30:50Z

As you see in my last commit I removed the ui file. There's just the formsubplottool.py, no compilation at all. It seemed to me simpler this way, since there is no framework to handle ui files. Although it would be nice to have, since handwriting of forms in general is inexpedient.

I tested it with pyqt4 and pyside.

dmcdougall · 2013-06-23T22:18:45Z

lib/matplotlib/backends/backend_qt4.py


    def funcleft(self, val):
        if val == self.sliderright.value():
            val -= 1
-        self.targetfig.subplots_adjust(left=val/1000.)
+        val /= 1000


Be careful about integer division here.

twmr · 2013-07-11T21:16:09Z

Should the qt4agg fixes and the subplottool improvements be separated into two independent PRs s.t. reviewing them is easier ?

NelleV · 2013-07-16T08:32:15Z

lib/matplotlib/backends/backend_qt4.py

-        win.setSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
-
-        win.show()
+        image = os.path.join( matplotlib.rcParams['datapath'],


Despite this module not being pep8 compliant, let's try to have the new code as pep8 as possible.
There should be no spaces after and before ( and ).

rhoef · 2013-07-19T13:14:41Z

I meant "integer division"
Since I can click on the single commits, it is not worth to tear apart the pull request now, but I'll keep it in mind for future.

tacaswell · 2013-10-26T20:43:45Z

@rhoef Can you re-base this branch?

Conflicts: lib/matplotlib/backends/backend_qt4.py lib/matplotlib/backends/qt4_editor/formsubplottool.py

Conflicts: lib/matplotlib/backends/backend_qt4.py

twmr · 2013-10-26T22:51:12Z

edit:
rebase done + pep8 fixes

twmr · 2013-11-01T21:35:34Z

lib/matplotlib/backends/backend_qt4.py

-                item, ok = QtGui.QInputDialog.getItem(self, 'Customize',
-                                                      'Select axes:', titles,
-                                                      0, False)
+                    text = "_axes%d" % i


@rhoef why do you use a leading underscore here ?

The figureeditor uses this kind of notation for lines, graphs with no label. I took it over from there.

twmr · 2013-11-15T17:51:16Z

What still needs to be done in order to get this PR merged ?

WeatherGod · 2013-11-15T18:07:48Z

Haven't looked over the PR, but you will definitely need to add an entry to the "whats_new.rst" file in the documentation.

twmr · 2013-11-15T20:24:21Z

I tried to separate the subplottool specific changes from the figureoptions stuff. The subplottools code is now in #2594, the figureoptions PR still needs to be done. @rhoef can you create the figureoptions PR ?

Here is the diff between this PR and #2594.

index 9bde376..7e7e844 100644
--- a/lib/matplotlib/backends/backend_qt4.py
+++ b/lib/matplotlib/backends/backend_qt4.py
@@ -615,18 +615,28 @@ class NavigationToolbar2QT(NavigationToolbar2, QtGui.QToolBar):
                 axes = allaxes[0]
             else:
                 titles = []
-                for i, axes in enumerate(allaxes):
+                for axes in allaxes:
+                    title = axes.get_title()
                     ylabel = axes.get_ylabel()
-                    text = "_axes%d" % i
-                    if ylabel:
-                        text += " %s" % ylabel
-                    titles.append(text)
+                    if title:
+                        fmt = "%(title)s"
+                        if ylabel:
+                            fmt += ": %(ylabel)s"
+                        fmt += " (%(axes_repr)s)"
+                    elif ylabel:
+                        fmt = "%(axes_repr)s (%(ylabel)s)"
+                    else:
+                        fmt = "%(axes_repr)s"
+                    titles.append(fmt % dict(title=title,
+                                         ylabel=ylabel,
+                                         axes_repr=repr(axes)))
                 item, ok = QtGui.QInputDialog.getItem(
                     self.parent, 'Customize', 'Select axes:', titles, 0, False)
                 if ok:
                     axes = allaxes[titles.index(six.text_type(item))]
                 else:
                     return
+
             figureoptions.figure_edit(axes, self)

     def _update_buttons_checked(self):
diff --git a/lib/matplotlib/backends/qt4_editor/figureoptions.py b/lib/matplotlib/backends/qt4_editor/figureoptions.py
index a8732bd..f9dc2f8 100644
--- a/lib/matplotlib/backends/qt4_editor/figureoptions.py
+++ b/lib/matplotlib/backends/qt4_editor/figureoptions.py
@@ -17,7 +17,6 @@ import os.path as osp
 import matplotlib.backends.qt4_editor.formlayout as formlayout
 from matplotlib.backends.qt4_compat import QtGui
 from matplotlib import markers
-from matplotlib.colors import rgb2hex

 def get_icon(name):
     import matplotlib
@@ -35,21 +34,6 @@ LINESTYLES = {

 MARKERS = markers.MarkerStyle.markers

-COLORS = {'c': '#00bfbf', 'b': '#0000ff', 'w': '#ffffff', 'g': '#008000',
-          'y': '#bfbf00', 'k': '#000000', 'r': '#ff0000', 'm': '#bf00bf'}
-
-def col2hex(color):
-    # default colors and hex colors
-    if isinstance(color, basestring):
-        try:
-            chex = COLORS[color]
-        except KeyError:
-            chex = color
-    else: # rgb tuples
-        chex = rgb2hex(color)
-    return chex
-
-
 def figure_edit(axes, parent=None):
     """Edit matplotlib figure options"""
     sep = (None, None) # separator

tacaswell · 2013-11-23T19:30:01Z

This PR changes the new-style signal/slot calls back to the old-style, which suffer from a bug in PySides (see #2382).

👎 on merging this until the signals/slots are fixed.

dmcdougall reviewed Jun 23, 2013
View reviewed changes

NelleV reviewed Jul 16, 2013
View reviewed changes

rhoef added 6 commits October 27, 2013 00:08

subplottool customized

2ab38e4

hexcolors in figureoptions and function col2hex fixed

98d56f0

tick delta in sliders changed

30f3d31

value labels in subplottool added

2364f47

removed ui file for sublplot for pyside-pyqt4 compat.

2bb4bdd

Conflicts: lib/matplotlib/backends/backend_qt4.py lib/matplotlib/backends/qt4_editor/formsubplottool.py

interdivsion fixed and spaces removed

bf5dfcd

Conflicts: lib/matplotlib/backends/backend_qt4.py

fix pep8 problems

2bffa69

twmr reviewed Nov 1, 2013
View reviewed changes

twmr mentioned this pull request Nov 15, 2013

I'd like to see axes.get_label() when clicking on 'Edit curves lines and axes parameters' after plt.show() #2593

Closed

twmr mentioned this pull request Nov 15, 2013

New layout for qt4 subplottool + QMainWindow -> QDialog #2594

Merged

rhoef closed this Dec 17, 2013

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New subplottool and various fixes #2112

New subplottool and various fixes #2112

rhoef commented Jun 2, 2013

efiring commented Jun 2, 2013

rhoef commented Jun 3, 2013

efiring commented Jun 3, 2013

rhoef commented Jun 6, 2013

efiring commented Jun 6, 2013

rhoef commented Jun 9, 2013

dmcdougall Jun 23, 2013

twmr commented Jul 11, 2013

NelleV Jul 16, 2013

rhoef commented Jul 19, 2013

tacaswell commented Oct 26, 2013

twmr commented Oct 26, 2013

twmr Nov 1, 2013

rhoef Nov 6, 2013

twmr commented Nov 15, 2013

WeatherGod commented Nov 15, 2013

twmr commented Nov 15, 2013

tacaswell commented Nov 23, 2013

New subplottool and various fixes #2112

New subplottool and various fixes #2112

Conversation

rhoef commented Jun 2, 2013

efiring commented Jun 2, 2013

rhoef commented Jun 3, 2013

efiring commented Jun 3, 2013

rhoef commented Jun 6, 2013

efiring commented Jun 6, 2013

rhoef commented Jun 9, 2013

dmcdougall Jun 23, 2013

Choose a reason for hiding this comment

twmr commented Jul 11, 2013

NelleV Jul 16, 2013

Choose a reason for hiding this comment

rhoef commented Jul 19, 2013

tacaswell commented Oct 26, 2013

twmr commented Oct 26, 2013

twmr Nov 1, 2013

Choose a reason for hiding this comment

rhoef Nov 6, 2013

Choose a reason for hiding this comment

twmr commented Nov 15, 2013

WeatherGod commented Nov 15, 2013

twmr commented Nov 15, 2013

tacaswell commented Nov 23, 2013