Commit 1a291ee7 authored by hrchilds's avatar hrchilds

Update from March 7, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@426 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5a180404
......@@ -303,7 +303,14 @@ ParsingExprList::GetExpressionTree(Expression *expr)
// Programmer: Jeremy Meredith
// Creation: January 9, 2005
//
// Modifications:
// Brad Whitlock, Thu Feb 24 16:07:13 PST 2005
// I made it iterate over varLeaves as a set instead of first creating
// a vector of strings because the vector constructor was not taking
// the set container's iterators successfully on MSVC 6.0.
//
// ****************************************************************************
static string
GetRealVariableHelper(const string &var, set<string> expandedVars)
{
......@@ -338,14 +345,17 @@ GetRealVariableHelper(const string &var, set<string> expandedVars)
if (varLeaves.empty())
return "";
// Turn it into a vector for easy walking
const vector<string> leaves(varLeaves.begin(), varLeaves.end());
int nLeaves = leaves.size();
// For each leaf, look for a real variable
for (int leaf = 0; leaf < nLeaves; leaf++)
#if defined(_WIN32) && defined(USING_MSVC6)
// Don't use const iterator on win32 MSVC 6.
for (std::set<std::string>::iterator it = varLeaves.begin();
it != varLeaves.end(); ++it)
#else
for (std::set<std::string>::const_iterator it = varLeaves.begin();
it != varLeaves.end(); ++it)
#endif
{
string realvar = GetRealVariableHelper(leaves[leaf], expandedVars);
string realvar = GetRealVariableHelper(*it, expandedVars);
// If we found a real variable, return it!
if (!realvar.empty())
......
......@@ -14,6 +14,7 @@
// This file makes sure that the entry point to each plugin is exported
// in the DLL. It must be exported to be visible to GetProcAddress.
//
extern "C" __declspec(dllexport) const char *VisItPluginVersion;
#ifdef GENERAL_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) GeneralDatabasePluginInfo* GetGeneralInfo();
#endif
......
......@@ -6,6 +6,7 @@
// This file makes sure that the entry point to each plugin is exported
// in the DLL. It must be exported to be visible to GetProcAddress.
//
extern "C" __declspec(dllexport) const char *VisItPluginVersion;
#ifdef GENERAL_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) GeneralOperatorPluginInfo* GetGeneralInfo();
#endif
......
......@@ -6,6 +6,7 @@
// This file makes sure that the entry point to each plugin is exported
// in the DLL. It must be exported to be visible to GetProcAddress.
//
extern "C" __declspec(dllexport) const char *VisItPluginVersion;
#ifdef GENERAL_PLUGIN_EXPORTS
extern "C" __declspec(dllexport) GeneralPlotPluginInfo* GetGeneralInfo();
#endif
......
......@@ -87,13 +87,13 @@ AnnotationObject::FontFamily_FromString(const std::string &s, AnnotationObject::
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
// ****************************************************************************
AnnotationObject::AnnotationObject() : AttributeSubject("ibbFFabaas*ibbbfis"),
AnnotationObject::AnnotationObject() : AttributeSubject("ibbFFabaas*ibbbfi"),
textColor(), color1(),
color2()
{
......@@ -113,7 +113,6 @@ AnnotationObject::AnnotationObject() : AttributeSubject("ibbFFabaas*ibbbfis"),
fontShadow = false;
floatAttribute1 = 0;
intAttribute1 = 0;
timeFormat = "%g";
}
// ****************************************************************************
......@@ -125,13 +124,13 @@ AnnotationObject::AnnotationObject() : AttributeSubject("ibbFFabaas*ibbbfis"),
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
// ****************************************************************************
AnnotationObject::AnnotationObject(const AnnotationObject &obj) : AttributeSubject("ibbFFabaas*ibbbfis")
AnnotationObject::AnnotationObject(const AnnotationObject &obj) : AttributeSubject("ibbFFabaas*ibbbfi")
{
objectType = obj.objectType;
visible = obj.visible;
......@@ -155,7 +154,6 @@ AnnotationObject::AnnotationObject(const AnnotationObject &obj) : AttributeSubje
fontShadow = obj.fontShadow;
floatAttribute1 = obj.floatAttribute1;
intAttribute1 = obj.intAttribute1;
timeFormat = obj.timeFormat;
SelectAll();
}
......@@ -169,7 +167,7 @@ AnnotationObject::AnnotationObject(const AnnotationObject &obj) : AttributeSubje
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -189,7 +187,7 @@ AnnotationObject::~AnnotationObject()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -221,7 +219,6 @@ AnnotationObject::operator = (const AnnotationObject &obj)
fontShadow = obj.fontShadow;
floatAttribute1 = obj.floatAttribute1;
intAttribute1 = obj.intAttribute1;
timeFormat = obj.timeFormat;
SelectAll();
return *this;
......@@ -236,7 +233,7 @@ AnnotationObject::operator = (const AnnotationObject &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -273,8 +270,7 @@ AnnotationObject::operator == (const AnnotationObject &obj) const
(fontItalic == obj.fontItalic) &&
(fontShadow == obj.fontShadow) &&
(floatAttribute1 == obj.floatAttribute1) &&
(intAttribute1 == obj.intAttribute1) &&
(timeFormat == obj.timeFormat));
(intAttribute1 == obj.intAttribute1));
}
// ****************************************************************************
......@@ -286,7 +282,7 @@ AnnotationObject::operator == (const AnnotationObject &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -307,7 +303,7 @@ AnnotationObject::operator != (const AnnotationObject &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -328,7 +324,7 @@ AnnotationObject::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -356,7 +352,7 @@ AnnotationObject::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -382,7 +378,7 @@ AnnotationObject::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -409,7 +405,7 @@ AnnotationObject::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -434,7 +430,6 @@ AnnotationObject::SelectAll()
Select(13, (void *)&fontShadow);
Select(14, (void *)&floatAttribute1);
Select(15, (void *)&intAttribute1);
Select(16, (void *)&timeFormat);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -450,7 +445,7 @@ AnnotationObject::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -569,12 +564,6 @@ AnnotationObject::CreateNode(DataNode *parentNode, bool completeSave, bool force
node->AddNode(new DataNode("intAttribute1", intAttribute1));
}
if(completeSave || !FieldsEqual(16, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("timeFormat", timeFormat));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
......@@ -594,7 +583,7 @@ AnnotationObject::CreateNode(DataNode *parentNode, bool completeSave, bool force
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -672,8 +661,6 @@ AnnotationObject::SetFromNode(DataNode *parentNode)
SetFloatAttribute1(node->AsFloat());
if((node = searchNode->GetNode("intAttribute1")) != 0)
SetIntAttribute1(node->AsInt());
if((node = searchNode->GetNode("timeFormat")) != 0)
SetTimeFormat(node->AsString());
}
///////////////////////////////////////////////////////////////////////////////
......@@ -796,13 +783,6 @@ AnnotationObject::SetIntAttribute1(int intAttribute1_)
Select(15, (void *)&intAttribute1);
}
void
AnnotationObject::SetTimeFormat(const std::string &timeFormat_)
{
timeFormat = timeFormat_;
Select(16, (void *)&timeFormat);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -939,18 +919,6 @@ AnnotationObject::GetIntAttribute1() const
return intAttribute1;
}
const std::string &
AnnotationObject::GetTimeFormat() const
{
return timeFormat;
}
std::string &
AnnotationObject::GetTimeFormat()
{
return timeFormat;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -991,12 +959,6 @@ AnnotationObject::SelectText()
Select(9, (void *)&text);
}
void
AnnotationObject::SelectTimeFormat()
{
Select(16, (void *)&timeFormat);
}
///////////////////////////////////////////////////////////////////////////////
// Keyframing methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1010,7 +972,7 @@ AnnotationObject::SelectTimeFormat()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -1037,7 +999,6 @@ AnnotationObject::GetFieldName(int index) const
case 13: return "Shadow";
case 14: return "Float attribute 1";
case 15: return "Integer attribute 1";
case 16: return "timeFormat";
default: return "invalid index";
}
}
......@@ -1051,7 +1012,7 @@ AnnotationObject::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -1078,7 +1039,6 @@ AnnotationObject::GetFieldType(int index) const
case 13: return FieldType_bool;
case 14: return FieldType_float;
case 15: return FieldType_int;
case 16: return FieldType_string;
default: return FieldType_unknown;
}
}
......@@ -1092,7 +1052,7 @@ AnnotationObject::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -1119,7 +1079,6 @@ AnnotationObject::GetFieldTypeName(int index) const
case 13: return "bool";
case 14: return "float";
case 15: return "int";
case 16: return "string";
default: return "invalid index";
}
}
......@@ -1133,7 +1092,7 @@ AnnotationObject::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -1238,11 +1197,6 @@ AnnotationObject::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (intAttribute1 == obj.intAttribute1);
}
break;
case 16:
{ // new scope
retval = (timeFormat == obj.timeFormat);
}
break;
default: retval = false;
}
......
......@@ -14,7 +14,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 13 08:10:28 PDT 2005
// Creation: Thu Feb 24 16:20:45 PST 2005
//
// Modifications:
//
......@@ -61,7 +61,6 @@ public:
void SelectColor1();
void SelectColor2();
void SelectText();
void SelectTimeFormat();
// Property setting methods
void SetObjectType(AnnotationType objectType_);
......@@ -80,7 +79,6 @@ public:
void SetFontShadow(bool fontShadow_);
void SetFloatAttribute1(float floatAttribute1_);
void SetIntAttribute1(int intAttribute1_);
void SetTimeFormat(const std::string &timeFormat_);
// Property getting methods
AnnotationType GetObjectType() const;
......@@ -105,8 +103,6 @@ public:
bool GetFontShadow() const;
float GetFloatAttribute1() const;
int GetIntAttribute1() const;
const std::string &GetTimeFormat() const;
std::string &GetTimeFormat();
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -147,7 +143,6 @@ private:
bool fontShadow;
float floatAttribute1;
int intAttribute1;
std::string timeFormat;
};
#endif
......@@ -62,7 +62,4 @@
<Field name="intAttribute1" label="Integer attribute 1" type="int">
0
</Field>
<Field name="timeFormat" label="timeFormat" type="string">
%g
</Field>
</Attribute>
......@@ -2308,6 +2308,9 @@ static int indentLevel = 0;
// Mark C. Miller, Tue Jan 18 12:44:34 PST 2005
// Added checks for null pointers before inserting (<<)
//
// Brad Whitlock, Thu Feb 24 16:05:29 PST 2005
// Fixed for win32.
//
// ****************************************************************************
ostream &
......@@ -2399,7 +2402,7 @@ operator << (ostream& os, const AttributeGroup& atts)
case msgTypeString:
{ std::string *sptr = (std::string *)(pos->address);
if (sptr)
os << *sptr;
os << sptr->c_str();
}
break;
case msgTypeAttributeGroup:
......
#ifndef SURFACEFILTERATTRIBUTES_H
#define SURFACEFILTERATTRIBUTES_H
#include <state_exports.h>
#include <string>
#include <AttributeSubject.h>
......@@ -18,7 +19,7 @@
//
// ****************************************************************************
class SurfaceFilterAttributes : public AttributeSubject
class STATE_API SurfaceFilterAttributes : public AttributeSubject
{
public:
enum Scaling
......
<?xml version="1.0"?>
<Attribute name="SurfaceFilterAttributes" purpose="Attributes for the surface filter" persistent="true">
<Attribute name="SurfaceFilterAttributes" purpose="Attributes for the surface filter" persistent="true" exportAPI="STATE_API">
<Enum name="Scaling">
Linear
Log
......
......@@ -10,7 +10,7 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -35,7 +35,7 @@ WindowInformation::WindowInformation() : AttributeSubject("sis*i*iibbbbbbbiii*bb
lastRenderMin = 0;
lastRenderAvg = 0;
lastRenderMax = 0;
numTriangles = 0;
numPrimitives = 0;
extents[0] = 0;
extents[1] = 0;
extents[2] = 0;
......@@ -53,7 +53,7 @@ WindowInformation::WindowInformation() : AttributeSubject("sis*i*iibbbbbbbiii*bb
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -84,7 +84,7 @@ WindowInformation::WindowInformation(const WindowInformation &obj) : AttributeSu
lastRenderMin = obj.lastRenderMin;
lastRenderAvg = obj.lastRenderAvg;
lastRenderMax = obj.lastRenderMax;
numTriangles = obj.numTriangles;
numPrimitives = obj.numPrimitives;
for(i = 0; i < 6; ++i)
extents[i] = obj.extents[i];
......@@ -101,7 +101,7 @@ WindowInformation::WindowInformation(const WindowInformation &obj) : AttributeSu
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -121,15 +121,16 @@ WindowInformation::~WindowInformation()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
// ****************************************************************************
void
WindowInformation&
WindowInformation::operator = (const WindowInformation &obj)
{
if (this == &obj) return *this;
int i;
activeSource = obj.activeSource;
......@@ -153,12 +154,13 @@ WindowInformation::operator = (const WindowInformation &obj)
lastRenderMin = obj.lastRenderMin;
lastRenderAvg = obj.lastRenderAvg;
lastRenderMax = obj.lastRenderMax;
numTriangles = obj.numTriangles;
numPrimitives = obj.numPrimitives;
for(i = 0; i < 6; ++i)
extents[i] = obj.extents[i];
SelectAll();
return *this;
}
// ****************************************************************************
......@@ -170,7 +172,7 @@ WindowInformation::operator = (const WindowInformation &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -208,7 +210,7 @@ WindowInformation::operator == (const WindowInformation &obj) const
(lastRenderMin == obj.lastRenderMin) &&
(lastRenderAvg == obj.lastRenderAvg) &&
(lastRenderMax == obj.lastRenderMax) &&
(numTriangles == obj.numTriangles) &&
(numPrimitives == obj.numPrimitives) &&
extents_equal);
}
......@@ -221,7 +223,7 @@ WindowInformation::operator == (const WindowInformation &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -242,7 +244,7 @@ WindowInformation::operator != (const WindowInformation &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -263,7 +265,7 @@ WindowInformation::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -291,7 +293,7 @@ WindowInformation::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -317,7 +319,7 @@ WindowInformation::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -344,7 +346,7 @@ WindowInformation::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -374,7 +376,7 @@ WindowInformation::SelectAll()
Select(18, (void *)&lastRenderMin);
Select(19, (void *)&lastRenderAvg);
Select(20, (void *)&lastRenderMax);
Select(21, (void *)&numTriangles);
Select(21, (void *)&numPrimitives);
Select(22, (void *)extents, 6);
}
......@@ -672,10 +674,10 @@ WindowInformation::SetLastRenderMax(float lastRenderMax_)
}
void
WindowInformation::SetNumTriangles(int numTriangles_)
WindowInformation::SetNumPrimitives(int numPrimitives_)
{
numTriangles = numTriangles_;
Select(21, (void *)&numTriangles);
numPrimitives = numPrimitives_;
Select(21, (void *)&numPrimitives);
}
void
......@@ -841,9 +843,9 @@ WindowInformation::GetLastRenderMax() const
}
int
WindowInformation::GetNumTriangles() const
WindowInformation::GetNumPrimitives() const
{
return numTriangles;
return numPrimitives;
}
const double *
......@@ -905,7 +907,7 @@ WindowInformation::SelectExtents()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Jan 23 16:22:27 PST 2004
// Creation: Fri Mar 4 10:37:12 PDT 2005
//
// Modifications:
//
......@@ -937,7 +939,7 @@ WindowInformation::GetFieldName(int index) const
case 18: return "lastRenderMin";
case 19: return "lastRenderAvg";
case 20: return "lastRenderMax";
case 21: return "numTriangles";
<