Commit 34dd47cf authored by js9's avatar js9

Adding extents to parallel coordinates window.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@3186 18c085ea-50e0-402c-830e-de6fd14e8384
parent aae485ad
......@@ -271,6 +271,46 @@ ParallelCoordinatesAttributes::CopyAttributes(const AttributeGroup *atts)
return retval;
}
Function: CreateCompatible
Declaration: virtual AttributeSubject *CreateCompatible(const std::string &) const;
Definition:
// ****************************************************************************
// Method: ParallelCoordinatesAttributes::CreateCompatible
//
// Purpose:
// Creates an object of the specified type initialized with the
// attributes from this object.
//
// Arguments:
// tname : The typename of the object that we want to create.
//
// Returns: A new object of the type specified by tname or 0.
//
// Programmer: Jeremy Meredith
// Creation: February 8, 2008
//
// ****************************************************************************
AttributeSubject *
ParallelCoordinatesAttributes::CreateCompatible(const std::string &tname) const
{
AttributeSubject *retval = 0;
if(TypeName() == tname)
{
retval = new ParallelCoordinatesAttributes(*this);
}
else if(tname == "AxisRestrictionAttributes")
{
AxisRestrictionAttributes *ar = new AxisRestrictionAttributes;
ar->SetMinima(extentMinima);
ar->SetMaxima(extentMaxima);
retval = ar;
}
}
Function: ResetAxes
Declaration: void ResetAxes();
Definition:
......
......@@ -61,6 +61,8 @@
</Function>
<Function name="CopyAttributes" user="false" member="true">
</Function>
<Function name="CreateCompatible" user="false" member="true">
</Function>
<Function name="ResetAxes" user="true" member="true">
</Function>
<Include file="header" quoted="false">
......
......@@ -51,7 +51,7 @@ const char *ParallelCoordinatesAttributes::TypeMapFormatString = "s*d*d*babfiabb
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -78,7 +78,7 @@ ParallelCoordinatesAttributes::ParallelCoordinatesAttributes() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -111,7 +111,7 @@ ParallelCoordinatesAttributes::ParallelCoordinatesAttributes(const ParallelCoord
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -131,7 +131,7 @@ ParallelCoordinatesAttributes::~ParallelCoordinatesAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -166,7 +166,7 @@ ParallelCoordinatesAttributes::operator = (const ParallelCoordinatesAttributes &
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -198,7 +198,7 @@ ParallelCoordinatesAttributes::operator == (const ParallelCoordinatesAttributes
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -219,7 +219,7 @@ ParallelCoordinatesAttributes::operator != (const ParallelCoordinatesAttributes
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -287,29 +287,39 @@ ParallelCoordinatesAttributes::CopyAttributes(const AttributeGroup *atts)
}
// ****************************************************************************
// Method: ParallelCoordinatesAttributes::CreateCompatible
// Method: ParallelCoordinatesAttributes::CreateCompatible
//
// Purpose:
// CreateCompatible method for the ParallelCoordinatesAttributes class.
// Purpose:
// Creates an object of the specified type initialized with the
// attributes from this object.
//
// Note: Autogenerated by xml2atts.
// Arguments:
// tname : The typename of the object that we want to create.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Returns: A new object of the type specified by tname or 0.
//
// Programmer: Jeremy Meredith
// Creation: February 8, 2008
//
// Modifications:
//
// ****************************************************************************
AttributeSubject *
ParallelCoordinatesAttributes::CreateCompatible(const std::string &tname) const
{
AttributeSubject *retval = 0;
if(TypeName() == tname)
{
retval = new ParallelCoordinatesAttributes(*this);
// Other cases could go here too.
}
else if(tname == "AxisRestrictionAttributes")
{
AxisRestrictionAttributes *ar = new AxisRestrictionAttributes;
return retval;
ar->SetMinima(extentMinima);
ar->SetMaxima(extentMaxima);
retval = ar;
}
}
// ****************************************************************************
......@@ -321,7 +331,7 @@ ParallelCoordinatesAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -348,7 +358,7 @@ ParallelCoordinatesAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -383,7 +393,7 @@ ParallelCoordinatesAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -489,7 +499,7 @@ ParallelCoordinatesAttributes::CreateNode(DataNode *parentNode, bool completeSav
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -759,7 +769,7 @@ ParallelCoordinatesAttributes::SelectContextColor()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -794,7 +804,7 @@ ParallelCoordinatesAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -829,7 +839,7 @@ ParallelCoordinatesAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......@@ -864,7 +874,7 @@ ParallelCoordinatesAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......
......@@ -52,7 +52,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Feb 8 12:36:04 PDT 2008
// Creation: Fri Feb 8 16:23:33 PST 2008
//
// Modifications:
//
......
......@@ -54,7 +54,7 @@ import llnl.visit.ColorAttribute;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Fri Feb 8 09:44:10 PDT 2008
// Creation: Fri Feb 8 16:23:38 PST 2008
//
// Modifications:
//
......
......@@ -51,7 +51,7 @@
// Note: Autogenerated by xml2python. Do not modify by hand!
//
// Programmer: xml2python
// Creation: Fri Feb 8 09:44:14 PDT 2008
// Creation: Fri Feb 8 16:23:42 PST 2008
//
// ****************************************************************************
......
......@@ -47,7 +47,7 @@ class QCheckBox;
class QGroupBox;
class QLabel;
class QLineEdit;
class QListBox;
class QListView;
class QSlider;
class QSpinBox;
class QVBox;
......@@ -57,6 +57,7 @@ class QvisLineStyleWidget;
class QvisLineWidthWidget;
class QvisOpacitySlider;
class QvisVariableButton;
class QListViewItem;
// ****************************************************************************
// Class: QvisParallelCoordinatesPlotWindow
......@@ -73,6 +74,10 @@ class QvisVariableButton;
// Jeremy Meredith, Fri Feb 8 12:34:19 EST 2008
// Added ability to unify extents across all axes.
//
// Jeremy Meredith, Fri Feb 8 16:12:06 EST 2008
// Changed axis list to QListView to support multiple columns.
// Added min/max extents columns for each axis, and a button to reset them.
//
// ****************************************************************************
class QvisParallelCoordinatesPlotWindow : public QvisPostableWindowObserver
......@@ -105,22 +110,24 @@ class QvisParallelCoordinatesPlotWindow : public QvisPostableWindowObserver
void contextNumPartitionsSliderChanged(int val);
void contextNumPartitionsSliderReleased();
void contextColorChanged(const QColor &color);
void axisSelected(int);
void axisSelected(QListViewItem*);
void addAxis(const QString &axisToAdd);
void delAxis();
void moveAxisUp();
void moveAxisDown();
void resetAxisExtents();
void linesOnlyIfExtentsToggled(bool);
void unifyAxisExtentsToggled(bool);
private:
int plotType;
QGroupBox *axisGroup;
QListBox *axisList;
QListView *axisList;
QvisVariableButton *axisNewButton;
QPushButton *axisDelButton;
QPushButton *axisUpButton;
QPushButton *axisDownButton;
QPushButton *axisResetExtentsButton;
QGroupBox *drawLines;
QCheckBox *linesOnlyIfExtents;
......
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