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
tick delta in sliders changed
  • Loading branch information
@rhoef @twmr
rhoef authored and twmr committed Oct 26, 2013
commit 30f3d31389a85ac96ccbb6c17475bf09ea8366e8
17 changes: 9 additions & 8 deletions lib/matplotlib/backends/qt4_editor/formsubplottool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Form implementation generated from reading ui file 'subplot_conftool.ui'
#
# Created: Sun May 5 09:49:09 2013
# Created: Sun May 5 20:30:44 2013
# by: PyQt4 UI code generator 4.9.3
#
# WARNING! All changes made in this file will be lost!
Expand All @@ -17,7 +17,7 @@
class Ui_SubplotTool(object):
def setupUi(self, SubplotTool):
SubplotTool.setObjectName(_fromUtf8("SubplotTool"))
SubplotTool.resize(447, 241)
SubplotTool.resize(447, 265)
self.horizontalLayout = QtGui.QHBoxLayout(SubplotTool)
self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
self.gridLayout = QtGui.QGridLayout()
Expand Down Expand Up @@ -64,7 +64,7 @@ def setupUi(self, SubplotTool):
self.slidertop.setInvertedAppearance(False)
self.slidertop.setInvertedControls(False)
self.slidertop.setTickPosition(QtGui.QSlider.TicksAbove)
self.slidertop.setTickInterval(10)
self.slidertop.setTickInterval(100)
self.slidertop.setObjectName(_fromUtf8("slidertop"))
self.hboxtop.addWidget(self.slidertop)
self.verticalLayout.addLayout(self.hboxtop)
Expand All @@ -84,7 +84,7 @@ def setupUi(self, SubplotTool):
self.sliderbottom.setOrientation(QtCore.Qt.Horizontal)
self.sliderbottom.setInvertedAppearance(False)
self.sliderbottom.setTickPosition(QtGui.QSlider.TicksAbove)
self.sliderbottom.setTickInterval(10)
self.sliderbottom.setTickInterval(100)
self.sliderbottom.setObjectName(_fromUtf8("sliderbottom"))
self.hboxbottom.addWidget(self.sliderbottom)
self.verticalLayout.addLayout(self.hboxbottom)
Expand All @@ -104,7 +104,7 @@ def setupUi(self, SubplotTool):
self.sliderleft.setOrientation(QtCore.Qt.Horizontal)
self.sliderleft.setInvertedAppearance(False)
self.sliderleft.setTickPosition(QtGui.QSlider.TicksAbove)
self.sliderleft.setTickInterval(10)
self.sliderleft.setTickInterval(100)
self.sliderleft.setObjectName(_fromUtf8("sliderleft"))
self.hboxleft.addWidget(self.sliderleft)
self.verticalLayout.addLayout(self.hboxleft)
Expand All @@ -124,7 +124,7 @@ def setupUi(self, SubplotTool):
self.sliderright.setOrientation(QtCore.Qt.Horizontal)
self.sliderright.setInvertedAppearance(False)
self.sliderright.setTickPosition(QtGui.QSlider.TicksAbove)
self.sliderright.setTickInterval(10)
self.sliderright.setTickInterval(100)
self.sliderright.setObjectName(_fromUtf8("sliderright"))
self.hboxright.addWidget(self.sliderright)
self.verticalLayout.addLayout(self.hboxright)
Expand All @@ -151,7 +151,7 @@ def setupUi(self, SubplotTool):
self.sliderhspace.setOrientation(QtCore.Qt.Horizontal)
self.sliderhspace.setInvertedAppearance(False)
self.sliderhspace.setTickPosition(QtGui.QSlider.TicksAbove)
self.sliderhspace.setTickInterval(10)
self.sliderhspace.setTickInterval(100)
self.sliderhspace.setObjectName(_fromUtf8("sliderhspace"))
self.hboxhspace.addWidget(self.sliderhspace)
self.verticalLayout_2.addLayout(self.hboxhspace)
Expand All @@ -168,10 +168,11 @@ def setupUi(self, SubplotTool):
self.labelwspace.setObjectName(_fromUtf8("labelwspace"))
self.hboxwspace.addWidget(self.labelwspace)
self.sliderwspace = QtGui.QSlider(self.groupBox_2)
self.sliderwspace.setTracking(True)
self.sliderwspace.setOrientation(QtCore.Qt.Horizontal)
self.sliderwspace.setInvertedAppearance(False)
self.sliderwspace.setTickPosition(QtGui.QSlider.TicksAbove)
self.sliderwspace.setTickInterval(10)
self.sliderwspace.setTickInterval(100)
self.sliderwspace.setObjectName(_fromUtf8("sliderwspace"))
self.hboxwspace.addWidget(self.sliderwspace)
self.verticalLayout_2.addLayout(self.hboxwspace)
Expand Down
17 changes: 10 additions & 7 deletions lib/matplotlib/backends/qt4_editor/subplot_conftool.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>447</width>
<height>241</height>
<height>265</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -130,7 +130,7 @@
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>10</number>
<number>100</number>
</property>
</widget>
</item>
Expand Down Expand Up @@ -172,7 +172,7 @@
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>10</number>
<number>100</number>
</property>
</widget>
</item>
Expand Down Expand Up @@ -214,7 +214,7 @@
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>10</number>
<number>100</number>
</property>
</widget>
</item>
Expand Down Expand Up @@ -256,7 +256,7 @@
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>10</number>
<number>100</number>
</property>
</widget>
</item>
Expand Down Expand Up @@ -313,7 +313,7 @@
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>10</number>
<number>100</number>
</property>
</widget>
</item>
Expand Down Expand Up @@ -345,6 +345,9 @@
</item>
<item>
<widget class="QSlider" name="sliderwspace">
<property name="tracking">
<bool>true</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -355,7 +358,7 @@
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>10</number>
<number>100</number>
</property>
</widget>
</item>
Expand Down