Commit 913adec4 authored by hrchilds's avatar hrchilds

Update from April 28, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@459 18c085ea-50e0-402c-830e-de6fd14e8384
parent d9c79b5e
...@@ -66,6 +66,9 @@ $0 = shift @ARGV; ...@@ -66,6 +66,9 @@ $0 = shift @ARGV;
# Jeremy Meredith, Fri Apr 1 16:05:49 PST 2005 # Jeremy Meredith, Fri Apr 1 16:05:49 PST 2005
# Added valgrind to -fullhelp, and unlimited the errors it will report. # Added valgrind to -fullhelp, and unlimited the errors it will report.
# #
# Jeremy Meredith, Thu Apr 28 18:02:28 PDT 2005
# Added multi-compiler support. Added linux-intel-icc platform.
#
############################################################################### ###############################################################################
...@@ -215,6 +218,7 @@ $fullusage = "$usage ...@@ -215,6 +218,7 @@ $fullusage = "$usage
path to a visit installation directory. path to a visit installation directory.
/bin is automatically appended to this path. /bin is automatically appended to this path.
-publicpluginsonly Disable all plugins but the default ones. -publicpluginsonly Disable all plugins but the default ones.
-compiler <cc> Require version built with the specified compiler.
Developer options Developer options
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
...@@ -323,6 +327,7 @@ $debug_valgrind = ""; ...@@ -323,6 +327,7 @@ $debug_valgrind = "";
$add_movie_args = 0; $add_movie_args = 0;
$envonly = 0; $envonly = 0;
$logging = 0; $logging = 0;
$req_compiler = "";
# Parse the arguments # Parse the arguments
@visitargs = (); @visitargs = ();
...@@ -374,6 +379,7 @@ while (scalar(@ARGV) > 0) { ...@@ -374,6 +379,7 @@ while (scalar(@ARGV) > 0) {
elsif ($arg eq "-gdb-vcl") { if($exe_name eq "vcl") {$debug_gdb = 1;} else {push @visitargs, $arg;}} elsif ($arg eq "-gdb-vcl") { if($exe_name eq "vcl") {$debug_gdb = 1;} else {push @visitargs, $arg;}}
elsif ($arg eq "-xterm") { if($debug_gdb) {$gdb_xterm = 1;} else {push @visitargs, $arg;}} elsif ($arg eq "-xterm") { if($debug_gdb) {$gdb_xterm = 1;} else {push @visitargs, $arg;}}
elsif ($arg eq "-break") { if($debug_gdb) {$bp = shift; push @breakpoints, $bp; } else {push @visitargs, $arg;}} elsif ($arg eq "-break") { if($debug_gdb) {$bp = shift; push @breakpoints, $bp; } else {push @visitargs, $arg;}}
elsif ($arg eq "-compiler") { $req_compiler = shift; push @visitargs, "-compiler", $req_compiler; }
elsif ($arg eq "-totalview" ) { elsif ($arg eq "-totalview" ) {
$debug_totalview = shift; $debug_totalview = shift;
push @norun, $debug_totalview; push @norun, $debug_totalview;
...@@ -605,7 +611,12 @@ for ($os) { ...@@ -605,7 +611,12 @@ for ($os) {
push @supportedarchs, "linux-x86_64"; push @supportedarchs, "linux-x86_64";
} }
else { else {
push @supportedarchs, "linux-intel"; if ($req_compiler eq "icc") {
push @supportedarchs, "linux-intel-icc";
}
else {
push @supportedarchs, "linux-intel";
}
} }
$launch = "mpirun" if ($procs_set && $launch eq ""); $launch = "mpirun" if ($procs_set && $launch eq "");
last; last;
......
...@@ -197,6 +197,9 @@ ...@@ -197,6 +197,9 @@
# Jeremy Meredith, Thu Mar 17 11:31:49 PST 2005 # Jeremy Meredith, Thu Mar 17 11:31:49 PST 2005
# Added xml2plugin back into the distribution. # Added xml2plugin back into the distribution.
# #
# Jeremy Meredith, Mon Apr 25 10:48:08 PDT 2005
# Added some basic multi-compiler support.
#
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
set DataFiles = "TRUE" set DataFiles = "TRUE"
...@@ -207,6 +210,8 @@ set PythonExe = "TRUE" ...@@ -207,6 +210,8 @@ set PythonExe = "TRUE"
set Compress = GZIP set Compress = GZIP
set VisItDir = `pwd` set VisItDir = `pwd`
set OSGiven = "FALSE" set OSGiven = "FALSE"
set CompilerGiven = "FALSE"
set compiler = ""
set Strip = "TRUE" set Strip = "TRUE"
set Help = "FALSE" set Help = "FALSE"
...@@ -268,6 +273,12 @@ while ($#argv >= 1) ...@@ -268,6 +273,12 @@ while ($#argv >= 1)
set OSGiven = TRUE set OSGiven = TRUE
breaksw breaksw
case -compiler:
shift
set compiler = $1
set CompilerGiven = TRUE
breaksw
default: default:
echo " " echo " "
echo ">>>>>>>>>> Illegal option $1 <<<<<<<<<<" echo ">>>>>>>>>> Illegal option $1 <<<<<<<<<<"
...@@ -293,6 +304,7 @@ if ($Help == TRUE) then ...@@ -293,6 +304,7 @@ if ($Help == TRUE) then
echo " -nstrip Do not strip the execubles and libraries." echo " -nstrip Do not strip the execubles and libraries."
echo " -nvtk No VTK libraries." echo " -nvtk No VTK libraries."
echo " -os os Operating system." echo " -os os Operating system."
echo " -compiler cc Compiler."
exit (1) exit (1)
endif endif
...@@ -452,7 +464,7 @@ endif ...@@ -452,7 +464,7 @@ endif
mkdir distribution/visit/$Version mkdir distribution/visit/$Version
mkdir distribution/visit/$Version/bin mkdir distribution/visit/$Version/bin
ln -s $Version distribution/visit/current ln -s $Version distribution/visit/current
set platforms="hp-hpux-pa sgi-irix6-mips2 sun4-sunos5-sparc ibm-aix-pwr ibm-aix-pwr64 dec-osf1-alpha linux-intel linux-ia64 linux-alpha linux-x86_64 darwin-ppc" set platforms="hp-hpux-pa sgi-irix6-mips2 sun4-sunos5-sparc ibm-aix-pwr ibm-aix-pwr64 dec-osf1-alpha linux-intel linux-intel-icc linux-ia64 linux-alpha linux-x86_64 darwin-ppc"
foreach platform ($platforms) foreach platform ($platforms)
mkdir distribution/visit/$Version/$platform mkdir distribution/visit/$Version/$platform
mkdir distribution/visit/$Version/$platform/bin mkdir distribution/visit/$Version/$platform/bin
...@@ -547,8 +559,13 @@ switch ($os) ...@@ -547,8 +559,13 @@ switch ($os)
case i486: case i486:
case i586: case i586:
case i686: case i686:
set osver = linux if (("$CompilerGiven" == "TRUE") && ("$compiler" == "icc")) then
set visitbindir = linux-intel set osver = linux-icc
set visitbindir = linux-intel-icc
else
set osver = linux
set visitbindir = linux-intel
endif
breaksw breaksw
case ia64: case ia64:
set osver = linux-ia64 set osver = linux-ia64
......
...@@ -6730,6 +6730,12 @@ avtDatabaseMetaData::GetSimInfo() const ...@@ -6730,6 +6730,12 @@ avtDatabaseMetaData::GetSimInfo() const
return *simInfo; return *simInfo;
} }
avtSimulationInformation&
avtDatabaseMetaData::GetSimInfo()
{
return *simInfo;
}
// **************************************************************************** // ****************************************************************************
// Function: avtDatabaseMetaData::VarIsCompound // Function: avtDatabaseMetaData::VarIsCompound
// //
......
...@@ -474,6 +474,9 @@ public: ...@@ -474,6 +474,9 @@ public:
// Brad Whitlock, Fri Apr 1 15:04:48 PST 2005 // Brad Whitlock, Fri Apr 1 15:04:48 PST 2005
// Added support for avtLabelMetaData. // Added support for avtLabelMetaData.
// //
// Jeremy Meredith, Thu Apr 28 17:48:21 PDT 2005
// Added a non-const accessor for the simulation info.
//
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
class DBATTS_API avtDatabaseMetaData : public AttributeSubject class DBATTS_API avtDatabaseMetaData : public AttributeSubject
...@@ -553,6 +556,7 @@ public: ...@@ -553,6 +556,7 @@ public:
bool GetIsSimulation() const { return isSimulation; } bool GetIsSimulation() const { return isSimulation; }
void SetSimInfo(const avtSimulationInformation&); void SetSimInfo(const avtSimulationInformation&);
const avtSimulationInformation &GetSimInfo() const; const avtSimulationInformation &GetSimInfo() const;
avtSimulationInformation &GetSimInfo();
const intVector &GetCycles() const { return cycles; }; const intVector &GetCycles() const { return cycles; };
void SetCycle(int, int); void SetCycle(int, int);
......
...@@ -6,29 +6,29 @@ ...@@ -6,29 +6,29 @@
// //
static const char *CommandArgumentType_strings[] = { static const char *CommandArgumentType_strings[] = {
"CmdArgInt", "CmdArgFloat", "CmdArgString" "CmdArgNone", "CmdArgInt", "CmdArgFloat",
}; "CmdArgString"};
std::string std::string
avtSimulationCommandSpecification::CommandArgumentType_ToString(avtSimulationCommandSpecification::CommandArgumentType t) avtSimulationCommandSpecification::CommandArgumentType_ToString(avtSimulationCommandSpecification::CommandArgumentType t)
{ {
int index = int(t); int index = int(t);
if(index < 0 || index >= 3) index = 0; if(index < 0 || index >= 4) index = 0;
return CommandArgumentType_strings[index]; return CommandArgumentType_strings[index];
} }
std::string std::string
avtSimulationCommandSpecification::CommandArgumentType_ToString(int t) avtSimulationCommandSpecification::CommandArgumentType_ToString(int t)
{ {
int index = (t < 0 || t >= 3) ? 0 : t; int index = (t < 0 || t >= 4) ? 0 : t;
return CommandArgumentType_strings[index]; return CommandArgumentType_strings[index];
} }
bool bool
avtSimulationCommandSpecification::CommandArgumentType_FromString(const std::string &s, avtSimulationCommandSpecification::CommandArgumentType &val) avtSimulationCommandSpecification::CommandArgumentType_FromString(const std::string &s, avtSimulationCommandSpecification::CommandArgumentType &val)
{ {
val = avtSimulationCommandSpecification::CmdArgInt; val = avtSimulationCommandSpecification::CmdArgNone;
for(int i = 0; i < 3; ++i) for(int i = 0; i < 4; ++i)
{ {
if(s == CommandArgumentType_strings[i]) if(s == CommandArgumentType_strings[i])
{ {
...@@ -48,13 +48,13 @@ avtSimulationCommandSpecification::CommandArgumentType_FromString(const std::str ...@@ -48,13 +48,13 @@ avtSimulationCommandSpecification::CommandArgumentType_FromString(const std::str
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
// **************************************************************************** // ****************************************************************************
avtSimulationCommandSpecification::avtSimulationCommandSpecification() : AttributeSubject("si") avtSimulationCommandSpecification::avtSimulationCommandSpecification() : AttributeSubject("sib")
{ {
} }
...@@ -67,16 +67,17 @@ avtSimulationCommandSpecification::avtSimulationCommandSpecification() : Attribu ...@@ -67,16 +67,17 @@ avtSimulationCommandSpecification::avtSimulationCommandSpecification() : Attribu
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
// **************************************************************************** // ****************************************************************************
avtSimulationCommandSpecification::avtSimulationCommandSpecification(const avtSimulationCommandSpecification &obj) : AttributeSubject("si") avtSimulationCommandSpecification::avtSimulationCommandSpecification(const avtSimulationCommandSpecification &obj) : AttributeSubject("sib")
{ {
name = obj.name; name = obj.name;
argumentType = obj.argumentType; argumentType = obj.argumentType;
enabled = obj.enabled;
SelectAll(); SelectAll();
} }
...@@ -90,7 +91,7 @@ avtSimulationCommandSpecification::avtSimulationCommandSpecification(const avtSi ...@@ -90,7 +91,7 @@ avtSimulationCommandSpecification::avtSimulationCommandSpecification(const avtSi
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -110,7 +111,7 @@ avtSimulationCommandSpecification::~avtSimulationCommandSpecification() ...@@ -110,7 +111,7 @@ avtSimulationCommandSpecification::~avtSimulationCommandSpecification()
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -122,6 +123,7 @@ avtSimulationCommandSpecification::operator = (const avtSimulationCommandSpecifi ...@@ -122,6 +123,7 @@ avtSimulationCommandSpecification::operator = (const avtSimulationCommandSpecifi
if (this == &obj) return *this; if (this == &obj) return *this;
name = obj.name; name = obj.name;
argumentType = obj.argumentType; argumentType = obj.argumentType;
enabled = obj.enabled;
SelectAll(); SelectAll();
return *this; return *this;
...@@ -136,7 +138,7 @@ avtSimulationCommandSpecification::operator = (const avtSimulationCommandSpecifi ...@@ -136,7 +138,7 @@ avtSimulationCommandSpecification::operator = (const avtSimulationCommandSpecifi
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -147,7 +149,8 @@ avtSimulationCommandSpecification::operator == (const avtSimulationCommandSpecif ...@@ -147,7 +149,8 @@ avtSimulationCommandSpecification::operator == (const avtSimulationCommandSpecif
{ {
// Create the return value // Create the return value
return ((name == obj.name) && return ((name == obj.name) &&
(argumentType == obj.argumentType)); (argumentType == obj.argumentType) &&
(enabled == obj.enabled));
} }
// **************************************************************************** // ****************************************************************************
...@@ -159,7 +162,7 @@ avtSimulationCommandSpecification::operator == (const avtSimulationCommandSpecif ...@@ -159,7 +162,7 @@ avtSimulationCommandSpecification::operator == (const avtSimulationCommandSpecif
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -180,7 +183,7 @@ avtSimulationCommandSpecification::operator != (const avtSimulationCommandSpecif ...@@ -180,7 +183,7 @@ avtSimulationCommandSpecification::operator != (const avtSimulationCommandSpecif
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -201,7 +204,7 @@ avtSimulationCommandSpecification::TypeName() const ...@@ -201,7 +204,7 @@ avtSimulationCommandSpecification::TypeName() const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -229,7 +232,7 @@ avtSimulationCommandSpecification::CopyAttributes(const AttributeGroup *atts) ...@@ -229,7 +232,7 @@ avtSimulationCommandSpecification::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -255,7 +258,7 @@ avtSimulationCommandSpecification::CreateCompatible(const std::string &tname) co ...@@ -255,7 +258,7 @@ avtSimulationCommandSpecification::CreateCompatible(const std::string &tname) co
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -282,7 +285,7 @@ avtSimulationCommandSpecification::NewInstance(bool copy) const ...@@ -282,7 +285,7 @@ avtSimulationCommandSpecification::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -293,6 +296,7 @@ avtSimulationCommandSpecification::SelectAll() ...@@ -293,6 +296,7 @@ avtSimulationCommandSpecification::SelectAll()
{ {
Select(0, (void *)&name); Select(0, (void *)&name);
Select(1, (void *)&argumentType); Select(1, (void *)&argumentType);
Select(2, (void *)&enabled);
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
...@@ -313,6 +317,13 @@ avtSimulationCommandSpecification::SetArgumentType(avtSimulationCommandSpecifica ...@@ -313,6 +317,13 @@ avtSimulationCommandSpecification::SetArgumentType(avtSimulationCommandSpecifica
Select(1, (void *)&argumentType); Select(1, (void *)&argumentType);
} }
void
avtSimulationCommandSpecification::SetEnabled(bool enabled_)
{
enabled = enabled_;
Select(2, (void *)&enabled);
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Get property methods // Get property methods
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
...@@ -335,6 +346,12 @@ avtSimulationCommandSpecification::GetArgumentType() const ...@@ -335,6 +346,12 @@ avtSimulationCommandSpecification::GetArgumentType() const
return CommandArgumentType(argumentType); return CommandArgumentType(argumentType);
} }
bool
avtSimulationCommandSpecification::GetEnabled() const
{
return enabled;
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Select property methods // Select property methods
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
...@@ -358,7 +375,7 @@ avtSimulationCommandSpecification::SelectName() ...@@ -358,7 +375,7 @@ avtSimulationCommandSpecification::SelectName()
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -371,6 +388,7 @@ avtSimulationCommandSpecification::GetFieldName(int index) const ...@@ -371,6 +388,7 @@ avtSimulationCommandSpecification::GetFieldName(int index) const
{ {
case 0: return "name"; case 0: return "name";
case 1: return "argumentType"; case 1: return "argumentType";
case 2: return "enabled";
default: return "invalid index"; default: return "invalid index";
} }
} }
...@@ -384,7 +402,7 @@ avtSimulationCommandSpecification::GetFieldName(int index) const ...@@ -384,7 +402,7 @@ avtSimulationCommandSpecification::GetFieldName(int index) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -397,6 +415,7 @@ avtSimulationCommandSpecification::GetFieldType(int index) const ...@@ -397,6 +415,7 @@ avtSimulationCommandSpecification::GetFieldType(int index) const
{ {
case 0: return FieldType_string; case 0: return FieldType_string;
case 1: return FieldType_enum; case 1: return FieldType_enum;
case 2: return FieldType_bool;
default: return FieldType_unknown; default: return FieldType_unknown;
} }
} }
...@@ -410,7 +429,7 @@ avtSimulationCommandSpecification::GetFieldType(int index) const ...@@ -410,7 +429,7 @@ avtSimulationCommandSpecification::GetFieldType(int index) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -423,6 +442,7 @@ avtSimulationCommandSpecification::GetFieldTypeName(int index) const ...@@ -423,6 +442,7 @@ avtSimulationCommandSpecification::GetFieldTypeName(int index) const
{ {
case 0: return "string"; case 0: return "string";
case 1: return "enum"; case 1: return "enum";
case 2: return "bool";
default: return "invalid index"; default: return "invalid index";
} }
} }
...@@ -436,7 +456,7 @@ avtSimulationCommandSpecification::GetFieldTypeName(int index) const ...@@ -436,7 +456,7 @@ avtSimulationCommandSpecification::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -459,6 +479,11 @@ avtSimulationCommandSpecification::FieldsEqual(int index_, const AttributeGroup ...@@ -459,6 +479,11 @@ avtSimulationCommandSpecification::FieldsEqual(int index_, const AttributeGroup
retval = (argumentType == obj.argumentType); retval = (argumentType == obj.argumentType);
} }
break; break;
case 2:
{ // new scope
retval = (enabled == obj.enabled);
}
break;
default: retval = false; default: retval = false;
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// Notes: Autogenerated by xml2atts. // Notes: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:21:33 PST 2005 // Creation: Thu Apr 28 11:48:56 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -50,11 +50,13 @@ public: ...@@ -50,11 +50,13 @@ public:
// Property setting methods // Property setting methods
void SetName(const std::string &name_); void SetName(const std::string &name_);
void SetArgumentType(CommandArgumentType argumentType_); void SetArgumentType(CommandArgumentType argumentType_);
void SetEnabled(bool enabled_);
// Property getting methods // Property getting methods
const std::string &GetName() const; const std::string &GetName() const;
std::string &GetName(); std::string &GetName();
CommandArgumentType GetArgumentType() const; CommandArgumentType GetArgumentType() const;
bool GetEnabled() const;
// Enum conversion functions // Enum conversion functions
static std::string CommandArgumentType_ToString(CommandArgumentType); static std::string CommandArgumentType_ToString(CommandArgumentType);
...@@ -72,6 +74,7 @@ public: ...@@ -72,6 +74,7 @@ public:
private: private:
std::string name; std::string name;
int argumentType; int argumentType;
bool enabled;
}; };
#endif #endif
<?xml version="1.0"?> <?xml version="1.0"?>
<Attribute name="avtSimulationCommandSpecification" purpose="Contains the specification for one command" persistent="false" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h"> <Attribute name="avtSimulationCommandSpecification" purpose="Contains the specification for one command" persistent="false" exportAPI="DBATTS_API" exportInclude="dbatts_exports.h">
<Enum name="CommandArgumentType"> <Enum name="CommandArgumentType">
CmdArgNone
CmdArgInt CmdArgInt
CmdArgFloat CmdArgFloat
CmdArgString CmdArgString
...@@ -9,4 +10,6 @@ ...@@ -9,4 +10,6 @@
</Field> </Field>
<Field name="argumentType" label="argumentType" type="enum" subtype="CommandArgumentType"> <Field name="argumentType" label="argumentType" type="enum" subtype="CommandArgumentType">
</Field> </Field>
<Field name="enabled" label="enabled" type="bool">
</Field>
</Attribute> </Attribute>
...@@ -14,7 +14,7 @@ class avtSimulationCommandSpecification; ...@@ -14,7 +14,7 @@ class avtSimulationCommandSpecification;
// Notes: Autogenerated by xml2atts. // Notes: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Fri Mar 18 16:28:35 PST 2005 // Creation: Thu Apr 28 11:35:13 PDT 2005
// //
// Modifications: // Modifications:
// //
...@@ -23,6 +23,13 @@ class avtSimulationCommandSpecification; ...@@ -23,6 +23,13 @@ class avtSimulationCommandSpecification;
class DBATTS_API avtSimulationInformation : public AttributeSubject class DBATTS_API avtSimulationInformation : public AttributeSubject
{ {
public: public:
enum RunMode
{
Unknown,
Running,
Stopped
};
avtSimulationInformation(); avtSimulationInformation();