For another project, please consult its home page to locate the current issue tracker.
| View Issue Details [ Jump to Notes ] | [ Print ] | ||||||||
| ID | Project | Category | View Status | Date Submitted | Last Update | ||||
| 0010643 | ParaView | Feature | public | 2010-04-29 11:43 | 2014-09-24 10:13 | ||||
| Reporter | Paul Edwards | ||||||||
| Assigned To | Utkarsh Ayachit | ||||||||
| Priority | normal | Severity | minor | Reproducibility | always | ||||
| Status | closed | Resolution | fixed | ||||||
| Platform | OS | OS Version | |||||||
| Product Version | Development | ||||||||
| Target Version | 4.2 | Fixed in Version | 4.2 | ||||||
| Summary | 0010643: Change font in chart legend | ||||||||
| Description | This is not possible - only the title font and axes. | ||||||||
| Tags | No tags attached. | ||||||||
| Project | TBD | ||||||||
| Topic Name | 10643_chart_legend_properties | ||||||||
| Type | incorrect functionality | ||||||||
| Attached Files | diff --git a/ParaViewCore/ClientServerCore/vtkPVXYChartView.cxx b/ParaViewCore/ClientServerCore/vtkPVXYChartView.cxx
index e929a7b..6c8fd42 100644
--- a/ParaViewCore/ClientServerCore/vtkPVXYChartView.cxx
+++ b/ParaViewCore/ClientServerCore/vtkPVXYChartView.cxx
@@ -165,6 +165,19 @@ void vtkPVXYChartView::SetTitleAlignment(int alignment)
}
//----------------------------------------------------------------------------
+void vtkPVXYChartView::SetLegendFont(const char* family, int pointSize,
+ bool bold, bool italic)
+{
+ if (this->Chart && this->Chart->GetLegend())
+ {
+ this->Chart->GetLegend()->GetLabelProperties()->SetFontFamilyAsString(family);
+ this->Chart->GetLegend()->GetLabelProperties()->SetFontSize(pointSize);
+ this->Chart->GetLegend()->GetLabelProperties()->SetBold(static_cast<int>(bold));
+ this->Chart->GetLegend()->GetLabelProperties()->SetItalic(static_cast<int>(italic));
+ }
+}
+
+//----------------------------------------------------------------------------
void vtkPVXYChartView::SetLegendVisibility(int visible)
{
if (this->Chart)
diff --git a/ParaViewCore/ClientServerCore/vtkPVXYChartView.h b/ParaViewCore/ClientServerCore/vtkPVXYChartView.h
index c43d8b8..0121b4f 100644
--- a/ParaViewCore/ClientServerCore/vtkPVXYChartView.h
+++ b/ParaViewCore/ClientServerCore/vtkPVXYChartView.h
@@ -66,6 +66,13 @@ public:
void SetTitleAlignment(int alignment);
// Description:
+ // Set the chart legend font.
+ // These methods should not be called directly. They are made public only so
+ // that the client-server-stream-interpreter can invoke them. Use the
+ // corresponding properties to change these values.
+ void SetLegendFont(const char* family, int pointSize, bool bold, bool italic);
+
+ // Description:
// Set the legend visibility.
// These methods should not be called directly. They are made public only so
// that the client-server-stream-interpreter can invoke them. Use the
diff --git a/ParaViewCore/ServerImplementation/Resources/views_and_representations.xml b/ParaViewCore/ServerImplementation/Resources/views_and_representations.xml
index a32bb0e..5c3297b 100644
--- a/ParaViewCore/ServerImplementation/Resources/views_and_representations.xml
+++ b/ParaViewCore/ServerImplementation/Resources/views_and_representations.xml
@@ -671,6 +671,18 @@
<BooleanDomain name="bool" />
</IntVectorProperty>
+ <StringVectorProperty
+ name="LegendFont"
+ command="SetLegendFont"
+ number_of_elements="4"
+ element_types="2 0 0 0"
+ default_values_delimiter=";"
+ default_values="Arial;14;0;0" >
+ <Documentation>
+ Set the chart title font (familyname, size, bold, italics).
+ </Documentation>
+ </StringVectorProperty>
+
<IntVectorProperty
name="LegendLocation"
command="SetLegendLocation"
diff --git a/Qt/Components/Resources/UI/pqChartOptionsWidget.ui b/Qt/Components/Resources/UI/pqChartOptionsWidget.ui
index 9e72f5c..d4f6268 100644
--- a/Qt/Components/Resources/UI/pqChartOptionsWidget.ui
+++ b/Qt/Components/Resources/UI/pqChartOptionsWidget.ui
@@ -1,93 +1,54 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>pqChartOptionsWidget</class>
- <widget class="QWidget" name="pqChartOptionsWidget" >
- <property name="geometry" >
+ <widget class="QWidget" name="pqChartOptionsWidget">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>346</width>
- <height>323</height>
+ <width>345</width>
+ <height>369</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Chart Options</string>
</property>
- <layout class="QVBoxLayout" >
- <property name="spacing" >
- <number>6</number>
- </property>
- <property name="leftMargin" >
- <number>9</number>
- </property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <item>
- <widget class="QStackedWidget" name="ChartPages" >
- <property name="currentIndex" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QStackedWidget" name="ChartPages">
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="General" >
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <widget class="QWidget" name="General">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="9" column="3" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="10" column="0" colspan="4" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <item row="0" column="0" colspan="4">
+ <widget class="QLabel" name="label">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>0</height>
- </size>
+ <property name="text">
+ <string>Chart Title</string>
</property>
- </spacer>
+ </widget>
</item>
- <item rowspan="3" row="7" column="0" >
+ <item row="1" column="0" rowspan="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
@@ -95,233 +56,237 @@
</property>
</spacer>
</item>
- <item rowspan="4" row="1" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
+ <item row="1" column="1">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Text</string>
</property>
- <property name="sizeHint" >
- <size>
- <width>16</width>
- <height>20</height>
- </size>
+ </widget>
+ </item>
+ <item row="1" column="2" colspan="2">
+ <widget class="QLineEdit" name="ChartTitle"/>
+ </item>
+ <item row="2" column="2">
+ <widget class="QLabel" name="label_17">
+ <property name="text">
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Helvetica'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use <span style=" font-weight:600;">${TIME}</span> to display current time.</p></body></html></string>
</property>
- </spacer>
+ </widget>
</item>
- <item row="3" column="1" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
+ <item row="3" column="1">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
<string>Font</string>
</property>
</widget>
</item>
- <item row="3" column="2" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="3" column="2" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="QLabel" name="ChartTitleFont" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+ <widget class="QLabel" name="ChartTitleFont">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Description</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="ChartTitleFontButton" >
- <property name="text" >
+ <widget class="QPushButton" name="ChartTitleFontButton">
+ <property name="text">
<string>Set &Font</string>
</property>
</widget>
</item>
</layout>
</item>
- <item row="1" column="2" colspan="2" >
- <widget class="QLineEdit" name="ChartTitle" />
- </item>
- <item row="1" column="1" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
- <string>Text</string>
+ <item row="4" column="1">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Alignment</string>
</property>
</widget>
</item>
- <item row="0" column="0" colspan="4" >
- <widget class="QLabel" name="label" >
- <property name="font" >
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
+ <item row="4" column="2">
+ <widget class="QComboBox" name="ChartTitleAlignment">
+ <item>
+ <property name="text">
+ <string>Left</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Center</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Right</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="4" column="3">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="text" >
- <string>Chart Title</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Color</string>
</property>
</widget>
</item>
- <item row="6" column="0" colspan="4" >
- <widget class="QLabel" name="label_5" >
- <property name="font" >
+ <item row="5" column="2" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="pqColorChooserButton" name="ChartTitleColor">
+ <property name="text">
+ <string>Set Co&lor</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="6" column="0" colspan="4">
+ <widget class="QLabel" name="label_5">
+ <property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Chart Legend</string>
</property>
</widget>
</item>
- <item row="7" column="1" colspan="3" >
- <widget class="QCheckBox" name="ShowLegend" >
- <property name="text" >
- <string>Show the Chart Legend When Available</string>
+ <item row="7" column="0" rowspan="5">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- </widget>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>16</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</item>
- <item row="8" column="1" >
- <widget class="QLabel" name="label_6" >
- <property name="text" >
- <string>Location</string>
+ <item row="7" column="1" colspan="3">
+ <widget class="QCheckBox" name="ShowLegend">
+ <property name="text">
+ <string>Show the Chart Legend When Available</string>
</property>
</widget>
</item>
- <item row="9" column="1" >
- <widget class="QLabel" name="label_7" >
- <property name="text" >
- <string>Flow</string>
+ <item row="10" column="1">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Location</string>
</property>
</widget>
</item>
- <item row="8" column="2" >
- <widget class="QComboBox" name="LegendLocation" >
+ <item row="10" column="2">
+ <widget class="QComboBox" name="LegendLocation">
<item>
- <property name="text" >
+ <property name="text">
<string>Top-left (inline)</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Top-right (inline)</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Bottom-right (inline)</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Bottom-left (inline)</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Left</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Top</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Right</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Bottom</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Custom</string>
</property>
</item>
</widget>
</item>
- <item row="9" column="2" >
- <widget class="QComboBox" name="LegendFlow" >
- <item>
- <property name="text" >
- <string>Left to Right</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Top to Bottom</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="5" column="2" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>0</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
- <widget class="pqColorChooserButton" name="ChartTitleColor" >
- <property name="text" >
- <string>Set Co&lor</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="8" column="3" >
+ <item row="10" column="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -329,45 +294,33 @@
</property>
</spacer>
</item>
- <item row="5" column="1" >
- <widget class="QLabel" name="label_8" >
- <property name="text" >
- <string>Color</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QLabel" name="label_4" >
- <property name="text" >
- <string>Alignment</string>
+ <item row="11" column="1">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Flow</string>
</property>
</widget>
</item>
- <item row="4" column="2" >
- <widget class="QComboBox" name="ChartTitleAlignment" >
- <item>
- <property name="text" >
- <string>Left</string>
- </property>
- </item>
+ <item row="11" column="2">
+ <widget class="QComboBox" name="LegendFlow">
<item>
- <property name="text" >
- <string>Center</string>
+ <property name="text">
+ <string>Left to Right</string>
</property>
</item>
<item>
- <property name="text" >
- <string>Right</string>
+ <property name="text">
+ <string>Top to Bottom</string>
</property>
</item>
</widget>
</item>
- <item row="4" column="3" >
+ <item row="11" column="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -375,44 +328,72 @@
</property>
</spacer>
</item>
- <item row="2" column="2" >
- <widget class="QLabel" name="label_17" >
- <property name="text" >
- <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Helvetica'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use <span style=" font-weight:600;">${TIME}</span> to display current time.</p></body></html></string>
+ <item row="12" column="0" colspan="4">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="8" column="1">
+ <widget class="QLabel" name="label_27">
+ <property name="text">
+ <string>Font</string>
</property>
</widget>
</item>
+ <item row="8" column="2" colspan="2">
+ <layout class="QHBoxLayout" name="_2">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="ChartLegendFont">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Description</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="ChartLegendFontButton">
+ <property name="text">
+ <string>Set &Font</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
- <widget class="QWidget" name="Axis" >
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <widget class="QWidget" name="Axis">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="10" column="3" >
+ <item row="10" column="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -420,12 +401,12 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="9" column="3" >
+ <item row="9" column="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -433,12 +414,12 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="3" column="3" >
+ <item row="3" column="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -446,12 +427,12 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="11" column="0" colspan="4" >
+ <item row="11" column="0" colspan="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
@@ -459,15 +440,15 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item rowspan="5" row="6" column="0" >
+ <item row="6" column="0" rowspan="5">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
@@ -475,15 +456,15 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item rowspan="4" row="1" column="0" >
+ <item row="1" column="0" rowspan="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
@@ -491,81 +472,72 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="9" column="2" >
- <widget class="QComboBox" name="LabelNotation" >
+ <item row="9" column="2">
+ <widget class="QComboBox" name="LabelNotation">
<item>
- <property name="text" >
+ <property name="text">
<string>Standard</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Exponential</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Engineering</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Mixed</string>
</property>
</item>
</widget>
</item>
- <item row="10" column="2" >
- <widget class="QSpinBox" name="LabelPrecision" >
- <property name="maximum" >
+ <item row="10" column="2">
+ <widget class="QSpinBox" name="LabelPrecision">
+ <property name="maximum">
<number>6</number>
</property>
</widget>
</item>
- <item row="10" column="1" >
- <widget class="QLabel" name="label_24" >
- <property name="text" >
+ <item row="10" column="1">
+ <widget class="QLabel" name="label_24">
+ <property name="text">
<string>Precision</string>
</property>
</widget>
</item>
- <item row="9" column="1" >
- <widget class="QLabel" name="label_23" >
- <property name="text" >
+ <item row="9" column="1">
+ <widget class="QLabel" name="label_23">
+ <property name="text">
<string>Notation</string>
</property>
</widget>
</item>
- <item row="8" column="2" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>0</number>
- </property>
- <property name="leftMargin" >
+ <item row="8" column="2" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>0</number>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="pqColorChooserButton" name="LabelColor" >
- <property name="text" >
+ <widget class="pqColorChooserButton" name="LabelColor">
+ <property name="text">
<string>&Label Color</string>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -575,130 +547,112 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</item>
- <item row="8" column="1" >
- <widget class="QLabel" name="label_22" >
- <property name="text" >
+ <item row="8" column="1">
+ <widget class="QLabel" name="label_22">
+ <property name="text">
<string>Color</string>
</property>
</widget>
</item>
- <item row="7" column="1" >
- <widget class="QLabel" name="label_21" >
- <property name="text" >
+ <item row="7" column="1">
+ <widget class="QLabel" name="label_21">
+ <property name="text">
<string>Font</string>
</property>
</widget>
</item>
- <item row="6" column="1" colspan="3" >
- <widget class="QCheckBox" name="ShowAxisLabels" >
- <property name="text" >
+ <item row="6" column="1" colspan="3">
+ <widget class="QCheckBox" name="ShowAxisLabels">
+ <property name="text">
<string>Show Axis Labels When Space is Available</string>
</property>
</widget>
</item>
- <item row="7" column="2" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="7" column="2" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="QLabel" name="AxisLabelFont" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+ <widget class="QLabel" name="AxisLabelFont">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Description</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="AxisLabelFontButton" >
- <property name="text" >
+ <widget class="QPushButton" name="AxisLabelFontButton">
+ <property name="text">
<string>Set &Font</string>
</property>
</widget>
</item>
</layout>
</item>
- <item row="5" column="0" colspan="4" >
- <widget class="QLabel" name="label_20" >
- <property name="font" >
+ <item row="5" column="0" colspan="4">
+ <widget class="QLabel" name="label_20">
+ <property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Axis Labels</string>
</property>
</widget>
</item>
- <item row="1" column="1" colspan="3" >
- <widget class="QCheckBox" name="ShowAxis" >
- <property name="text" >
+ <item row="1" column="1" colspan="3">
+ <widget class="QCheckBox" name="ShowAxis">
+ <property name="text">
<string>Show Axis</string>
</property>
</widget>
</item>
- <item row="4" column="1" >
- <widget class="QLabel" name="label_19" >
- <property name="text" >
+ <item row="4" column="1">
+ <widget class="QLabel" name="label_19">
+ <property name="text">
<string>Colors</string>
</property>
</widget>
</item>
- <item row="4" column="2" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="4" column="2" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="pqColorChooserButton" name="AxisColor" >
- <property name="text" >
+ <widget class="pqColorChooserButton" name="AxisColor">
+ <property name="text">
<string>A&xis Color</string>
</property>
</widget>
</item>
<item>
- <widget class="pqColorChooserButton" name="GridColor" >
- <property name="text" >
+ <widget class="pqColorChooserButton" name="GridColor">
+ <property name="text">
<string>&Grid Color</string>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -708,78 +662,66 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</item>
- <item row="3" column="1" >
- <widget class="QLabel" name="label_18" >
- <property name="text" >
+ <item row="3" column="1">
+ <widget class="QLabel" name="label_18">
+ <property name="text">
<string>Grid Color</string>
</property>
</widget>
</item>
- <item row="3" column="2" >
- <widget class="QComboBox" name="GridType" >
+ <item row="3" column="2">
+ <widget class="QComboBox" name="GridType">
<item>
- <property name="text" >
+ <property name="text">
<string>Lighter</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Specified</string>
</property>
</item>
</widget>
</item>
- <item row="2" column="1" colspan="3" >
- <widget class="QCheckBox" name="ShowAxisGrid" >
- <property name="text" >
+ <item row="2" column="1" colspan="3">
+ <widget class="QCheckBox" name="ShowAxisGrid">
+ <property name="text">
<string>Show Axis Grid</string>
</property>
</widget>
</item>
- <item row="0" column="0" colspan="4" >
- <widget class="QLabel" name="AxisGeneralLabel" >
- <property name="font" >
+ <item row="0" column="0" colspan="4">
+ <widget class="QLabel" name="AxisGeneralLabel">
+ <property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>General</string>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="AxisLayout" >
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
+ <widget class="QWidget" name="AxisLayout">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item rowspan="5" row="1" column="0" >
+ <item row="1" column="0" rowspan="5">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
@@ -787,51 +729,39 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="5" column="1" >
- <widget class="QStackedWidget" name="AxisLayoutPages" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <item row="5" column="1">
+ <widget class="QStackedWidget" name="AxisLayoutPages">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="currentIndex" >
+ <property name="currentIndex">
<number>2</number>
</property>
- <widget class="QWidget" name="BlankPage" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <widget class="QWidget" name="BlankPage">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
- <widget class="QWidget" name="RangePage" >
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
+ <widget class="QWidget" name="RangePage">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="2" column="0" colspan="2" >
+ <item row="2" column="0" colspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
@@ -839,54 +769,42 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="AxisMaximum" />
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="AxisMaximum"/>
</item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="AxisMinimum" />
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="AxisMinimum"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_16" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_16">
+ <property name="text">
<string>Maximum</string>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label_15" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_15">
+ <property name="text">
<string>Minimum</string>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="ListPage" >
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
+ <widget class="QWidget" name="ListPage">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="3" column="1" >
+ <item row="3" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
@@ -894,33 +812,33 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="2" column="1" >
- <widget class="QPushButton" name="GenerateButton" >
- <property name="text" >
+ <item row="2" column="1">
+ <widget class="QPushButton" name="GenerateButton">
+ <property name="text">
<string>&Generate</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="RemoveButton" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="RemoveButton">
+ <property name="text">
<string>&Delete</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="AddButton" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="AddButton">
+ <property name="text">
<string>&New Label</string>
</property>
</widget>
</item>
- <item rowspan="4" row="0" column="0" >
- <widget class="QListView" name="LabelList" >
- <property name="editTriggers" >
- <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked</set>
+ <item row="0" column="0" rowspan="4">
+ <widget class="QListView" name="LabelList">
+ <property name="editTriggers">
+ <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
</property>
- <property name="selectionMode" >
+ <property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
</widget>
@@ -929,87 +847,75 @@ p, li { white-space: pre-wrap; }
</widget>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QRadioButton" name="UseChartSelect" >
- <property name="whatsThis" >
+ <item row="2" column="1">
+ <widget class="QRadioButton" name="UseChartSelect">
+ <property name="whatsThis">
<string>Check this option to let the chart choose the best axis layout.</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Let the Chart Determine the Axis Layout</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="4" column="1" >
- <widget class="QRadioButton" name="UseFixedInterval" >
- <property name="whatsThis" >
+ <item row="4" column="1">
+ <widget class="QRadioButton" name="UseFixedInterval">
+ <property name="whatsThis">
<string>Check this option to specify each of the axis labels. This option gives you the most control.</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Specify Each of the Axis Labels.</string>
</property>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QRadioButton" name="UseBestFit" >
- <property name="whatsThis" >
+ <item row="3" column="1">
+ <widget class="QRadioButton" name="UseBestFit">
+ <property name="whatsThis">
<string>Check this option to specify the range and let the chart choose suitable intervals.</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Specify the Axis Range</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QCheckBox" name="UseLogScale" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="UseLogScale">
+ <property name="text">
<string>Use Logarithmic Scale When Available</string>
</property>
</widget>
</item>
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="label_14" >
- <property name="font" >
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="label_14">
+ <property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Axis Layout</string>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="AxisTitle" >
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <widget class="QWidget" name="AxisTitle">
+ <layout class="QGridLayout">
+ <property name="margin">
<number>0</number>
</property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="6" column="0" colspan="4" >
+ <item row="6" column="0" colspan="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
@@ -1017,12 +923,12 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="4" column="3" >
+ <item row="4" column="3">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -1030,138 +936,120 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="4" column="2" >
- <widget class="QComboBox" name="AxisTitleAlignment" >
+ <item row="4" column="2">
+ <widget class="QComboBox" name="AxisTitleAlignment">
<item>
- <property name="text" >
+ <property name="text">
<string>Left</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Center</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>Right</string>
</property>
</item>
</widget>
</item>
- <item row="0" column="0" colspan="4" >
- <widget class="QLabel" name="label_9" >
- <property name="font" >
+ <item row="0" column="0" colspan="4">
+ <widget class="QLabel" name="label_9">
+ <property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Axis Title</string>
</property>
</widget>
</item>
- <item row="3" column="1" >
- <widget class="QLabel" name="label_11" >
- <property name="text" >
+ <item row="3" column="1">
+ <widget class="QLabel" name="label_11">
+ <property name="text">
<string>Font</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QLabel" name="label_10" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
<string>Text</string>
</property>
</widget>
</item>
- <item row="4" column="1" >
- <widget class="QLabel" name="label_12" >
- <property name="text" >
+ <item row="4" column="1">
+ <widget class="QLabel" name="label_12">
+ <property name="text">
<string>Alignment</string>
</property>
</widget>
</item>
- <item row="5" column="1" >
- <widget class="QLabel" name="label_13" >
- <property name="text" >
+ <item row="5" column="1">
+ <widget class="QLabel" name="label_13">
+ <property name="text">
<string>Color</string>
</property>
</widget>
</item>
- <item row="1" column="2" colspan="2" >
- <widget class="QLineEdit" name="AxisTitleText" />
+ <item row="1" column="2" colspan="2">
+ <widget class="QLineEdit" name="AxisTitleText"/>
</item>
- <item row="3" column="2" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
+ <item row="3" column="2" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>6</number>
</property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="QLabel" name="AxisTitleFont" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+ <widget class="QLabel" name="AxisTitleFont">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Description</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="AxisTitleFontButton" >
- <property name="text" >
+ <widget class="QPushButton" name="AxisTitleFontButton">
+ <property name="text">
<string>Set &Font</string>
</property>
</widget>
</item>
</layout>
</item>
- <item row="5" column="2" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>0</number>
- </property>
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
+ <item row="5" column="2" colspan="2">
+ <layout class="QHBoxLayout">
+ <property name="spacing">
<number>0</number>
</property>
- <property name="bottomMargin" >
+ <property name="margin">
<number>0</number>
</property>
<item>
- <widget class="pqColorChooserButton" name="AxisTitleColor" >
- <property name="text" >
+ <widget class="pqColorChooserButton" name="AxisTitleColor">
+ <property name="text">
<string>Set Co&lor</string>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
@@ -1171,15 +1059,15 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</item>
- <item rowspan="4" row="1" column="0" >
+ <item row="1" column="0" rowspan="4">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
@@ -1187,13 +1075,13 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
- <item row="2" column="2" >
- <widget class="QLabel" name="label_25" >
- <property name="text" >
- <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+ <item row="2" column="2">
+ <widget class="QLabel" name="label_25">
+ <property name="text">
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Helvetica'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use <span style=" font-weight:600;">${TIME}</span> to display current time.</p></body></html></string>
+</style></head><body style=" font-family:'Helvetica'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use <span style=" font-weight:600;">${TIME}</span> to display current time.</p></body></html></string>
</property>
</widget>
</item>
diff --git a/Qt/Components/pqXYChartOptionsEditor.cxx b/Qt/Components/pqXYChartOptionsEditor.cxx
index 80ecfb7..8ad5277 100644
--- a/Qt/Components/pqXYChartOptionsEditor.cxx
+++ b/Qt/Components/pqXYChartOptionsEditor.cxx
@@ -117,6 +117,7 @@ public:
QString CurrentPage;
QFont TitleFont;
+ QFont LegendFont;
pqXYChartOptionsEditorAxis *AxisData[4];
int CurrentAxis;
int AxisIndex;
@@ -142,7 +143,7 @@ pqXYChartOptionsEditorAxis::pqXYChartOptionsEditorAxis()
//----------------------------------------------------------------------------
pqXYChartOptionsEditorForm::pqXYChartOptionsEditorForm()
- : Ui::pqChartOptionsWidget(), CurrentPage(), TitleFont()
+ : Ui::pqChartOptionsWidget(), CurrentPage(), TitleFont(), LegendFont()
{
this->CurrentAxis = vtkAxis::LEFT;
this->AxisIndex = -1;
@@ -275,6 +276,8 @@ pqXYChartOptionsEditor::pqXYChartOptionsEditor(QWidget *widgetParent)
QObject::connect(this->Internal->Form->LabelPrecision,
SIGNAL(valueChanged(int)),
this, SLOT(setLabelPrecision(int)));
+ QObject::connect(this->Internal->Form->ChartLegendFontButton,
+ SIGNAL(clicked()), this, SLOT(pickLegendFont()));
QObject::connect(this->Internal->Form->AxisMinimum, SIGNAL(textEdited(QString)),
this, SLOT(setAxisMinimum()));
@@ -606,6 +609,12 @@ void pqXYChartOptionsEditor::pickTitleFont()
this->Internal->Form->TitleFont);
}
+void pqXYChartOptionsEditor::pickLegendFont()
+{
+ this->pickFont(this->Internal->Form->ChartLegendFont,
+ this->Internal->Form->LegendFont);
+}
+
void pqXYChartOptionsEditor::pickAxisTitleFont()
{
if(this->Internal->Form->AxisIndex != -1)
@@ -812,6 +821,17 @@ void pqXYChartOptionsEditor::updateOptions()
proxy->GetProperty("ShowLegend")).toInt() != 0);
values = pqSMAdaptor::getMultipleElementProperty(
+ proxy->GetProperty("LegendFont"));
+ if(values.size() == 4)
+ {
+ this->Internal->Form->LegendFont = QFont(values[0].toString(), values[1].toInt(),
+ values[2].toInt() != 0 ? QFont::Bold : -1,
+ values[3].toInt() != 0);
+ this->updateDescription(this->Internal->Form->ChartLegendFont,
+ this->Internal->Form->LegendFont);
+ }
+
+ values = pqSMAdaptor::getMultipleElementProperty(
proxy->GetProperty("ChartTitleFont"));
if(values.size() == 4)
{
@@ -1001,6 +1021,15 @@ void pqXYChartOptionsEditor::applyAxisOptions()
pqSMAdaptor::setMultipleElementProperty(
proxy->GetProperty("ChartTitleColor"), values);
+ // Apply the font type info for the legend
+ values.clear();
+ values.append(QVariant(this->Internal->Form->LegendFont.family()));
+ values.append(QVariant(this->Internal->Form->LegendFont.pointSize()));
+ values.append(QVariant(this->Internal->Form->LegendFont.bold() ? 1 : 0));
+ values.append(QVariant(this->Internal->Form->LegendFont.italic() ? 1 : 0));
+ pqSMAdaptor::setMultipleElementProperty(
+ proxy->GetProperty("LegendFont"), values);
+
// Axis visibility
values.clear();
for(int i = 0; i < 4; ++i)
diff --git a/Qt/Components/pqXYChartOptionsEditor.h b/Qt/Components/pqXYChartOptionsEditor.h
index fa14f86..b512db7 100644
--- a/Qt/Components/pqXYChartOptionsEditor.h
+++ b/Qt/Components/pqXYChartOptionsEditor.h
@@ -108,6 +108,7 @@ protected slots:
void generateAxisLabels();
void pickTitleFont();
+ void pickLegendFont();
private:
void updateOptions();
| ||||||||
| Relationships | |
| Relationships |
| Notes | |
|
(0026734) Paul Edwards (reporter) 2011-06-07 05:38 |
Uploaded a patch to add the functionality. |
|
(0026739) Marcus D. Hanwell (developer) 2011-06-07 10:06 |
I don't see a patch. |
|
(0026740) Paul Edwards (reporter) 2011-06-07 10:42 |
Patch uploaded! |
|
(0027665) Arno Mayrhofer (reporter) 2011-11-07 05:33 |
Can this please be included in PV12? I'm surprised that this has not been requested earlier, as this is a major issue for me that forces me to use another program for my 2-D plots. |
|
(0033326) Utkarsh Ayachit (administrator) 2014-09-11 16:23 |
commit 21808c43e47aa087c65b0d5f0908b0141d9c27ed Author: Sven Buijssen <sven.buijssen@tu-dortmund.de> Date: Thu Sep 4 18:00:57 2014 +0200 Implemented feature request 0010643 (allow legend font editing) Change-Id: I41a599644f086332e5369dae3bd5281458fc8fad commit 0e6d8f5f69876442b491d2fe5337546d6976249c Author: Sven Buijssen <sven.buijssen@tu-dortmund.de> Date: Thu Sep 4 17:02:07 2014 +0200 Fixed copy/paste errors in API documentation |
|
(0033334) Utkarsh Ayachit (administrator) 2014-09-14 11:30 |
Topics merged into master: 10643_chart_legend_properties (VTK) 13139-plot-small-geometry 14931-cluttered-histogram 14983_catalyst_programmablefilter 14990_finalize_catalyst_pipelines add-flexibility-to-catalyst-exporter catalyst_fix_plugins fix_text_source pvweb-docs-further-reorganization pvweb-move-firefox-test-to-port-8080 |
|
(0033350) Alan Scott (manager) 2014-09-16 17:16 |
Tested remote server, Linux, master. |
| Notes |
| Issue History | |||
| Date Modified | Username | Field | Change |
| 2010-04-29 11:43 | Paul Edwards | New Issue | |
| 2011-06-07 05:38 | Paul Edwards | Note Added: 0026734 | |
| 2011-06-07 10:06 | Marcus D. Hanwell | Note Added: 0026739 | |
| 2011-06-07 10:06 | Marcus D. Hanwell | Assigned To | => Marcus D. Hanwell |
| 2011-06-07 10:06 | Marcus D. Hanwell | Status | backlog => tabled |
| 2011-06-07 10:41 | Paul Edwards | File Added: FEATURE_change_legend_font.patch | |
| 2011-06-07 10:42 | Paul Edwards | Note Added: 0026740 | |
| 2011-06-16 13:10 | Zack Galbreath | Category | Feature Request => Feature |
| 2011-11-07 05:33 | Arno Mayrhofer | Note Added: 0027665 | |
| 2014-09-11 01:23 | Utkarsh Ayachit | Assigned To | Marcus D. Hanwell => Utkarsh Ayachit |
| 2014-09-11 01:23 | Utkarsh Ayachit | Project | => TBD |
| 2014-09-11 01:23 | Utkarsh Ayachit | Type | => incorrect functionality |
| 2014-09-11 01:23 | Utkarsh Ayachit | Target Version | => 4.2 |
| 2014-09-11 16:23 | Utkarsh Ayachit | Topic Name | => 10643_chart_legend_properties |
| 2014-09-11 16:23 | Utkarsh Ayachit | Note Added: 0033326 | |
| 2014-09-11 16:23 | Utkarsh Ayachit | Status | backlog => gatekeeper review |
| 2014-09-11 16:23 | Utkarsh Ayachit | Fixed in Version | => git-next |
| 2014-09-11 16:23 | Utkarsh Ayachit | Resolution | open => fixed |
| 2014-09-14 11:30 | Utkarsh Ayachit | Fixed in Version | git-next => git-master |
| 2014-09-14 11:30 | Utkarsh Ayachit | Status | gatekeeper review => customer review |
| 2014-09-14 11:30 | Utkarsh Ayachit | Note Added: 0033334 | |
| 2014-09-16 17:16 | Alan Scott | Note Added: 0033350 | |
| 2014-09-16 17:16 | Alan Scott | Status | customer review => closed |
| 2014-09-24 10:13 | Utkarsh Ayachit | Fixed in Version | git-master => 4.2 |
| Issue History |
| Copyright © 2000 - 2018 MantisBT Team |