Skip to content
Snippets Groups Projects
Unverified Commit ab1f3331 authored by Gagik Vardanyan's avatar Gagik Vardanyan Committed by GitHub
Browse files

Merge pull request #27276 from mantidproject/27090_Fix_figure_options_in_matplotlib_v1.5 

Fix figure options on matplotlib v1.5 - RHEL7 only
parents b344c6e5 ef4d9d9f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/legend_tab.ui
+ 59
− 111
View file @ ab1f3331
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>527</width> <width>527</width>
<height>562</height> <height>446</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -28,27 +28,34 @@ ...@@ -28,27 +28,34 @@
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="0"> <item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<layout class="QGridLayout" name="grid_layout"> <layout class="QGridLayout" name="grid_layout">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum> <enum>QLayout::SetDefaultConstraint</enum>
</property> </property>
<item row="13" column="2" colspan="2"> <item row="9" column="2" colspan="2">
<widget class="QWidget" name="title_color_selector_dummy_widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="11" column="2" colspan="2">
<widget class="QComboBox" name="entries_font_combo_box"/> <widget class="QComboBox" name="entries_font_combo_box"/>
</item> </item>
<item row="4" column="3">
<widget class="QSpinBox" name="transparency_spin_box">
<property name="suffix">
<string>%</string>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
<item row="2" column="2" colspan="2"> <item row="2" column="2" colspan="2">
<widget class="QWidget" name="background_color_selector_dummy_widget" native="true"> <widget class="QWidget" name="background_color_selector_dummy_widget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -59,10 +66,10 @@ ...@@ -59,10 +66,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="2" column="0">
<widget class="QLabel" name="transparency_label"> <widget class="QLabel" name="background_color_label">
<property name="text"> <property name="text">
<string>Transparency</string> <string>Background Color</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -76,7 +83,14 @@ ...@@ -76,7 +83,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="4" column="0">
<widget class="QLabel" name="transparency_label">
<property name="text">
<string>Transparency</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="title_label_2"> <widget class="QLabel" name="title_label_2">
<property name="font"> <property name="font">
<font> <font>
...@@ -90,27 +104,17 @@ ...@@ -90,27 +104,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0" colspan="2">
<widget class="QLabel" name="background_color_label"> <widget class="QCheckBox" name="hide_box_check_box">
<property name="text"> <property name="text">
<string>Background Color</string> <string>Hide Box</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QSpinBox" name="transparency_spin_box">
<property name="suffix">
<string>%</string>
</property>
<property name="maximum">
<number>100</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="12" column="0">
<widget class="QLabel" name="edge_color_label"> <widget class="QLabel" name="entries_size_label">
<property name="text"> <property name="text">
<string>Edge Color</string> <string>Size</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -128,18 +132,12 @@ ...@@ -128,18 +132,12 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="4"> <item row="3" column="0">
<spacer name="verticalSpacer"> <widget class="QLabel" name="edge_color_label">
<property name="orientation"> <property name="text">
<enum>Qt::Vertical</enum> <string>Edge Color</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
<item row="3" column="2" colspan="2"> <item row="3" column="2" colspan="2">
<widget class="QWidget" name="edge_color_selector_dummy_widget" native="true"> <widget class="QWidget" name="edge_color_selector_dummy_widget" native="true">
...@@ -151,67 +149,17 @@ ...@@ -151,67 +149,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="0"> <item row="17" column="0">
<widget class="QLabel" name="marker_size_label"> <widget class="QLabel" name="marker_size_label">
<property name="text"> <property name="text">
<string>Length</string> <string>Length</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="17" column="0" colspan="4"> <item row="13" column="2" colspan="2">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="hide_box_check_box">
<property name="text">
<string>Hide Box</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="4">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="14" column="0">
<widget class="QLabel" name="entries_size_label">
<property name="text">
<string>Size</string>
</property>
</widget>
</item>
<item row="15" column="2" colspan="2">
<widget class="QWidget" name="entries_color_selector_dummy_widget" native="true"/> <widget class="QWidget" name="entries_color_selector_dummy_widget" native="true"/>
</item> </item>
<item row="10" column="2" colspan="2"> <item row="11" column="0">
<widget class="QWidget" name="title_color_selector_dummy_widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="entries_font_label"> <widget class="QLabel" name="entries_font_label">
<property name="text"> <property name="text">
<string>Font</string> <string>Font</string>
...@@ -234,14 +182,14 @@ ...@@ -234,14 +182,14 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="15" column="0"> <item row="13" column="0">
<widget class="QLabel" name="entries_color_label"> <widget class="QLabel" name="entries_color_label">
<property name="text"> <property name="text">
<string>Color</string> <string>Color</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="2" colspan="2"> <item row="12" column="2" colspan="2">
<widget class="QDoubleSpinBox" name="entries_size_spin_box"> <widget class="QDoubleSpinBox" name="entries_size_spin_box">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
...@@ -251,44 +199,44 @@ ...@@ -251,44 +199,44 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="6" column="0">
<widget class="QLabel" name="title_label"> <widget class="QLabel" name="title_label">
<property name="text"> <property name="text">
<string>Title</string> <string>Title</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2" colspan="2"> <item row="6" column="2" colspan="2">
<widget class="QLineEdit" name="title_line_edit"/> <widget class="QLineEdit" name="title_line_edit"/>
</item> </item>
<item row="8" column="0"> <item row="7" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Font</string> <string>Font</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="9" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Color</string> <string>Color</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0"> <item row="8" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Size</string> <string>Size</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="2" colspan="2"> <item row="7" column="2" colspan="2">
<widget class="QComboBox" name="title_font_combo_box"/> <widget class="QComboBox" name="title_font_combo_box"/>
</item> </item>
<item row="9" column="2" colspan="2"> <item row="8" column="2" colspan="2">
<widget class="QDoubleSpinBox" name="title_size_spin_box"/> <widget class="QDoubleSpinBox" name="title_size_spin_box"/>
</item> </item>
<item row="12" column="0"> <item row="10" column="0">
<widget class="QLabel" name="entries_label"> <widget class="QLabel" name="entries_label">
<property name="font"> <property name="font">
<font> <font>
...@@ -302,10 +250,10 @@ ...@@ -302,10 +250,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="2" colspan="2"> <item row="17" column="2" colspan="2">
<widget class="QDoubleSpinBox" name="marker_size_spin_box"/> <widget class="QDoubleSpinBox" name="marker_size_spin_box"/>
</item> </item>
<item row="19" column="0"> <item row="16" column="0">
<widget class="QLabel" name="markers_label"> <widget class="QLabel" name="markers_label">
<property name="font"> <property name="font">
<font> <font>
......
qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
+ 5
− 5
View file @ ab1f3331
...@@ -43,8 +43,7 @@ class LegendTabWidgetPresenter: ...@@ -43,8 +43,7 @@ class LegendTabWidgetPresenter:
def init_view(self): def init_view(self):
if int(matplotlib.__version__[0]) < 2: if int(matplotlib.__version__[0]) < 2:
self.view.background_color_selector_widget.setVisible(False) self.view.hide_box_properties()
self.view.edge_color_selector_widget.setVisible(False)
"""Sets all of the initial values of the input fields when the tab is first loaded""" """Sets all of the initial values of the input fields when the tab is first loaded"""
legend_props = LegendProperties.from_legend(self.axes[0].get_legend()) legend_props = LegendProperties.from_legend(self.axes[0].get_legend())
...@@ -56,9 +55,10 @@ class LegendTabWidgetPresenter: ...@@ -56,9 +55,10 @@ class LegendTabWidgetPresenter:
self.view.set_edge_color(legend_props.edge_color) self.view.set_edge_color(legend_props.edge_color)
# Converts alpha value (opacity value between 0 and 1) to transparency percentage. # Converts alpha value (opacity value between 0 and 1) to transparency percentage.
transparency = 100-(legend_props.transparency*100) if int(matplotlib.__version__[0]) > 2:
self.view.set_transparency_spin_box(transparency) transparency = 100-(legend_props.transparency*100)
self.view.set_transparency_slider(transparency) self.view.set_transparency_spin_box(transparency)
self.view.set_transparency_slider(transparency)
self.view.set_entries_font(legend_props.entries_font) self.view.set_entries_font(legend_props.entries_font)
self.view.set_entries_size(legend_props.entries_size) self.view.set_entries_size(legend_props.entries_size)
self.view.set_entries_color(legend_props.entries_color) self.view.set_entries_color(legend_props.entries_color)
......
qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
+ 14
− 0
View file @ ab1f3331
...@@ -53,6 +53,11 @@ class LegendTabWidgetView(QWidget): ...@@ -53,6 +53,11 @@ class LegendTabWidgetView(QWidget):
def get_transparency_spin_box_value(self): def get_transparency_spin_box_value(self):
return self.transparency_spin_box.value() return self.transparency_spin_box.value()
def hide_transparency(self):
self.transparency_label.setHidden(True)
self.transparency_slider.setHidden(True)
self.transparency_spin_box.setHidden(True)
def set_title(self, title): def set_title(self, title):
self.title_line_edit.setText(title) self.title_line_edit.setText(title)
...@@ -130,3 +135,12 @@ class LegendTabWidgetView(QWidget): ...@@ -130,3 +135,12 @@ class LegendTabWidgetView(QWidget):
advanced_props = self.advanced_options.get_properties() advanced_props = self.advanced_options.get_properties()
props.update(advanced_props) props.update(advanced_props)
return props return props
def hide_box_properties(self):
self.box_label.setHidden(True)
self.hide_box_check_box.setHidden(True)
self.background_color_label.setHidden(True)
self.background_color_selector_widget.setHidden(True)
self.edge_color_label.setHidden(True)
self.edge_color_selector_widget.setHidden(True)
self.hide_transparency()
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment