Commit 8a0335e3 authored by hrchilds's avatar hrchilds
Browse files

Update from April 2, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@212 18c085ea-50e0-402c-830e-de6fd14e8384
parent 14750ee7
......@@ -48,13 +48,13 @@ QueryOverTimeAttributes::TimeType_FromString(const std::string &s, QueryOverTime
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
// ****************************************************************************
QueryOverTimeAttributes::QueryOverTimeAttributes() : AttributeSubject("ibdbdibiai*d*")
QueryOverTimeAttributes::QueryOverTimeAttributes() : AttributeSubject("ibibiibia")
{
timeType = Cycle;
startTimeFlag = false;
......@@ -75,13 +75,13 @@ QueryOverTimeAttributes::QueryOverTimeAttributes() : AttributeSubject("ibdbdibia
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
// ****************************************************************************
QueryOverTimeAttributes::QueryOverTimeAttributes(const QueryOverTimeAttributes &obj) : AttributeSubject("ibdbdibiai*d*")
QueryOverTimeAttributes::QueryOverTimeAttributes(const QueryOverTimeAttributes &obj) : AttributeSubject("ibibiibia")
{
timeType = obj.timeType;
startTimeFlag = obj.startTimeFlag;
......@@ -92,8 +92,6 @@ QueryOverTimeAttributes::QueryOverTimeAttributes(const QueryOverTimeAttributes &
createWindow = obj.createWindow;
windowId = obj.windowId;
queryAtts = obj.queryAtts;
timeSteps = obj.timeSteps;
timeStates = obj.timeStates;
SelectAll();
}
......@@ -107,7 +105,7 @@ QueryOverTimeAttributes::QueryOverTimeAttributes(const QueryOverTimeAttributes &
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -127,7 +125,7 @@ QueryOverTimeAttributes::~QueryOverTimeAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -145,8 +143,6 @@ QueryOverTimeAttributes::operator = (const QueryOverTimeAttributes &obj)
createWindow = obj.createWindow;
windowId = obj.windowId;
queryAtts = obj.queryAtts;
timeSteps = obj.timeSteps;
timeStates = obj.timeStates;
SelectAll();
}
......@@ -160,7 +156,7 @@ QueryOverTimeAttributes::operator = (const QueryOverTimeAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -178,9 +174,7 @@ QueryOverTimeAttributes::operator == (const QueryOverTimeAttributes &obj) const
(stride == obj.stride) &&
(createWindow == obj.createWindow) &&
(windowId == obj.windowId) &&
(queryAtts == obj.queryAtts) &&
(timeSteps == obj.timeSteps) &&
(timeStates == obj.timeStates));
(queryAtts == obj.queryAtts));
}
// ****************************************************************************
......@@ -192,7 +186,7 @@ QueryOverTimeAttributes::operator == (const QueryOverTimeAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -213,7 +207,7 @@ QueryOverTimeAttributes::operator != (const QueryOverTimeAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -234,7 +228,7 @@ QueryOverTimeAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -262,7 +256,7 @@ QueryOverTimeAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -288,7 +282,7 @@ QueryOverTimeAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -315,7 +309,7 @@ QueryOverTimeAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -333,8 +327,6 @@ QueryOverTimeAttributes::SelectAll()
Select(6, (void *)&createWindow);
Select(7, (void *)&windowId);
Select(8, (void *)&queryAtts);
Select(9, (void *)&timeSteps);
Select(10, (void *)&timeStates);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -356,7 +348,7 @@ QueryOverTimeAttributes::SetStartTimeFlag(bool startTimeFlag_)
}
void
QueryOverTimeAttributes::SetStartTime(double startTime_)
QueryOverTimeAttributes::SetStartTime(int startTime_)
{
startTime = startTime_;
Select(2, (void *)&startTime);
......@@ -370,7 +362,7 @@ QueryOverTimeAttributes::SetEndTimeFlag(bool endTimeFlag_)
}
void
QueryOverTimeAttributes::SetEndTime(double endTime_)
QueryOverTimeAttributes::SetEndTime(int endTime_)
{
endTime = endTime_;
Select(4, (void *)&endTime);
......@@ -404,20 +396,6 @@ QueryOverTimeAttributes::SetQueryAtts(const QueryAttributes &queryAtts_)
Select(8, (void *)&queryAtts);
}
void
QueryOverTimeAttributes::SetTimeSteps(const intVector &timeSteps_)
{
timeSteps = timeSteps_;
Select(9, (void *)&timeSteps);
}
void
QueryOverTimeAttributes::SetTimeStates(const doubleVector &timeStates_)
{
timeStates = timeStates_;
Select(10, (void *)&timeStates);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -434,7 +412,7 @@ QueryOverTimeAttributes::GetStartTimeFlag() const
return startTimeFlag;
}
double
int
QueryOverTimeAttributes::GetStartTime() const
{
return startTime;
......@@ -446,7 +424,7 @@ QueryOverTimeAttributes::GetEndTimeFlag() const
return endTimeFlag;
}
double
int
QueryOverTimeAttributes::GetEndTime() const
{
return endTime;
......@@ -482,30 +460,6 @@ QueryOverTimeAttributes::GetQueryAtts()
return queryAtts;
}
const intVector &
QueryOverTimeAttributes::GetTimeSteps() const
{
return timeSteps;
}
intVector &
QueryOverTimeAttributes::GetTimeSteps()
{
return timeSteps;
}
const doubleVector &
QueryOverTimeAttributes::GetTimeStates() const
{
return timeStates;
}
doubleVector &
QueryOverTimeAttributes::GetTimeStates()
{
return timeStates;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -516,18 +470,6 @@ QueryOverTimeAttributes::SelectQueryAtts()
Select(8, (void *)&queryAtts);
}
void
QueryOverTimeAttributes::SelectTimeSteps()
{
Select(9, (void *)&timeSteps);
}
void
QueryOverTimeAttributes::SelectTimeStates()
{
Select(10, (void *)&timeStates);
}
///////////////////////////////////////////////////////////////////////////////
// Keyframing methods
///////////////////////////////////////////////////////////////////////////////
......@@ -541,7 +483,7 @@ QueryOverTimeAttributes::SelectTimeStates()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -561,8 +503,6 @@ QueryOverTimeAttributes::GetFieldName(int index) const
case 6: return "createWindow";
case 7: return "windowId";
case 8: return "queryAtts";
case 9: return "timeSteps";
case 10: return "timeStates";
default: return "invalid index";
}
}
......@@ -576,7 +516,7 @@ QueryOverTimeAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -589,15 +529,13 @@ QueryOverTimeAttributes::GetFieldType(int index) const
{
case 0: return FieldType_enum;
case 1: return FieldType_bool;
case 2: return FieldType_double;
case 2: return FieldType_int;
case 3: return FieldType_bool;
case 4: return FieldType_double;
case 4: return FieldType_int;
case 5: return FieldType_int;
case 6: return FieldType_bool;
case 7: return FieldType_int;
case 8: return FieldType_att;
case 9: return FieldType_intVector;
case 10: return FieldType_doubleVector;
default: return FieldType_unknown;
}
}
......@@ -611,7 +549,7 @@ QueryOverTimeAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -624,15 +562,13 @@ QueryOverTimeAttributes::GetFieldTypeName(int index) const
{
case 0: return "enum";
case 1: return "bool";
case 2: return "double";
case 2: return "int";
case 3: return "bool";
case 4: return "double";
case 4: return "int";
case 5: return "int";
case 6: return "bool";
case 7: return "int";
case 8: return "att";
case 9: return "intVector";
case 10: return "doubleVector";
default: return "invalid index";
}
}
......@@ -646,7 +582,7 @@ QueryOverTimeAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -704,16 +640,6 @@ QueryOverTimeAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) cons
retval = (queryAtts == obj.queryAtts);
}
break;
case 9:
{ // new scope
retval = (timeSteps == obj.timeSteps);
}
break;
case 10:
{ // new scope
retval = (timeStates == obj.timeStates);
}
break;
default: retval = false;
}
......
......@@ -13,7 +13,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Mar 31 10:27:39 PDT 2004
// Creation: Fri Apr 2 10:58:15 PDT 2004
//
// Modifications:
//
......@@ -45,37 +45,29 @@ public:
// Property selection methods
virtual void SelectAll();
void SelectQueryAtts();
void SelectTimeSteps();
void SelectTimeStates();
// Property setting methods
void SetTimeType(TimeType timeType_);
void SetStartTimeFlag(bool startTimeFlag_);
void SetStartTime(double startTime_);
void SetStartTime(int startTime_);
void SetEndTimeFlag(bool endTimeFlag_);
void SetEndTime(double endTime_);
void SetEndTime(int endTime_);
void SetStride(int stride_);
void SetCreateWindow(bool createWindow_);
void SetWindowId(int windowId_);
void SetQueryAtts(const QueryAttributes &queryAtts_);
void SetTimeSteps(const intVector &timeSteps_);
void SetTimeStates(const doubleVector &timeStates_);
// Property getting methods
TimeType GetTimeType() const;
bool GetStartTimeFlag() const;
double GetStartTime() const;
int GetStartTime() const;
bool GetEndTimeFlag() const;
double GetEndTime() const;
int GetEndTime() const;
int GetStride() const;
bool GetCreateWindow() const;
int GetWindowId() const;
const QueryAttributes &GetQueryAtts() const;
QueryAttributes &GetQueryAtts();
const intVector &GetTimeSteps() const;
intVector &GetTimeSteps();
const doubleVector &GetTimeStates() const;
doubleVector &GetTimeStates();
// Enum conversion functions
static std::string TimeType_ToString(TimeType);
......@@ -93,15 +85,13 @@ public:
private:
int timeType;
bool startTimeFlag;
double startTime;
int startTime;
bool endTimeFlag;
double endTime;
int endTime;
int stride;
bool createWindow;
int windowId;
QueryAttributes queryAtts;
intVector timeSteps;
doubleVector timeStates;
};
#endif
......@@ -11,14 +11,14 @@
<Field name="startTimeFlag" label="startTimeFlag" type="bool">
false
</Field>
<Field name="startTime" label="startTime" type="double" enabler="startTimeFlag:true">
0.000000
<Field name="startTime" label="startTime" type="int" enabler="startTimeFlag:true">
0
</Field>
<Field name="endTimeFlag" label="endTimeFlag" type="bool">
false
</Field>
<Field name="endTime" label="endTime" type="double" enabler="endTimeFlag:true">
1.000000
<Field name="endTime" label="endTime" type="int" enabler="endTimeFlag:true">
1
</Field>
<Field name="stride" label="stride" type="int">
1
......@@ -31,8 +31,4 @@
</Field>
<Field name="queryAtts" label="queryAtts" type="att" subtype="QueryAttributes" internal="true">
</Field>
<Field name="timeSteps" label="timeSteps" type="intVector" internal="true">
</Field>
<Field name="timeStates" label="timeStates" type="doubleVector" internal="true">
</Field>
</Attribute>
......@@ -5854,121 +5854,3 @@ Indent(ostream &out, int indent)
}
// ****************************************************************************
// Method: avtDatabaseMetaData::GetVarCentering
//
// Purpose:
// Determines the centering of the variable argument.
//
// Arguments:
// var_in A variable name.
//
// Returns: The centering of var.
//
// Programmer: Kathleen Bonnell
// Creation: April 1, 2004
//
// Modifications:
//
// ****************************************************************************
avtCentering
avtDatabaseMetaData::GetVarCentering(std::string var_in) const
{
int i;
// If the variable is an expression, we need to find a "real" variable
// name to work with.
ExprNode *tree = ParsingExprList::GetExpressionTree(var_in);
while (tree != NULL)
{
var_in = *tree->GetVarLeaves().begin();
tree = ParsingExprList::GetExpressionTree(var_in);
}
std::string var;
if (!VarIsCompound(var_in))
{
var = var_in;
}
else
{
ParseCompoundForVar(var_in, var);
}
int nmeshes = meshes.size();
for (i = 0 ; i < nmeshes ; i++)
{
if ((meshes[i]->name == var) ||
(meshes[i]->blockTitle == var) ||
(meshes[i]->groupTitle == var))
{
return AVT_NO_VARIABLE;
}
}
int nvectors = vectors.size();
for (i = 0 ; i < nvectors ; i++)
{
if (vectors[i]->name == var)
{
return vectors[i]->centering;
}
}
int ntensors = tensors.size();
for (i = 0 ; i < ntensors ; i++)
{
if (tensors[i]->name == var)
{
return tensors[i]->centering;
}
}
int nsymmtensors = symm_tensors.size();
for (i = 0 ; i < nsymmtensors ; i++)
{
if (symm_tensors[i]->name == var)
{
return symm_tensors[i]->centering;
}
}
int nscalars = scalars.size();
for (i = 0 ; i < nscalars ; i++)
{
if (scalars[i]->name == var)
{
return scalars[i]->centering;
}
}
int nmats = materials.size();
for (i = 0 ; i < nmats ; i++)
{
if (materials[i]->name == var)
{
return AVT_ZONECENT;
}
}
int nspecies = species.size();
for (i = 0 ; i < nspecies ; i++)
{
if (species[i]->name == var)
{
return AVT_ZONECENT;
}
}
int ncurves = curves.size();
for (i = 0 ; i < ncurves ; i++)
{
if (curves[i]->name == var)
{
return AVT_NODECENT;
}
}
EXCEPTION1(InvalidVariableException, var);
}
......@@ -492,7 +492,6 @@ public:
int GetNDomains(std::string) const;
avtVarType DetermineVarType(std::string) const;
avtCentering GetVarCentering(std::string) const;
avtSubsetType DetermineSubsetType(const std::string &) const;
std::string MeshForVar(std::string) const;
std::string MaterialOnMesh(std::string) const;
......
......@@ -46,6 +46,9 @@ typedef void (*ProgressCallback)(void *, const char *, const char *,int,int);
// Kathleen Bonnell, Thu Apr 1 16:04:44 PST 2004
// Added PerformQueryInTime, SetTimeVarying, SetSILUseSet.
//
// Kathleen Bonnell, Fri Apr 2 08:51:17 PST 2004
// Changed args to PerformQueryInTime.
//
// ****************************************************************************
class QUERY_API avtDataObjectQuery : public virtual avtDataObjectSink
......@@ -60,7 +63,8 @@ class QUERY_API avtDataObjectQuery : public virtual avtDataObjectSink
virtual bool OriginalData(void) { return false; };
virtual void PerformQuery(QueryAttributes *) = 0;
virtual void PerformQueryInTime(QueryAttributes *,
const intVector &) {;};
const int, const int, const int,
const int, doubleVector &) {;};
virtual std::string GetResultMessage(void) = 0;
static void RegisterInitializeProgressCallback(
......
......@@ -320,21 +320,34 @@ avtDatasetQuery::GetResultValue(const int i)
// Creation: March 24, 2004
//
// Modifications:
// Kathleen Bonnell, Fri Apr 2 08:51:17 PST 2004
// Changed args.
//
// ****************************************************************************
void
avtDatasetQuery::PerformQueryInTime(QueryAttributes *qA,
const intVector &timeSteps)
avtDatasetQuery::PerformQueryInTime(QueryAttributes *qA, const int startT ,
const int endT, const int stride,
const int timeType, doubleVector &times)
{
queryAtts = *qA;
Init(timeSteps.size());
int nFrames = (int) ceil((endT -startT)/stride) + 1;
//
// Ensure that the specified endTime is included,
// regardless of the stride.
//
int actualEnd = startT + nFrames *stride;
if (actualEnd < endT)
actualEnd = endT