Commit 82892156 authored by Yohann Bearzi's avatar Yohann Bearzi Committed by Kitware Robot

Merge topic 'issue19108_fix'

8934ec27 Issue #19108, added a QSpinBox for marker size
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !3445
parents 0e370bcf 8934ec27
Pipeline #143828 running with stage
389cbc1c5cebfadebc8391d6515b10c9221c4318d14d837bc7ef8bf0c4e10370ac9030947e9be0eab59905ecbebfbe372117fd78245c1bd84590890b9a8a9101
dbfe6eca654faffbe381beacccec4ce629c25e491c1a61d2ebe653592d61af33607c95ea64e618fc1510f96791ceeb111882a6750597f88b53c48360ff5c0847
......@@ -18,4 +18,10 @@
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/PropertiesFrame/ProxyPanel/OnlyReportSelectionStatistics/CheckBox" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/MainControlsToolbar/actionAutoApply" command="set_boolean" arguments="false" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionTesting_Window_Size" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/SeriesTable" command="setCurrent" arguments="0.0" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/SeriesTable" command="setCheckState" arguments="0.0,2" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_vcontainer/1QScrollBar0" command="mouseWheel" arguments="-120,0,0,87,220" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/MarkerSize" command="set_double" arguments="1" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/MarkerSize" command="set_double" arguments="10" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/MarkerStyleList" command="activated" arguments="Square" />
</pqevents>
......@@ -8,4 +8,8 @@
<pqevent object="pqClientMainWindow/centralwidget/MultiViewWidget/CoreWidget/qt_tabwidget_stackedwidget/MultiViewWidget1/Container/Frame.0/CentralWidgetFrame/EmptyView/scrollArea/qt_scrollarea_viewport/widgetFoo/ConvertActionsFrame/XYPointChartView" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mousePress" arguments="1,1,0,11,4,/0:0/0:1" />
<pqevent object="pqClientMainWindow/pipelineBrowserDock/pipelineBrowser" command="mouseRelease" arguments="1,0,0,11,4,/0:0/0:1" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/SeriesTable" command="setCurrent" arguments="0.2" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/SeriesTable" command="setCurrent" arguments="6.2" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/MarkerSize" command="set_double" arguments="1" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/MarkerSize" command="set_double" arguments="10" />
</pqevents>
......@@ -43,7 +43,7 @@
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/SeriesTable" command="setCheckState" arguments="11.0,2" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/SeriesTable" command="setCurrent" arguments="11.0" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/SeriesTable" command="setCheckState" arguments="11.0,2" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/Thickness" command="set_int" arguments="3" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/Thickness" command="set_double" arguments="3" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/Thickness" command="key" arguments="16777221" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/SeriesEditor/StyleList" command="set_string" arguments="Dash" />
<pqevent object="pqClientMainWindow/propertiesDock/propertiesPanel/scrollArea/qt_scrollarea_viewport/scrollAreaWidgetContents/DisplayFrame/ProxyPanel/CompositeDataSetIndex/TreeWidget" command="setCheckState" arguments="0.0.1.0,2" />
......
......@@ -167,7 +167,7 @@ void vtkXYChartRepresentation::SetSeriesVisibility(const char* seriesname, bool
}
//----------------------------------------------------------------------------
void vtkXYChartRepresentation::SetLineThickness(const char* seriesname, int value)
void vtkXYChartRepresentation::SetLineThickness(const char* seriesname, double value)
{
assert(seriesname != NULL);
this->Internals->LineThicknesses[seriesname] = value;
......@@ -222,6 +222,14 @@ void vtkXYChartRepresentation::SetMarkerStyle(const char* seriesname, int style)
this->Modified();
}
//----------------------------------------------------------------------------
void vtkXYChartRepresentation::SetMarkerSize(const char* seriesname, double value)
{
assert(seriesname != NULL);
this->Internals->MarkerSizes[seriesname] = value;
this->Modified();
}
//----------------------------------------------------------------------------
void vtkXYChartRepresentation::SetLabel(const char* seriesname, const char* label)
{
......@@ -282,6 +290,13 @@ void vtkXYChartRepresentation::ClearMarkerStyles()
this->Modified();
}
//----------------------------------------------------------------------------
void vtkXYChartRepresentation::ClearMarkerSizes()
{
this->Internals->MarkerSizes.clear();
this->Modified();
}
//----------------------------------------------------------------------------
void vtkXYChartRepresentation::ClearLabels()
{
......
......@@ -107,11 +107,12 @@ public:
* Set/Clear the properties for Y series/columns.
*/
void SetSeriesVisibility(const char* seriesname, bool visible);
void SetLineThickness(const char* name, int value);
void SetLineThickness(const char* name, double value);
void SetLineStyle(const char* name, int value);
void SetColor(const char* name, double r, double g, double b);
void SetAxisCorner(const char* name, int corner);
void SetMarkerStyle(const char* name, int style);
void SetMarkerSize(const char* name, double value);
void SetLabel(const char* name, const char* label);
void SetUseColorMapping(const char* name, bool useColorMapping);
void SetLookupTable(const char* name, vtkScalarsToColors* lut);
......@@ -123,6 +124,7 @@ public:
void ClearLineStyles();
void ClearColors();
void ClearAxisCorners();
void ClearMarkerSizes();
void ClearMarkerStyles();
void ClearLabels();
......
......@@ -201,6 +201,7 @@ public:
std::map<std::string, vtkColor3d> Colors;
std::map<std::string, int> AxisCorners;
std::map<std::string, int> MarkerStyles;
std::map<std::string, double> MarkerSizes;
std::map<std::string, std::string> Labels;
std::map<std::string, bool> UseColorMapping;
std::map<std::string, vtkScalarsToColors*> Lut;
......@@ -442,6 +443,8 @@ protected:
{
plotPoints->SetMarkerStyle(this->GetSeriesParameter(self, tableName, columnName, role,
this->MarkerStyles, static_cast<int>(vtkPlotPoints::NONE)));
plotPoints->SetMarkerSize(
this->GetSeriesParameter(self, tableName, columnName, role, this->MarkerSizes, 1.0));
// the vtkValidPointMask array is used by some filters (like plot
// over line) to indicate invalid points. this instructs the line
// plot to not render those points
......
......@@ -21,6 +21,8 @@
#include "vtkSISourceProxy.h"
#include "vtkSMMessage.h"
#include <vtksys/SystemTools.hxx>
#include <assert.h>
#include <string>
#include <vector>
......@@ -161,8 +163,33 @@ bool vtkSIStringVectorProperty::ReadXMLAttributes(vtkSIProxy* proxy, vtkPVXMLEle
}
this->ElementTypes->resize(number_of_elements_per_command, STRING);
element->GetVectorAttribute(
"element_types", number_of_elements_per_command, &(*this->ElementTypes)[0]);
const std::map<std::string, int> elementTypesStrMap = { { std::string("int"), INT },
{ std::string("double"), DOUBLE }, { std::string("str"), STRING } };
// This fails if attributes are strings
// In this case, we treat them by their name
if (!element->GetVectorAttribute(
"element_types", number_of_elements_per_command, &(*this->ElementTypes)[0]) &&
element->GetAttribute("element_types") != nullptr)
{
std::string element_types = element->GetAttribute("element_types");
std::vector<std::string> parts = vtksys::SystemTools::SplitString(element_types, ' ');
if (parts.size() == this->ElementTypes->size())
{
for (std::size_t i = 0; i < parts.size(); ++i)
{
auto element_iter = elementTypesStrMap.find(parts[i]);
if (element_iter == elementTypesStrMap.end())
{
vtkGenericWarningMacro("Element type " << parts[i] << " does not exists");
}
else
{
(*this->ElementTypes)[i] = element_iter->second;
}
}
}
}
vtkVectorOfStrings values;
bool hasDefaultValues = false;
if (number_of_elements > 0)
......
......@@ -7925,7 +7925,7 @@
</StringVectorProperty>
<StringVectorProperty command="SetLineThickness"
clean_command="ClearLineThicknesses"
element_types="2 0"
element_types="str int"
name="SeriesLineThickness"
number_of_elements_per_command="2"
repeat_command="1">
......@@ -7959,6 +7959,24 @@
</RequiredProperties>
</ChartSeriesSelectionDomain>
</StringVectorProperty>
<StringVectorProperty command="SetMarkerSize"
clean_command="ClearMarkerSizes"
element_types="str double"
name="SeriesMarkerSize"
number_of_elements_per_command="2"
repeat_command="1">
<Documentation>Set the series marker size.</Documentation>
<ChartSeriesSelectionDomain name="array_list"
hide_partial_arrays="0"
default_mode="value"
default_value="2">
<RequiredProperties>
<Property function="Input" name="Input" />
<Property function="FieldDataSelection" name="AttributeType" />
<Property function="CompositeIndexSelection" name="CompositeDataSetIndex" />
</RequiredProperties>
</ChartSeriesSelectionDomain>
</StringVectorProperty>
<PropertyGroup label="Series Parameters"
panel_widget="SeriesEditor"
......@@ -7973,6 +7991,8 @@
function="SeriesLineStyle" />
<Property name="SeriesLabel"
function="SeriesLabel" />
<Property name="SeriesMarkerSize"
function="SeriesMarkerSize" />
<Property name="SeriesMarkerStyle"
function="SeriesMarkerStyle" />
<Property name="SeriesPlotCorner"
......@@ -8011,7 +8031,7 @@
</StringVectorProperty>
<StringVectorProperty command="SetLineThickness"
clean_command="ClearLineThicknesses"
element_types="2 0"
element_types="str double"
name="SeriesLineThickness"
number_of_elements_per_command="2"
repeat_command="1">
......@@ -8043,6 +8063,23 @@
</RequiredProperties>
</ChartSeriesSelectionDomain>
</StringVectorProperty>
<StringVectorProperty command="SetMarkerSize"
clean_command="ClearMarkerSizes"
element_types="str double"
name="SeriesMarkerSize"
number_of_elements_per_command="2"
repeat_command="1">
<Documentation>Set the series marker size.</Documentation>
<ChartSeriesSelectionDomain name="array_list"
default_mode="value"
default_value="2">
<RequiredProperties>
<Property function="Input" name="Input" />
<Property function="FieldDataSelection" name="AttributeType" />
<Property function="CompositeIndexSelection" name="CompositeDataSetIndex" />
</RequiredProperties>
</ChartSeriesSelectionDomain>
</StringVectorProperty>
<PropertyGroup label="Series Parameters"
panel_widget="SeriesEditor"
......@@ -8059,6 +8096,8 @@
function="SeriesLabel" />
<Property name="SeriesMarkerStyle"
function="SeriesMarkerStyle" />
<Property name="SeriesMarkerSize"
function="SeriesMarkerSize" />
<Property name="SeriesPlotCorner"
function="SeriesPlotCorner"/>
</PropertyGroup>
......
......@@ -15,10 +15,13 @@
</property>
<layout class="QGridLayout" name="wdgLayout" columnstretch="0,0">
<item row="1" column="1">
<widget class="QSpinBox" name="Thickness">
<widget class="QDoubleSpinBox" name="Thickness">
<property name="enabled">
<bool>false</bool>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -31,9 +34,6 @@
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="value">
<number>1</number>
</property>
......@@ -149,14 +149,46 @@
</item>
</widget>
</item>
<item row="4" column="1">
<widget class="QDoubleSpinBox" name="MarkerSize">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis">
<string>Enter the size for the marker.</string>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="MarkerSizeLabel">
<property name="text">
<string>Marker Size</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="AxisListLabel">
<property name="text">
<string>Chart Axes</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QComboBox" name="AxisList">
<property name="enabled">
<bool>false</bool>
......
......@@ -58,6 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QVector>
#include <cassert>
#include <limits>
//=============================================================================
// QAbstractTableModel for showing the series properties. Since series
......@@ -506,9 +507,10 @@ public:
vtkSmartPointer<vtkSMPropertyGroup> PropertyGroup;
vtkNew<vtkEventQtSlotConnect> VTKConnector;
pqSeriesParametersModel Model;
QMap<QString, int> Thickness;
QMap<QString, double> Thickness;
QMap<QString, int> Style;
QMap<QString, int> MarkerStyle;
QMap<QString, double> MarkerSize;
QMap<QString, int> PlotCorner;
bool RefreshingWidgets;
......@@ -521,6 +523,10 @@ public:
this->Ui.wdgLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing());
this->Ui.wdgLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing());
// give infinite maximum to line thickness and marker size
this->Ui.MarkerSize->setMaximum(std::numeric_limits<double>::infinity());
this->Ui.Thickness->setMaximum(std::numeric_limits<double>::infinity());
this->Ui.SeriesTable->setDragEnabled(supportsReorder);
this->Ui.SeriesTable->setDragDropMode(
supportsReorder ? QAbstractItemView::InternalMove : QAbstractItemView::NoDragDrop);
......@@ -671,6 +677,17 @@ pqSeriesEditorPropertyWidget::pqSeriesEditorPropertyWidget(
ui.MarkerStyleList->hide();
}
if (smgroup->GetProperty("SeriesMarkerSize"))
{
this->addPropertyLink(this, "seriesMarkerSize", SIGNAL(seriesMarkerSizeChanged()),
smgroup->GetProperty("SeriesMarkerSize"));
}
else
{
ui.MarkerSizeLabel->hide();
ui.MarkerSize->hide();
}
if (smgroup->GetProperty("SeriesPlotCorner"))
{
this->addPropertyLink(this, "seriesPlotCorner", SIGNAL(seriesPlotCornerChanged()),
......@@ -693,10 +710,11 @@ pqSeriesEditorPropertyWidget::pqSeriesEditorPropertyWidget(
SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)),
SLOT(refreshPropertiesWidgets()));
this->connect(ui.Thickness, SIGNAL(valueChanged(int)), SLOT(savePropertiesWidgets()));
this->connect(ui.Thickness, SIGNAL(valueChanged(double)), SLOT(savePropertiesWidgets()));
this->connect(ui.StyleList, SIGNAL(currentIndexChanged(int)), SLOT(savePropertiesWidgets()));
this->connect(
ui.MarkerStyleList, SIGNAL(currentIndexChanged(int)), SLOT(savePropertiesWidgets()));
this->connect(ui.MarkerSize, SIGNAL(valueChanged(double)), SLOT(savePropertiesWidgets()));
this->connect(ui.AxisList, SIGNAL(currentIndexChanged(int)), SLOT(savePropertiesWidgets()));
}
......@@ -846,7 +864,7 @@ void setSeriesValues(QMap<QString, T>& data, const QList<QVariant>& values)
template <class T>
void getSeriesValues(const QMap<QString, T>& data, QList<QVariant>& reply)
{
QMap<QString, int>::const_iterator iter = data.constBegin();
typename QMap<QString, T>::const_iterator iter = data.constBegin();
for (; iter != data.constEnd(); ++iter)
{
reply.push_back(iter.key());
......@@ -858,7 +876,7 @@ void getSeriesValues(const QMap<QString, T>& data, QList<QVariant>& reply)
//-----------------------------------------------------------------------------
void pqSeriesEditorPropertyWidget::setSeriesLineThickness(const QList<QVariant>& values)
{
setSeriesValues<int>(this->Internals->Thickness, values);
setSeriesValues<double>(this->Internals->Thickness, values);
this->refreshPropertiesWidgets();
}
......@@ -866,7 +884,7 @@ void pqSeriesEditorPropertyWidget::setSeriesLineThickness(const QList<QVariant>&
QList<QVariant> pqSeriesEditorPropertyWidget::seriesLineThickness() const
{
QList<QVariant> reply;
getSeriesValues(this->Internals->Thickness, reply);
getSeriesValues<double>(this->Internals->Thickness, reply);
return reply;
}
......@@ -900,6 +918,21 @@ QList<QVariant> pqSeriesEditorPropertyWidget::seriesMarkerStyle() const
return reply;
}
//-----------------------------------------------------------------------------
void pqSeriesEditorPropertyWidget::setSeriesMarkerSize(const QList<QVariant>& values)
{
setSeriesValues<double>(this->Internals->MarkerSize, values);
this->refreshPropertiesWidgets();
}
//-----------------------------------------------------------------------------
QList<QVariant> pqSeriesEditorPropertyWidget::seriesMarkerSize() const
{
QList<QVariant> reply;
getSeriesValues<double>(this->Internals->MarkerSize, reply);
return reply;
}
//-----------------------------------------------------------------------------
void pqSeriesEditorPropertyWidget::setSeriesPlotCorner(const QList<QVariant>& values)
{
......@@ -928,6 +961,7 @@ void pqSeriesEditorPropertyWidget::refreshPropertiesWidgets()
// nothing is selected, disable all properties widgets.
ui.AxisList->setEnabled(false);
ui.MarkerStyleList->setEnabled(false);
ui.MarkerSize->setEnabled(false);
ui.StyleList->setEnabled(false);
ui.Thickness->setEnabled(false);
return;
......@@ -943,6 +977,9 @@ void pqSeriesEditorPropertyWidget::refreshPropertiesWidgets()
ui.MarkerStyleList->setCurrentIndex(this->Internals->MarkerStyle[key]);
ui.MarkerStyleList->setEnabled(true);
ui.MarkerSize->setValue(this->Internals->MarkerSize[key]);
ui.MarkerSize->setEnabled(true);
ui.AxisList->setCurrentIndex(this->Internals->PlotCorner[key]);
ui.AxisList->setEnabled(true);
this->Internals->RefreshingWidgets = false;
......@@ -990,6 +1027,12 @@ void pqSeriesEditorPropertyWidget::savePropertiesWidgets()
this->Internals->MarkerStyle[key] = ui.MarkerStyleList->currentIndex();
emit this->seriesMarkerStyleChanged();
}
else if (ui.MarkerSize == senderWidget &&
this->Internals->MarkerSize[key] != ui.MarkerSize->value())
{
this->Internals->MarkerSize[key] = ui.MarkerSize->value();
emit this->seriesMarkerSizeChanged();
}
else if (ui.AxisList == senderWidget &&
this->Internals->PlotCorner[key] != ui.AxisList->currentIndex())
{
......
......@@ -69,6 +69,9 @@ class PQAPPLICATIONCOMPONENTS_EXPORT pqSeriesEditorPropertyWidget : public pqPro
Q_PROPERTY(QList<QVariant> seriesMarkerStyle READ seriesMarkerStyle WRITE setSeriesMarkerStyle
NOTIFY seriesMarkerStyleChanged)
Q_PROPERTY(QList<QVariant> seriesMarkerSize READ seriesMarkerSize WRITE setSeriesMarkerSize NOTIFY
seriesMarkerSizeChanged)
Q_PROPERTY(QList<QVariant> seriesPlotCorner READ seriesPlotCorner WRITE setSeriesPlotCorner NOTIFY
seriesPlotCornerChanged)
......@@ -78,111 +81,164 @@ public:
pqSeriesEditorPropertyWidget(vtkSMProxy* proxy, vtkSMPropertyGroup* smgroup, QWidget* parent = 0);
~pqSeriesEditorPropertyWidget() override;
//@{
/**
* Get/Set the visibility for series.
*/
QList<QVariant> seriesVisibility() const;
void setSeriesVisibility(const QList<QVariant>&);
//@}
//@{
/**
* Get/Set the color for each of the series.
*/
QList<QVariant> seriesColor() const;
void setSeriesColor(const QList<QVariant>&);
//@}
//@{
/**
* Get/Set the label for each of the series.
*/
QList<QVariant> seriesLabel() const;
void setSeriesLabel(const QList<QVariant>&);
//@}
//@{
/**
* Get/Set the line-thickness for each of the series.
*/
QList<QVariant> seriesLineThickness() const;
void setSeriesLineThickness(const QList<QVariant>&);
//@}
//@{
/**
* Get/Set the line-style for each of the series.
*/
QList<QVariant> seriesLineStyle() const;
void setSeriesLineStyle(const QList<QVariant>&);
//@}
//@{
/**
* Get/Set the marker-style for each of the series.
*/
QList<QVariant> seriesMarkerStyle() const;
void setSeriesMarkerStyle(const QList<QVariant>&);
//@}
//@{
/**
* Get/Set the marker-size for each of the series.
*/
QList<QVariant> seriesMarkerSize() const;
void setSeriesMarkerSize(const QList<QVariant>&);
//@}
//@{
/**
* Get/Set the plot-corner for each of the series.
*/
QList<QVariant> seriesPlotCorner() const;
void setSeriesPlotCorner(const QList<QVariant>&);
//@}
signals:
//@{
/**
* Fired when the series visibility changes.
*/
void seriesVisibilityChanged();
//@}
//@{
/**
* Fired when the series labels change.
*/
void seriesLabelChanged();
//@}
//@{
/**
* Fired when the series colors change.
*/
void seriesColorChanged();
//@}
//@{
/**
* Fired when the series line thickness changes
*/
void seriesLineThicknessChanged();
//@}
//@{
/**
* Fired when the series line style changes
*/
void seriesLineStyleChanged();
//@}
//@{
/**
* Fired when the series marker style changes
*/
void seriesMarkerStyleChanged();
//@}
//@{
/**
* Fired when the series marker size changes
*/
void seriesMarkerSizeChanged();
//@}
//@{
/**
* Fired when the series plot corners change
*/
void seriesPlotCornerChanged();
//@}
private slots:
//@{
/**
* called whenever the internal model's data changes. We fire
* seriesVisibilityChanged() signals appropriately.
*/
void onDataChanged(const QModelIndex& topleft, const QModelIndex& btmright);
//@}
//@{
/**
* called when user double-clicks on an item. If the double click is on the
* 1st column, we show the color editor to allow editing of the series color.
*/
void onDoubleClicked(const QModelIndex& idx);
//@}
//@{
/**
* update all series-properties widgets using the "current" series.
*/
void refreshPropertiesWidgets();
//@}
//@{
/**
* update all selected series with the value from the sender widget.
*/
void savePropertiesWidgets();
//@}
//@{
/**
* called when the vtkSMProperty fires a vtkCommand::DomainModifiedEvent.
*/
void domainModified(vtkObject* sender);
//@}
private:
Q_DISABLE_COPY(pqSeriesEditorPropertyWidget)
......
Markdown is supported
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