Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit 1511103e authored by hrchilds's avatar hrchilds

Update from September 8, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@319 18c085ea-50e0-402c-830e-de6fd14e8384
parent 77a674eb
......@@ -671,9 +671,9 @@ env command for configure.
#
# Build and install it in the visit directory.
#
gunzip visit040816.tar.gz
tar xf visit040816.tar
cd visit040816/config-site
gunzip visit040913.tar.gz
tar xf visit040913.tar
cd visit040913/config-site
echo VISITHOME=$VISITDIR > `hostname`.conf
sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf
cd ..
......@@ -682,11 +682,11 @@ make
clearcase_bin/visit-bin-dist
# Use the appropriate install command based on the operating system on
# which you built VisIt.
clearcase_bin/visit-install 1.3.4 aix $VISITDIR
clearcase_bin/visit-install 1.3.4 irix6 $VISITDIR
clearcase_bin/visit-install 1.3.4 linux $VISITDIR
clearcase_bin/visit-install 1.3.4 osf1 $VISITDIR
clearcase_bin/visit-install 1.3.4 sunos5 $VISITDIR
clearcase_bin/visit-install 1.3.5 aix $VISITDIR
clearcase_bin/visit-install 1.3.5 irix6 $VISITDIR
clearcase_bin/visit-install 1.3.5 linux $VISITDIR
clearcase_bin/visit-install 1.3.5 osf1 $VISITDIR
clearcase_bin/visit-install 1.3.5 sunos5 $VISITDIR
When running the configure script you can enable or disable certain dependent
packages. All the configure options are listed at the beginning of the
......
......@@ -17,7 +17,7 @@ Unix and Mac OS X:
where
"version" will be 1.3.4 for the current distribution.
"version" will be 1.3.5 for the current distribution.
"platform" will be one of the following: aix, darwin, irix6, linux,
osf1, or sunos5 depending on the machine. The one you use should
......@@ -28,17 +28,17 @@ Unix and Mac OS X:
For example
visit-install 1.3.4 irix6 /usr/local/visit
visit-install 1.3.5 irix6 /usr/local/visit
will install the irix6, 1.3.4 version of visit in the directory
will install the irix6, 1.3.5 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_3_4.irix6.tar.gz" present in the current directory for this
"visit1_3_5.irix6.tar.gz" present in the current directory for this
to function properly. You can install multiple binaries into the
same directory. For example, you could then execute
visit-install 1.3.4 linux /usr/local/visit
visit-install 1.3.5 linux /usr/local/visit
to add a linux, 1.3.4 version of visit to the same directory.
to add a linux, 1.3.5 version of visit to the same directory.
2. Add the bin directory below the installation directory
(/usr/local/visit/bin in our example) to each user's search path.
......@@ -76,8 +76,8 @@ Unix and Mac OS X:
Windows:
1. Copy the file visit1.3.4.exe to your desktop.
1. Copy the file visit1.3.5.exe to your desktop.
2. Double click on the visit1.3.4.exe icon to run the installer.
2. Double click on the visit1.3.5.exe icon to run the installer.
3. Follow the directions provided by the installer.
......@@ -39,43 +39,6 @@ QueryList::QueryType_FromString(const std::string &s, QueryList::QueryType &val)
return false;
}
//
// Enum conversion methods for QueryList::CoordinateRepresentation
//
static const char *CoordinateRepresentation_strings[] = {
"WorldSpace", "ScreenSpace"};
std::string
QueryList::CoordinateRepresentation_ToString(QueryList::CoordinateRepresentation t)
{
int index = int(t);
if(index < 0 || index >= 2) index = 0;
return CoordinateRepresentation_strings[index];
}
std::string
QueryList::CoordinateRepresentation_ToString(int t)
{
int index = (t < 0 || t >= 2) ? 0 : t;
return CoordinateRepresentation_strings[index];
}
bool
QueryList::CoordinateRepresentation_FromString(const std::string &s, QueryList::CoordinateRepresentation &val)
{
val = QueryList::WorldSpace;
for(int i = 0; i < 2; ++i)
{
if(s == CoordinateRepresentation_strings[i])
{
val = (CoordinateRepresentation)i;
return true;
}
}
return false;
}
//
// Enum conversion methods for QueryList::WindowType
//
......@@ -162,13 +125,13 @@ QueryList::Groups_FromString(const std::string &s, QueryList::Groups &val)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
// ****************************************************************************
QueryList::QueryList() : AttributeSubject("s*i*i*i*i*i*i*i*")
QueryList::QueryList() : AttributeSubject("s*i*i*i*i*i*i*")
{
}
......@@ -181,18 +144,17 @@ QueryList::QueryList() : AttributeSubject("s*i*i*i*i*i*i*i*")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
// ****************************************************************************
QueryList::QueryList(const QueryList &obj) : AttributeSubject("s*i*i*i*i*i*i*i*")
QueryList::QueryList(const QueryList &obj) : AttributeSubject("s*i*i*i*i*i*i*")
{
names = obj.names;
types = obj.types;
groups = obj.groups;
coordRep = obj.coordRep;
numInputs = obj.numInputs;
allowedVarTypes = obj.allowedVarTypes;
winType = obj.winType;
......@@ -210,7 +172,7 @@ QueryList::QueryList(const QueryList &obj) : AttributeSubject("s*i*i*i*i*i*i*i*"
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -230,7 +192,7 @@ QueryList::~QueryList()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -242,7 +204,6 @@ QueryList::operator = (const QueryList &obj)
names = obj.names;
types = obj.types;
groups = obj.groups;
coordRep = obj.coordRep;
numInputs = obj.numInputs;
allowedVarTypes = obj.allowedVarTypes;
winType = obj.winType;
......@@ -260,7 +221,7 @@ QueryList::operator = (const QueryList &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -273,7 +234,6 @@ QueryList::operator == (const QueryList &obj) const
return ((names == obj.names) &&
(types == obj.types) &&
(groups == obj.groups) &&
(coordRep == obj.coordRep) &&
(numInputs == obj.numInputs) &&
(allowedVarTypes == obj.allowedVarTypes) &&
(winType == obj.winType) &&
......@@ -289,7 +249,7 @@ QueryList::operator == (const QueryList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -310,7 +270,7 @@ QueryList::operator != (const QueryList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -331,7 +291,7 @@ QueryList::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -359,7 +319,7 @@ QueryList::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -385,7 +345,7 @@ QueryList::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -412,7 +372,7 @@ QueryList::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -424,11 +384,10 @@ QueryList::SelectAll()
Select(0, (void *)&names);
Select(1, (void *)&types);
Select(2, (void *)&groups);
Select(3, (void *)&coordRep);
Select(4, (void *)&numInputs);
Select(5, (void *)&allowedVarTypes);
Select(6, (void *)&winType);
Select(7, (void *)&timeQuery);
Select(3, (void *)&numInputs);
Select(4, (void *)&allowedVarTypes);
Select(5, (void *)&winType);
Select(6, (void *)&timeQuery);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -444,7 +403,7 @@ QueryList::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -480,30 +439,24 @@ QueryList::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
}
if(completeSave || !FieldsEqual(3, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("coordRep", coordRep));
}
if(completeSave || !FieldsEqual(4, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("numInputs", numInputs));
}
if(completeSave || !FieldsEqual(5, &defaultObject))
if(completeSave || !FieldsEqual(4, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("allowedVarTypes", allowedVarTypes));
}
if(completeSave || !FieldsEqual(6, &defaultObject))
if(completeSave || !FieldsEqual(5, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("winType", winType));
}
if(completeSave || !FieldsEqual(7, &defaultObject))
if(completeSave || !FieldsEqual(6, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("timeQuery", timeQuery));
......@@ -528,7 +481,7 @@ QueryList::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -552,8 +505,6 @@ QueryList::SetFromNode(DataNode *parentNode)
SetTypes(node->AsIntVector());
if((node = searchNode->GetNode("groups")) != 0)
SetGroups(node->AsIntVector());
if((node = searchNode->GetNode("coordRep")) != 0)
SetCoordRep(node->AsIntVector());
if((node = searchNode->GetNode("numInputs")) != 0)
SetNumInputs(node->AsIntVector());
if((node = searchNode->GetNode("allowedVarTypes")) != 0)
......@@ -589,39 +540,32 @@ QueryList::SetGroups(const intVector &groups_)
Select(2, (void *)&groups);
}
void
QueryList::SetCoordRep(const intVector &coordRep_)
{
coordRep = coordRep_;
Select(3, (void *)&coordRep);
}
void
QueryList::SetNumInputs(const intVector &numInputs_)
{
numInputs = numInputs_;
Select(4, (void *)&numInputs);
Select(3, (void *)&numInputs);
}
void
QueryList::SetAllowedVarTypes(const intVector &allowedVarTypes_)
{
allowedVarTypes = allowedVarTypes_;
Select(5, (void *)&allowedVarTypes);
Select(4, (void *)&allowedVarTypes);
}
void
QueryList::SetWinType(const intVector &winType_)
{
winType = winType_;
Select(6, (void *)&winType);
Select(5, (void *)&winType);
}
void
QueryList::SetTimeQuery(const intVector &timeQuery_)
{
timeQuery = timeQuery_;
Select(7, (void *)&timeQuery);
Select(6, (void *)&timeQuery);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -664,18 +608,6 @@ QueryList::GetGroups()
return groups;
}
const intVector &
QueryList::GetCoordRep() const
{
return coordRep;
}
intVector &
QueryList::GetCoordRep()
{
return coordRep;
}
const intVector &
QueryList::GetNumInputs() const
{
......@@ -746,34 +678,28 @@ QueryList::SelectGroups()
Select(2, (void *)&groups);
}
void
QueryList::SelectCoordRep()
{
Select(3, (void *)&coordRep);
}
void
QueryList::SelectNumInputs()
{
Select(4, (void *)&numInputs);
Select(3, (void *)&numInputs);
}
void
QueryList::SelectAllowedVarTypes()
{
Select(5, (void *)&allowedVarTypes);
Select(4, (void *)&allowedVarTypes);
}
void
QueryList::SelectWinType()
{
Select(6, (void *)&winType);
Select(5, (void *)&winType);
}
void
QueryList::SelectTimeQuery()
{
Select(7, (void *)&timeQuery);
Select(6, (void *)&timeQuery);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -789,7 +715,7 @@ QueryList::SelectTimeQuery()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -803,11 +729,10 @@ QueryList::GetFieldName(int index) const
case 0: return "names";
case 1: return "types";
case 2: return "groups";
case 3: return "coordRep";
case 4: return "numInputs";
case 5: return "allowedVarTypes";
case 6: return "winType";
case 7: return "timeQuery";
case 3: return "numInputs";
case 4: return "allowedVarTypes";
case 5: return "winType";
case 6: return "timeQuery";
default: return "invalid index";
}
}
......@@ -821,7 +746,7 @@ QueryList::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -839,7 +764,6 @@ QueryList::GetFieldType(int index) const
case 4: return FieldType_intVector;
case 5: return FieldType_intVector;
case 6: return FieldType_intVector;
case 7: return FieldType_intVector;
default: return FieldType_unknown;
}
}
......@@ -853,7 +777,7 @@ QueryList::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -871,7 +795,6 @@ QueryList::GetFieldTypeName(int index) const
case 4: return "intVector";
case 5: return "intVector";
case 6: return "intVector";
case 7: return "intVector";
default: return "invalid index";
}
}
......@@ -885,7 +808,7 @@ QueryList::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -914,26 +837,21 @@ QueryList::FieldsEqual(int index_, const AttributeGroup *rhs) const
}
break;
case 3:
{ // new scope
retval = (coordRep == obj.coordRep);
}
break;
case 4:
{ // new scope
retval = (numInputs == obj.numInputs);
}
break;
case 5:
case 4:
{ // new scope
retval = (allowedVarTypes == obj.allowedVarTypes);
}
break;
case 6:
case 5:
{ // new scope
retval = (winType == obj.winType);
}
break;
case 7:
case 6:
{ // new scope
retval = (timeQuery == obj.timeQuery);
}
......@@ -965,15 +883,17 @@ QueryList::FieldsEqual(int index_, const AttributeGroup *rhs) const
// Kathleen Bonnell, Tue Nov 18 08:20:36 PST 2003
// Set default window type based on query type.
//
// Kathleen Bonnell, Sat Sep 4 11:41:18 PDT 2004
// Made all parameters required, added Groups.
//
// ****************************************************************************
void
QueryList::AddQuery(const std::string &name, QueryType t, Groups g, CoordinateRepresentation r, WindowType w, int num_input, int allowedVars, bool timeQ)
QueryList::AddQuery(const std::string &name, QueryType t, Groups g, WindowType w, int num_input, int allowedVars, bool timeQ)
{
names.push_back(name);
types.push_back((int)t);
groups.push_back((int)g);
coordRep.push_back((int)r);
numInputs.push_back(num_input);
allowedVarTypes.push_back(allowedVars);
timeQuery.push_back((int)timeQ);
......@@ -992,8 +912,7 @@ QueryList::AddQuery(const std::string &name, QueryType t, Groups g, CoordinateRe
// ****************************************************************************
bool
QueryList::QueryExists(const std::string &name, QueryType t,
CoordinateRepresentation rep)
QueryList::QueryExists(const std::string &name, QueryType t)
{
int i;
bool match = false;
......@@ -1001,7 +920,7 @@ QueryList::QueryExists(const std::string &name, QueryType t,
{
if (name == names[i])
{
if (t == types[i] && rep == coordRep[i])
if (t == types[i])
{
match = true;
}
......
Function: AddQuery
Declaration: void AddQuery(const std::string &name, QueryType t, Groups g, CoordinateRepresentation r, WindowType w, int num_input, int allowedVars, bool timeQ);
Declaration: void AddQuery(const std::string &name, QueryType t, Groups g, WindowType w, int num_input, int allowedVars, bool timeQ);
Definition:
// ****************************************************************************
// Method: AddQuery
......@@ -24,12 +24,11 @@ Definition:
// ****************************************************************************
void
QueryList::AddQuery(const std::string &name, QueryType t, Groups g, CoordinateRepresentation r, WindowType w, int num_input, int allowedVars, bool timeQ)
QueryList::AddQuery(const std::string &name, QueryType t, Groups g, WindowType w, int num_input, int allowedVars, bool timeQ)
{
names.push_back(name);
types.push_back((int)t);
groups.push_back((int)g);
coordRep.push_back((int)r);
numInputs.push_back(num_input);
allowedVarTypes.push_back(allowedVars);
timeQuery.push_back((int)timeQ);
......@@ -37,7 +36,7 @@ QueryList::AddQuery(const std::string &name, QueryType t, Groups g, CoordinateRe
}
Function: QueryExists
Declaration: bool QueryExists(const std::string &name, QueryType t, CoordinateRepresentation rep = WorldSpace);
Declaration: bool QueryExists(const std::string &name, QueryType t);
Definition:
// ****************************************************************************
// Method: QueryExists
......@@ -51,8 +50,7 @@ Definition:
// ****************************************************************************
bool
QueryList::QueryExists(const std::string &name, QueryType t,
CoordinateRepresentation rep)
QueryList::QueryExists(const std::string &name, QueryType t)
{
int i;
bool match = false;
......@@ -60,7 +58,7 @@ QueryList::QueryExists(const std::string &name, QueryType t,
{
if (name == names[i])
{
if (t == types[i] && rep == coordRep[i])
if (t == types[i])
{
match = true;
}
......
......@@ -13,7 +13,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Sat Sep 4 11:20:22 PDT 2004
// Creation: Wed Sep 8 10:40:57 PDT 2004
//
// Modifications:
//
......@@ -28,11 +28,6 @@ public:
PointQuery,
LineQuery
};
enum CoordinateRepresentation
{
WorldSpace,
ScreenSpace
};
enum WindowType
{
Basic,
......@@ -70,7 +65,6 @@ public:
void SelectNames();
void SelectTypes();
void SelectGroups();
void SelectCoordRep();
void SelectNumInputs();
void SelectAllowedVarTypes();
void SelectWinType();
......@@ -80,7 +74,6 @@ public:
void SetNames(const stringVector &names_);
void SetTypes(const intVector &types_);
void SetGroups(const intVector &groups_);
void SetCoordRep(const intVector &coordRep_);
void SetNumInputs(const intVector &numInputs_);
void SetAllowedVarTypes(const intVector &allowedVarTypes_);
void SetWinType(const intVector &winType_);
......@@ -93,8 +86,6 @@ public:
intVector &GetTypes();
const intVector &GetGroups() const;
intVector &GetGroups();
const intVector &GetCoordRep() const;
intVector &GetCoordRep();
const intVector &GetNumInputs() const;