Commit 469c3b04 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Marcus D. Hanwell

Removing all old charting classes from ServerManager/Qt.

parent f5079ab7
......@@ -37,7 +37,7 @@
#include "pqActiveView.h"
#include "pqApplicationCore.h"
#include "pqDisplayPolicy.h"
#include "pqLineChartView.h"
#include "pqXYChartView.h"
#include "pqObjectBuilder.h"
#include "pqOutputPort.h"
#include "pqPipelineRepresentation.h"
......@@ -257,7 +257,7 @@ pqView *pqSLACManager::getMeshView()
pqView *pqSLACManager::getPlotView()
{
return this->findView(this->getPlotFilter(), 0,
pqLineChartView::lineChartViewType());
pqXYChartView::XYChartViewType());
}
//-----------------------------------------------------------------------------
......
......@@ -27,7 +27,7 @@
#include "pqActiveView.h"
#include "pqApplicationCore.h"
#include "pqDataRepresentation.h"
#include "pqLineChartView.h"
#include "pqXYChartView.h"
#include "pqObjectBuilder.h"
#include "pqPipelineRepresentation.h"
#include "pqPipelineSource.h"
......@@ -603,7 +603,7 @@ pqView * pqPlotter::findView(pqPipelineSource *source, int port,
pqView * pqPlotter::getPlotView(pqPipelineSource * plotFilter)
{
return this->findView(plotFilter, 0,
pqLineChartView::lineChartViewType());
pqXYChartView::XYChartViewType());
}
//-----------------------------------------------------------------------------
......
......@@ -56,7 +56,7 @@
#include "pqActiveView.h"
#include "pqApplicationCore.h"
#include "pqDisplayPolicy.h"
#include "pqLineChartView.h"
#include "pqXYChartView.h"
#include "pqObjectBuilder.h"
#include "pqOutputPort.h"
#include "pqPipelineRepresentation.h"
......@@ -722,7 +722,7 @@ pqView *pqSierraPlotToolsManager::getMeshView()
pqView *pqSierraPlotToolsManager::getPlotView()
{
return this->findView(this->getPlotFilter(), 0,
pqLineChartView::lineChartViewType());
pqXYChartView::XYChartViewType());
}
//-----------------------------------------------------------------------------
......
......@@ -31,14 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
========================================================================*/
#include "pqViewSettingsManager.h"
#include "pqActiveChartOptions.h"
#include "pqActiveXYChartOptions.h"
#include "pqActiveObjects.h"
#include "pqActiveRenderViewOptions.h"
#include "pqActiveTwoDRenderViewOptions.h"
#include "pqApplicationCore.h"
#include "pqBarChartView.h"
#include "pqLineChartView.h"
#include "pqXYChartView.h"
#include "pqXYBarChartView.h"
#include "pqPluginManager.h"
......@@ -50,11 +47,8 @@ pqViewSettingsManager::pqViewSettingsManager(QObject* parentObject)
: Superclass(parentObject)
{
this->setRenderViewOptions(new pqActiveRenderViewOptions(this));
pqActiveChartOptions *chartOptions = new pqActiveChartOptions(this);
pqActiveXYChartOptions *xyChartOptions = new pqActiveXYChartOptions(this);
pqActiveXYChartOptions *xyBarChartOptions = new pqActiveXYChartOptions(this);
this->registerOptions(pqBarChartView::barChartViewType(), chartOptions);
this->registerOptions(pqLineChartView::lineChartViewType(), chartOptions);
this->registerOptions(pqXYChartView::XYChartViewType(), xyChartOptions);
this->registerOptions(pqXYBarChartView::XYBarChartViewType(), xyBarChartOptions);
pqActiveTwoDRenderViewOptions* twoDOptions =
......
......@@ -51,7 +51,6 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES "${MOC_INCLUDE_DIRS}")
QT4_WRAP_CPP(MOC_BUILT_SOURCES
pq3DWidget.h
pqAboutDialog.h
pqActiveChartOptions.h
pqActiveRenderViewOptions.h
pqActiveObjects.h
pqActiveServer.h
......@@ -68,9 +67,6 @@ QT4_WRAP_CPP(MOC_BUILT_SOURCES
pqApplicationOptions.h
pqApplicationOptionsDialog.h
pqAutoGeneratedObjectPanel.h
pqBarChartDisplayPanel.h
pqBarChartOptionsEditor.h
pqBoxChartOptionsEditor.h
pqBoxWidget.h
pqCalculatorPanel.h
pqCameraDialog.h
......@@ -79,7 +75,6 @@ QT4_WRAP_CPP(MOC_BUILT_SOURCES
pqChartOptionsEditor.h
pqChartViewContextMenu.h
pqChartViewContextMenuHandler.h
pqChartSeriesEditorModel.h
pqClipPanel.h
pqColorMapModel.h
pqColorPresetManager.h
......@@ -124,8 +119,6 @@ QT4_WRAP_CPP(MOC_BUILT_SOURCES
pqKeyFrameEditor.h
pqKeyFrameTimeValidator.h
pqKeyFrameTypeWidget.h
pqLineChartDisplayPanel.h
pqLineChartOptionsEditor.h
pqLineSourceWidget.h
pqLineWidget.h
pqLinksEditor.h
......@@ -192,7 +185,6 @@ QT4_WRAP_CPP(MOC_BUILT_SOURCES
pqSplineWidget.h
pqSpreadSheetDisplayEditor.h
pqSpreadSheetViewDecorator.h
pqStackedChartOptionsEditor.h
pqStandardColorButton.h
pqStandardColorLinkAdaptor.h
pqStreamTracerPanel.h
......@@ -223,9 +215,7 @@ SET(UI_FORMS
#Resources/UI/pqAddSourceDialog.ui
Resources/UI/pqAnimationSettings.ui
Resources/UI/pqApplicationOptions.ui
Resources/UI/pqBarChartDisplayPanel.ui
Resources/UI/pqBarChartOptionsWidget.ui
Resources/UI/pqBoxChartOptionsWidget.ui
Resources/UI/pqBoxWidget.ui
Resources/UI/pqCalculatorPanel.ui
Resources/UI/pqCameraDialog.ui
......@@ -256,8 +246,6 @@ SET(UI_FORMS
Resources/UI/pqIsoVolumePanel.ui
Resources/UI/pqKeyFrameEditor.ui
Resources/UI/pqKeyFrameTypeWidget.ui
Resources/UI/pqLineChartDisplayPanel.ui
Resources/UI/pqLineChartOptionsWidget.ui
Resources/UI/pqLineSourceControls.ui
Resources/UI/pqLineWidget.ui
Resources/UI/pqLineSourceControls.ui
......@@ -292,7 +280,6 @@ SET(UI_FORMS
Resources/UI/pqSplineWidget.ui
Resources/UI/pqSpreadSheetDisplayEditor.ui
Resources/UI/pqSpreadSheetViewDecorator.ui
Resources/UI/pqStackedChartOptionsWidget.ui
Resources/UI/pqStreamTracerPanel.ui
Resources/UI/pqTextDisplayPropertiesWidget.ui
Resources/UI/pqThresholdPanel.ui
......@@ -348,8 +335,6 @@ ADD_LIBRARY(pqComponents
pqAboutDialog.h
pqActionGroupInterface.cxx
pqActionGroupInterface.h
pqActiveChartOptions.cxx
pqActiveChartOptions.h
pqActiveRenderViewOptions.cxx
pqActiveRenderViewOptions.h
pqActiveObjects.cxx
......@@ -382,20 +367,6 @@ ADD_LIBRARY(pqComponents
pqApplicationOptionsDialog.h
pqAutoGeneratedObjectPanel.cxx
pqAutoGeneratedObjectPanel.h
pqBarChartDisplayPanel.cxx
pqBarChartDisplayPanel.h
pqBarChartOptionsEditor.cxx
pqBarChartOptionsEditor.h
pqBarChartOptionsHandler.cxx
pqBarChartOptionsHandler.h
pqBarChartViewContextMenuHandler.cxx
pqBarChartViewContextMenuHandler.h
pqBoxChartOptionsEditor.cxx
pqBoxChartOptionsEditor.h
pqBoxChartOptionsHandler.cxx
pqBoxChartOptionsHandler.h
pqBoxChartViewContextMenuHandler.cxx
pqBoxChartViewContextMenuHandler.h
pqBoxWidget.cxx
pqBoxWidget.h
pqCalculatorPanel.cxx
......@@ -418,8 +389,6 @@ ADD_LIBRARY(pqComponents
pqChartViewContextMenu.h
pqChartViewContextMenuHandler.cxx
pqChartViewContextMenuHandler.h
pqChartSeriesEditorModel.cxx
pqChartSeriesEditorModel.h
pqClipPanel.cxx
pqClipPanel.h
pqCloseViewUndoElement.cxx
......@@ -517,14 +486,6 @@ ADD_LIBRARY(pqComponents
pqKeyFrameTimeValidator.h
pqKeyFrameTypeWidget.cxx
pqKeyFrameTypeWidget.h
pqLineChartDisplayPanel.cxx
pqLineChartDisplayPanel.h
pqLineChartOptionsEditor.cxx
pqLineChartOptionsEditor.h
pqLineChartOptionsHandler.cxx
pqLineChartOptionsHandler.h
pqLineChartViewContextMenuHandler.cxx
pqLineChartViewContextMenuHandler.h
pqLineSourceWidget.cxx
pqLineSourceWidget.h
pqLineWidget.cxx
......@@ -661,12 +622,6 @@ ADD_LIBRARY(pqComponents
pqSpreadSheetDisplayEditor.h
pqSpreadSheetViewDecorator.cxx
pqSpreadSheetViewDecorator.h
pqStackedChartOptionsEditor.cxx
pqStackedChartOptionsEditor.h
pqStackedChartOptionsHandler.cxx
pqStackedChartOptionsHandler.h
pqStackedChartViewContextMenuHandler.cxx
pqStackedChartViewContextMenuHandler.h
pqStandardColorButton.cxx
pqStandardColorButton.h
pqStandardColorLinkAdaptor.cxx
......
<ui version="4.0" >
<class>pqBarChartDisplayPanel</class>
<widget class="QWidget" name="pqBarChartDisplayPanel" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>296</width>
<height>726</height>
</rect>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="ViewData" >
<property name="toolTip" >
<string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';">Toggle visibility of this display's series.&lt;/p>&lt;/body>&lt;/html></string>
</property>
<property name="whatsThis" >
<string>Use this option to show/hide all the line series in the chart.</string>
</property>
<property name="text" >
<string>Show Series in Chart</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Attribute Mode</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QComboBox" name="AttributeMode" >
<item>
<property name="text" >
<string>Point Data</string>
</property>
<property name="icon" >
<iconset resource="../pqComponents.qrc" >:/pqWidgets/Icons/pqPointData16.png</iconset>
</property>
</item>
<item>
<property name="text" >
<string>Cell Data</string>
</property>
<property name="icon" >
<iconset resource="../pqComponents.qrc" >:/pqWidgets/Icons/pqCellData16.png</iconset>
</property>
</item>
<item>
<property name="text" >
<string>Vertex Data</string>
</property>
<property name="icon" >
<iconset resource="../pqComponents.qrc" >:/pqWidgets/Icons/pqPointData16.png</iconset>
</property>
</item>
<item>
<property name="text" >
<string>Edge Data</string>
</property>
<property name="icon" >
<iconset resource="../pqComponents.qrc" >:/pqWidgets/Icons/pqRamp24.png</iconset>
</property>
</item>
<item>
<property name="text" >
<string>Row Data</string>
</property>
<property name="icon" >
<iconset resource="../pqComponents.qrc" >:/pqWidgets/Icons/pqSpreadsheet16.png</iconset>
</property>
</item>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="pqTreeWidget" name="CompositeIndex" >
<column>
<property name="text" >
<string>Select Block</string>
</property>
</column>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>X Axis Data</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
<widget class="QRadioButton" name="UseArrayIndex" >
<property name="whatsThis" >
<string>Select this option to use the indexes of the y-axis array for the x-axis points.</string>
</property>
<property name="text" >
<string>Use Array Index From Y Axis Data</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
<property name="autoExclusive" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QRadioButton" name="UseDataArray" >
<property name="whatsThis" >
<string>Select this option to use a data array to define the x-axis points.</string>
</property>
<property name="text" >
<string>Use Data Array</string>
</property>
<property name="autoExclusive" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QComboBox" name="XAxisArray" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="whatsThis" >
<string>Choose the name of the x-axis data array.</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0" colspan="2" >
<widget class="QGroupBox" name="SeriesGroup" >
<property name="sizePolicy" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<string>Bar Series</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
<widget class="pqTreeView" name="SeriesList" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="whatsThis" >
<string>This displays the list of line series. You can use the list to edit the series options.</string>
</property>
<property name="editTriggers" >
<set>QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked</set>
</property>
<property name="selectionMode" >
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="selectionBehavior" >
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="rootIsDecorated" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<widget class="QCheckBox" name="SeriesEnabled" >
<property name="whatsThis" >
<string>Use this option to show/hide the line series in the chart.</string>
</property>
<property name="text" >
<string>Enable Series</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>Series Color</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="pqColorChooserButton" name="ColorButton" >
<property name="text" >
<string>Choose Color...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>pqTreeView</class>
<extends>QTreeView</extends>
<header>pqTreeView.h</header>
</customwidget>
<customwidget>
<class>pqTreeWidget</class>
<extends>QTreeWidget</extends>
<header>pqTreeWidget.h</header>
</customwidget>
<customwidget>
<class>pqColorChooserButton</class>
<extends>QPushButton</extends>
<header>pqColorChooserButton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>UseDataArray</sender>
<signal>toggled(bool)</signal>
<receiver>XAxisArray</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
<x>82</x>
<y>341</y>
</hint>
<hint type="destinationlabel" >
<x>213</x>
<y>341</y>
</hint>
</hints>
</connection>
</connections>
</ui>
<ui version="4.0" >
<class>pqBoxChartOptionsWidget</class>
<widget class="QWidget" name="pqBoxChartOptionsWidget" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>346</width>
<height>323</height>
</rect>
</property>
<property name="windowTitle" >
<string>Statistical Box Chart Options</string>
</property>
<layout class="QGridLayout" >
<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="text" >
<string>Statistical Box Chart</string>
</property>
</widget>
</item>
<item rowspan="3" row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Box Help Format</string>
</property>
</widget>
</item>
<item row="1" column="2" colspan="2" >
<widget class="QLineEdit" name="HelpFormat" />
</item>
<item row="2" column="1" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Outlier Help Format</string>
</property>
</widget>
</item>
<item row="2" column="2" colspan="2" >
<widget class="QLineEdit" name="OutlierFormat" />
</item>
<item row="3" column="1" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>Outline Style</string>
</property>
</widget>
</item>
<item row="3" column="2" >
<widget class="QComboBox" name="OutlineStyle" >
<item>
<property name="text" >
<string>Darker</string>
</property>
</item>
<item>
<property name="text" >
<string>Black</string>
</property>
</item>
</widget>
</item>
<item row="3" 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="4" 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" >
<string>Box Spacing</string>
</property>
</widget>
</item>
<item row="5" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="1" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<string>Box Width Fraction</string>
</property>
</widget>
</item>
<item row="5" column="2" >
<widget class="QDoubleSpinBox" name="WidthFraction" >
<property name="maximum" >
<double>1.000000000000000</double>
</property>
<property name="singleStep" >
<double>0.100000000000000</double>
</property>
<property name="value" >
<double>0.800000000000000</double>
</property>
</widget>
</item>
<item row="5" 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="6" column="0" colspan="4" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<tabstops>
<tabstop>HelpFormat</tabstop>
<tabstop>OutlierFormat</tabstop>
<tabstop>OutlineStyle</tabstop>
<tabstop>WidthFraction</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
This diff is collapsed.
<ui version="4.0" >
<class>pqLineChartOptionsWidget</class>
<widget class="QWidget" name="pqLineChartOptionsWidget" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>346</width>
<height>323</height>
</rect>
</property>
<property name="windowTitle" >
<string>View Settings (Line Chart)</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="3" >
<widget class="QLabel" name="label" >
<property name="font" >
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Line Chart</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Help Format</string>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QLineEdit" name="HelpFormat" />
</item>
<item row="2" column="0" colspan="3" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
<ui version="4.0" >
<class>pqStackedChartOptionsWidget</class>