Commit 9cadb835 authored by hrchilds's avatar hrchilds

Merge 2.0RC to the trunk, picking up UI changes that were already on the

trunk, plus some fixes and comments.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10191 18c085ea-50e0-402c-830e-de6fd14e8384
parent eeede396
......@@ -1814,6 +1814,15 @@ avtStreamlineFilter::ComputeDomainToRankMapping()
#endif
}
// ****************************************************************************
// Modifications:
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change ".size() == 0" test with empty, as empty has much better
// performance.
//
// ****************************************************************************
int
avtStreamlineFilter::DomainToRank(DomainType &domain)
{
......@@ -1907,6 +1916,10 @@ avtStreamlineFilter::DomainToRank(DomainType &domain)
// Use domainToCellLocatorMap.find() instead of [] accessor. It will actually
// add an entry for the key if doesn't already exist.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change ".size() == 0" test with empty, as empty has much better
// performance.
//
// ****************************************************************************
avtIVPSolver::Result
......
......@@ -67,12 +67,12 @@ class DomainType;
class avtSLAlgorithm;
#define STREAMLINE_SOURCE_POINT 0
#define STREAMLINE_SOURCE_LINE 1
#define STREAMLINE_SOURCE_PLANE 2
#define STREAMLINE_SOURCE_SPHERE 3
#define STREAMLINE_SOURCE_BOX 4
#define STREAMLINE_SOURCE_CIRCLE 5
#define STREAMLINE_SOURCE_POINT_LIST 6
#define STREAMLINE_SOURCE_POINT_LIST 1
#define STREAMLINE_SOURCE_LINE 2
#define STREAMLINE_SOURCE_CIRCLE 3
#define STREAMLINE_SOURCE_PLANE 4
#define STREAMLINE_SOURCE_SPHERE 5
#define STREAMLINE_SOURCE_BOX 6
#define STREAMLINE_COLOR_SOLID 0
#define STREAMLINE_COLOR_SPEED 1
......@@ -213,6 +213,10 @@ class avtSLAlgorithm;
// Hank Childs, Sat Feb 20 05:12:45 PST 2010
// Add methods for initializing locators.
//
// Allen Sanderson, Sun Mar 7 16:18:46 PST 2010
// Re-order define's for source type to match recent changes in the
// streamline attributes.
//
// ****************************************************************************
class AVTFILTERS_API avtStreamlineFilter :
......
......@@ -145,6 +145,9 @@ protected:
// Jeremy Meredith, Tue Apr 22 14:31:20 EDT 2008
// Removed Extents tool. (Subsumed by axis restriction tool.)
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Reorder the icons (2.0 interface changes).
//
// ****************************************************************************
VisWinTools::VisWinTools(VisWindowColleagueProxy &v) : VisWinColleague(v),
......
......@@ -621,6 +621,10 @@ void QvisPointControl::SetPointType(int type)
// Brad Whitlock, Tue Apr 8 15:26:49 PDT 2008
// Support for internationalization.
//
// Allen Sanderson, Sun Mar 7 16:29:40 PST 2010
// Combine point type test ... we wanted an 'and', where the current test
// was just giving us a last one in.
//
// ****************************************************************************
void
......@@ -636,8 +640,7 @@ QvisPointControl::UpdatePointType()
else
sizeLabel->setText(tr("Point size (pixels)"));
sizeVarToggle->setEnabled(e);
sizeVarButton->setEnabled(sizeVarToggle->isChecked());
sizeVarButton->setEnabled(e && sizeVarToggle->isChecked());
}
// ****************************************************************************
......
......@@ -140,6 +140,9 @@ QvisBoundaryPlotWindow::~QvisBoundaryPlotWindow()
// Brad Whitlock, Thu Jul 17 11:35:40 PDT 2008
// Qt 4.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -73,6 +73,9 @@ class QvisPointControl;
// Brad Whitlock, Wed Jul 20 14:23:58 PST 2005
// Added a new slot to handle a new signal from QvisPointControl.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisBoundaryPlotWindow : public QvisPostableWindowObserver
......
......@@ -149,6 +149,9 @@ QvisContourPlotWindow::~QvisContourPlotWindow()
// Dave Pugmire, Wed Oct 29 16:00:48 EDT 2008
// Swap the min/max in the gui.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......@@ -158,7 +161,7 @@ QvisContourPlotWindow::CreateWindowContents()
// Create the scale group
//
QGroupBox * dataGroup = new QGroupBox(central);
dataGroup->setTitle(tr("Data"));
dataGroup->setTitle(tr("Contour Levels"));
topLayout->addWidget(dataGroup);
QGridLayout *dataLayout = new QGridLayout(dataGroup);
......@@ -181,6 +184,10 @@ QvisContourPlotWindow::CreateWindowContents()
scalingButtons->addButton(rb, 1);
dataLayout->addWidget(rb, 0, 2);
// Each time a radio button is clicked, call the scale clicked slot.
connect(scalingButtons, SIGNAL(buttonClicked(int)),
this, SLOT(scaleClicked(int)));
//
// Create the Limits stuff
//
......@@ -231,9 +238,6 @@ QvisContourPlotWindow::CreateWindowContents()
this, SLOT(processSelectByText()));
dataLayout->addWidget(selectByLineEdit, 2, 2);
// Create the contour color group box.
contourColorGroup = new QGroupBox(central);
contourColorGroup->setTitle(tr("Contour colors"));
......
......@@ -83,6 +83,9 @@ class QvisOpacitySlider;
// Mark C. Miller, Wed Nov 16 10:46:36 PST 2005
// Moved StringToDoubleList to QvisWindowBase
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisContourPlotWindow : public QvisPostableWindowObserver
......
......@@ -178,7 +178,7 @@ CurveViewerPluginInfo::SetColor(AttributeSubject *atts)
{
CurveAttributes *curveAtts = (CurveAttributes *)atts;
if (curveAtts->GetCycleColors())
if (curveAtts->GetCurveColorSource())
{
ColorAttribute c;
unsigned char rgb[3] = {0,0,0};
......
......@@ -144,6 +144,9 @@ QvisCurvePlotWindow::~QvisCurvePlotWindow()
// Brad Whitlock, Fri Jul 18 10:40:08 PDT 2008
// Qt 4.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......@@ -153,7 +156,7 @@ QvisCurvePlotWindow::CreateWindowContents()
// Create the geometry
//
QGroupBox * geometryGroup = new QGroupBox(central);
geometryGroup->setTitle(tr("Geometry"));
geometryGroup->setTitle(tr("Line Geometry"));
topLayout->addWidget(geometryGroup);
QGridLayout *geometryLayout = new QGridLayout(geometryGroup);
......
......@@ -78,6 +78,9 @@ class QvisLineWidthWidget;
// Brad Whitlock, Mon Nov 20 13:25:30 PST 2006
// Added controls to control symbol-based rendering.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisCurvePlotWindow : public QvisPostableWindowObserver
......
......@@ -139,6 +139,9 @@ QvisFilledBoundaryPlotWindow::~QvisFilledBoundaryPlotWindow()
// Brad Whitlock, Thu Jul 17 11:35:40 PDT 2008
// Qt 4.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -68,6 +68,9 @@ class QvisPointControl;
//
// Modifications:
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisFilledBoundaryPlotWindow : public QvisPostableWindowObserver
......
......@@ -136,6 +136,9 @@ QvisLabelPlotWindow::~QvisLabelPlotWindow()
// Cyrus Harrison, Fri Jul 18 14:44:51 PDT 2008
// Initial Qt4 Port.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -120,7 +120,7 @@ MeshAttributes::SmoothingLevel_FromString(const std::string &s, MeshAttributes::
//
static const char *MeshColor_strings[] = {
"Foreground", "MeshColorTable"};
"Foreground", "MeshCustom"};
std::string
MeshAttributes::MeshColor_ToString(MeshAttributes::MeshColor t)
......@@ -157,7 +157,7 @@ MeshAttributes::MeshColor_FromString(const std::string &s, MeshAttributes::MeshC
//
static const char *OpaqueColor_strings[] = {
"Background", "OpaqueColorTable"};
"Background", "OpaqueCustom"};
std::string
MeshAttributes::OpaqueColor_ToString(MeshAttributes::OpaqueColor t)
......
......@@ -78,12 +78,12 @@ public:
enum MeshColor
{
Foreground,
MeshColorTable
MeshCustom
};
enum OpaqueColor
{
Background,
OpaqueColorTable
OpaqueCustom
};
enum OpaqueMode
{
......
......@@ -74,10 +74,10 @@ public class MeshAttributes extends AttributeSubject implements Plugin
public final static int SMOOTHINGLEVEL_HIGH = 2;
public final static int MESHCOLOR_FOREGROUND = 0;
public final static int MESHCOLOR_MESHCOLORTABLE = 1;
public final static int MESHCOLOR_MESHCUSTOM = 1;
public final static int OPAQUECOLOR_BACKGROUND = 0;
public final static int OPAQUECOLOR_OPAQUECOLORTABLE = 1;
public final static int OPAQUECOLOR_OPAQUECUSTOM = 1;
public final static int OPAQUEMODE_AUTO = 0;
public final static int OPAQUEMODE_ON = 1;
......@@ -455,14 +455,14 @@ public class MeshAttributes extends AttributeSubject implements Plugin
str = str + indent + "meshColorSource = ";
if(meshColorSource == MESHCOLOR_FOREGROUND)
str = str + "MESHCOLOR_FOREGROUND";
if(meshColorSource == MESHCOLOR_MESHCOLORTABLE)
str = str + "MESHCOLOR_MESHCOLORTABLE";
if(meshColorSource == MESHCOLOR_MESHCUSTOM)
str = str + "MESHCOLOR_MESHCUSTOM";
str = str + "\n";
str = str + indent + "opaqueColorSource = ";
if(opaqueColorSource == OPAQUECOLOR_BACKGROUND)
str = str + "OPAQUECOLOR_BACKGROUND";
if(opaqueColorSource == OPAQUECOLOR_OPAQUECOLORTABLE)
str = str + "OPAQUECOLOR_OPAQUECOLORTABLE";
if(opaqueColorSource == OPAQUECOLOR_OPAQUECUSTOM)
str = str + "OPAQUECOLOR_OPAQUECUSTOM";
str = str + "\n";
str = str + indent + "opaqueMode = ";
if(opaqueMode == OPAQUEMODE_AUTO)
......
......@@ -98,30 +98,30 @@ PyMeshAttributes_ToString(const MeshAttributes *atts, const char *prefix)
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%serrorTolerance = %g\n", prefix, atts->GetErrorTolerance());
str += tmpStr;
const char *meshColorSource_names = "Foreground, MeshColorTable";
const char *meshColorSource_names = "Foreground, MeshCustom";
switch (atts->GetMeshColorSource())
{
case MeshAttributes::Foreground:
SNPRINTF(tmpStr, 1000, "%smeshColorSource = %sForeground # %s\n", prefix, prefix, meshColorSource_names);
str += tmpStr;
break;
case MeshAttributes::MeshColorTable:
SNPRINTF(tmpStr, 1000, "%smeshColorSource = %sMeshColorTable # %s\n", prefix, prefix, meshColorSource_names);
case MeshAttributes::MeshCustom:
SNPRINTF(tmpStr, 1000, "%smeshColorSource = %sMeshCustom # %s\n", prefix, prefix, meshColorSource_names);
str += tmpStr;
break;
default:
break;
}
const char *opaqueColorSource_names = "Background, OpaqueColorTable";
const char *opaqueColorSource_names = "Background, OpaqueCustom";
switch (atts->GetOpaqueColorSource())
{
case MeshAttributes::Background:
SNPRINTF(tmpStr, 1000, "%sopaqueColorSource = %sBackground # %s\n", prefix, prefix, opaqueColorSource_names);
str += tmpStr;
break;
case MeshAttributes::OpaqueColorTable:
SNPRINTF(tmpStr, 1000, "%sopaqueColorSource = %sOpaqueColorTable # %s\n", prefix, prefix, opaqueColorSource_names);
case MeshAttributes::OpaqueCustom:
SNPRINTF(tmpStr, 1000, "%sopaqueColorSource = %sOpaqueCustom # %s\n", prefix, prefix, opaqueColorSource_names);
str += tmpStr;
break;
default:
......@@ -449,7 +449,7 @@ MeshAttributes_SetMeshColorSource(PyObject *self, PyObject *args)
fprintf(stderr, "An invalid meshColorSource value was given. "
"Valid values are in the range of [0,1]. "
"You can also use the following names: "
"Foreground, MeshColorTable.");
"Foreground, MeshCustom.");
return NULL;
}
......@@ -482,7 +482,7 @@ MeshAttributes_SetOpaqueColorSource(PyObject *self, PyObject *args)
fprintf(stderr, "An invalid opaqueColorSource value was given. "
"Valid values are in the range of [0,1]. "
"You can also use the following names: "
"Background, OpaqueColorTable.");
"Background, OpaqueCustom.");
return NULL;
}
......@@ -912,15 +912,15 @@ PyMeshAttributes_getattr(PyObject *self, char *name)
return MeshAttributes_GetMeshColorSource(self, NULL);
if(strcmp(name, "Foreground") == 0)
return PyInt_FromLong(long(MeshAttributes::Foreground));
if(strcmp(name, "MeshColorTable") == 0)
return PyInt_FromLong(long(MeshAttributes::MeshColorTable));
if(strcmp(name, "MeshCustom") == 0)
return PyInt_FromLong(long(MeshAttributes::MeshCustom));
if(strcmp(name, "opaqueColorSource") == 0)
return MeshAttributes_GetOpaqueColorSource(self, NULL);
if(strcmp(name, "Background") == 0)
return PyInt_FromLong(long(MeshAttributes::Background));
if(strcmp(name, "OpaqueColorTable") == 0)
return PyInt_FromLong(long(MeshAttributes::OpaqueColorTable));
if(strcmp(name, "OpaqueCustom") == 0)
return PyInt_FromLong(long(MeshAttributes::OpaqueCustom));
if(strcmp(name, "opaqueMode") == 0)
return MeshAttributes_GetOpaqueMode(self, NULL);
......
......@@ -158,6 +158,9 @@ QvisMeshPlotWindow::~QvisMeshPlotWindow()
// Jeremy Meredith, Fri Feb 20 17:28:17 EST 2009
// Added per-plot alpha (opacity) support.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......@@ -472,6 +475,9 @@ QvisMeshPlotWindow::CreateWindowContents()
// Jeremy Meredith, Fri Feb 20 17:28:17 EST 2009
// Added per-plot alpha (opacity) support.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......@@ -1046,6 +1052,11 @@ QvisMeshPlotWindow::opaqueModeChanged(int val)
// Programmer: Kathleen Bonnell
// Creation: September 26, 2001
//
// Modifications:
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......@@ -1074,6 +1085,11 @@ QvisMeshPlotWindow::opaqueColorClicked(int val)
// Programmer: Kathleen Bonnell
// Creation: September 26, 2001
//
// Modifications:
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -100,6 +100,9 @@ class QvisOpacitySlider;
// Jeremy Meredith, Fri Feb 20 17:28:17 EST 2009
// Added per-plot alpha (opacity) support.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisMeshPlotWindow : public QvisPostableWindowObserver
......
......@@ -126,6 +126,9 @@ QvisMoleculePlotWindow::~QvisMoleculePlotWindow()
// Cyrus Harrison, Fri Jul 18 14:38:14 PDT 2008
// Initial Qt4 Port.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -73,6 +73,9 @@ class QGroupBox;
// Cyrus Harrison, Fri Jul 18 14:38:14 PDT 2008
// Initial Qt4 Port.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisMoleculePlotWindow : public QvisPostableWindowObserver
......
......@@ -123,6 +123,9 @@ QvisPoincarePlotWindow::~QvisPoincarePlotWindow()
//
// Modifications:
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -72,6 +72,9 @@ class QvisVariableButton;
//
// Modifications:
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisPoincarePlotWindow : public QvisPostableWindowObserver
......
......@@ -177,6 +177,9 @@ QvisPseudocolorPlotWindow::~QvisPseudocolorPlotWindow()
// (instead of just a single global opacity for the whole plot).
// There's a new toggle for this, and it overrides the whole-plot opacity.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -104,6 +104,9 @@ class PseudocolorAttributes;
// (instead of just a single global opacity for the whole plot).
// There's a new toggle for this, and it overrides the whole-plot opacity.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisPseudocolorPlotWindow : public QvisPostableWindowObserver
......
......@@ -152,6 +152,9 @@ QvisScatterPlotWindow::~QvisScatterPlotWindow()
// Dave Pugmire, Wed Oct 29 16:00:48 EDT 2008
// Swap the min/max in the gui.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -72,6 +72,9 @@ class QvisVariableButton;
// Brad Whitlock, Wed Jul 20 15:26:06 PST 2005
// Added pointSizeLabel.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisScatterPlotWindow : public QvisPostableWindowObserver
......
......@@ -166,6 +166,9 @@ QvisStreamlinePlotWindow::~QvisStreamlinePlotWindow()
// Dave Pugmire, Tue Dec 29 14:37:53 EST 2009
// Add custom renderer and lots of appearance options to the streamlines plots.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -112,6 +112,9 @@ class StreamlineAttributes;
// Dave Pugmire, Tue Feb 16 09:08:32 EST 2010
// Add display head geom as cone.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisStreamlinePlotWindow : public QvisPostableWindowObserver
......
......@@ -140,6 +140,9 @@ QvisSubsetPlotWindow::~QvisSubsetPlotWindow()
// Brad Whitlock, Thu Jul 17 11:35:40 PDT 2008
// Qt 4.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......@@ -389,6 +392,9 @@ QvisSubsetPlotWindow::CreateWindowContents()
// Brad Whitlock, Thu Jul 17 11:43:27 PDT 2008
// Qt 4.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -70,6 +70,9 @@ class QvisPointControl;
// Brad Whitlock, Thu Jul 17 15:44:03 PDT 2008
// Adapted from Boundary plot window after that windows was ported to Qt 4.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisSubsetPlotWindow : public QvisPostableWindowObserver
......
......@@ -147,6 +147,9 @@ QvisSurfacePlotWindow::~QvisSurfacePlotWindow()
// Dave Pugmire, Wed Oct 29 16:00:48 EDT 2008
// Swap the min/max in the gui.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -38,6 +38,7 @@
#ifndef QVIS_SURFACE_PLOT_WINDOW_H
#define QVIS_SURFACE_PLOT_WINDOW_H
#include <QvisPostableWindowObserver.h>
#include <AttributeSubject.h>
......@@ -85,6 +86,9 @@ class QvisOpacitySlider;
// Kathleen Bonnell, Thu Mar 28 14:03:19 PST 2002
// Revert back to using one min/max for both scaling and coloring purposes.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisSurfacePlotWindow : public QvisPostableWindowObserver
......
......@@ -126,6 +126,9 @@ QvisTensorPlotWindow::~QvisTensorPlotWindow()
// Brad Whitlock, Tue Aug 8 20:12:23 PST 2008
// Qt 4.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -69,6 +69,9 @@ class QvisColorTableButton;
// Eric Brugger, Wed Nov 24 11:39:58 PST 2004
// Added scaleByMagnitude and autoScale.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisTensorPlotWindow : public QvisPostableWindowObserver
......
......@@ -111,6 +111,9 @@ QvisTruecolorPlotWindow::~QvisTruecolorPlotWindow()
// Brad Whitlock, Tue Aug 5 20:03:23 PST 2008
// Qt 4.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -62,6 +62,9 @@ class QvisOpacitySlider;
// Kathleen Bonnell, Mon Jul 25 15:27:06 PDT 2005
// Add lighting toggle.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Rename lighting to lightingToggle.
//
// ****************************************************************************
class QvisTruecolorPlotWindow : public QvisPostableWindowObserver
......
......@@ -170,6 +170,9 @@ QvisVectorPlotWindow::~QvisVectorPlotWindow()
// Dave Pugmire, Thu Oct 30 08:40:26 EDT 2008
// Switch the order of the min/max.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
void
......
......@@ -93,6 +93,9 @@ class VectorAttributes;
// Brad Whitlock, Tue Jul 29 11:07:34 PDT 2008
// Qt 4.
//
// Allen Sanderson, Sun Mar 7 12:49:56 PST 2010
// Change layout of window for 2.0 interface changes.
//
// ****************************************************************************
class QvisVectorPlotWindow : public QvisPostableWindowObserver
......
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