Commit d736c4f7 authored by hrchilds's avatar hrchilds

Update from February 12, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@174 18c085ea-50e0-402c-830e-de6fd14e8384
parent c2e6de47
/* XPM */
static const char * choosecenterofrotation_xpm[] = {
"32 32 25 1",
"- c None",
". c #32A6FA",
"+ c #468AB6",
"@ c #36A2FA",
"# c #A7A7A7",
"$ c #FEFEFE",
"% c #0AEEF2",
"& c #B2B2B2",
"* c #666666",
"= c #10E3F4",
"; c #1CD0F4",
"> c #999999",
", c #F0F0F0",
"' c #B6B6B6",
") c #24C2F6",
"! c #BABABA",
"~ c #767676",
"{ c #E6E6E6",
"] c #C4C4C4",
"^ c #32AAFA",
"/ c #DADADA",
"( c #7A7A7A",
"_ c #04FBF2",
": c #2CB3F7",
"< c #868686",
"--------------<$<---]]]]--------",
"--------------<$<--]++!]]]]-----",
"--------------<$<--]@@+++!]]]]--",
"--------------<$<--]@@@@@+++!]]-",
"-----]]]------<$<--]@@@@@@@@+&]]",
"----]_!]]-----<$<--]@@@@@..^^#!]",
"---]__&!]-----<$<--]@...^^^+<#!]",
"--]__##!]--!<<<$<<<!^^^^^::<>&]]",
"-]___>&]]->/$$$$$$$/^:::::::#!]-",
"-]__>#!]->!$<<<$<<<$:::<:)))+&]]",
"]___>&]]>!$#--<$<-->,>~>)))))#!]",
"]___>']!/$#---<$<--]>,-&&);;;+&]",
"]__%>']<$<----<$<---]<$<]&;;;;#!",
"]%%%>']<$<----<$<----<$<]];;;;>'",
"<%%=*(<<$<<<<<<$<<<<<<$<<<(===*(",
"$===]{$$$$$$$$$$$$$$$$$$$$,===]{",
"<===*(<<$<<<<<<$<<<<<<$<<<<=%%*(",
"]=;;;&]<$<----<$<----<$<--]%%%>'",
"];;;;>!<$<----<$<----<$<--]%__>'",
"]+;;;)&]/$#---<$<---#$/!--]___>'",
"]!)))))&>!$>]-<$<--#$!>---]___>'",
"]]+))):>:::,<<<$<<<$!>----]__<#!",
"-]!:::::::^<,$$$$$$/>----]___>&]",
"-]]&::^^^^^>(<<$<<<!-----]__>#!]",
"--]+^^^...@>']<$<-------]__>>&]]",
"-]^^..@@@@@>']<$<-------]_##&]]-",
"-]+@@@@@@@@>']<$<-------]!&']]--",
"-]!+++@@@@@>']<$<-------]]!]]---",
"-]]&#>+++@@>']<$<--------]]]----",
"--]]!'&#>++>']<$<---------------",
"---]]]]!'&##!]<$<---------------",
"------]]]]!!]]<$<---------------"};
This diff is collapsed.
......@@ -12,7 +12,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:36 PDT 2003
// Creation: Mon Feb 9 14:49:10 PST 2004
//
// Modifications:
//
......@@ -40,6 +40,7 @@ public:
void SelectFocus();
void SelectViewUp();
void SelectImagePan();
void SelectCenterOfRotation();
// Property setting methods
void SetViewNormal(const double *viewNormal_);
......@@ -53,6 +54,8 @@ public:
void SetImageZoom(double imageZoom_);
void SetPerspective(bool perspective_);
void SetEyeAngle(double eyeAngle_);
void SetCenterOfRotationSet(bool centerOfRotationSet_);
void SetCenterOfRotation(const double *centerOfRotation_);
// Property getting methods
const double *GetViewNormal() const;
......@@ -70,6 +73,9 @@ public:
double GetImageZoom() const;
bool GetPerspective() const;
double GetEyeAngle() const;
bool GetCenterOfRotationSet() const;
const double *GetCenterOfRotation() const;
double *GetCenterOfRotation();
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -94,6 +100,8 @@ private:
double imageZoom;
bool perspective;
double eyeAngle;
bool centerOfRotationSet;
double centerOfRotation[3];
};
#endif
......@@ -40,4 +40,12 @@
<Field name="eyeAngle" label="eyeAngle" type="double">
2.000000
</Field>
<Field name="centerOfRotationSet" label="centerOfRotationSet" type="bool">
false
</Field>
<Field name="centerOfRotation" label="centerOfRotation" type="doubleArray" length="3">
0.000000
0.000000
0.000000
</Field>
</Attribute>
......@@ -7,6 +7,42 @@
#include <avtSourceFromDatabase.h>
// ****************************************************************************
// Method: avtDatasetDatabase constructor
//
// Purpose:
// Defines the constructor. Note: this should not be inlined in the
// header because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtDatasetDatabase::avtDatasetDatabase()
{
;
}
// ****************************************************************************
// Method: avtDatasetDatabase destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
// because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtDatasetDatabase::~avtDatasetDatabase()
{
;
}
// ****************************************************************************
// Method: avtDatasetDatabase::CreateSource
//
......
......@@ -4,12 +4,11 @@
#ifndef AVT_DATASET_DATABASE_H
#define AVT_DATASET_DATABASE_H
#include <database_exports.h>
#include <database_exports.h>
#include <avtDatabase.h>
class avtSourceFromDatabase;
......@@ -22,13 +21,19 @@ class avtSourceFromDatabase;
// Programmer: Hank Childs
// Creation: August 17, 2001
//
// Modifications:
//
// Hank Childs, Thu Feb 5 17:11:06 PST 2004
// Moved inlined constructor and destructor definitions to .C files
// because certain compilers have problems with them.
//
// ****************************************************************************
class DATABASE_API avtDatasetDatabase : public avtDatabase
{
public:
avtDatasetDatabase() {;}
virtual ~avtDatasetDatabase() {;}
avtDatasetDatabase();
virtual ~avtDatasetDatabase();
avtDataObjectSource *CreateSource(const char *, int);
......
......@@ -272,7 +272,8 @@ avtGenericDatabase::GetOutput(avtDataSpecification_p spec,
//
avtDatasetVerifier verifier;
vtkDataSet **ds_list = new vtkDataSet*[nDomains];
for (int i = 0 ; i < nDomains ; i++)
int i;
for (i = 0 ; i < nDomains ; i++)
{
ds_list[i] = datasetCollection.GetDataset(i, 0);
}
......@@ -295,7 +296,7 @@ avtGenericDatabase::GetOutput(avtDataSpecification_p spec,
// always send the array when MatSelected, until a better solution is derived.
//
bool shouldDoMatSelect = false;
for (int i = 0 ; i < datasetCollection.GetNDomains() ; i++)
for (i = 0 ; i < datasetCollection.GetNDomains() ; i++)
{
shouldDoMatSelect = shouldDoMatSelect || datasetCollection.needsMatSelect[i];
}
......
......@@ -24,6 +24,24 @@ const char *avtVariableCache::SYMMETRIC_TENSORS_NAME
const char *avtVariableCache::DATASET_NAME = "DATASET";
// ****************************************************************************
// Method: avtVariableCache constructor
//
// Purpose:
// Defines the constructor. Note: this should not be inlined in the
// header because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtVariableCache::avtVariableCache()
{
;
}
// ****************************************************************************
// Method: avtVariableCache destructor
//
......@@ -51,6 +69,42 @@ avtVariableCache::~avtVariableCache()
}
// ****************************************************************************
// Method: avtCachableItem constructor
//
// Purpose:
// Defines the constructor. Note: this should not be inlined in the
// header because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtCachableItem::avtCachableItem()
{
;
}
// ****************************************************************************
// Method: avtCachableItem destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
// because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtCachableItem::~avtCachableItem()
{
;
}
// ****************************************************************************
// Method: avtVariableCache::GetVTKObject
//
......@@ -977,6 +1031,24 @@ avtCachedVoidRef::avtCachedVoidRef(void_ref_ptr vr)
}
// ****************************************************************************
// Method: avtCachedVoidRef destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
// because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtCachedVoidRef::~avtCachedVoidRef()
{
;
}
// ****************************************************************************
// Method: avtCachedVTKObject constructor
//
......
......@@ -42,12 +42,16 @@ class vtkObject;
// Jeremy Meredith, Thu Oct 24 13:21:15 PDT 2002
// Added HasVoidRef to check if a void ref exists.
//
// Hank Childs, Thu Feb 5 17:11:06 PST 2004
// Moved inlined constructor and destructor definitions to .C files
// because certain compilers have problems with them.
//
// ****************************************************************************
class DATABASE_API avtVariableCache
{
public:
avtVariableCache() {;};
avtVariableCache();
virtual ~avtVariableCache();
static const char *SCALARS_NAME;
......@@ -155,8 +159,8 @@ class DATABASE_API avtVariableCache
class DATABASE_API avtCachableItem
{
public:
avtCachableItem() {;};
virtual ~avtCachableItem() {;};
avtCachableItem();
virtual ~avtCachableItem();
};
......@@ -177,7 +181,7 @@ class DATABASE_API avtCachedVoidRef : public avtCachableItem
{
public:
avtCachedVoidRef(void_ref_ptr);
virtual ~avtCachedVoidRef() {;};
virtual ~avtCachedVoidRef();
void_ref_ptr GetVoidRef(void) { return voidRef; };
......
......@@ -10,6 +10,24 @@
using std::vector;
// ****************************************************************************
// Method: avtFileFormatInterface destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
// because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtFileFormatInterface::~avtFileFormatInterface()
{
;
}
// ****************************************************************************
// Method: avtFileFormatInterface::SetCache
//
......
......@@ -79,6 +79,10 @@ class avtVariableCache;
// Mark C. Miller, Wed Dec 10 10:31:52 PST 2003
// I added method CanCacheVariable()
//
// Hank Childs, Thu Feb 5 17:11:06 PST 2004
// Moved inlined destructor definition to .C file because certain compilers
// have problems with them.
//
// Mark C. Miller, Mon Feb 9 16:00:10 PST 2004
// Added method, ActivateTimestep
//
......@@ -87,7 +91,7 @@ class avtVariableCache;
class DATABASE_API avtFileFormatInterface
{
public:
virtual ~avtFileFormatInterface() {;};
virtual ~avtFileFormatInterface();
virtual vtkDataSet *GetMesh(int, int, const char *) = 0;
virtual vtkDataArray *GetVar(int, int, const char *) = 0;
......
......@@ -11,6 +11,42 @@
#include <ExpressionException.h>
// ****************************************************************************
// Method: avtBinaryMathFilter constructor
//
// Purpose:
// Defines the constructor. Note: this should not be inlined in the
// header because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtBinaryMathFilter::avtBinaryMathFilter()
{
;
}
// ****************************************************************************
// Method: avtBinaryMathFilter destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
// because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtBinaryMathFilter::~avtBinaryMathFilter()
{
;
}
// ****************************************************************************
// Method: avtBinaryMathFilter::DeriveVariable
//
......
......@@ -25,14 +25,18 @@ class vtkDataArray;
// Added the NumVariableArguments function, specifying that all
// subclasses of BinaryMathFilter process two variable arguments.
//
// Hank Childs, Thu Feb 5 17:11:06 PST 2004
// Moved inlined constructor and destructor definitions to .C files
// because certain compilers have problems with them.
//
// ****************************************************************************
class EXPRESSION_API avtBinaryMathFilter
: public avtMultipleInputExpressionFilter
{
public:
avtBinaryMathFilter() {;};
virtual ~avtBinaryMathFilter() {;};
avtBinaryMathFilter();
virtual ~avtBinaryMathFilter();
virtual const char *GetType(void) { return "avtBinaryMathFilter";};
virtual const char *GetDescription(void) = 0;
......
// ************************************************************************* //
// avtComparisonFilter.C //
// ************************************************************************* //
#include <avtComparisonFilter.h>
// ****************************************************************************
// Method: avtComparisonFilter constructor
//
// Purpose:
// Defines the constructor. Note: this should not be inlined in the
// header because it causes problems for certain compilers.
//
// Programmer: Hank Childs
// Creation: February 5, 2004
//
// ****************************************************************************
avtComparisonFilter::avtComparisonFilter()
{
;
}
// ****************************************************************************
// Method: avtComparisonFilter destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
// because it causes problems for certain compilers.