8000 New subplottool and various fixes by rhoef · Pull Request #2112 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

New subplottool and various fixes #2112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

New subplottool and various fixes #2112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ab38e4
subplottool customized
rhoef May 5, 2013
98d56f0
hexcolors in figureoptions and function col2hex fixed
rhoef May 5, 2013
30f3d31
tick delta in sliders changed
rhoef May 5, 2013
2364f47
value labels in subplottool added
rhoef Jun 2, 2013
2bb4bdd
removed ui file for sublplot for pyside-pyqt4 compat.
rhoef Jun 9, 2013
bf5dfcd
interdivsion fixed and spaces removed
rhoef Jul 19, 2013
2bffa69
fix pep8 problems
twmr Oct 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed ui file for sublplot for pyside-pyqt4 compat. 
Conflicts:
	lib/matplotlib/backends/backend_qt4.py
	lib/matplotlib/backends/qt4_editor/formsubplottool.py
  • Loading branch information
@rhoef @twmr
rhoef authored and twmr committed Oct 26, 2013
commit 2bb4bddd6c3585ba53ea4f4c302115b32ff0fa60
7 changes: 3 additions & 4 deletions lib/matplotlib/backends/backend_qt4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
figureoptions = None

from .qt4_compat import QtCore, QtGui, _getSaveFileName, __version__
from matplotlib.backends.qt4_editor.formsubplottool import Ui_SubplotTool
from matplotlib.backends.qt4_editor.formsubplottool import UiSubplotTool

backend_version = __version__

Expand Down Expand Up @@ -713,10 +713,9 @@ def save_figure(self, *args):
QtGui.QMessageBox.Ok, QtGui.QMessageBox.NoButton)


class SubplotToolQt(SubplotTool, QtGui.QDialog, Ui_SubplotTool):
class SubplotToolQt(SubplotTool, UiSubplotTool):
def __init__(self, targetfig, parent):
QtGui.QDialog.__init__(self, None)
self.setupUi(self)
UiSubplotTool.__init__(self, None)
self.targetfig = targetfig
self.parent = parent
self.connect(self.doneButton, QtCore.SIGNAL("clicked()"), self.close)
Expand Down
Loading
0