diff --git a/BUILD_NOTES b/BUILD_NOTES index 1839bdc70bbdb95d5f0535ba1cb39828404e1604..1ae00c052f9ea2ab430c247b1a099b1204b17c7d 100644 --- a/BUILD_NOTES +++ b/BUILD_NOTES @@ -184,6 +184,19 @@ cd VTK # ../CMake-1.4.7/Source/cmake +# +# On linux systems you will want to avoid using runtime type identification +# (rtti) to achieve maximum portability among different versions of linux. +# Ideally this would be done by editing CMakeCache.txt, adding "-fno-rtti" +# to the CMAKE_CXX_FLAGS string and running cmake, but alas, this doesn't +# work. The work around is to do the following: +# env CXXFLAGS="-fno-rtti" ../CMake-1.4.7/Source/cmake +# +# This indirectly turns off rtti, because VTK_NO_ANSI_STRING_STREAM is set +# to 1. This causes vtkOStrStreamWrapper.cxx to use instead +# of , which requires rtti. +# + # # On tru64 systems using g++ 3.0.4, several files in the Imaging directory # will not compile because of an internal compiler error. You will need to diff --git a/VERSION b/VERSION index 0664a8fd291f962d348db7633b2c79e8188f62fa..5625e59da8873d8077c1fb0feb605078b34b640e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.6 +1.2 diff --git a/clearcase_bin/visit-bin-dist b/clearcase_bin/visit-bin-dist index 5eeded561737f42421595219a17044eb2da35d70..bc0de25f6681f37c302a55537a396bc619d6a60f 100644 --- a/clearcase_bin/visit-bin-dist +++ b/clearcase_bin/visit-bin-dist @@ -446,6 +446,7 @@ switch ($os) breaksw endsw +set verdir = distribution/visit/$Version set bindir = distribution/visit/$Version/$visitbindir/bin set libdir = distribution/visit/$Version/$visitbindir/lib set incdir = distribution/visit/$Version/$visitbindir/include @@ -609,10 +610,10 @@ endif # # Copy the configuration files. # -mkdir $VisItDir/.visit -cp clearcase_bin/visit-config-closed $VisItDir/.visit -cp clearcase_bin/visit-config-open $VisItDir/.visit -ln -s visit-config-open $VisItDir/.visit/config +mkdir $verdir/.visit +cp $VisItDir/clearcase_bin/visit-config-closed $verdir/.visit +cp $VisItDir/clearcase_bin/visit-config-open $verdir/.visit +ln -s visit-config-open $verdir/.visit/config # # Strip the executables and shared libraries. diff --git a/clearcase_bin/visit-build-closed b/clearcase_bin/visit-build-closed index 35d5859368dff870b8ba7178ee17f86cbf32a437..ece35b30f1ff7b2e3e206ce008668e1904ecede2 100644 --- a/clearcase_bin/visit-build-closed +++ b/clearcase_bin/visit-build-closed @@ -139,7 +139,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1 cd $dist ver=\`cat VERSION\` ver2=\`echo \$ver | tr "." "_"\` -./configure >> ../buildlog 2>&1 +env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1 make -j 4 >> ../buildlog 2>&1 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1 mv visit\$ver2.linux.tar.gz .. @@ -177,6 +177,7 @@ cd $dist ver=\`cat VERSION\` ver2=\`echo \$ver | tr "." "_"\` env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1 +make -j 4 >> ../buildlog 2>&1 env PARALLEL=4 make -P >> ../buildlog 2>&1 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1 mv visit\$ver2.irix6.tar.gz .. @@ -325,7 +326,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1 cd $dist ver=\`cat VERSION\` ver2=\`echo \$ver | tr "." "_"\` -./configure --enable-parallel >> ../buildlog 2>&1 +env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1 make -j 3 >> ../buildlog 2>&1 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1 mv visit\$ver2.linux.tar.gz .. diff --git a/clearcase_bin/visit-build-open b/clearcase_bin/visit-build-open index 47ac87f09403cf7da367905cdbc9b752eee2b6d4..0642f5db9a19623faeaf9a12d20d3741f2b5e744 100644 --- a/clearcase_bin/visit-build-open +++ b/clearcase_bin/visit-build-open @@ -169,10 +169,15 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1 cd $dist ver=\`cat VERSION\` ver2=\`echo \$ver | tr "." "_"\` -./configure >> ../buildlog 2>&1 -make -j 2 >> ../buildlog 2>&1 +env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1 +make -j 4 >> ../buildlog 2>&1 clearcase_bin/visit-bin-dist >> ../buildlog 2>&1 mv visit\$ver2.linux.tar.gz .. +make distclean >> ../buildlog 2>&1 +env CXXFLAGS="-O2 -DFAKE_EXCEPTIONS" ./configure >> ../buildlog 2>&1 +make -j 4 >> ../buildlog 2>&1 +clearcase_bin/visit-bin-dist >> ../buildlog 2>&1 +mv visit\$ver2.linux.tar.gz ../visit\$ver2.linux_suse.tar.gz cd .. rm -f resultlog echo " build of visit on kickit" > resultlog 2>&1 diff --git a/clearcase_bin/visit-install b/clearcase_bin/visit-install index fff61fc9af3c3bc01058ffb4139ea8f0a2a1c9aa..d3d5c2884e0373fa28d5e58b318fc069a45de31d 100644 --- a/clearcase_bin/visit-install +++ b/clearcase_bin/visit-install @@ -144,9 +144,6 @@ while ($config == prompt) breaksw endsw end -echo "config=$config" - -exit (1) if ($config != none && $config != open && $config != closed) then echo "Illegal configuration option, choices are none, open and closed." @@ -236,11 +233,11 @@ cp distribution/visit/data/* $dir/data # # Set the link for the configuration file. # -rm -f $dir/.visit/config +rm -f $dir/$version+/.visit/config if ($config == open) then - ln -s visit-config-open $dir/.visit/config + ln -s visit-config-open $dir/$version+/.visit/config else if ($config == closed) then - ln -s visit-config-closed $dir/.visit/config + ln -s visit-config-closed $dir/$version+/.visit/config endif # diff --git a/clearcase_bin/visit-install-open b/clearcase_bin/visit-install-open index fd45b0ca876af7515517ac24b8366cbf6429a5be..b9ccbd2290584fc40c9c1439eb8366c08c4a3bf2 100644 --- a/clearcase_bin/visit-install-open +++ b/clearcase_bin/visit-install-open @@ -197,6 +197,7 @@ then if [ $test = no ] then scp kickit:/var/tmp/$user/kickit/visitbuild/visit$ver2.linux.tar.gz . + scp kickit:/var/tmp/$user/kickit/visitbuild/visit$ver2.linux_suse.tar.gz . scp visit$ver2.linux.tar.gz kickit: scp visit-install kickit: scp kickit kickit:kickit_install diff --git a/common/misc/VisItException.h b/common/misc/VisItException.h index 2728ced9e51a39deb1585c7725c6c19065557a9d..dad4efe94a607afeee224fdecfa7269168764ef8 100644 --- a/common/misc/VisItException.h +++ b/common/misc/VisItException.h @@ -17,7 +17,11 @@ // Must be re-added //#include +#ifdef FAKE_EXCEPTIONS +#define VISIT_THROW_NOTHING +#else #define VISIT_THROW_NOTHING throw() +#endif // **************************************************************************** // Class: VisItException @@ -55,9 +59,12 @@ // I fixed a bug in the fake exceptions' TRY statement that could let // nested TRY's rethrow a previously caught exception. // +// Eric Brugger, Wed Jul 23 13:46:05 PDT 2003 +// No longer inherit from exception. +// // **************************************************************************** -class MISC_API VisItException : public std::exception +class MISC_API VisItException { public: VisItException(); diff --git a/common/plugin/PluginManager.C b/common/plugin/PluginManager.C index a12a27602569303ddc0861701156e026250deb6e..0f7944f70d6cd5f4b6159977dab62b41ab993545 100644 --- a/common/plugin/PluginManager.C +++ b/common/plugin/PluginManager.C @@ -157,12 +157,24 @@ PluginManager::PluginLoaded(const string &id) // Programmer: Jeremy Meredith // Creation: September 26, 2001 // +// Modfications: +// Brad Whitlock, Thu Jul 17 09:56:19 PDT 2003 +// Prevented case where a bad id could add itself to the allindexmap. +// // **************************************************************************** string PluginManager::GetPluginName(const string &id) { - return names[allindexmap[id]]; + string retval; + if(allindexmap.find(id) != allindexmap.end()) + { + int index = allindexmap[id]; + if(index < names.size()) + retval = names[index]; + } + + return retval; } // **************************************************************************** @@ -177,12 +189,24 @@ PluginManager::GetPluginName(const string &id) // Programmer: Jeremy Meredith // Creation: September 26, 2001 // +// Modifications: +// Brad Whitlock, Thu Jul 17 09:56:19 PDT 2003 +// Prevented case where a bad id could add itself to the allindexmap. +// // **************************************************************************** string PluginManager::GetPluginVersion(const string &id) { - return versions[allindexmap[id]]; + string retval; + if(allindexmap.find(id) != allindexmap.end()) + { + int index = allindexmap[id]; + if(index < versions.size()) + retval = versions[index]; + } + + return retval; } // **************************************************************************** @@ -281,12 +305,21 @@ PluginManager::GetEnabledID(int index) const // Programmer: Jeremy Meredith // Creation: June 17, 2003 // +// Modifications: +// Brad Whitlock, Thu Jul 17 09:51:19 PDT 2003 +// Added a check to prevent the case where a bad id could add itself to +// the map. +// // **************************************************************************** int PluginManager::GetEnabledIndex(const std::string &id) { - return loadedindexmap[id]; + int retval = -1; + if(loadedindexmap.find(id) != loadedindexmap.end()) + retval = loadedindexmap[id]; + + return retval; } // **************************************************************************** @@ -301,12 +334,22 @@ PluginManager::GetEnabledIndex(const std::string &id) // Programmer: Jeremy Meredith // Creation: September 26, 2001 // +// Modifications: +// Brad Whitlock, Thu Jul 17 09:51:19 PDT 2003 +// Added a check to prevent the case where a bad id could add itself to +// the map. +// // **************************************************************************** void PluginManager::DisablePlugin(const string &id) { - enabled[allindexmap[id]] = false; + if(allindexmap.find(id) != allindexmap.end()) + { + int index = allindexmap[id]; + if(index < enabled.size()) + enabled[index] = false; + } } // **************************************************************************** @@ -321,12 +364,22 @@ PluginManager::DisablePlugin(const string &id) // Programmer: Jeremy Meredith // Creation: September 26, 2001 // +// Modifications: +// Brad Whitlock, Thu Jul 17 09:51:19 PDT 2003 +// Added a check to prevent the case where a bad id could add itself to +// the map. +// // **************************************************************************** void PluginManager::EnablePlugin(const string &id) { - enabled[allindexmap[id]] = true; + if(allindexmap.find(id) != allindexmap.end()) + { + int index = allindexmap[id]; + if(index < enabled.size()) + enabled[index] = true; + } } // **************************************************************************** diff --git a/common/state/AnimationAttributes.C b/common/state/AnimationAttributes.C index ae65c2ab0f5fa360667a15806c10c2f10e1261e7..f0cd6075bb039e2aff54e8c0e828f94e5a7e993a 100644 --- a/common/state/AnimationAttributes.C +++ b/common/state/AnimationAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -31,7 +31,7 @@ AnimationAttributes::AnimationAttributes() : AttributeSubject("bi") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -54,7 +54,7 @@ AnimationAttributes::AnimationAttributes(const AnimationAttributes &obj) : Attri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -74,7 +74,7 @@ AnimationAttributes::~AnimationAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -98,7 +98,7 @@ AnimationAttributes::operator = (const AnimationAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -121,7 +121,7 @@ AnimationAttributes::operator == (const AnimationAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -142,7 +142,7 @@ AnimationAttributes::operator != (const AnimationAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -163,7 +163,7 @@ AnimationAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -191,7 +191,7 @@ AnimationAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -208,6 +208,33 @@ AnimationAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: AnimationAttributes::NewInstance +// +// Purpose: +// NewInstance method for the AnimationAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:25 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +AnimationAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new AnimationAttributes(*this); + else + retval = new AnimationAttributes; + + return retval; +} + // **************************************************************************** // Method: AnimationAttributes::SelectAll // @@ -217,7 +244,7 @@ AnimationAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -243,7 +270,7 @@ AnimationAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -291,7 +318,7 @@ AnimationAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -361,7 +388,7 @@ AnimationAttributes::GetTimeout() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -387,7 +414,7 @@ AnimationAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -413,7 +440,7 @@ AnimationAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -439,7 +466,7 @@ AnimationAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // diff --git a/common/state/AnimationAttributes.h b/common/state/AnimationAttributes.h index 8ace27b195bbfb78d0c0356a79d384cbf26eeb34..4eb2d048ae1e8c6fc6e86349f24f4f7bfcefbc8d 100644 --- a/common/state/AnimationAttributes.h +++ b/common/state/AnimationAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 3 17:47:27 PST 2003 +// Creation: Wed Jul 23 11:29:25 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/AnnotationAttributes.C b/common/state/AnnotationAttributes.C index cdc9ba933cb59ade12349a9fb582cdd64c60b317..f93dcaca754f647626f8c35aedcf8e61897e3fc0 100644 --- a/common/state/AnnotationAttributes.C +++ b/common/state/AnnotationAttributes.C @@ -199,7 +199,7 @@ AnnotationAttributes::BackgroundMode_FromString(const std::string &s, Annotation // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -284,7 +284,7 @@ AnnotationAttributes::AnnotationAttributes() : AttributeSubject("bbbbbbbbddddddd // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -373,7 +373,7 @@ AnnotationAttributes::AnnotationAttributes(const AnnotationAttributes &obj) : At // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -393,7 +393,7 @@ AnnotationAttributes::~AnnotationAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -483,7 +483,7 @@ AnnotationAttributes::operator = (const AnnotationAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -572,7 +572,7 @@ AnnotationAttributes::operator == (const AnnotationAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -593,7 +593,7 @@ AnnotationAttributes::operator != (const AnnotationAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -614,7 +614,7 @@ AnnotationAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -642,7 +642,7 @@ AnnotationAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -659,6 +659,33 @@ AnnotationAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: AnnotationAttributes::NewInstance +// +// Purpose: +// NewInstance method for the AnnotationAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:28 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +AnnotationAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new AnnotationAttributes(*this); + else + retval = new AnnotationAttributes; + + return retval; +} + // **************************************************************************** // Method: AnnotationAttributes::SelectAll // @@ -668,7 +695,7 @@ AnnotationAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -760,7 +787,7 @@ AnnotationAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -1228,7 +1255,7 @@ AnnotationAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -2424,7 +2451,7 @@ AnnotationAttributes::SelectGradientColor2() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -2516,7 +2543,7 @@ AnnotationAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -2608,7 +2635,7 @@ AnnotationAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -2700,7 +2727,7 @@ AnnotationAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // diff --git a/common/state/AnnotationAttributes.h b/common/state/AnnotationAttributes.h index 10acf8eee78e86f7bac2eb18782d261ca31b7eba..40bec1aa532f76001088b4f095e0ce6e669bdb42 100644 --- a/common/state/AnnotationAttributes.h +++ b/common/state/AnnotationAttributes.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:28 PST 2003 +// Creation: Wed Jul 23 11:29:28 PDT 2003 // // Modifications: // @@ -70,6 +70,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/AppearanceAttributes.C b/common/state/AppearanceAttributes.C index 2da900faf4f33edd16cd779f0af703adb62d7ece..d74e253729a9aec68b1976c07290540cd2afa0f2 100644 --- a/common/state/AppearanceAttributes.C +++ b/common/state/AppearanceAttributes.C @@ -1,10 +1,6 @@ #include #include -#if defined(_WIN32) -#include -#endif - // **************************************************************************** // Method: AppearanceAttributes::AppearanceAttributes // @@ -14,33 +10,19 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // // **************************************************************************** -AppearanceAttributes::AppearanceAttributes() : AttributeSubject("ssssi"), - background("#c0c0c0"), foreground("#000000"), - fontDescription("-adobe-helvetica-bold-r-normal--14-140-75-75-p-82-iso8859-1"), - style("motif") +AppearanceAttributes::AppearanceAttributes() : AttributeSubject("ssssi") { + background = "#c0c0c0"; + foreground = "#000000"; + fontDescription = "-adobe-helvetica-bold-r-normal--14-140-75-75-p-82-iso8859-1"; + InitializeStyle(); orientation = 0; -#if defined(_WIN32) - char tmp[20]; - DWORD c; - unsigned char *cptr = (unsigned char *)&c; - - c = GetSysColor(COLOR_BTNFACE); - sprintf(tmp, "#%02x%02x%02x", int(cptr[0]), int(cptr[1]), int(cptr[2])); - background = tmp; - - c = GetSysColor(COLOR_WINDOWTEXT); - sprintf(tmp, "#%02x%02x%02x", int(cptr[0]), int(cptr[1]), int(cptr[2])); - foreground = tmp; - - style = "windows"; -#endif } // **************************************************************************** @@ -52,7 +34,7 @@ AppearanceAttributes::AppearanceAttributes() : AttributeSubject("ssssi"), // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -78,7 +60,7 @@ AppearanceAttributes::AppearanceAttributes(const AppearanceAttributes &obj) : At // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -98,7 +80,7 @@ AppearanceAttributes::~AppearanceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -125,7 +107,7 @@ AppearanceAttributes::operator = (const AppearanceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -151,7 +133,7 @@ AppearanceAttributes::operator == (const AppearanceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -172,7 +154,7 @@ AppearanceAttributes::operator != (const AppearanceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -193,7 +175,7 @@ AppearanceAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -221,7 +203,7 @@ AppearanceAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -238,6 +220,33 @@ AppearanceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: AppearanceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the AppearanceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:40:27 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +AppearanceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new AppearanceAttributes(*this); + else + retval = new AppearanceAttributes; + + return retval; +} + // **************************************************************************** // Method: AppearanceAttributes::SelectAll // @@ -247,7 +256,7 @@ AppearanceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -276,7 +285,7 @@ AppearanceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -342,7 +351,7 @@ AppearanceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -509,7 +518,7 @@ AppearanceAttributes::SelectStyle() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -538,7 +547,7 @@ AppearanceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -567,7 +576,7 @@ AppearanceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -596,7 +605,7 @@ AppearanceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -644,3 +653,28 @@ AppearanceAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const // User-defined methods. /////////////////////////////////////////////////////////////////////////////// +#if defined(_WIN32) +#include +#endif +void +AppearanceAttributes::InitializeStyle() +{ +#if defined(_WIN32) + char tmp[20]; + DWORD c; + unsigned char *cptr = (unsigned char *)&c; + + c = GetSysColor(COLOR_BTNFACE); + sprintf(tmp, "#%02x%02x%02x", int(cptr[0]), int(cptr[1]), int(cptr[2])); + background = tmp; + + c = GetSysColor(COLOR_WINDOWTEXT); + sprintf(tmp, "#%02x%02x%02x", int(cptr[0]), int(cptr[1]), int(cptr[2])); + foreground = tmp; + + style = "windows"; +#else + style = "motif"; +#endif +} + diff --git a/common/state/AppearanceAttributes.code b/common/state/AppearanceAttributes.code new file mode 100644 index 0000000000000000000000000000000000000000..6d818c14b251cea5144aab8421d33c2611d9a2f7 --- /dev/null +++ b/common/state/AppearanceAttributes.code @@ -0,0 +1,30 @@ +Initialization: style + InitializeStyle(); + +Function: InitializeStyle +Declaration: void InitializeStyle(); +Definition: +#if defined(_WIN32) +#include +#endif +void +AppearanceAttributes::InitializeStyle() +{ +#if defined(_WIN32) + char tmp[20]; + DWORD c; + unsigned char *cptr = (unsigned char *)&c; + + c = GetSysColor(COLOR_BTNFACE); + sprintf(tmp, "#%02x%02x%02x", int(cptr[0]), int(cptr[1]), int(cptr[2])); + background = tmp; + + c = GetSysColor(COLOR_WINDOWTEXT); + sprintf(tmp, "#%02x%02x%02x", int(cptr[0]), int(cptr[1]), int(cptr[2])); + foreground = tmp; + + style = "windows"; +#else + style = "motif"; +#endif +} diff --git a/common/state/AppearanceAttributes.h b/common/state/AppearanceAttributes.h index 0f2412eadbc25fdb5b5622bc6f08868ed6fce3ed..fb49c824acee5bee42e5ac307f1cfdd9bd8f5e26 100644 --- a/common/state/AppearanceAttributes.h +++ b/common/state/AppearanceAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:41 PST 2003 +// Creation: Wed Jul 23 11:40:27 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); @@ -70,6 +71,8 @@ public: virtual std::string GetFieldTypeName(int index) const; virtual bool FieldsEqual(int index, const AttributeGroup *rhs) const; + // User-defined methods + void InitializeStyle(); private: std::string background; std::string foreground; diff --git a/common/state/AppearanceAttributes.xml b/common/state/AppearanceAttributes.xml index da6a5a4256c969294ca90ada530a6eaf71fd020d..4d2b373918ab7dfa9db845a3740ca09a6670538e 100644 --- a/common/state/AppearanceAttributes.xml +++ b/common/state/AppearanceAttributes.xml @@ -1,8 +1,10 @@ - + #c0c0c0 #000000 -adobe-helvetica-bold-r-normal--14-140-75-75-p-82-iso8859-1 - motif + motif 0 + + diff --git a/common/state/AttributeSubject.h b/common/state/AttributeSubject.h index bf4e91cc76664a7133e853e1c099cf35104e106b..e266343e6140605cdbe3841e4fbd878494441b3a 100644 --- a/common/state/AttributeSubject.h +++ b/common/state/AttributeSubject.h @@ -24,6 +24,10 @@ // Brad Whitlock, Mon Feb 11 15:26:34 PST 2002 // Added a new method to create compatible types. // +// Brad Whitlock, Wed Jul 23 11:15:49 PDT 2003 +// Added a new method to create a new instance that does not have to +// be initialized from the calling object. +// // **************************************************************************** class STATE_API AttributeSubject : public AttributeGroup, public Subject @@ -34,6 +38,7 @@ public: virtual void SelectAll() = 0; virtual void Notify(); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool copy) const { return 0; }; // what the ? virtual bool VarChangeRequiresReset(void) { return false; }; diff --git a/common/state/AttributeSubjectMap.C b/common/state/AttributeSubjectMap.C index 662fdbf43f84ef539f9225e928d147a8c1799c70..21f462e8c23958fa64e6e28acbd4d99e4bce79e3 100644 --- a/common/state/AttributeSubjectMap.C +++ b/common/state/AttributeSubjectMap.C @@ -4,6 +4,7 @@ #include #include +#include #include @@ -23,6 +24,11 @@ AttributeSubjectMap::AttributeSubjectMap() maxIndices = MAP_INCR; atts = new AttributeSubject*[MAP_INCR]; indices = new int[MAP_INCR]; + for(int i = 0; i < MAP_INCR; ++i) + { + atts[i] = 0; + indices[i] = 0; + } } // **************************************************************************** @@ -133,6 +139,10 @@ AttributeSubjectMap::SetAtts(const int index, const AttributeSubject *attr) // Programmer: Eric Brugger // Creation: November 15, 2002 // +// Modifications: +// Brad Whitlock, Wed Jul 23 11:25:12 PDT 2003 +// Made it use NewInstance. +// // **************************************************************************** void @@ -171,8 +181,7 @@ AttributeSubjectMap::SetAtts(const int index, const AttributeSubject *attr, atts[j] = atts[j-1]; indices[j] = indices[j-1]; } - atts[i] = attr->CreateCompatible(attr->TypeName()); - atts[i]->CopyAttributes(attr); + atts[i] = attr->NewInstance(true); indices[i] = index; nIndices++; } @@ -209,23 +218,27 @@ void AttributeSubjectMap::GetAtts(const int index, AttributeSubject *attr) const { int i; - for (i = 0; i < nIndices && indices[i] <= index; ++i) ; - - if (i == 0) - { - attr->CopyAttributes(atts[0]); - } - else if (i == nIndices) - { - attr->CopyAttributes(atts[nIndices-1]); - } - else + + if(nIndices > 0) { - int i0 = indices[i-1]; - int i1 = indices[i]; - double f = (double) (index - i0) / (double) (i1 - i0); + for (i = 0; i < nIndices && indices[i] <= index; ++i) ; + + if (i == 0) + { + attr->CopyAttributes(atts[0]); + } + else if (i == nIndices) + { + attr->CopyAttributes(atts[nIndices-1]); + } + else + { + int i0 = indices[i-1]; + int i1 = indices[i]; + double f = (double) (index - i0) / (double) (i1 - i0); - attr->InterpolateLinear(atts[i-1], atts[i], f); + attr->InterpolateLinear(atts[i-1], atts[i], f); + } } } @@ -247,6 +260,8 @@ AttributeSubjectMap::ClearAtts() for (i = 0; i < nIndices; ++i) { delete atts[i]; + atts[i] = 0; + indices[i] = 0; } nIndices = 0; @@ -604,3 +619,122 @@ AttributeSubjectMap::ResizeMap(const int newSize) maxIndices = newSize; } + +// **************************************************************************** +// Method: AttributeSubjectMap::CreateNode +// +// Purpose: +// Saves the AttributeSubjectMap to a DataNode. +// +// Arguments: +// parentNode : The node to which the map will be saved. +// +// Programmer: Brad Whitlock +// Creation: Tue Jul 22 11:32:17 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +bool +AttributeSubjectMap::CreateNode(DataNode *parentNode) +{ + bool retval = false; + + if(parentNode == 0) + return retval; + + if(nIndices > 0) + { + DataNode *mapNode = new DataNode("AttributeSubjectMap"); + parentNode->AddNode(mapNode); + + // Add the indices. + intVector ids; + int i; + for(i = 0; i < nIndices; ++i) + ids.push_back(indices[i]); + mapNode->AddNode(new DataNode("indices", ids)); + + // Add the attributes. + DataNode *attNode = new DataNode("attributes"); + mapNode->AddNode(attNode); + for(i = 0; i < nIndices; ++i) + atts[i]->CreateNode(attNode, true); + + retval = true; + } + + return retval; +} + +// **************************************************************************** +// Method: AttributeSubjectMap::SetFromNode +// +// Purpose: +// Initializes the map using the data in the config file. +// +// Arguments: +// parentNode : The data node that will be used to initialize the map. +// factoryObj : The object that we use to create new instances of attributes. +// +// Programmer: Brad Whitlock +// Creation: Tue Jul 22 11:33:21 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +AttributeSubjectMap::SetFromNode(DataNode *parentNode, + AttributeSubject *factoryObj) +{ + // + // Clear the attributes. + // + ClearAtts(); + + // + // Look for the required nodes. + // + if(parentNode == 0) + return; + + DataNode *mapNode = parentNode->GetNode("AttributeSubjectMap"); + if(mapNode == 0) + return; + + DataNode *indicesNode = mapNode->GetNode("indices"); + if(indicesNode == 0) + return; + + DataNode *attsNode = mapNode->GetNode("attributes"); + if(attsNode == 0) + return; + + // + // Now that we have all of the nodes that we need, read in the objects + // and add them to the "map". + // + const intVector &iv = indicesNode->AsIntVector(); + DataNode **attsObjects = attsNode->GetChildren(); + const int numAtts = attsNode->GetNumChildren(); + for(int i = 0; i < iv.size(); ++i) + { + if(i < numAtts) + { + // Create a fresh AttributeSubject so that its fields are + // initialized to the default values and not those last read in. + AttributeSubject *reader = factoryObj->NewInstance(false); + + // Initialize the object using the data node. + reader->SetFromNode(attsObjects[i]); + + // Add the object to the map. + SetAtts(iv[i], reader); + + // delete the reader object. + delete reader; + } + } +} diff --git a/common/state/AttributeSubjectMap.h b/common/state/AttributeSubjectMap.h index 6403a060c4918236a137dda001a30b4987af0ff2..acd7dc25164e8b8496e7aa3ea8fd3689777f8ad2 100644 --- a/common/state/AttributeSubjectMap.h +++ b/common/state/AttributeSubjectMap.h @@ -8,6 +8,7 @@ #include class AttributeSubject; +class DataNode; // **************************************************************************** // Class: AttributeSubjectMap @@ -38,6 +39,9 @@ class STATE_API AttributeSubjectMap AttributeSubject *CreateCompatible(const std::string &) const; bool CopyAttributes(const AttributeSubjectMap *); + bool CreateNode(DataNode *parentNode); + void SetFromNode(DataNode *parentNode, AttributeSubject *factoryObj); + private: void ResizeMap(const int); diff --git a/common/state/BoxExtents.C b/common/state/BoxExtents.C index 6960211546dccaf2f9e66a48f3bea854e4bb932f..7c7eccf2d048b011e334e97a35c16460f46f6190 100644 --- a/common/state/BoxExtents.C +++ b/common/state/BoxExtents.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -35,7 +35,7 @@ BoxExtents::BoxExtents() : AttributeSubject("D") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -61,7 +61,7 @@ BoxExtents::BoxExtents(const BoxExtents &obj) : AttributeSubject("D") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -81,7 +81,7 @@ BoxExtents::~BoxExtents() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -108,7 +108,7 @@ BoxExtents::operator = (const BoxExtents &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -137,7 +137,7 @@ BoxExtents::operator == (const BoxExtents &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -158,7 +158,7 @@ BoxExtents::operator != (const BoxExtents &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -179,7 +179,7 @@ BoxExtents::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -207,7 +207,7 @@ BoxExtents::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -224,6 +224,33 @@ BoxExtents::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: BoxExtents::NewInstance +// +// Purpose: +// NewInstance method for the BoxExtents class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:35 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +BoxExtents::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new BoxExtents(*this); + else + retval = new BoxExtents; + + return retval; +} + // **************************************************************************** // Method: BoxExtents::SelectAll // @@ -233,7 +260,7 @@ BoxExtents::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -258,7 +285,7 @@ BoxExtents::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -300,7 +327,7 @@ BoxExtents::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -362,7 +389,7 @@ BoxExtents::GetExtents() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -387,7 +414,7 @@ BoxExtents::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -412,7 +439,7 @@ BoxExtents::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -437,7 +464,7 @@ BoxExtents::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // diff --git a/common/state/BoxExtents.h b/common/state/BoxExtents.h index dc78344c12cbe168409f6bac82bcdfbf22d9e261..3065c128cbe823921a4a489999735cf6436e5b8a 100644 --- a/common/state/BoxExtents.h +++ b/common/state/BoxExtents.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:35 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/ColorAttribute.C b/common/state/ColorAttribute.C index 9260cc12415897c776415099625e565b18e8f0c8..8f55175dda9d4e30f2c0b3dabceef9b6a749dfdf 100644 --- a/common/state/ColorAttribute.C +++ b/common/state/ColorAttribute.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -33,7 +33,7 @@ ColorAttribute::ColorAttribute() : AttributeSubject("U") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -59,7 +59,7 @@ ColorAttribute::ColorAttribute(const ColorAttribute &obj) : AttributeSubject("U" // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -79,7 +79,7 @@ ColorAttribute::~ColorAttribute() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -106,7 +106,7 @@ ColorAttribute::operator = (const ColorAttribute &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -135,7 +135,7 @@ ColorAttribute::operator == (const ColorAttribute &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -156,7 +156,7 @@ ColorAttribute::operator != (const ColorAttribute &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -177,7 +177,7 @@ ColorAttribute::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -205,7 +205,7 @@ ColorAttribute::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -222,6 +222,33 @@ ColorAttribute::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ColorAttribute::NewInstance +// +// Purpose: +// NewInstance method for the ColorAttribute class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:38 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ColorAttribute::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ColorAttribute(*this); + else + retval = new ColorAttribute; + + return retval; +} + // **************************************************************************** // Method: ColorAttribute::SelectAll // @@ -231,7 +258,7 @@ ColorAttribute::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -256,7 +283,7 @@ ColorAttribute::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -298,7 +325,7 @@ ColorAttribute::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -362,7 +389,7 @@ ColorAttribute::GetColor() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -387,7 +414,7 @@ ColorAttribute::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -412,7 +439,7 @@ ColorAttribute::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -437,7 +464,7 @@ ColorAttribute::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // diff --git a/common/state/ColorAttribute.h b/common/state/ColorAttribute.h index 756e413962a2b880df08ba6bd27cab8ba9d5f4fc..84c4b4f28d36ac1343ec60fc07d03cde883829f9 100644 --- a/common/state/ColorAttribute.h +++ b/common/state/ColorAttribute.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:42 PST 2003 +// Creation: Wed Jul 23 11:29:38 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/ColorAttributeList.C b/common/state/ColorAttributeList.C index 87b522456082337ae2923764672e075fd6415293..c0ef1ea890747d97674461c268fb432e92056412 100644 --- a/common/state/ColorAttributeList.C +++ b/common/state/ColorAttributeList.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ ColorAttributeList::ColorAttributeList() : AttributeSubject("a*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -68,7 +68,7 @@ ColorAttributeList::ColorAttributeList(const ColorAttributeList &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -92,7 +92,7 @@ ColorAttributeList::~ColorAttributeList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -131,7 +131,7 @@ ColorAttributeList::operator = (const ColorAttributeList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -164,7 +164,7 @@ ColorAttributeList::operator == (const ColorAttributeList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -185,7 +185,7 @@ ColorAttributeList::operator != (const ColorAttributeList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -206,7 +206,7 @@ ColorAttributeList::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -234,7 +234,7 @@ ColorAttributeList::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -251,6 +251,33 @@ ColorAttributeList::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ColorAttributeList::NewInstance +// +// Purpose: +// NewInstance method for the ColorAttributeList class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:41 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ColorAttributeList::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ColorAttributeList(*this); + else + retval = new ColorAttributeList; + + return retval; +} + // **************************************************************************** // Method: ColorAttributeList::SelectAll // @@ -260,7 +287,7 @@ ColorAttributeList::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -281,7 +308,7 @@ ColorAttributeList::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -306,7 +333,7 @@ ColorAttributeList::CreateSubAttributeGroup(int) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -349,7 +376,7 @@ ColorAttributeList::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -418,7 +445,7 @@ ColorAttributeList::GetColors() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -443,7 +470,7 @@ ColorAttributeList::AddColorAttribute(const ColorAttribute &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -471,7 +498,7 @@ ColorAttributeList::ClearColorAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -506,7 +533,7 @@ ColorAttributeList::RemoveColorAttribute(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -527,7 +554,7 @@ ColorAttributeList::GetNumColorAttributes() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -548,7 +575,7 @@ ColorAttributeList::GetColorAttribute(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -569,7 +596,7 @@ ColorAttributeList::GetColorAttribute(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -590,7 +617,7 @@ ColorAttributeList::operator [] (int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -615,7 +642,7 @@ ColorAttributeList::operator [] (int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -640,7 +667,7 @@ ColorAttributeList::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -665,7 +692,7 @@ ColorAttributeList::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -690,7 +717,7 @@ ColorAttributeList::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // diff --git a/common/state/ColorAttributeList.h b/common/state/ColorAttributeList.h index 5e9c6d1e8a2ed942ed764cddf858ce6c29f21e80..65951d5900ed37bf517b0e1b9b7d0bd0e6a91271 100644 --- a/common/state/ColorAttributeList.h +++ b/common/state/ColorAttributeList.h @@ -13,7 +13,7 @@ class ColorAttribute; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:43 PST 2003 +// Creation: Wed Jul 23 11:29:41 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/ColorControlPoint.C b/common/state/ColorControlPoint.C index 7eef3c185fe4e5b0183bc0d690b4d9f1e0f1a010..b60f4b23b2b53e0a2f03582bc310dc2fd6769e96 100644 --- a/common/state/ColorControlPoint.C +++ b/common/state/ColorControlPoint.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -34,7 +34,7 @@ ColorControlPoint::ColorControlPoint() : AttributeSubject("Uf") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -61,7 +61,7 @@ ColorControlPoint::ColorControlPoint(const ColorControlPoint &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -81,7 +81,7 @@ ColorControlPoint::~ColorControlPoint() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -109,7 +109,7 @@ ColorControlPoint::operator = (const ColorControlPoint &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -139,7 +139,7 @@ ColorControlPoint::operator == (const ColorControlPoint &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -160,7 +160,7 @@ ColorControlPoint::operator != (const ColorControlPoint &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -181,7 +181,7 @@ ColorControlPoint::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -209,7 +209,7 @@ ColorControlPoint::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -226,6 +226,33 @@ ColorControlPoint::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ColorControlPoint::NewInstance +// +// Purpose: +// NewInstance method for the ColorControlPoint class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:44 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ColorControlPoint::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ColorControlPoint(*this); + else + retval = new ColorControlPoint; + + return retval; +} + // **************************************************************************** // Method: ColorControlPoint::SelectAll // @@ -235,7 +262,7 @@ ColorControlPoint::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -261,7 +288,7 @@ ColorControlPoint::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -309,7 +336,7 @@ ColorControlPoint::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -398,7 +425,7 @@ ColorControlPoint::SelectColors() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -424,7 +451,7 @@ ColorControlPoint::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -450,7 +477,7 @@ ColorControlPoint::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -476,7 +503,7 @@ ColorControlPoint::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // diff --git a/common/state/ColorControlPoint.h b/common/state/ColorControlPoint.h index 16f2fa9042fa9bbbe90e112667eb68adef61a6f7..7b69a38bedc2218402bf763713fb4748f9b545f4 100644 --- a/common/state/ColorControlPoint.h +++ b/common/state/ColorControlPoint.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:44 PST 2003 +// Creation: Wed Jul 23 11:29:44 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/ColorControlPointList.C b/common/state/ColorControlPointList.C index a2f4084a4d8889b3865a51560bfdf2e6639d1b9a..d1cdf6559ae6619bc9b863da77ae56f082308f97 100644 --- a/common/state/ColorControlPointList.C +++ b/common/state/ColorControlPointList.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -34,7 +34,7 @@ ColorControlPointList::ColorControlPointList() : AttributeSubject("a*bbbb") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -76,7 +76,7 @@ ColorControlPointList::ColorControlPointList(const ColorControlPointList &obj) : // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -100,7 +100,7 @@ ColorControlPointList::~ColorControlPointList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -143,7 +143,7 @@ ColorControlPointList::operator = (const ColorControlPointList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -180,7 +180,7 @@ ColorControlPointList::operator == (const ColorControlPointList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -201,7 +201,7 @@ ColorControlPointList::operator != (const ColorControlPointList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -222,7 +222,7 @@ ColorControlPointList::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -250,7 +250,7 @@ ColorControlPointList::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -267,6 +267,33 @@ ColorControlPointList::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ColorControlPointList::NewInstance +// +// Purpose: +// NewInstance method for the ColorControlPointList class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:47 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ColorControlPointList::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ColorControlPointList(*this); + else + retval = new ColorControlPointList; + + return retval; +} + // **************************************************************************** // Method: ColorControlPointList::SelectAll // @@ -276,7 +303,7 @@ ColorControlPointList::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -301,7 +328,7 @@ ColorControlPointList::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -326,7 +353,7 @@ ColorControlPointList::CreateSubAttributeGroup(int) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -393,7 +420,7 @@ ColorControlPointList::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -532,7 +559,7 @@ ColorControlPointList::SelectControlPoints() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -557,7 +584,7 @@ ColorControlPointList::AddColorControlPoint(const ColorControlPoint &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -585,7 +612,7 @@ ColorControlPointList::ClearColorControlPoints() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -620,7 +647,7 @@ ColorControlPointList::RemoveColorControlPoint(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -641,7 +668,7 @@ ColorControlPointList::GetNumColorControlPoints() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -662,7 +689,7 @@ ColorControlPointList::GetColorControlPoint(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -683,7 +710,7 @@ ColorControlPointList::GetColorControlPoint(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -704,7 +731,7 @@ ColorControlPointList::operator [] (int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -729,7 +756,7 @@ ColorControlPointList::operator [] (int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -758,7 +785,7 @@ ColorControlPointList::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -787,7 +814,7 @@ ColorControlPointList::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -816,7 +843,7 @@ ColorControlPointList::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // diff --git a/common/state/ColorControlPointList.h b/common/state/ColorControlPointList.h index eeb14ef9cf692853f01b56aaa5663d9111d83b5d..ccb8a7280cfeae4ac6d38636334a027d3877a8c9 100644 --- a/common/state/ColorControlPointList.h +++ b/common/state/ColorControlPointList.h @@ -13,7 +13,7 @@ class ColorControlPoint; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 16:52:33 PST 2003 +// Creation: Wed Jul 23 11:29:47 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/ColorTableAttributes.C b/common/state/ColorTableAttributes.C index 882fad7e08d6db2027fe69d9132a679cf4ee83a3..9e80257e409b5e3670dd967cfca048523051d537 100644 --- a/common/state/ColorTableAttributes.C +++ b/common/state/ColorTableAttributes.C @@ -14,7 +14,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -35,7 +35,7 @@ ColorTableAttributes::ColorTableAttributes() : AttributeSubject("s*a*ss") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -76,7 +76,7 @@ ColorTableAttributes::ColorTableAttributes(const ColorTableAttributes &obj) : At // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -100,7 +100,7 @@ ColorTableAttributes::~ColorTableAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -142,7 +142,7 @@ ColorTableAttributes::operator = (const ColorTableAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -178,7 +178,7 @@ ColorTableAttributes::operator == (const ColorTableAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -199,7 +199,7 @@ ColorTableAttributes::operator != (const ColorTableAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -220,7 +220,7 @@ ColorTableAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -248,7 +248,7 @@ ColorTableAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -265,6 +265,33 @@ ColorTableAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ColorTableAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ColorTableAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:50 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ColorTableAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ColorTableAttributes(*this); + else + retval = new ColorTableAttributes; + + return retval; +} + // **************************************************************************** // Method: ColorTableAttributes::SelectAll // @@ -274,7 +301,7 @@ ColorTableAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -298,7 +325,7 @@ ColorTableAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -608,7 +635,7 @@ ColorTableAttributes::SelectActiveDiscrete() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -633,7 +660,7 @@ ColorTableAttributes::AddColorControlPointList(const ColorControlPointList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -661,7 +688,7 @@ ColorTableAttributes::ClearColorControlPointLists() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -696,7 +723,7 @@ ColorTableAttributes::RemoveColorControlPointList(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -717,7 +744,7 @@ ColorTableAttributes::GetNumColorControlPointLists() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -738,7 +765,7 @@ ColorTableAttributes::GetColorControlPointList(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -759,7 +786,7 @@ ColorTableAttributes::GetColorControlPointList(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -780,7 +807,7 @@ ColorTableAttributes::operator [] (int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -805,7 +832,7 @@ ColorTableAttributes::operator [] (int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -833,7 +860,7 @@ ColorTableAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -861,7 +888,7 @@ ColorTableAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -889,7 +916,7 @@ ColorTableAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:15 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // diff --git a/common/state/ColorTableAttributes.h b/common/state/ColorTableAttributes.h index ecd78148a06a345eaea0a996f5f735c6e459af9c..49edab6326eaeeba0802a7c8fd0abd5fd91e59b2 100644 --- a/common/state/ColorTableAttributes.h +++ b/common/state/ColorTableAttributes.h @@ -14,7 +14,7 @@ class ColorControlPointList; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 7 17:05:14 PST 2003 +// Creation: Wed Jul 23 11:29:50 PDT 2003 // // Modifications: // @@ -34,6 +34,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/CompactSILRestrictionAttributes.C b/common/state/CompactSILRestrictionAttributes.C index 768f1cde11ea6b3129e2f49413d64d43ae74a389..eda32e34ce48379f12e41c89a7f789a459394c0f 100644 --- a/common/state/CompactSILRestrictionAttributes.C +++ b/common/state/CompactSILRestrictionAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ CompactSILRestrictionAttributes::CompactSILRestrictionAttributes() : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -53,7 +53,7 @@ CompactSILRestrictionAttributes::CompactSILRestrictionAttributes(const CompactSI // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -73,7 +73,7 @@ CompactSILRestrictionAttributes::~CompactSILRestrictionAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -97,7 +97,7 @@ CompactSILRestrictionAttributes::operator = (const CompactSILRestrictionAttribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -120,7 +120,7 @@ CompactSILRestrictionAttributes::operator == (const CompactSILRestrictionAttribu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -141,7 +141,7 @@ CompactSILRestrictionAttributes::operator != (const CompactSILRestrictionAttribu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -162,7 +162,7 @@ CompactSILRestrictionAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -190,7 +190,7 @@ CompactSILRestrictionAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -207,6 +207,33 @@ CompactSILRestrictionAttributes::CreateCompatible(const std::string &tname) cons return retval; } +// **************************************************************************** +// Method: CompactSILRestrictionAttributes::NewInstance +// +// Purpose: +// NewInstance method for the CompactSILRestrictionAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:53 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +CompactSILRestrictionAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new CompactSILRestrictionAttributes(*this); + else + retval = new CompactSILRestrictionAttributes; + + return retval; +} + // **************************************************************************** // Method: CompactSILRestrictionAttributes::SelectAll // @@ -216,7 +243,7 @@ CompactSILRestrictionAttributes::CreateCompatible(const std::string &tname) cons // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -242,7 +269,7 @@ CompactSILRestrictionAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -290,7 +317,7 @@ CompactSILRestrictionAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -376,7 +403,7 @@ CompactSILRestrictionAttributes::SelectUseSet() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -402,7 +429,7 @@ CompactSILRestrictionAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -428,7 +455,7 @@ CompactSILRestrictionAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -454,7 +481,7 @@ CompactSILRestrictionAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // diff --git a/common/state/CompactSILRestrictionAttributes.h b/common/state/CompactSILRestrictionAttributes.h index ae728c5910b01bd32e23c285f8f00c87101520bc..6b39403e3a38da9e313de810a5f853f9f0298ad0 100644 --- a/common/state/CompactSILRestrictionAttributes.h +++ b/common/state/CompactSILRestrictionAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:46 PST 2003 +// Creation: Wed Jul 23 11:29:53 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/ConfigManager.C b/common/state/ConfigManager.C index d3048c68c1a635d16452d83767aefd202fe37031..db98b0a4cdd47130aab1e7ca81148b086932dd68 100644 --- a/common/state/ConfigManager.C +++ b/common/state/ConfigManager.C @@ -539,6 +539,9 @@ ConfigManager::ReadStringVector(char termChar) // Brad Whitlock, Thu Jul 3 16:16:26 PST 2003 // Made it use stringVector class. // +// Brad Whitlock, Tue Jul 22 10:09:22 PDT 2003 +// I fixed a bug in reading in CHAR_NODE data. +// // **************************************************************************** DataNode * @@ -569,8 +572,7 @@ ConfigManager::ReadFieldData(const std::string &tagName, NodeTypeEnum type, // Read a character. if(minSize > 0) { - sscanf(sv[i].c_str(), "%c", &cval); - retval = new DataNode(tagName, cval); + retval = new DataNode(tagName, sv[0][0]); } break; case UNSIGNED_CHAR_NODE: diff --git a/common/state/ContourOpAttributes.C b/common/state/ContourOpAttributes.C index 639fecb6142e2e31ca846f28db328aa65432defb..b56444563702afddc511518a2c4b6cbeebdce15e 100644 --- a/common/state/ContourOpAttributes.C +++ b/common/state/ContourOpAttributes.C @@ -85,7 +85,7 @@ ContourOpAttributes::ContourScaling_FromString(const std::string &s, ContourOpAt // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -110,7 +110,7 @@ ContourOpAttributes::ContourOpAttributes() : AttributeSubject("id*d*ibbddis") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -141,7 +141,7 @@ ContourOpAttributes::ContourOpAttributes(const ContourOpAttributes &obj) : Attri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -161,7 +161,7 @@ ContourOpAttributes::~ContourOpAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -193,7 +193,7 @@ ContourOpAttributes::operator = (const ContourOpAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -224,7 +224,7 @@ ContourOpAttributes::operator == (const ContourOpAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -245,7 +245,7 @@ ContourOpAttributes::operator != (const ContourOpAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -266,7 +266,7 @@ ContourOpAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -294,7 +294,7 @@ ContourOpAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -311,6 +311,33 @@ ContourOpAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ContourOpAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ContourOpAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:56 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ContourOpAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ContourOpAttributes(*this); + else + retval = new ContourOpAttributes; + + return retval; +} + // **************************************************************************** // Method: ContourOpAttributes::SelectAll // @@ -320,7 +347,7 @@ ContourOpAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -354,7 +381,7 @@ ContourOpAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -450,7 +477,7 @@ ContourOpAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -708,7 +735,7 @@ ContourOpAttributes::SelectVariable() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -742,7 +769,7 @@ ContourOpAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -776,7 +803,7 @@ ContourOpAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -810,7 +837,7 @@ ContourOpAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // diff --git a/common/state/ContourOpAttributes.h b/common/state/ContourOpAttributes.h index 002923c19261cd3d410a62c7b015a12bd23fd1ac..5aa699c8c5b991e2e1ffec7344b964c04e68197b 100644 --- a/common/state/ContourOpAttributes.h +++ b/common/state/ContourOpAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:30 PST 2003 +// Creation: Wed Jul 23 11:29:56 PDT 2003 // // Modifications: // @@ -45,6 +45,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/DatabaseAttributes.C b/common/state/DatabaseAttributes.C index 38ed660ff04603ce6a52a4156703be0c0e07e34f..5b3b2b5a52243b64ce8d821218658440a4cd67a1 100644 --- a/common/state/DatabaseAttributes.C +++ b/common/state/DatabaseAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ DatabaseAttributes::DatabaseAttributes() : AttributeSubject("i") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -52,7 +52,7 @@ DatabaseAttributes::DatabaseAttributes(const DatabaseAttributes &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -72,7 +72,7 @@ DatabaseAttributes::~DatabaseAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -95,7 +95,7 @@ DatabaseAttributes::operator = (const DatabaseAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -117,7 +117,7 @@ DatabaseAttributes::operator == (const DatabaseAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -138,7 +138,7 @@ DatabaseAttributes::operator != (const DatabaseAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -159,7 +159,7 @@ DatabaseAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -187,7 +187,7 @@ DatabaseAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -204,6 +204,33 @@ DatabaseAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: DatabaseAttributes::NewInstance +// +// Purpose: +// NewInstance method for the DatabaseAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:29:57 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +DatabaseAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new DatabaseAttributes(*this); + else + retval = new DatabaseAttributes; + + return retval; +} + // **************************************************************************** // Method: DatabaseAttributes::SelectAll // @@ -213,7 +240,7 @@ DatabaseAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -238,7 +265,7 @@ DatabaseAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -280,7 +307,7 @@ DatabaseAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -335,7 +362,7 @@ DatabaseAttributes::GetState() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -360,7 +387,7 @@ DatabaseAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -385,7 +412,7 @@ DatabaseAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -410,7 +437,7 @@ DatabaseAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // diff --git a/common/state/DatabaseAttributes.h b/common/state/DatabaseAttributes.h index c2494c278bd15b44b244b991603a027f7328f67a..1f56f3b08766855c89618a1148d2885930087c0a 100644 --- a/common/state/DatabaseAttributes.h +++ b/common/state/DatabaseAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:47 PST 2003 +// Creation: Wed Jul 23 11:29:57 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/EngineList.C b/common/state/EngineList.C index 6b905ba62da88a605e48c85513448f32acdaf74b..0142c138707c6eafdbc5842b936947a20a827ab9 100644 --- a/common/state/EngineList.C +++ b/common/state/EngineList.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -29,7 +29,7 @@ EngineList::EngineList() : AttributeSubject("s*i*i*i*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -54,7 +54,7 @@ EngineList::EngineList(const EngineList &obj) : AttributeSubject("s*i*i*i*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -74,7 +74,7 @@ EngineList::~EngineList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -100,7 +100,7 @@ EngineList::operator = (const EngineList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -125,7 +125,7 @@ EngineList::operator == (const EngineList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -146,7 +146,7 @@ EngineList::operator != (const EngineList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -167,7 +167,7 @@ EngineList::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -195,7 +195,7 @@ EngineList::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -212,6 +212,33 @@ EngineList::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: EngineList::NewInstance +// +// Purpose: +// NewInstance method for the EngineList class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:00 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +EngineList::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new EngineList(*this); + else + retval = new EngineList; + + return retval; +} + // **************************************************************************** // Method: EngineList::SelectAll // @@ -221,7 +248,7 @@ EngineList::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -249,7 +276,7 @@ EngineList::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -309,7 +336,7 @@ EngineList::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -461,7 +488,7 @@ EngineList::SelectLoadBalancing() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -489,7 +516,7 @@ EngineList::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -517,7 +544,7 @@ EngineList::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -545,7 +572,7 @@ EngineList::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // diff --git a/common/state/EngineList.h b/common/state/EngineList.h index 0c6920b67182e9727049951aa41f58913e9a9758..51bcc8892317cbfe9b1ae646fc76b79b79b52f36 100644 --- a/common/state/EngineList.h +++ b/common/state/EngineList.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:48 PST 2003 +// Creation: Wed Jul 23 11:30:00 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/Expression.C b/common/state/Expression.C index fe77a9a8793fc6f93d9ac73299c2858b868327ca..cf3b0dd9baf65c5acc0790a5ba73454ff1ae5670 100644 --- a/common/state/Expression.C +++ b/common/state/Expression.C @@ -49,7 +49,7 @@ Expression::ExprType_FromString(const std::string &s, Expression::ExprType &val) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -72,7 +72,7 @@ Expression::Expression() : AttributeSubject("ssbi") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -97,7 +97,7 @@ Expression::Expression(const Expression &obj) : AttributeSubject("ssbi") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -117,7 +117,7 @@ Expression::~Expression() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -143,7 +143,7 @@ Expression::operator = (const Expression &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -168,7 +168,7 @@ Expression::operator == (const Expression &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -189,7 +189,7 @@ Expression::operator != (const Expression &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -210,7 +210,7 @@ Expression::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -238,7 +238,7 @@ Expression::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -255,6 +255,33 @@ Expression::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: Expression::NewInstance +// +// Purpose: +// NewInstance method for the Expression class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:03 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +Expression::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new Expression(*this); + else + retval = new Expression; + + return retval; +} + // **************************************************************************** // Method: Expression::SelectAll // @@ -264,7 +291,7 @@ Expression::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -292,7 +319,7 @@ Expression::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -352,7 +379,7 @@ Expression::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -494,7 +521,7 @@ Expression::SelectDefinition() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -522,7 +549,7 @@ Expression::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -550,7 +577,7 @@ Expression::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -578,7 +605,7 @@ Expression::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // diff --git a/common/state/Expression.h b/common/state/Expression.h index 8f7cf8049ae25ee8ecdca33eb7c351d23a08ca3d..7908754e063771cdc82373c2780da15571fbd9a4 100644 --- a/common/state/Expression.h +++ b/common/state/Expression.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:32 PST 2003 +// Creation: Wed Jul 23 11:30:03 PDT 2003 // // Modifications: // @@ -43,6 +43,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/ExpressionList.C b/common/state/ExpressionList.C index 5509c8ebfa9e1c357aa5f70a7bb4e338c1094cd7..f300108fe983b7b120b5630f1d530dca5107f6d8 100644 --- a/common/state/ExpressionList.C +++ b/common/state/ExpressionList.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ ExpressionList::ExpressionList() : AttributeSubject("a*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -68,7 +68,7 @@ ExpressionList::ExpressionList(const ExpressionList &obj) : AttributeSubject("a* // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -92,7 +92,7 @@ ExpressionList::~ExpressionList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -131,7 +131,7 @@ ExpressionList::operator = (const ExpressionList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -164,7 +164,7 @@ ExpressionList::operator == (const ExpressionList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -185,7 +185,7 @@ ExpressionList::operator != (const ExpressionList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -206,7 +206,7 @@ ExpressionList::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -234,7 +234,7 @@ ExpressionList::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -251,6 +251,33 @@ ExpressionList::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ExpressionList::NewInstance +// +// Purpose: +// NewInstance method for the ExpressionList class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:06 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ExpressionList::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ExpressionList(*this); + else + retval = new ExpressionList; + + return retval; +} + // **************************************************************************** // Method: ExpressionList::SelectAll // @@ -260,7 +287,7 @@ ExpressionList::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -281,7 +308,7 @@ ExpressionList::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -306,7 +333,7 @@ ExpressionList::CreateSubAttributeGroup(int) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -349,7 +376,7 @@ ExpressionList::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -418,7 +445,7 @@ ExpressionList::GetExpressions() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -443,7 +470,7 @@ ExpressionList::AddExpression(const Expression &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -471,7 +498,7 @@ ExpressionList::ClearExpressions() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -506,7 +533,7 @@ ExpressionList::RemoveExpression(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -527,7 +554,7 @@ ExpressionList::GetNumExpressions() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -548,7 +575,7 @@ ExpressionList::GetExpression(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -569,7 +596,7 @@ ExpressionList::GetExpression(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -590,7 +617,7 @@ ExpressionList::operator [] (int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -615,7 +642,7 @@ ExpressionList::operator [] (int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -640,7 +667,7 @@ ExpressionList::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -665,7 +692,7 @@ ExpressionList::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -690,7 +717,7 @@ ExpressionList::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // diff --git a/common/state/ExpressionList.h b/common/state/ExpressionList.h index 37568bb2859cad5c31e9897ef9820182bd220d84..450ebef7a163cc680079a5b58118e3911556d373 100644 --- a/common/state/ExpressionList.h +++ b/common/state/ExpressionList.h @@ -13,7 +13,7 @@ class Expression; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:49 PST 2003 +// Creation: Wed Jul 23 11:30:06 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/GaussianControlPoint.C b/common/state/GaussianControlPoint.C index b23d29304d022bcdf25bbb457490156489a05129..8cbebad9c7dd2ca7abd71964037cf0229d4383d9 100644 --- a/common/state/GaussianControlPoint.C +++ b/common/state/GaussianControlPoint.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -34,7 +34,7 @@ GaussianControlPoint::GaussianControlPoint() : AttributeSubject("fffff") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -60,7 +60,7 @@ GaussianControlPoint::GaussianControlPoint(const GaussianControlPoint &obj) : At // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -80,7 +80,7 @@ GaussianControlPoint::~GaussianControlPoint() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -107,7 +107,7 @@ GaussianControlPoint::operator = (const GaussianControlPoint &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -133,7 +133,7 @@ GaussianControlPoint::operator == (const GaussianControlPoint &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -154,7 +154,7 @@ GaussianControlPoint::operator != (const GaussianControlPoint &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -175,7 +175,7 @@ GaussianControlPoint::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -203,7 +203,7 @@ GaussianControlPoint::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -220,6 +220,33 @@ GaussianControlPoint::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: GaussianControlPoint::NewInstance +// +// Purpose: +// NewInstance method for the GaussianControlPoint class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:09 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +GaussianControlPoint::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new GaussianControlPoint(*this); + else + retval = new GaussianControlPoint; + + return retval; +} + // **************************************************************************** // Method: GaussianControlPoint::SelectAll // @@ -229,7 +256,7 @@ GaussianControlPoint::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -258,7 +285,7 @@ GaussianControlPoint::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -324,7 +351,7 @@ GaussianControlPoint::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -439,7 +466,7 @@ GaussianControlPoint::GetYBias() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -468,7 +495,7 @@ GaussianControlPoint::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -497,7 +524,7 @@ GaussianControlPoint::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -526,7 +553,7 @@ GaussianControlPoint::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // diff --git a/common/state/GaussianControlPoint.h b/common/state/GaussianControlPoint.h index f7616496b719137bdfe3e4672c01292a5248d464..049fa505a4c1930bc40e74e5464ca084c9520c8b 100644 --- a/common/state/GaussianControlPoint.h +++ b/common/state/GaussianControlPoint.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:50 PST 2003 +// Creation: Wed Jul 23 11:30:09 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/GaussianControlPointList.C b/common/state/GaussianControlPointList.C index 3d2419973b7f9318b58c6ae832b5fc8a104e3ae1..5be281cbd4ce2b073666170cd7af59686b43b575 100644 --- a/common/state/GaussianControlPointList.C +++ b/common/state/GaussianControlPointList.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ GaussianControlPointList::GaussianControlPointList() : AttributeSubject("a*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -68,7 +68,7 @@ GaussianControlPointList::GaussianControlPointList(const GaussianControlPointLis // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -92,7 +92,7 @@ GaussianControlPointList::~GaussianControlPointList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -131,7 +131,7 @@ GaussianControlPointList::operator = (const GaussianControlPointList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -164,7 +164,7 @@ GaussianControlPointList::operator == (const GaussianControlPointList &obj) cons // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -185,7 +185,7 @@ GaussianControlPointList::operator != (const GaussianControlPointList &obj) cons // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -206,7 +206,7 @@ GaussianControlPointList::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -234,7 +234,7 @@ GaussianControlPointList::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -251,6 +251,33 @@ GaussianControlPointList::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: GaussianControlPointList::NewInstance +// +// Purpose: +// NewInstance method for the GaussianControlPointList class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:12 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +GaussianControlPointList::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new GaussianControlPointList(*this); + else + retval = new GaussianControlPointList; + + return retval; +} + // **************************************************************************** // Method: GaussianControlPointList::SelectAll // @@ -260,7 +287,7 @@ GaussianControlPointList::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -281,7 +308,7 @@ GaussianControlPointList::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -306,7 +333,7 @@ GaussianControlPointList::CreateSubAttributeGroup(int) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -349,7 +376,7 @@ GaussianControlPointList::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -418,7 +445,7 @@ GaussianControlPointList::GetControlPoints() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -443,7 +470,7 @@ GaussianControlPointList::AddGaussianControlPoint(const GaussianControlPoint &ob // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -471,7 +498,7 @@ GaussianControlPointList::ClearGaussianControlPoints() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -506,7 +533,7 @@ GaussianControlPointList::RemoveGaussianControlPoint(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -527,7 +554,7 @@ GaussianControlPointList::GetNumGaussianControlPoints() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -548,7 +575,7 @@ GaussianControlPointList::GetGaussianControlPoint(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -569,7 +596,7 @@ GaussianControlPointList::GetGaussianControlPoint(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -590,7 +617,7 @@ GaussianControlPointList::operator [] (int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -615,7 +642,7 @@ GaussianControlPointList::operator [] (int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -640,7 +667,7 @@ GaussianControlPointList::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -665,7 +692,7 @@ GaussianControlPointList::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -690,7 +717,7 @@ GaussianControlPointList::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // diff --git a/common/state/GaussianControlPointList.h b/common/state/GaussianControlPointList.h index 1abf50dbe8b5f370fa4dcd22a89d5bfabbd16a88..7b8399f6df422fb60456612e687c9c0529fafd89 100644 --- a/common/state/GaussianControlPointList.h +++ b/common/state/GaussianControlPointList.h @@ -13,7 +13,7 @@ class GaussianControlPoint; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:51 PST 2003 +// Creation: Wed Jul 23 11:30:12 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/GlobalAttributes.C b/common/state/GlobalAttributes.C index 508cd68e0d74b31ed4bfcc6e39da2c4ea9f59557..ae5de4dbfb4810b09fafe555b8818763c8936673 100644 --- a/common/state/GlobalAttributes.C +++ b/common/state/GlobalAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -45,7 +45,7 @@ GlobalAttributes::GlobalAttributes() : AttributeSubject("i*ibbbbsiiiiibibi*bb") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -84,7 +84,7 @@ GlobalAttributes::GlobalAttributes(const GlobalAttributes &obj) : AttributeSubje // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -104,7 +104,7 @@ GlobalAttributes::~GlobalAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -144,7 +144,7 @@ GlobalAttributes::operator = (const GlobalAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -183,7 +183,7 @@ GlobalAttributes::operator == (const GlobalAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -204,7 +204,7 @@ GlobalAttributes::operator != (const GlobalAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -225,7 +225,7 @@ GlobalAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -253,7 +253,7 @@ GlobalAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -270,6 +270,33 @@ GlobalAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: GlobalAttributes::NewInstance +// +// Purpose: +// NewInstance method for the GlobalAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:15 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +GlobalAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new GlobalAttributes(*this); + else + retval = new GlobalAttributes; + + return retval; +} + // **************************************************************************** // Method: GlobalAttributes::SelectAll // @@ -279,7 +306,7 @@ GlobalAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -774,7 +801,7 @@ GlobalAttributes::SelectViewKeyframes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -816,7 +843,7 @@ GlobalAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -858,7 +885,7 @@ GlobalAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -900,7 +927,7 @@ GlobalAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // diff --git a/common/state/GlobalAttributes.h b/common/state/GlobalAttributes.h index 65d0bebb8681d00256522407f1cdc3c0f7f66618..97a220dfc57dc35ae9f8b5d4ee83da099667d557 100644 --- a/common/state/GlobalAttributes.h +++ b/common/state/GlobalAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:15 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/GlobalLineoutAttributes.C b/common/state/GlobalLineoutAttributes.C index 49964135795eebac026bb98ef5f3106d100cfe48..79ee703f86dff7818cc0cff2195bc217bbd0ba5f 100644 --- a/common/state/GlobalLineoutAttributes.C +++ b/common/state/GlobalLineoutAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ GlobalLineoutAttributes::GlobalLineoutAttributes() : AttributeSubject("b") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -52,7 +52,7 @@ GlobalLineoutAttributes::GlobalLineoutAttributes(const GlobalLineoutAttributes & // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -72,7 +72,7 @@ GlobalLineoutAttributes::~GlobalLineoutAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -95,7 +95,7 @@ GlobalLineoutAttributes::operator = (const GlobalLineoutAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -117,7 +117,7 @@ GlobalLineoutAttributes::operator == (const GlobalLineoutAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -138,7 +138,7 @@ GlobalLineoutAttributes::operator != (const GlobalLineoutAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -159,7 +159,7 @@ GlobalLineoutAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -187,7 +187,7 @@ GlobalLineoutAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -204,6 +204,33 @@ GlobalLineoutAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: GlobalLineoutAttributes::NewInstance +// +// Purpose: +// NewInstance method for the GlobalLineoutAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:18 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +GlobalLineoutAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new GlobalLineoutAttributes(*this); + else + retval = new GlobalLineoutAttributes; + + return retval; +} + // **************************************************************************** // Method: GlobalLineoutAttributes::SelectAll // @@ -213,7 +240,7 @@ GlobalLineoutAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -259,7 +286,7 @@ GlobalLineoutAttributes::GetDynamic() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -284,7 +311,7 @@ GlobalLineoutAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -309,7 +336,7 @@ GlobalLineoutAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -334,7 +361,7 @@ GlobalLineoutAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // diff --git a/common/state/GlobalLineoutAttributes.h b/common/state/GlobalLineoutAttributes.h index 807aa5a86f9c56d2faccb639084120959e4a7b6f..33c85d06d00fcd1b353154a903efcf43e1fa5654 100644 --- a/common/state/GlobalLineoutAttributes.h +++ b/common/state/GlobalLineoutAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:52 PST 2003 +// Creation: Wed Jul 23 11:30:18 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/HostProfile.C b/common/state/HostProfile.C index 33de471cf39660266ffbe0d95474318360649fee..d1762742b5a58eac1be9f618e1ac6856be7764b5 100644 --- a/common/state/HostProfile.C +++ b/common/state/HostProfile.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -47,7 +47,7 @@ HostProfile::HostProfile() : AttributeSubject("sssiibibsbsbsbsbbbs*bbssb") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -92,7 +92,7 @@ HostProfile::HostProfile(const HostProfile &obj) : AttributeSubject("sssiibibsbs // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -112,7 +112,7 @@ HostProfile::~HostProfile() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -158,7 +158,7 @@ HostProfile::operator = (const HostProfile &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -203,7 +203,7 @@ HostProfile::operator == (const HostProfile &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -224,7 +224,7 @@ HostProfile::operator != (const HostProfile &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -245,7 +245,7 @@ HostProfile::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -273,7 +273,7 @@ HostProfile::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -290,6 +290,33 @@ HostProfile::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: HostProfile::NewInstance +// +// Purpose: +// NewInstance method for the HostProfile class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:22 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +HostProfile::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new HostProfile(*this); + else + retval = new HostProfile; + + return retval; +} + // **************************************************************************** // Method: HostProfile::SelectAll // @@ -299,7 +326,7 @@ HostProfile::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -347,7 +374,7 @@ HostProfile::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -527,7 +554,7 @@ HostProfile::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -1051,7 +1078,7 @@ HostProfile::SelectHostAliases() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -1099,7 +1126,7 @@ HostProfile::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -1147,7 +1174,7 @@ HostProfile::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -1195,7 +1222,7 @@ HostProfile::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // diff --git a/common/state/HostProfile.h b/common/state/HostProfile.h index 43454317d0cfa06d340284c1c02ef2672d49ccd7..bf491f06207a929d21614541c38f8acca966d9e1 100644 --- a/common/state/HostProfile.h +++ b/common/state/HostProfile.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:42:33 PST 2003 +// Creation: Wed Jul 23 11:30:22 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/HostProfileList.C b/common/state/HostProfileList.C index c2455dbe1a258acf0c088d9fa83b1e2f52096862..53bb8ec874d181313ff15b405beb7cf38ac6afd8 100644 --- a/common/state/HostProfileList.C +++ b/common/state/HostProfileList.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -31,7 +31,7 @@ HostProfileList::HostProfileList() : AttributeSubject("a*i") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -70,7 +70,7 @@ HostProfileList::HostProfileList(const HostProfileList &obj) : AttributeSubject( // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -94,7 +94,7 @@ HostProfileList::~HostProfileList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -134,7 +134,7 @@ HostProfileList::operator = (const HostProfileList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -168,7 +168,7 @@ HostProfileList::operator == (const HostProfileList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -189,7 +189,7 @@ HostProfileList::operator != (const HostProfileList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -210,7 +210,7 @@ HostProfileList::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -238,7 +238,7 @@ HostProfileList::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -255,6 +255,33 @@ HostProfileList::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: HostProfileList::NewInstance +// +// Purpose: +// NewInstance method for the HostProfileList class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:25 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +HostProfileList::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new HostProfileList(*this); + else + retval = new HostProfileList; + + return retval; +} + // **************************************************************************** // Method: HostProfileList::SelectAll // @@ -264,7 +291,7 @@ HostProfileList::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -286,7 +313,7 @@ HostProfileList::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -311,7 +338,7 @@ HostProfileList::CreateSubAttributeGroup(int) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -492,7 +519,7 @@ HostProfileList::SelectProfiles() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -517,7 +544,7 @@ HostProfileList::AddHostProfile(const HostProfile &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -545,7 +572,7 @@ HostProfileList::ClearHostProfiles() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -580,7 +607,7 @@ HostProfileList::RemoveHostProfile(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -601,7 +628,7 @@ HostProfileList::GetNumHostProfiles() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -622,7 +649,7 @@ HostProfileList::GetHostProfile(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -643,7 +670,7 @@ HostProfileList::GetHostProfile(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -664,7 +691,7 @@ HostProfileList::operator [] (int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -689,7 +716,7 @@ HostProfileList::operator [] (int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -715,7 +742,7 @@ HostProfileList::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -741,7 +768,7 @@ HostProfileList::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -767,7 +794,7 @@ HostProfileList::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // diff --git a/common/state/HostProfileList.h b/common/state/HostProfileList.h index fe0c1b4f960792427f5ec8307b8dcf82328bc16b..faa15fa7500e845368986052a956665f9d9f2b01 100644 --- a/common/state/HostProfileList.h +++ b/common/state/HostProfileList.h @@ -13,7 +13,7 @@ class HostProfile; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:54 PST 2003 +// Creation: Wed Jul 23 11:30:25 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/KeyframeAttributes.C b/common/state/KeyframeAttributes.C index 3e282d2d4ad19c022066e2f3dc68af22b0b5163f..6f45b0e6f7f3b314a8afbbdf3d36c5514d331051 100644 --- a/common/state/KeyframeAttributes.C +++ b/common/state/KeyframeAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ KeyframeAttributes::KeyframeAttributes() : AttributeSubject("b") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -52,7 +52,7 @@ KeyframeAttributes::KeyframeAttributes(const KeyframeAttributes &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -72,7 +72,7 @@ KeyframeAttributes::~KeyframeAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -95,7 +95,7 @@ KeyframeAttributes::operator = (const KeyframeAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -117,7 +117,7 @@ KeyframeAttributes::operator == (const KeyframeAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -138,7 +138,7 @@ KeyframeAttributes::operator != (const KeyframeAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -159,7 +159,7 @@ KeyframeAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -187,7 +187,7 @@ KeyframeAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -204,6 +204,33 @@ KeyframeAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: KeyframeAttributes::NewInstance +// +// Purpose: +// NewInstance method for the KeyframeAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:29 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +KeyframeAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new KeyframeAttributes(*this); + else + retval = new KeyframeAttributes; + + return retval; +} + // **************************************************************************** // Method: KeyframeAttributes::SelectAll // @@ -213,7 +240,7 @@ KeyframeAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -238,7 +265,7 @@ KeyframeAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -280,7 +307,7 @@ KeyframeAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -335,7 +362,7 @@ KeyframeAttributes::GetEnabled() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -360,7 +387,7 @@ KeyframeAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -385,7 +412,7 @@ KeyframeAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -410,7 +437,7 @@ KeyframeAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // diff --git a/common/state/KeyframeAttributes.h b/common/state/KeyframeAttributes.h index 5317843edf9b6574b410fa33ad25a51d5e4910e3..a2ba8c49ad15a2609c65e4b15daa3d453af1e568 100644 --- a/common/state/KeyframeAttributes.h +++ b/common/state/KeyframeAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:55 PST 2003 +// Creation: Wed Jul 23 11:30:29 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/LightAttributes.C b/common/state/LightAttributes.C index b71687b5ab20348fe5760d1bb3ac53f7f60aa403..847e7a492be55a3b70d8bf96d16c14b2987c288b 100644 --- a/common/state/LightAttributes.C +++ b/common/state/LightAttributes.C @@ -48,7 +48,7 @@ LightAttributes::LightType_FromString(const std::string &s, LightAttributes::Lig // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -57,7 +57,7 @@ LightAttributes::LightType_FromString(const std::string &s, LightAttributes::Lig LightAttributes::LightAttributes() : AttributeSubject("biDad"), color(255, 255, 255) { - enabledFlag = true; + enabledFlag = false; type = Camera; direction[0] = 0; direction[1] = 0; @@ -74,7 +74,7 @@ LightAttributes::LightAttributes() : AttributeSubject("biDad"), // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -103,7 +103,7 @@ LightAttributes::LightAttributes(const LightAttributes &obj) : AttributeSubject( // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -123,7 +123,7 @@ LightAttributes::~LightAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -153,7 +153,7 @@ LightAttributes::operator = (const LightAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -186,7 +186,7 @@ LightAttributes::operator == (const LightAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -207,7 +207,7 @@ LightAttributes::operator != (const LightAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -228,7 +228,7 @@ LightAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -256,7 +256,7 @@ LightAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -273,6 +273,33 @@ LightAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: LightAttributes::NewInstance +// +// Purpose: +// NewInstance method for the LightAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:32 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +LightAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new LightAttributes(*this); + else + retval = new LightAttributes; + + return retval; +} + // **************************************************************************** // Method: LightAttributes::SelectAll // @@ -282,7 +309,7 @@ LightAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -311,7 +338,7 @@ LightAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -383,7 +410,7 @@ LightAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -542,7 +569,7 @@ LightAttributes::SelectColor() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -571,7 +598,7 @@ LightAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -600,7 +627,7 @@ LightAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -629,7 +656,7 @@ LightAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // diff --git a/common/state/LightAttributes.h b/common/state/LightAttributes.h index cbae9475ad8e359242c3c1bc9f8ec9272e64b7b3..008dab19f14c9cd1ef31b64c44234f4a082aedaf 100644 --- a/common/state/LightAttributes.h +++ b/common/state/LightAttributes.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:35 PST 2003 +// Creation: Wed Jul 23 11:30:32 PDT 2003 // // Modifications: // @@ -41,6 +41,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/LightAttributes.xml b/common/state/LightAttributes.xml index 6a5022b280da57ac6d4ac524975ab01e11449063..448f7688558e3714b78683ed4daa1fe5090c9dc6 100644 --- a/common/state/LightAttributes.xml +++ b/common/state/LightAttributes.xml @@ -5,7 +5,7 @@ Object Camera - true + false Camera 0. 0. -1. 255 255 255 255 diff --git a/common/state/LightList.C b/common/state/LightList.C index 5fcff4b126c20df4a24adcbe624d0d2ef2dc776a..04aa21abf408d976a5aec12c1255ac2ed05cca3d 100644 --- a/common/state/LightList.C +++ b/common/state/LightList.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ LightList::LightList() : AttributeSubject("aaaaaaaa") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -59,7 +59,7 @@ LightList::LightList(const LightList &obj) : AttributeSubject("aaaaaaaa") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -79,7 +79,7 @@ LightList::~LightList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -109,7 +109,7 @@ LightList::operator = (const LightList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -138,7 +138,7 @@ LightList::operator == (const LightList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -159,7 +159,7 @@ LightList::operator != (const LightList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -180,7 +180,7 @@ LightList::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -208,7 +208,7 @@ LightList::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -225,6 +225,33 @@ LightList::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: LightList::NewInstance +// +// Purpose: +// NewInstance method for the LightList class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:36 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +LightList::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new LightList(*this); + else + retval = new LightList; + + return retval; +} + // **************************************************************************** // Method: LightList::SelectAll // @@ -234,7 +261,7 @@ LightList::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -266,7 +293,7 @@ LightList::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -398,7 +425,7 @@ LightList::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -658,7 +685,7 @@ LightList::SelectLight7() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -690,7 +717,7 @@ LightList::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -722,7 +749,7 @@ LightList::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -754,7 +781,7 @@ LightList::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // diff --git a/common/state/LightList.h b/common/state/LightList.h index e8ca331b8d6d20f3e796ec0d504e2da32518dc9f..323ad84bf56227d27ca80fb6567526620e49ef7d 100644 --- a/common/state/LightList.h +++ b/common/state/LightList.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:56 PST 2003 +// Creation: Wed Jul 23 11:30:36 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/Line.C b/common/state/Line.C index e0ad6eafdfc1c676d2b0ff3c13ec4f9f8958b5b6..82a43c470b5e452881898778aa79b7cd2449853d 100644 --- a/common/state/Line.C +++ b/common/state/Line.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -40,7 +40,7 @@ Line::Line() : AttributeSubject("DDsaiibbs") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -76,7 +76,7 @@ Line::Line(const Line &obj) : AttributeSubject("DDsaiibbs") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -96,7 +96,7 @@ Line::~Line() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -133,7 +133,7 @@ Line::operator = (const Line &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -175,7 +175,7 @@ Line::operator == (const Line &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -196,7 +196,7 @@ Line::operator != (const Line &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -217,7 +217,7 @@ Line::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -245,7 +245,7 @@ Line::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -262,6 +262,33 @@ Line::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: Line::NewInstance +// +// Purpose: +// NewInstance method for the Line class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:40 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +Line::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new Line(*this); + else + retval = new Line; + + return retval; +} + // **************************************************************************** // Method: Line::SelectAll // @@ -271,7 +298,7 @@ Line::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -304,7 +331,7 @@ Line::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -400,7 +427,7 @@ Line::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -643,7 +670,7 @@ Line::SelectVarName() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -676,7 +703,7 @@ Line::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -709,7 +736,7 @@ Line::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -742,7 +769,7 @@ Line::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // diff --git a/common/state/Line.h b/common/state/Line.h index 3d61edb1b922692c70f8c14691583cd7ce483908..c23b07ff35bae0a7d473b8aeea451f562793a081 100644 --- a/common/state/Line.h +++ b/common/state/Line.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:40 PDT 2003 // // Modifications: // @@ -34,6 +34,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/MaterialAttributes.C b/common/state/MaterialAttributes.C index a6449af40ffdbb6e8b54c77642f1947cc9acafa5..234fdf3d1277f7421a0e352724f2d27920811dbc 100644 --- a/common/state/MaterialAttributes.C +++ b/common/state/MaterialAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -32,7 +32,7 @@ MaterialAttributes::MaterialAttributes() : AttributeSubject("bbb") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -56,7 +56,7 @@ MaterialAttributes::MaterialAttributes(const MaterialAttributes &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -76,7 +76,7 @@ MaterialAttributes::~MaterialAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -101,7 +101,7 @@ MaterialAttributes::operator = (const MaterialAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -125,7 +125,7 @@ MaterialAttributes::operator == (const MaterialAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -146,7 +146,7 @@ MaterialAttributes::operator != (const MaterialAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -167,7 +167,7 @@ MaterialAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -195,7 +195,7 @@ MaterialAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -212,6 +212,33 @@ MaterialAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: MaterialAttributes::NewInstance +// +// Purpose: +// NewInstance method for the MaterialAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:44 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +MaterialAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new MaterialAttributes(*this); + else + retval = new MaterialAttributes; + + return retval; +} + // **************************************************************************** // Method: MaterialAttributes::SelectAll // @@ -221,7 +248,7 @@ MaterialAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -248,7 +275,7 @@ MaterialAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -302,7 +329,7 @@ MaterialAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -387,7 +414,7 @@ MaterialAttributes::GetCleanZonesOnly() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -414,7 +441,7 @@ MaterialAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -441,7 +468,7 @@ MaterialAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -468,7 +495,7 @@ MaterialAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // diff --git a/common/state/MaterialAttributes.h b/common/state/MaterialAttributes.h index 556fabc2af4c8f4eccd468808b7bd7541c77d18e..9bd677e56327ed2f96557eb052b3d8df409d6305 100644 --- a/common/state/MaterialAttributes.h +++ b/common/state/MaterialAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:57 PST 2003 +// Creation: Wed Jul 23 11:30:44 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/MessageAttributes.C b/common/state/MessageAttributes.C index befebc53be9826ba2012dc56803f74e43e37992b..169943b674833b65a0f9c0d635346c12948c11f4 100644 --- a/common/state/MessageAttributes.C +++ b/common/state/MessageAttributes.C @@ -48,7 +48,7 @@ MessageAttributes::Severity_FromString(const std::string &s, MessageAttributes:: // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -69,7 +69,7 @@ MessageAttributes::MessageAttributes() : AttributeSubject("si") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -92,7 +92,7 @@ MessageAttributes::MessageAttributes(const MessageAttributes &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -112,7 +112,7 @@ MessageAttributes::~MessageAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -136,7 +136,7 @@ MessageAttributes::operator = (const MessageAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -159,7 +159,7 @@ MessageAttributes::operator == (const MessageAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -180,7 +180,7 @@ MessageAttributes::operator != (const MessageAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -201,7 +201,7 @@ MessageAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -229,7 +229,7 @@ MessageAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -246,6 +246,33 @@ MessageAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: MessageAttributes::NewInstance +// +// Purpose: +// NewInstance method for the MessageAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:47 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +MessageAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new MessageAttributes(*this); + else + retval = new MessageAttributes; + + return retval; +} + // **************************************************************************** // Method: MessageAttributes::SelectAll // @@ -255,7 +282,7 @@ MessageAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -281,7 +308,7 @@ MessageAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -329,7 +356,7 @@ MessageAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -429,7 +456,7 @@ MessageAttributes::SelectText() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -455,7 +482,7 @@ MessageAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -481,7 +508,7 @@ MessageAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -507,7 +534,7 @@ MessageAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // diff --git a/common/state/MessageAttributes.h b/common/state/MessageAttributes.h index 933b628df33faf14921bf52fc148a64745379903..a79e3af186289a547a404ce3e4afec844114db33 100644 --- a/common/state/MessageAttributes.h +++ b/common/state/MessageAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:37 PST 2003 +// Creation: Wed Jul 23 11:30:47 PDT 2003 // // Modifications: // @@ -40,6 +40,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/NamespaceAttributes.C b/common/state/NamespaceAttributes.C index 172a4dc2f039064ac6bf9156739c7e015d2902f5..cc2e5cca794a8ec58515025c8eb2c51f6b1da638 100644 --- a/common/state/NamespaceAttributes.C +++ b/common/state/NamespaceAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -32,7 +32,7 @@ NamespaceAttributes::NamespaceAttributes() : AttributeSubject("ii*ii") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -57,7 +57,7 @@ NamespaceAttributes::NamespaceAttributes(const NamespaceAttributes &obj) : Attri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -77,7 +77,7 @@ NamespaceAttributes::~NamespaceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -103,7 +103,7 @@ NamespaceAttributes::operator = (const NamespaceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -128,7 +128,7 @@ NamespaceAttributes::operator == (const NamespaceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -149,7 +149,7 @@ NamespaceAttributes::operator != (const NamespaceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -170,7 +170,7 @@ NamespaceAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -198,7 +198,7 @@ NamespaceAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -215,6 +215,33 @@ NamespaceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: NamespaceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the NamespaceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:50 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +NamespaceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new NamespaceAttributes(*this); + else + retval = new NamespaceAttributes; + + return retval; +} + // **************************************************************************** // Method: NamespaceAttributes::SelectAll // @@ -224,7 +251,7 @@ NamespaceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -252,7 +279,7 @@ NamespaceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -312,7 +339,7 @@ NamespaceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -428,7 +455,7 @@ NamespaceAttributes::SelectSubsets() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -456,7 +483,7 @@ NamespaceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -484,7 +511,7 @@ NamespaceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -512,7 +539,7 @@ NamespaceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // diff --git a/common/state/NamespaceAttributes.h b/common/state/NamespaceAttributes.h index 9e6e437ab1161ef2544119d189798122ae26d89e..fa5cce758cecab65db306f07490bb514b834d43b 100644 --- a/common/state/NamespaceAttributes.h +++ b/common/state/NamespaceAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:39:59 PST 2003 +// Creation: Wed Jul 23 11:30:50 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/PickAttributes.C b/common/state/PickAttributes.C index 66749e75bd46cc646a88386371d6c3e71bb0c1e0..5bdb69cd51d0eae9e898782e5d720d8e70ef82ad 100644 --- a/common/state/PickAttributes.C +++ b/common/state/PickAttributes.C @@ -49,7 +49,7 @@ PickAttributes::PickType_FromString(const std::string &s, PickAttributes::PickTy // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -91,7 +91,7 @@ PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbi") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -161,7 +161,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bb // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -185,7 +185,7 @@ PickAttributes::~PickAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -256,7 +256,7 @@ PickAttributes::operator = (const PickAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -329,7 +329,7 @@ PickAttributes::operator == (const PickAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -350,7 +350,7 @@ PickAttributes::operator != (const PickAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -371,7 +371,7 @@ PickAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -399,7 +399,7 @@ PickAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -416,6 +416,33 @@ PickAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: PickAttributes::NewInstance +// +// Purpose: +// NewInstance method for the PickAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:53 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +PickAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new PickAttributes(*this); + else + retval = new PickAttributes; + + return retval; +} + // **************************************************************************** // Method: PickAttributes::SelectAll // @@ -425,7 +452,7 @@ PickAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -466,7 +493,7 @@ PickAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -491,7 +518,7 @@ PickAttributes::CreateSubAttributeGroup(int) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -654,7 +681,7 @@ PickAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1175,7 +1202,7 @@ PickAttributes::SelectRayPoint2() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1200,7 +1227,7 @@ PickAttributes::AddPickVarInfo(const PickVarInfo &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1228,7 +1255,7 @@ PickAttributes::ClearPickVarInfos() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1263,7 +1290,7 @@ PickAttributes::RemovePickVarInfo(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1284,7 +1311,7 @@ PickAttributes::GetNumPickVarInfos() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1305,7 +1332,7 @@ PickAttributes::GetPickVarInfo(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1326,7 +1353,7 @@ PickAttributes::GetPickVarInfo(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1347,7 +1374,7 @@ PickAttributes::operator [] (int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1372,7 +1399,7 @@ PickAttributes::operator [] (int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1417,7 +1444,7 @@ PickAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1462,7 +1489,7 @@ PickAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -1507,7 +1534,7 @@ PickAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:40 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // diff --git a/common/state/PickAttributes.h b/common/state/PickAttributes.h index 92769a5db0c0d63f3cafd0ddb46c502d7956db76..821c2767fa7ce1815ead634781aaec5133529cf3 100644 --- a/common/state/PickAttributes.h +++ b/common/state/PickAttributes.h @@ -15,7 +15,7 @@ class PickVarInfo; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:39 PST 2003 +// Creation: Wed Jul 23 11:30:53 PDT 2003 // // Modifications: // @@ -41,6 +41,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/PickVarInfo.C b/common/state/PickVarInfo.C index b75a8fe17306cd9f7660f1ac2d2747683e913b1b..2d30f3767a2f5197dd55973820849cad0aadfb1c 100644 --- a/common/state/PickVarInfo.C +++ b/common/state/PickVarInfo.C @@ -49,7 +49,7 @@ PickVarInfo::Centering_FromString(const std::string &s, PickVarInfo::Centering & // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -71,7 +71,7 @@ PickVarInfo::PickVarInfo() : AttributeSubject("ss*d*s*d*bisbi*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -102,7 +102,7 @@ PickVarInfo::PickVarInfo(const PickVarInfo &obj) : AttributeSubject("ss*d*s*d*bi // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -122,7 +122,7 @@ PickVarInfo::~PickVarInfo() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -154,7 +154,7 @@ PickVarInfo::operator = (const PickVarInfo &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -185,7 +185,7 @@ PickVarInfo::operator == (const PickVarInfo &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -206,7 +206,7 @@ PickVarInfo::operator != (const PickVarInfo &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -227,7 +227,7 @@ PickVarInfo::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -255,7 +255,7 @@ PickVarInfo::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -272,6 +272,33 @@ PickVarInfo::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: PickVarInfo::NewInstance +// +// Purpose: +// NewInstance method for the PickVarInfo class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:30:56 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +PickVarInfo::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new PickVarInfo(*this); + else + retval = new PickVarInfo; + + return retval; +} + // **************************************************************************** // Method: PickVarInfo::SelectAll // @@ -281,7 +308,7 @@ PickVarInfo::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -541,7 +568,7 @@ PickVarInfo::SelectNumMatsPerZone() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -575,7 +602,7 @@ PickVarInfo::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -609,7 +636,7 @@ PickVarInfo::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -643,7 +670,7 @@ PickVarInfo::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // diff --git a/common/state/PickVarInfo.h b/common/state/PickVarInfo.h index dee4696888a10a5aff628119cf50a2882d0b196f..25726eb3e25ce3cc21b93cee6f955b80489a3a0c 100644 --- a/common/state/PickVarInfo.h +++ b/common/state/PickVarInfo.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:42 PST 2003 +// Creation: Wed Jul 23 11:30:56 PDT 2003 // // Modifications: // @@ -41,6 +41,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/PlaneAttributes.C b/common/state/PlaneAttributes.C index b62f1d6944dcdf8e6449cc0fb89b5598989ef954..96702bcc62045af4ca3c057cd97e1723674ea00f 100644 --- a/common/state/PlaneAttributes.C +++ b/common/state/PlaneAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -41,7 +41,7 @@ PlaneAttributes::PlaneAttributes() : AttributeSubject("DDDbdb") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -77,7 +77,7 @@ PlaneAttributes::PlaneAttributes(const PlaneAttributes &obj) : AttributeSubject( // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -97,7 +97,7 @@ PlaneAttributes::~PlaneAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -134,7 +134,7 @@ PlaneAttributes::operator = (const PlaneAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -178,7 +178,7 @@ PlaneAttributes::operator == (const PlaneAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -199,7 +199,7 @@ PlaneAttributes::operator != (const PlaneAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -220,7 +220,7 @@ PlaneAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -248,7 +248,7 @@ PlaneAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -265,6 +265,33 @@ PlaneAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: PlaneAttributes::NewInstance +// +// Purpose: +// NewInstance method for the PlaneAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:00 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +PlaneAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new PlaneAttributes(*this); + else + retval = new PlaneAttributes; + + return retval; +} + // **************************************************************************** // Method: PlaneAttributes::SelectAll // @@ -274,7 +301,7 @@ PlaneAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -304,7 +331,7 @@ PlaneAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -376,7 +403,7 @@ PlaneAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -552,7 +579,7 @@ PlaneAttributes::SelectUpAxis() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -582,7 +609,7 @@ PlaneAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -612,7 +639,7 @@ PlaneAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -642,7 +669,7 @@ PlaneAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // diff --git a/common/state/PlaneAttributes.h b/common/state/PlaneAttributes.h index 9d9fef1dadec1d450a7c6f42a08da811317b3746..9b5d4cdae10fdc6a3ea0f3b9ff9c6dfdefac7b9a 100644 --- a/common/state/PlaneAttributes.h +++ b/common/state/PlaneAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Thu Jul 3 11:13:15 PDT 2003 +// Creation: Wed Jul 23 11:31:00 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/Plot.C b/common/state/Plot.C index 6125215705cb12b717be4c40b63be452a6c7d9a9..70dabfe53b9a943a0aec666adcaa14cf9295db69 100644 --- a/common/state/Plot.C +++ b/common/state/Plot.C @@ -48,7 +48,7 @@ Plot::StateType_FromString(const std::string &s, Plot::StateType &val) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -78,7 +78,7 @@ Plot::Plot() : AttributeSubject("iibbbssi*iiiii*i*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -113,7 +113,7 @@ Plot::Plot(const Plot &obj) : AttributeSubject("iibbbssi*iiiii*i*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -133,7 +133,7 @@ Plot::~Plot() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -169,7 +169,7 @@ Plot::operator = (const Plot &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -204,7 +204,7 @@ Plot::operator == (const Plot &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -225,7 +225,7 @@ Plot::operator != (const Plot &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -246,7 +246,7 @@ Plot::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -274,7 +274,7 @@ Plot::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -291,6 +291,33 @@ Plot::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: Plot::NewInstance +// +// Purpose: +// NewInstance method for the Plot class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:03 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +Plot::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new Plot(*this); + else + retval = new Plot; + + return retval; +} + // **************************************************************************** // Method: Plot::SelectAll // @@ -300,7 +327,7 @@ Plot::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -592,7 +619,7 @@ Plot::SelectDatabaseKeyframes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -630,7 +657,7 @@ Plot::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -668,7 +695,7 @@ Plot::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -706,7 +733,7 @@ Plot::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // diff --git a/common/state/Plot.h b/common/state/Plot.h index 5d83f74be8429b2980fdabe0313babce6673b4b8..ef8c434c0a9bbf4312c99f1b58d9c8b4bb2567ef 100644 --- a/common/state/Plot.h +++ b/common/state/Plot.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:45 PST 2003 +// Creation: Wed Jul 23 11:31:03 PDT 2003 // // Modifications: // @@ -41,6 +41,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/PlotList.C b/common/state/PlotList.C index 4f0c619422fd682bab984b9b16afc06b769fd62b..f51af620c8e115c65299d6e3ada1a52ae9b8851b 100644 --- a/common/state/PlotList.C +++ b/common/state/PlotList.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ PlotList::PlotList() : AttributeSubject("a*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -68,7 +68,7 @@ PlotList::PlotList(const PlotList &obj) : AttributeSubject("a*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -92,7 +92,7 @@ PlotList::~PlotList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -131,7 +131,7 @@ PlotList::operator = (const PlotList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -164,7 +164,7 @@ PlotList::operator == (const PlotList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -185,7 +185,7 @@ PlotList::operator != (const PlotList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -206,7 +206,7 @@ PlotList::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -234,7 +234,7 @@ PlotList::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -251,6 +251,33 @@ PlotList::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: PlotList::NewInstance +// +// Purpose: +// NewInstance method for the PlotList class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:06 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +PlotList::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new PlotList(*this); + else + retval = new PlotList; + + return retval; +} + // **************************************************************************** // Method: PlotList::SelectAll // @@ -260,7 +287,7 @@ PlotList::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -281,7 +308,7 @@ PlotList::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -306,7 +333,7 @@ PlotList::CreateSubAttributeGroup(int) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -349,7 +376,7 @@ PlotList::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -418,7 +445,7 @@ PlotList::GetPlots() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -443,7 +470,7 @@ PlotList::AddPlot(const Plot &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -471,7 +498,7 @@ PlotList::ClearPlots() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -506,7 +533,7 @@ PlotList::RemovePlot(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -527,7 +554,7 @@ PlotList::GetNumPlots() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -548,7 +575,7 @@ PlotList::GetPlot(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -569,7 +596,7 @@ PlotList::GetPlot(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -590,7 +617,7 @@ PlotList::operator [] (int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -615,7 +642,7 @@ PlotList::operator [] (int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -640,7 +667,7 @@ PlotList::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -665,7 +692,7 @@ PlotList::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -690,7 +717,7 @@ PlotList::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // diff --git a/common/state/PlotList.h b/common/state/PlotList.h index 39e81d5511fb5d0fc6249fb81a4ef477bc78f487..a6beb1c02393820c6f1d5481246e2fe301e486fb 100644 --- a/common/state/PlotList.h +++ b/common/state/PlotList.h @@ -13,7 +13,7 @@ class Plot; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:22:19 PST 2003 +// Creation: Wed Jul 23 11:31:06 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/PlotQueryInfo.C b/common/state/PlotQueryInfo.C index 80a0d0712acd958ffe5d125fc610989f6d8c30c2..81ffe2ecd3a1f492442ae75810b0e73b6b56508e 100644 --- a/common/state/PlotQueryInfo.C +++ b/common/state/PlotQueryInfo.C @@ -50,7 +50,7 @@ PlotQueryInfo::ChangeType_FromString(const std::string &s, PlotQueryInfo::Change // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -70,7 +70,7 @@ PlotQueryInfo::PlotQueryInfo() : AttributeSubject("i") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -92,7 +92,7 @@ PlotQueryInfo::PlotQueryInfo(const PlotQueryInfo &obj) : AttributeSubject("i") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -112,7 +112,7 @@ PlotQueryInfo::~PlotQueryInfo() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -135,7 +135,7 @@ PlotQueryInfo::operator = (const PlotQueryInfo &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -157,7 +157,7 @@ PlotQueryInfo::operator == (const PlotQueryInfo &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -178,7 +178,7 @@ PlotQueryInfo::operator != (const PlotQueryInfo &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -199,7 +199,7 @@ PlotQueryInfo::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -227,7 +227,7 @@ PlotQueryInfo::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -244,6 +244,33 @@ PlotQueryInfo::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: PlotQueryInfo::NewInstance +// +// Purpose: +// NewInstance method for the PlotQueryInfo class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:09 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +PlotQueryInfo::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new PlotQueryInfo(*this); + else + retval = new PlotQueryInfo; + + return retval; +} + // **************************************************************************** // Method: PlotQueryInfo::SelectAll // @@ -253,7 +280,7 @@ PlotQueryInfo::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -299,7 +326,7 @@ PlotQueryInfo::GetChangeType() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -324,7 +351,7 @@ PlotQueryInfo::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -349,7 +376,7 @@ PlotQueryInfo::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -374,7 +401,7 @@ PlotQueryInfo::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // diff --git a/common/state/PlotQueryInfo.h b/common/state/PlotQueryInfo.h index ab913f71f84d5fb4b9b475eb5fa073ed1b17af15..1b0f595b81f00922c997da4b04148e5c74fe3e3e 100644 --- a/common/state/PlotQueryInfo.h +++ b/common/state/PlotQueryInfo.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:47 PST 2003 +// Creation: Wed Jul 23 11:31:09 PDT 2003 // // Modifications: // @@ -47,6 +47,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/PluginManagerAttributes.C b/common/state/PluginManagerAttributes.C index 291e9827fd5985c3eca5a39f1b0e469a4be89f04..7857cc6abfed37d6f6785a6a4fc546410b2ac0fc 100644 --- a/common/state/PluginManagerAttributes.C +++ b/common/state/PluginManagerAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -29,7 +29,7 @@ PluginManagerAttributes::PluginManagerAttributes() : AttributeSubject("s*s*s*s*i // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -55,7 +55,7 @@ PluginManagerAttributes::PluginManagerAttributes(const PluginManagerAttributes & // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -75,7 +75,7 @@ PluginManagerAttributes::~PluginManagerAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -102,7 +102,7 @@ PluginManagerAttributes::operator = (const PluginManagerAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -128,7 +128,7 @@ PluginManagerAttributes::operator == (const PluginManagerAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -149,7 +149,7 @@ PluginManagerAttributes::operator != (const PluginManagerAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -170,7 +170,7 @@ PluginManagerAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -198,7 +198,7 @@ PluginManagerAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -215,6 +215,33 @@ PluginManagerAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: PluginManagerAttributes::NewInstance +// +// Purpose: +// NewInstance method for the PluginManagerAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:12 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +PluginManagerAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new PluginManagerAttributes(*this); + else + retval = new PluginManagerAttributes; + + return retval; +} + // **************************************************************************** // Method: PluginManagerAttributes::SelectAll // @@ -224,7 +251,7 @@ PluginManagerAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -253,7 +280,7 @@ PluginManagerAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -319,7 +346,7 @@ PluginManagerAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -498,7 +525,7 @@ PluginManagerAttributes::SelectEnabled() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -527,7 +554,7 @@ PluginManagerAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -556,7 +583,7 @@ PluginManagerAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -585,7 +612,7 @@ PluginManagerAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // diff --git a/common/state/PluginManagerAttributes.h b/common/state/PluginManagerAttributes.h index 23ad32a6aab01ff6cc5b0791b3de6306d9377717..3ad97c129139267ef59355b0b071faf20aa052ec 100644 --- a/common/state/PluginManagerAttributes.h +++ b/common/state/PluginManagerAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:04 PST 2003 +// Creation: Wed Jul 23 11:31:12 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/Point.C b/common/state/Point.C index f9d9be166acb28fe54ad40b2516f05b7810ae1f8..2366f5a25f6b577b47ad42a33b53325611d9782a 100644 --- a/common/state/Point.C +++ b/common/state/Point.C @@ -50,7 +50,7 @@ Point::ValueType_FromString(const std::string &s, Point::ValueType &val) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -69,7 +69,7 @@ Point::Point() : AttributeSubject("s") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -91,7 +91,7 @@ Point::Point(const Point &obj) : AttributeSubject("s") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -111,7 +111,7 @@ Point::~Point() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -134,7 +134,7 @@ Point::operator = (const Point &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -156,7 +156,7 @@ Point::operator == (const Point &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -177,7 +177,7 @@ Point::operator != (const Point &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -198,7 +198,7 @@ Point::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -226,7 +226,7 @@ Point::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -243,6 +243,33 @@ Point::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: Point::NewInstance +// +// Purpose: +// NewInstance method for the Point class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:15 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +Point::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new Point(*this); + else + retval = new Point; + + return retval; +} + // **************************************************************************** // Method: Point::SelectAll // @@ -252,7 +279,7 @@ Point::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -277,7 +304,7 @@ Point::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -319,7 +346,7 @@ Point::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -380,7 +407,7 @@ Point::GetValue() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -405,7 +432,7 @@ Point::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -430,7 +457,7 @@ Point::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -455,7 +482,7 @@ Point::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // diff --git a/common/state/Point.h b/common/state/Point.h index 8a443a015a0524f12aff11716ed4ef842b6181ca..c935b1d4d68305231b65f3f798a26cc17883bcb2 100644 --- a/common/state/Point.h +++ b/common/state/Point.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:50 PST 2003 +// Creation: Wed Jul 23 11:31:15 PDT 2003 // // Modifications: // @@ -45,6 +45,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/PointAttributes.C b/common/state/PointAttributes.C index 68068e26ec266efe1a3c783703e97ae79d27f372..14b49c19ef3ff4fd7368a7193cac1565781f7c1b 100644 --- a/common/state/PointAttributes.C +++ b/common/state/PointAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -32,7 +32,7 @@ PointAttributes::PointAttributes() : AttributeSubject("D") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -40,8 +40,6 @@ PointAttributes::PointAttributes() : AttributeSubject("D") PointAttributes::PointAttributes(const PointAttributes &obj) : AttributeSubject("D") { - int i; - point[0] = obj.point[0]; point[1] = obj.point[1]; point[2] = obj.point[2]; @@ -59,7 +57,7 @@ PointAttributes::PointAttributes(const PointAttributes &obj) : AttributeSubject( // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -79,7 +77,7 @@ PointAttributes::~PointAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -88,8 +86,6 @@ PointAttributes::~PointAttributes() void PointAttributes::operator = (const PointAttributes &obj) { - int i; - point[0] = obj.point[0]; point[1] = obj.point[1]; point[2] = obj.point[2]; @@ -107,14 +103,14 @@ PointAttributes::operator = (const PointAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // // **************************************************************************** bool -PointAttributes::operator == (const PointAttributes &obj) +PointAttributes::operator == (const PointAttributes &obj) const { int i; @@ -136,14 +132,14 @@ PointAttributes::operator == (const PointAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // // **************************************************************************** bool -PointAttributes::operator != (const PointAttributes &obj) +PointAttributes::operator != (const PointAttributes &obj) const { return !(this->operator == (obj)); } @@ -157,7 +153,7 @@ PointAttributes::operator != (const PointAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -178,7 +174,7 @@ PointAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -206,7 +202,7 @@ PointAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -223,6 +219,33 @@ PointAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: PointAttributes::NewInstance +// +// Purpose: +// NewInstance method for the PointAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:18 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +PointAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new PointAttributes(*this); + else + retval = new PointAttributes; + + return retval; +} + // **************************************************************************** // Method: PointAttributes::SelectAll // @@ -232,7 +255,7 @@ PointAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -257,24 +280,37 @@ PointAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // // **************************************************************************** -void -PointAttributes::CreateNode(DataNode *parentNode) +bool +PointAttributes::CreateNode(DataNode *parentNode, bool forceAdd) { if(parentNode == 0) - return; + return false; + PointAttributes defaultObject; + bool addToParent = false; // Create a node for PointAttributes. DataNode *node = new DataNode("PointAttributes"); - node->AddNode(new DataNode("point", point, 3)); + + if(!FieldsEqual(0, &defaultObject)) + { + addToParent = true; + node->AddNode(new DataNode("point", point, 3)); + } + // Add the node to the parent node. - parentNode->AddNode(node); + if(addToParent || forceAdd) + parentNode->AddNode(node); + else + delete node; + + return (addToParent || forceAdd); } // **************************************************************************** @@ -286,7 +322,7 @@ PointAttributes::CreateNode(DataNode *parentNode) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -349,7 +385,7 @@ PointAttributes::GetPoint() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -374,7 +410,7 @@ PointAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -399,7 +435,7 @@ PointAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -424,28 +460,35 @@ PointAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // // **************************************************************************** bool -PointAttributes::FieldsEqual(int index_, AttributeGroup *rhs) +PointAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const { int i; - PointAttributes &obj = *((PointAttributes*)rhs); - // Compare the point arrays. - bool point_equal = true; - for(i = 0; i < 3 && point_equal; ++i) - point_equal = (point[i] == obj.point[i]); - + const PointAttributes &obj = *((const PointAttributes*)rhs); + bool retval = false; switch (index_) { - case 0: return point_equal; - default: return false; + case 0: + { // new scope + // Compare the point arrays. + bool point_equal = true; + for(i = 0; i < 3 && point_equal; ++i) + point_equal = (point[i] == obj.point[i]); + + retval = point_equal; + } + break; + default: retval = false; } + + return retval; } /////////////////////////////////////////////////////////////////////////////// diff --git a/common/state/PointAttributes.h b/common/state/PointAttributes.h index d3482d7e17d8a696e2b43f5ee97a66d1b40abe41..3ca614c4d3f035d3d04f36d1bbdee3ca6660f62e 100644 --- a/common/state/PointAttributes.h +++ b/common/state/PointAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jun 9 09:54:24 PDT 2003 +// Creation: Wed Jul 23 11:31:18 PDT 2003 // // Modifications: // @@ -26,12 +26,13 @@ public: virtual ~PointAttributes(); virtual void operator = (const PointAttributes &obj); - virtual bool operator == (const PointAttributes &obj); - virtual bool operator != (const PointAttributes &obj); + virtual bool operator == (const PointAttributes &obj) const; + virtual bool operator != (const PointAttributes &obj) const; virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); @@ -45,7 +46,7 @@ public: double *GetPoint(); // Persistence methods - virtual void CreateNode(DataNode *node); + virtual bool CreateNode(DataNode *node, bool forceAdd); virtual void SetFromNode(DataNode *node); @@ -53,7 +54,7 @@ public: virtual std::string GetFieldName(int index) const; virtual AttributeGroup::FieldType GetFieldType(int index) const; virtual std::string GetFieldTypeName(int index) const; - virtual bool FieldsEqual(int index, AttributeGroup *rhs); + virtual bool FieldsEqual(int index, const AttributeGroup *rhs) const; private: double point[3]; diff --git a/common/state/PrinterAttributes.C b/common/state/PrinterAttributes.C index 31e9f23a03a466592f1b18b44a50a0fcd34c20ae..5ff5d481577f692f783652e76311090e3ec82f08 100644 --- a/common/state/PrinterAttributes.C +++ b/common/state/PrinterAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -37,7 +37,7 @@ PrinterAttributes::PrinterAttributes() : AttributeSubject("ssssibbbsi") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -68,7 +68,7 @@ PrinterAttributes::PrinterAttributes(const PrinterAttributes &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -88,7 +88,7 @@ PrinterAttributes::~PrinterAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -120,7 +120,7 @@ PrinterAttributes::operator = (const PrinterAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -151,7 +151,7 @@ PrinterAttributes::operator == (const PrinterAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -172,7 +172,7 @@ PrinterAttributes::operator != (const PrinterAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -193,7 +193,7 @@ PrinterAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -221,7 +221,7 @@ PrinterAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -238,6 +238,33 @@ PrinterAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: PrinterAttributes::NewInstance +// +// Purpose: +// NewInstance method for the PrinterAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:21 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +PrinterAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new PrinterAttributes(*this); + else + retval = new PrinterAttributes; + + return retval; +} + // **************************************************************************** // Method: PrinterAttributes::SelectAll // @@ -247,7 +274,7 @@ PrinterAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -281,7 +308,7 @@ PrinterAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -377,7 +404,7 @@ PrinterAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -631,7 +658,7 @@ PrinterAttributes::SelectOutputToFileName() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -665,7 +692,7 @@ PrinterAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -699,7 +726,7 @@ PrinterAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -733,7 +760,7 @@ PrinterAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // diff --git a/common/state/PrinterAttributes.h b/common/state/PrinterAttributes.h index 018927e9efaa18a327eeb468ba84be295d775bcb..38699ce8fedc24d831893919e1b4a43fb4c8ec7d 100644 --- a/common/state/PrinterAttributes.h +++ b/common/state/PrinterAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:05 PST 2003 +// Creation: Wed Jul 23 11:31:21 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/QueryAttributes.C b/common/state/QueryAttributes.C index 04a9fee7cf96b8c87e0a3f530ba7490b6cbddb96..01ce2b2ef8f21695aec395cca87ee6babaa6bf20 100644 --- a/common/state/QueryAttributes.C +++ b/common/state/QueryAttributes.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -46,7 +46,7 @@ QueryAttributes::QueryAttributes() : AttributeSubject("ss*sFiiFFFd") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -89,7 +89,7 @@ QueryAttributes::QueryAttributes(const QueryAttributes &obj) : AttributeSubject( // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -109,7 +109,7 @@ QueryAttributes::~QueryAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -153,7 +153,7 @@ QueryAttributes::operator = (const QueryAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -206,7 +206,7 @@ QueryAttributes::operator == (const QueryAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -227,7 +227,7 @@ QueryAttributes::operator != (const QueryAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -248,7 +248,7 @@ QueryAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -276,7 +276,7 @@ QueryAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -293,6 +293,33 @@ QueryAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: QueryAttributes::NewInstance +// +// Purpose: +// NewInstance method for the QueryAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:23 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +QueryAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new QueryAttributes(*this); + else + retval = new QueryAttributes; + + return retval; +} + // **************************************************************************** // Method: QueryAttributes::SelectAll // @@ -302,7 +329,7 @@ QueryAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -336,7 +363,7 @@ QueryAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -432,7 +459,7 @@ QueryAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -718,7 +745,7 @@ QueryAttributes::SelectCellPoint() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -752,7 +779,7 @@ QueryAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -786,7 +813,7 @@ QueryAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -820,7 +847,7 @@ QueryAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // diff --git a/common/state/QueryAttributes.h b/common/state/QueryAttributes.h index 11994bc6f2fd591fdb03f271dff3fcc6e9f8c6b3..d300851fb8d6025e806193a3591b10beae34cb1c 100644 --- a/common/state/QueryAttributes.h +++ b/common/state/QueryAttributes.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Fri Jul 11 11:56:17 PDT 2003 +// Creation: Wed Jul 23 11:31:23 PDT 2003 // // Modifications: // @@ -34,6 +34,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/QueryList.C b/common/state/QueryList.C index 1f0137ddfe0b476bb2659c9d8e99480b4fc693a2..2bfaa21b912d55c5538d9c93355a05098878e7e3 100644 --- a/common/state/QueryList.C +++ b/common/state/QueryList.C @@ -85,7 +85,7 @@ QueryList::CoordinateRepresentation_FromString(const std::string &s, QueryList:: // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -104,7 +104,7 @@ QueryList::QueryList() : AttributeSubject("s*i*i*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -128,7 +128,7 @@ QueryList::QueryList(const QueryList &obj) : AttributeSubject("s*i*i*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -148,7 +148,7 @@ QueryList::~QueryList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -173,7 +173,7 @@ QueryList::operator = (const QueryList &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -197,7 +197,7 @@ QueryList::operator == (const QueryList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -218,7 +218,7 @@ QueryList::operator != (const QueryList &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -239,7 +239,7 @@ QueryList::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -267,7 +267,7 @@ QueryList::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -284,6 +284,33 @@ QueryList::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: QueryList::NewInstance +// +// Purpose: +// NewInstance method for the QueryList class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:27 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +QueryList::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new QueryList(*this); + else + retval = new QueryList; + + return retval; +} + // **************************************************************************** // Method: QueryList::SelectAll // @@ -293,7 +320,7 @@ QueryList::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -320,7 +347,7 @@ QueryList::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -374,7 +401,7 @@ QueryList::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -499,7 +526,7 @@ QueryList::SelectCoordRep() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -526,7 +553,7 @@ QueryList::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -553,7 +580,7 @@ QueryList::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // @@ -580,7 +607,7 @@ QueryList::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:27 PDT 2003 // // Modifications: // diff --git a/common/state/QueryList.h b/common/state/QueryList.h index 12b389d113e26a134433de935c5df19309662499..46aa3747159e4b57e89c1c862a6b5a54e248bcf8 100644 --- a/common/state/QueryList.h +++ b/common/state/QueryList.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:52 PST 2003 +// Creation: Wed Jul 23 11:31:26 PDT 2003 // // Modifications: // @@ -45,6 +45,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/RenderingAttributes.C b/common/state/RenderingAttributes.C index bec79f2a25cdad01a5c4e2e210fdb5bfa410ee2f..5fab07445ab10dfa27df111f6a1bef11ff929368 100644 --- a/common/state/RenderingAttributes.C +++ b/common/state/RenderingAttributes.C @@ -86,7 +86,7 @@ RenderingAttributes::StereoTypes_FromString(const std::string &s, RenderingAttri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -113,7 +113,7 @@ RenderingAttributes::RenderingAttributes() : AttributeSubject("bibbibbi") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -142,7 +142,7 @@ RenderingAttributes::RenderingAttributes(const RenderingAttributes &obj) : Attri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -162,7 +162,7 @@ RenderingAttributes::~RenderingAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -192,7 +192,7 @@ RenderingAttributes::operator = (const RenderingAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -221,7 +221,7 @@ RenderingAttributes::operator == (const RenderingAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -242,7 +242,7 @@ RenderingAttributes::operator != (const RenderingAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -263,7 +263,7 @@ RenderingAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -291,7 +291,7 @@ RenderingAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -308,6 +308,33 @@ RenderingAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: RenderingAttributes::NewInstance +// +// Purpose: +// NewInstance method for the RenderingAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:29 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +RenderingAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new RenderingAttributes(*this); + else + retval = new RenderingAttributes; + + return retval; +} + // **************************************************************************** // Method: RenderingAttributes::SelectAll // @@ -317,7 +344,7 @@ RenderingAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -349,7 +376,7 @@ RenderingAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -433,7 +460,7 @@ RenderingAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -621,7 +648,7 @@ RenderingAttributes::GetScalableThreshold() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -653,7 +680,7 @@ RenderingAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -685,7 +712,7 @@ RenderingAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -717,7 +744,7 @@ RenderingAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // diff --git a/common/state/RenderingAttributes.h b/common/state/RenderingAttributes.h index 4288e40448a54a14176843fe84e78c23c2265359..b5f1e9dfc8aec9f459d3b706cf218436ce49f2d4 100644 --- a/common/state/RenderingAttributes.h +++ b/common/state/RenderingAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:30:25 PST 2003 +// Creation: Wed Jul 23 11:31:29 PDT 2003 // // Modifications: // @@ -46,6 +46,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/ResampleAttributes.C b/common/state/ResampleAttributes.C index 860fad6ce73bf53c9290bc6ed72cbfd66daf1004..38bd52c0db7da9b2a1d8dbf23c85c8b9887f5da8 100644 --- a/common/state/ResampleAttributes.C +++ b/common/state/ResampleAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -35,7 +35,7 @@ ResampleAttributes::ResampleAttributes() : AttributeSubject("biiiif") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -62,7 +62,7 @@ ResampleAttributes::ResampleAttributes(const ResampleAttributes &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -82,7 +82,7 @@ ResampleAttributes::~ResampleAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -110,7 +110,7 @@ ResampleAttributes::operator = (const ResampleAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -137,7 +137,7 @@ ResampleAttributes::operator == (const ResampleAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -158,7 +158,7 @@ ResampleAttributes::operator != (const ResampleAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -179,7 +179,7 @@ ResampleAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -207,7 +207,7 @@ ResampleAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -224,6 +224,33 @@ ResampleAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ResampleAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ResampleAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:32 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ResampleAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ResampleAttributes(*this); + else + retval = new ResampleAttributes; + + return retval; +} + // **************************************************************************** // Method: ResampleAttributes::SelectAll // @@ -233,7 +260,7 @@ ResampleAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -263,7 +290,7 @@ ResampleAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -335,7 +362,7 @@ ResampleAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -465,7 +492,7 @@ ResampleAttributes::GetDefaultVal() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -495,7 +522,7 @@ ResampleAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -525,7 +552,7 @@ ResampleAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -555,7 +582,7 @@ ResampleAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // diff --git a/common/state/ResampleAttributes.h b/common/state/ResampleAttributes.h index 05e1f1116028d87e6d0c48286265cd827a69cfec..159999cbc027ffebd22ba6ab4c44bc807c462298 100644 --- a/common/state/ResampleAttributes.h +++ b/common/state/ResampleAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:08 PST 2003 +// Creation: Wed Jul 23 11:31:32 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/SILAttributes.C b/common/state/SILAttributes.C index d1abe250b5be3b100e37b002f82dc59d394475c7..8329d57969fad7ac13f3012b79d189e2b9d451f7 100644 --- a/common/state/SILAttributes.C +++ b/common/state/SILAttributes.C @@ -12,7 +12,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -33,7 +33,7 @@ SILAttributes::SILAttributes() : AttributeSubject("is*i*i*is*i*i*a*a*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -94,7 +94,7 @@ SILAttributes::SILAttributes(const SILAttributes &obj) : AttributeSubject("is*i* // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -121,7 +121,7 @@ SILAttributes::~SILAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -183,7 +183,7 @@ SILAttributes::operator = (const SILAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -234,7 +234,7 @@ SILAttributes::operator == (const SILAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -255,7 +255,7 @@ SILAttributes::operator != (const SILAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -276,7 +276,7 @@ SILAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -304,7 +304,7 @@ SILAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -321,6 +321,33 @@ SILAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SILAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SILAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:35 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SILAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SILAttributes(*this); + else + retval = new SILAttributes; + + return retval; +} + // **************************************************************************** // Method: SILAttributes::SelectAll // @@ -330,7 +357,7 @@ SILAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -360,7 +387,7 @@ SILAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -396,7 +423,7 @@ SILAttributes::CreateSubAttributeGroup(int attr_id) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -494,7 +521,7 @@ SILAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -533,9 +560,8 @@ SILAttributes::SetFromNode(DataNode *parentNode) // Go through all of the children and construct a new // NamespaceAttributes for each one of them. - int i; children = searchNode->GetChildren(); - for(i = 0; i < searchNode->GetNumChildren(); ++i) + for(int i = 0; i < searchNode->GetNumChildren(); ++i) { if(children[i]->GetKey() == std::string("NamespaceAttributes")) { @@ -551,7 +577,7 @@ SILAttributes::SetFromNode(DataNode *parentNode) // Go through all of the children and construct a new // SILMatrixAttributes for each one of them. children = searchNode->GetChildren(); - for(i = 0; i < searchNode->GetNumChildren(); ++i) + for(int i = 0; i < searchNode->GetNumChildren(); ++i) { if(children[i]->GetKey() == std::string("SILMatrixAttributes")) { @@ -800,7 +826,7 @@ SILAttributes::SelectMatrices() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -825,7 +851,7 @@ SILAttributes::AddNamespaceAttributes(const NamespaceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -853,7 +879,7 @@ SILAttributes::ClearNamespaceAttributess() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -888,7 +914,7 @@ SILAttributes::RemoveNamespaceAttributes(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -909,7 +935,7 @@ SILAttributes::GetNumNamespaceAttributess() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -930,7 +956,7 @@ SILAttributes::GetNamespaceAttributes(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -951,7 +977,7 @@ SILAttributes::GetNamespaceAttributes(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -976,7 +1002,7 @@ SILAttributes::AddSILMatrixAttributes(const SILMatrixAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -1004,7 +1030,7 @@ SILAttributes::ClearSILMatrixAttributess() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -1039,7 +1065,7 @@ SILAttributes::RemoveSILMatrixAttributes(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -1060,7 +1086,7 @@ SILAttributes::GetNumSILMatrixAttributess() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -1081,7 +1107,7 @@ SILAttributes::GetSILMatrixAttributes(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -1106,7 +1132,7 @@ SILAttributes::GetSILMatrixAttributes(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -1140,7 +1166,7 @@ SILAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -1174,7 +1200,7 @@ SILAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -1208,7 +1234,7 @@ SILAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // diff --git a/common/state/SILAttributes.h b/common/state/SILAttributes.h index 1c266d365a970dea6e04bf34c9da8756e5b4770f..e54fd44c86987f352e2722344100875e5e3da94c 100644 --- a/common/state/SILAttributes.h +++ b/common/state/SILAttributes.h @@ -15,7 +15,7 @@ class SILMatrixAttributes; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:09 PST 2003 +// Creation: Wed Jul 23 11:31:35 PDT 2003 // // Modifications: // @@ -35,6 +35,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/SILMatrixAttributes.C b/common/state/SILMatrixAttributes.C index 01a639211e79e2fca54a6f4389ea1e1d83f00a9f..679e9041ebf32a51e8706a95aa3f48aaef447f85 100644 --- a/common/state/SILMatrixAttributes.C +++ b/common/state/SILMatrixAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -31,7 +31,7 @@ SILMatrixAttributes::SILMatrixAttributes() : AttributeSubject("i*sii*si") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -58,7 +58,7 @@ SILMatrixAttributes::SILMatrixAttributes(const SILMatrixAttributes &obj) : Attri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -78,7 +78,7 @@ SILMatrixAttributes::~SILMatrixAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -106,7 +106,7 @@ SILMatrixAttributes::operator = (const SILMatrixAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -133,7 +133,7 @@ SILMatrixAttributes::operator == (const SILMatrixAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -154,7 +154,7 @@ SILMatrixAttributes::operator != (const SILMatrixAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -175,7 +175,7 @@ SILMatrixAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -203,7 +203,7 @@ SILMatrixAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -220,6 +220,33 @@ SILMatrixAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SILMatrixAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SILMatrixAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:38 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SILMatrixAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SILMatrixAttributes(*this); + else + retval = new SILMatrixAttributes; + + return retval; +} + // **************************************************************************** // Method: SILMatrixAttributes::SelectAll // @@ -229,7 +256,7 @@ SILMatrixAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -259,7 +286,7 @@ SILMatrixAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -331,7 +358,7 @@ SILMatrixAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -513,7 +540,7 @@ SILMatrixAttributes::SelectCategory2() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -543,7 +570,7 @@ SILMatrixAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -573,7 +600,7 @@ SILMatrixAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -603,7 +630,7 @@ SILMatrixAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // diff --git a/common/state/SILMatrixAttributes.h b/common/state/SILMatrixAttributes.h index f45e3d5408a51fc73aff85e29b19fed9dd75d94e..a08b2ba631689de12d1ecdb9cfded9ec6f049f83 100644 --- a/common/state/SILMatrixAttributes.h +++ b/common/state/SILMatrixAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:38 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/SILRestrictionAttributes.C b/common/state/SILRestrictionAttributes.C index 6fc3f2124547648b277f806a8e9e787709b4553a..a40f0130982ff8d06dc9c41a5ae7102a27122b79 100644 --- a/common/state/SILRestrictionAttributes.C +++ b/common/state/SILRestrictionAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ SILRestrictionAttributes::SILRestrictionAttributes() : AttributeSubject("u*ia") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -54,7 +54,7 @@ SILRestrictionAttributes::SILRestrictionAttributes(const SILRestrictionAttribute // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -74,7 +74,7 @@ SILRestrictionAttributes::~SILRestrictionAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -99,7 +99,7 @@ SILRestrictionAttributes::operator = (const SILRestrictionAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -123,7 +123,7 @@ SILRestrictionAttributes::operator == (const SILRestrictionAttributes &obj) cons // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -144,7 +144,7 @@ SILRestrictionAttributes::operator != (const SILRestrictionAttributes &obj) cons // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -165,7 +165,7 @@ SILRestrictionAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -193,7 +193,7 @@ SILRestrictionAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -210,6 +210,33 @@ SILRestrictionAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SILRestrictionAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SILRestrictionAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:41 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SILRestrictionAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SILRestrictionAttributes(*this); + else + retval = new SILRestrictionAttributes; + + return retval; +} + // **************************************************************************** // Method: SILRestrictionAttributes::SelectAll // @@ -219,7 +246,7 @@ SILRestrictionAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -246,7 +273,7 @@ SILRestrictionAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -306,7 +333,7 @@ SILRestrictionAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -419,7 +446,7 @@ SILRestrictionAttributes::SelectSilAtts() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -446,7 +473,7 @@ SILRestrictionAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -473,7 +500,7 @@ SILRestrictionAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -500,7 +527,7 @@ SILRestrictionAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // diff --git a/common/state/SILRestrictionAttributes.h b/common/state/SILRestrictionAttributes.h index 4be73215ad6541207d7144f657d2d8ccffe481bf..97695857d086f4898a520646281b0aaa5ac0e4f7 100644 --- a/common/state/SILRestrictionAttributes.h +++ b/common/state/SILRestrictionAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:10 PST 2003 +// Creation: Wed Jul 23 11:31:41 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/SaveWindowAttributes.C b/common/state/SaveWindowAttributes.C index 8f856363796f90784a22135f96b197772240e1a6..bef396d681636cdf26733e981166b8f601bdc565 100644 --- a/common/state/SaveWindowAttributes.C +++ b/common/state/SaveWindowAttributes.C @@ -51,7 +51,7 @@ SaveWindowAttributes::FileFormat_FromString(const std::string &s, SaveWindowAttr // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -83,7 +83,7 @@ SaveWindowAttributes::SaveWindowAttributes() : AttributeSubject("ssbibiibbibbs") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -117,7 +117,7 @@ SaveWindowAttributes::SaveWindowAttributes(const SaveWindowAttributes &obj) : At // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -137,7 +137,7 @@ SaveWindowAttributes::~SaveWindowAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -172,7 +172,7 @@ SaveWindowAttributes::operator = (const SaveWindowAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -206,7 +206,7 @@ SaveWindowAttributes::operator == (const SaveWindowAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -227,7 +227,7 @@ SaveWindowAttributes::operator != (const SaveWindowAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -248,7 +248,7 @@ SaveWindowAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -276,7 +276,7 @@ SaveWindowAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -293,6 +293,33 @@ SaveWindowAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SaveWindowAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SaveWindowAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:45 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SaveWindowAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SaveWindowAttributes(*this); + else + retval = new SaveWindowAttributes; + + return retval; +} + // **************************************************************************** // Method: SaveWindowAttributes::SelectAll // @@ -302,7 +329,7 @@ SaveWindowAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -339,7 +366,7 @@ SaveWindowAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -453,7 +480,7 @@ SaveWindowAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -742,7 +769,7 @@ SaveWindowAttributes::SelectLastRealFilename() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -779,7 +806,7 @@ SaveWindowAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -816,7 +843,7 @@ SaveWindowAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -853,7 +880,7 @@ SaveWindowAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:57 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // diff --git a/common/state/SaveWindowAttributes.h b/common/state/SaveWindowAttributes.h index 9fb0e068e76ea75b866c40bf8d1d2f5d9fc54a82..d8d1ebb583aad3027686c6c4bb9fda7f947910ac 100644 --- a/common/state/SaveWindowAttributes.h +++ b/common/state/SaveWindowAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:56 PST 2003 +// Creation: Wed Jul 23 11:31:45 PDT 2003 // // Modifications: // @@ -49,6 +49,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/SimilarityTransformAttributes.C b/common/state/SimilarityTransformAttributes.C index 5ccc81eb8e930b6d6906ca95928b6cfc4f0f3559..da29c6dfe4c38b79a33be9ed179113052bebb822 100644 --- a/common/state/SimilarityTransformAttributes.C +++ b/common/state/SimilarityTransformAttributes.C @@ -48,7 +48,7 @@ SimilarityTransformAttributes::AngleType_FromString(const std::string &s, Simila // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -87,7 +87,7 @@ SimilarityTransformAttributes::SimilarityTransformAttributes() : AttributeSubjec // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -131,7 +131,7 @@ SimilarityTransformAttributes::SimilarityTransformAttributes(const SimilarityTra // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -151,7 +151,7 @@ SimilarityTransformAttributes::~SimilarityTransformAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -196,7 +196,7 @@ SimilarityTransformAttributes::operator = (const SimilarityTransformAttributes & // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -248,7 +248,7 @@ SimilarityTransformAttributes::operator == (const SimilarityTransformAttributes // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -269,7 +269,7 @@ SimilarityTransformAttributes::operator != (const SimilarityTransformAttributes // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -370,6 +370,33 @@ SimilarityTransformAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SimilarityTransformAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SimilarityTransformAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:48 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SimilarityTransformAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SimilarityTransformAttributes(*this); + else + retval = new SimilarityTransformAttributes; + + return retval; +} + // **************************************************************************** // Method: SimilarityTransformAttributes::SelectAll // @@ -379,7 +406,7 @@ SimilarityTransformAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -417,7 +444,7 @@ SimilarityTransformAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -537,7 +564,7 @@ SimilarityTransformAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -847,7 +874,7 @@ SimilarityTransformAttributes::SelectScaleOrigin() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -885,7 +912,7 @@ SimilarityTransformAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -923,7 +950,7 @@ SimilarityTransformAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -961,7 +988,7 @@ SimilarityTransformAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // diff --git a/common/state/SimilarityTransformAttributes.h b/common/state/SimilarityTransformAttributes.h index 370f27062d9b59e34b9e0bbb50c0bb68afd277a6..b35f85bf947b615d3844d1bbf4b3ab2252295eb3 100644 --- a/common/state/SimilarityTransformAttributes.h +++ b/common/state/SimilarityTransformAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:47:59 PST 2003 +// Creation: Wed Jul 23 11:31:48 PDT 2003 // // Modifications: // @@ -39,6 +39,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/SphereAttributes.C b/common/state/SphereAttributes.C index 98714ee443aeca062a3514ac3392460e6ac9feda..d794c4fd699d98d2dc21afd227bb24c259e18ee1 100644 --- a/common/state/SphereAttributes.C +++ b/common/state/SphereAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -33,7 +33,7 @@ SphereAttributes::SphereAttributes() : AttributeSubject("Dd") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -59,7 +59,7 @@ SphereAttributes::SphereAttributes(const SphereAttributes &obj) : AttributeSubje // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -79,7 +79,7 @@ SphereAttributes::~SphereAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -106,7 +106,7 @@ SphereAttributes::operator = (const SphereAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -136,7 +136,7 @@ SphereAttributes::operator == (const SphereAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -157,7 +157,7 @@ SphereAttributes::operator != (const SphereAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -178,7 +178,7 @@ SphereAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -206,7 +206,7 @@ SphereAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -223,6 +223,33 @@ SphereAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SphereAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SphereAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:51 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SphereAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SphereAttributes(*this); + else + retval = new SphereAttributes; + + return retval; +} + // **************************************************************************** // Method: SphereAttributes::SelectAll // @@ -232,7 +259,7 @@ SphereAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -258,7 +285,7 @@ SphereAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -306,7 +333,7 @@ SphereAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -394,7 +421,7 @@ SphereAttributes::SelectOrigin() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -420,7 +447,7 @@ SphereAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -446,7 +473,7 @@ SphereAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -472,7 +499,7 @@ SphereAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // diff --git a/common/state/SphereAttributes.h b/common/state/SphereAttributes.h index f1c3913fcfbfb591c3d355d42d81bb3d7ce7c54e..59d156c0245bc9643f0817d0a7b5cbe5a695585e 100644 --- a/common/state/SphereAttributes.h +++ b/common/state/SphereAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:12 PST 2003 +// Creation: Wed Jul 23 11:31:51 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/StatusAttributes.C b/common/state/StatusAttributes.C index 7b915a81fd25968b195da3835482510d2362129a..78ef8289e43cf61c80ca336a077be56535ba007a 100644 --- a/common/state/StatusAttributes.C +++ b/common/state/StatusAttributes.C @@ -12,7 +12,7 @@ const int StatusAttributes::DEFAULT_DURATION = 5000; // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -39,7 +39,7 @@ StatusAttributes::StatusAttributes() : AttributeSubject("sbsiisiii") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -69,7 +69,7 @@ StatusAttributes::StatusAttributes(const StatusAttributes &obj) : AttributeSubje // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -89,7 +89,7 @@ StatusAttributes::~StatusAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -120,7 +120,7 @@ StatusAttributes::operator = (const StatusAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -150,7 +150,7 @@ StatusAttributes::operator == (const StatusAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -171,7 +171,7 @@ StatusAttributes::operator != (const StatusAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -192,7 +192,7 @@ StatusAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -220,7 +220,7 @@ StatusAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -237,6 +237,33 @@ StatusAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: StatusAttributes::NewInstance +// +// Purpose: +// NewInstance method for the StatusAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:54 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +StatusAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new StatusAttributes(*this); + else + retval = new StatusAttributes; + + return retval; +} + // **************************************************************************** // Method: StatusAttributes::SelectAll // @@ -246,7 +273,7 @@ StatusAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -279,7 +306,7 @@ StatusAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -369,7 +396,7 @@ StatusAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -584,7 +611,7 @@ StatusAttributes::SelectCurrentStageName() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -617,7 +644,7 @@ StatusAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -650,7 +677,7 @@ StatusAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -683,7 +710,7 @@ StatusAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // diff --git a/common/state/StatusAttributes.h b/common/state/StatusAttributes.h index 304cda7cb21a2b608f66554a53638c7b249545c5..132ee313e650bbdf3ce9257b865fdf5aaf1f9ec1 100644 --- a/common/state/StatusAttributes.h +++ b/common/state/StatusAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:29:36 PST 2003 +// Creation: Wed Jul 23 11:31:54 PDT 2003 // // Modifications: // @@ -35,6 +35,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/SyncAttributes.C b/common/state/SyncAttributes.C index 4b5181c351a2b524f78554a0caff3d412fd31064..80de83316d4bdb895713da42c9416f35ec75a274 100644 --- a/common/state/SyncAttributes.C +++ b/common/state/SyncAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -30,7 +30,7 @@ SyncAttributes::SyncAttributes() : AttributeSubject("i") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -52,7 +52,7 @@ SyncAttributes::SyncAttributes(const SyncAttributes &obj) : AttributeSubject("i" // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -72,7 +72,7 @@ SyncAttributes::~SyncAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -95,7 +95,7 @@ SyncAttributes::operator = (const SyncAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -117,7 +117,7 @@ SyncAttributes::operator == (const SyncAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -138,7 +138,7 @@ SyncAttributes::operator != (const SyncAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -159,7 +159,7 @@ SyncAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -187,7 +187,7 @@ SyncAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -204,6 +204,33 @@ SyncAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SyncAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SyncAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:31:57 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SyncAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SyncAttributes(*this); + else + retval = new SyncAttributes; + + return retval; +} + // **************************************************************************** // Method: SyncAttributes::SelectAll // @@ -213,7 +240,7 @@ SyncAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -238,7 +265,7 @@ SyncAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -280,7 +307,7 @@ SyncAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -335,7 +362,7 @@ SyncAttributes::GetSyncTag() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -360,7 +387,7 @@ SyncAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -385,7 +412,7 @@ SyncAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -410,7 +437,7 @@ SyncAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // diff --git a/common/state/SyncAttributes.h b/common/state/SyncAttributes.h index 045d8265ff95fed88c4f5d84735b76cab7313c77..b96783d7f4e9d97b4a86bff9eae3cde586b1c34f 100644 --- a/common/state/SyncAttributes.h +++ b/common/state/SyncAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:14 PST 2003 +// Creation: Wed Jul 23 11:31:57 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/ViewAttributes.C b/common/state/ViewAttributes.C index e2ee7668153245ad1b3b8d76f45dd60f762847e1..633447a7b3c396db94c9405385c73242da65f677 100644 --- a/common/state/ViewAttributes.C +++ b/common/state/ViewAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -55,7 +55,7 @@ ViewAttributes::ViewAttributes() : AttributeSubject("DDDdbdddDdbDD") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -106,7 +106,7 @@ ViewAttributes::ViewAttributes(const ViewAttributes &obj) : AttributeSubject("DD // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -126,7 +126,7 @@ ViewAttributes::~ViewAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -178,7 +178,7 @@ ViewAttributes::operator = (const ViewAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -244,7 +244,7 @@ ViewAttributes::operator == (const ViewAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -265,7 +265,7 @@ ViewAttributes::operator != (const ViewAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -286,7 +286,7 @@ ViewAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -314,7 +314,7 @@ ViewAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -331,6 +331,33 @@ ViewAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ViewAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ViewAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:32:00 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ViewAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ViewAttributes(*this); + else + retval = new ViewAttributes; + + return retval; +} + // **************************************************************************** // Method: ViewAttributes::SelectAll // @@ -340,7 +367,7 @@ ViewAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -377,7 +404,7 @@ ViewAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -491,7 +518,7 @@ ViewAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -815,7 +842,7 @@ ViewAttributes::SelectViewportCoords() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -852,7 +879,7 @@ ViewAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -889,7 +916,7 @@ ViewAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -926,7 +953,7 @@ ViewAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // diff --git a/common/state/ViewAttributes.h b/common/state/ViewAttributes.h index 20fbc5eb24196ce9d46406481d9035245e3b6efa..7c1ff37c778c05541091d579a19ea2ed37c91aa2 100644 --- a/common/state/ViewAttributes.h +++ b/common/state/ViewAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 10 11:57:05 PDT 2003 +// Creation: Wed Jul 23 11:32:00 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/WindowAttributes.C b/common/state/WindowAttributes.C index 33518fa9093efbd9d6970634194ab1f3cffa8739..3d1444f0eca80e2e5929823e4bf6caa0a10fdcd5 100644 --- a/common/state/WindowAttributes.C +++ b/common/state/WindowAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -44,7 +44,7 @@ WindowAttributes::WindowAttributes() : AttributeSubject("aaaaIUUiFF") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -89,7 +89,7 @@ WindowAttributes::WindowAttributes(const WindowAttributes &obj) : AttributeSubje // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -109,7 +109,7 @@ WindowAttributes::~WindowAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -155,7 +155,7 @@ WindowAttributes::operator = (const WindowAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -213,7 +213,7 @@ WindowAttributes::operator == (const WindowAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -234,7 +234,7 @@ WindowAttributes::operator != (const WindowAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -255,7 +255,7 @@ WindowAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -283,7 +283,7 @@ WindowAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -300,6 +300,33 @@ WindowAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: WindowAttributes::NewInstance +// +// Purpose: +// NewInstance method for the WindowAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:32:04 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +WindowAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new WindowAttributes(*this); + else + retval = new WindowAttributes; + + return retval; +} + // **************************************************************************** // Method: WindowAttributes::SelectAll // @@ -309,7 +336,7 @@ WindowAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -343,7 +370,7 @@ WindowAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -463,7 +490,7 @@ WindowAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -774,7 +801,7 @@ WindowAttributes::SelectGradBG2() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -808,7 +835,7 @@ WindowAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -842,7 +869,7 @@ WindowAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // @@ -876,7 +903,7 @@ WindowAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:04 PDT 2003 // // Modifications: // diff --git a/common/state/WindowAttributes.h b/common/state/WindowAttributes.h index eeda91cc894e8a3482d4988750e4727b6f5db902..2a6761af732bc126d7b8da715734613c52207776 100644 --- a/common/state/WindowAttributes.h +++ b/common/state/WindowAttributes.h @@ -16,7 +16,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:40:15 PST 2003 +// Creation: Wed Jul 23 11:32:03 PDT 2003 // // Modifications: // @@ -36,6 +36,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/common/state/WindowInformation.C b/common/state/WindowInformation.C index c7e5b55ef3b591e6e904fb3f1b35d48b5ecc7837..65aff1817105881384c10c6fdfc10a9f9a889f2f 100644 --- a/common/state/WindowInformation.C +++ b/common/state/WindowInformation.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -50,7 +50,7 @@ WindowInformation::WindowInformation() : AttributeSubject("ibbbbiifffiDbbbb") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -91,7 +91,7 @@ WindowInformation::WindowInformation(const WindowInformation &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -111,7 +111,7 @@ WindowInformation::~WindowInformation() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -153,7 +153,7 @@ WindowInformation::operator = (const WindowInformation &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -197,7 +197,7 @@ WindowInformation::operator == (const WindowInformation &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -218,7 +218,7 @@ WindowInformation::operator != (const WindowInformation &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -239,7 +239,7 @@ WindowInformation::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -267,7 +267,7 @@ WindowInformation::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -284,6 +284,33 @@ WindowInformation::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: WindowInformation::NewInstance +// +// Purpose: +// NewInstance method for the WindowInformation class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:32:07 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +WindowInformation::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new WindowInformation(*this); + else + retval = new WindowInformation; + + return retval; +} + // **************************************************************************** // Method: WindowInformation::SelectAll // @@ -293,7 +320,7 @@ WindowInformation::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -702,7 +729,7 @@ WindowInformation::SelectExtents() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -742,7 +769,7 @@ WindowInformation::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -782,7 +809,7 @@ WindowInformation::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -822,7 +849,7 @@ WindowInformation::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // diff --git a/common/state/WindowInformation.h b/common/state/WindowInformation.h index 126844b05c5c178e8489d4800f8304b904880249..bd3dfb3019c63636b58742d4ca07118f84cc4504 100644 --- a/common/state/WindowInformation.h +++ b/common/state/WindowInformation.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed May 21 07:30:59 PDT 2003 +// Creation: Wed Jul 23 11:32:07 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/components/DBAtts/MetaData/avtTypes.C b/components/DBAtts/MetaData/avtTypes.C index 70a443ccaed811301c619961bf9d751dfdfe8295..ff9c0e99fd68e72e2a34044ec439288a7514b12e 100644 --- a/components/DBAtts/MetaData/avtTypes.C +++ b/components/DBAtts/MetaData/avtTypes.C @@ -14,4 +14,62 @@ const char *AUXILIARY_DATA_MIXED_VARIABLE = "MIXED_VARIABLE"; const char *AUXILIARY_DATA_DOMAIN_BOUNDARY_INFORMATION = "DOMAIN_BOUNDARY_INFORMATION"; +static const char *avtExtentType_strings[] = { "AVT_ORIGINAL_EXTENTS", + "AVT_ACTUAL_EXTENTS", "AVT_SPECIFIED_EXTENTS", "AVT_UNKNOWN_EXTENT_TYPE"}; +// **************************************************************************** // Function: avtExtentType_ToString +// +// Purpose: +// Returns a string version of avtExtentType. +// +// Programmer: Brad Whitlock +// Creation: Tue Jul 15 16:44:12 PST 2003 +// +// Modifications: +// +// **************************************************************************** +std::string +avtExtentType_ToString(avtExtentType m) +{ + int index = int(m); + if(m < AVT_ORIGINAL_EXTENTS || m > AVT_UNKNOWN_EXTENT_TYPE) index = 0; + return avtExtentType_strings[index]; +} + +std::string +avtExtentType_ToString(int m) +{ + int index = m; + if(index < 0 || index > 3) index = 0; + return avtExtentType_strings[index]; +} + +// **************************************************************************** +// Function: avtExtentType_FromString +// +// Purpose: +// Returns an avtExtentType associated with a string value. +// +// Programmer: Brad Whitlock +// Creation: Tue Jul 15 16:44:44 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +bool +avtExtentType_FromString(const std::string &s, avtExtentType &m) +{ + m = AVT_ORIGINAL_EXTENTS; + + for(int i = 0; i < 3; ++i) + { + if(s == avtExtentType_strings[i]) + { + m = avtExtentType(i); + return true; + } + } + + return false; +} diff --git a/components/DBAtts/MetaData/avtTypes.h b/components/DBAtts/MetaData/avtTypes.h index 0f472f30300db56cf92b9f16227e6c2cb1103536..804dc2ac82a1825d7e512f7f9b24006d635369b6 100644 --- a/components/DBAtts/MetaData/avtTypes.h +++ b/components/DBAtts/MetaData/avtTypes.h @@ -89,6 +89,10 @@ DBATTS_API extern const char * AUXILIARY_DATA_SPATIAL_EXTENTS; DBATTS_API extern const char * AUXILIARY_DATA_MIXED_VARIABLE; DBATTS_API extern const char * AUXILIARY_DATA_DOMAIN_BOUNDARY_INFORMATION; +DBATTS_API std::string avtExtentType_ToString(avtExtentType); +DBATTS_API std::string avtExtentType_ToString(int); +DBATTS_API bool avtExtentType_FromString(const std::string &, avtExtentType &); + #endif diff --git a/components/Pipeline/PrivateFilters/avtDatasetToSamplePointsFilter.C b/components/Pipeline/PrivateFilters/avtDatasetToSamplePointsFilter.C index 7a88bff4f6b95939279486ebac73399c980d2e31..59197aa4efcca8010bdb03bd0b884e3039177aa8 100644 --- a/components/Pipeline/PrivateFilters/avtDatasetToSamplePointsFilter.C +++ b/components/Pipeline/PrivateFilters/avtDatasetToSamplePointsFilter.C @@ -28,6 +28,9 @@ // Hank Childs, Fri Mar 15 17:40:02 PST 2002 // Account for new avtDatasetExaminer. // +// Hank Childs, Wed Jul 23 14:59:55 PDT 2003 +// Account for not sampling VTK and AVT variables. +// // **************************************************************************** void @@ -61,7 +64,17 @@ avtDatasetToSamplePointsFilter::PreExecute(void) if (!leaveAsIs) { - sp->SetNumberOfVariables(vl.nvars); + int realNVars = 0; + for (int i = 0 ; i < vl.nvars ; i++) + { + const char *vname = vl.varnames[i].c_str(); + if (strstr(vname, "vtk") != NULL) + continue; + if (strstr(vname, "avt") != NULL) + continue; + realNVars++; + } + sp->SetNumberOfVariables(realNVars); } } diff --git a/components/Pipeline/PublicFilters/avtResampleFilter.C b/components/Pipeline/PublicFilters/avtResampleFilter.C index 14439d1666488918ecf0222f10fe530266de5a7e..51ab4e8c47a899bb914bb05ac6a81538ec5cd792 100644 --- a/components/Pipeline/PublicFilters/avtResampleFilter.C +++ b/components/Pipeline/PublicFilters/avtResampleFilter.C @@ -326,6 +326,9 @@ avtResampleFilter::BypassResample(void) // Hank Childs, Mon Jul 7 22:31:00 PDT 2003 // Copy over whether or not an error occurred in resampling. // +// Hank Childs, Wed Jul 23 15:33:14 PDT 2003 +// Make accomodations for not sampling avt and vtk variables. +// // **************************************************************************** void @@ -410,18 +413,30 @@ avtResampleFilter::ResampleInput(void) vl.nvars = -1; avtDatasetExaminer::GetVariableList(ds, vl); + // + // This is hack-ish. The sample point extractor throws out variables + // that have "avt" or "vtk" in them. The returned sample points don't + // have variable names, so we need to match up the variables from the + // input dataset. + // + int myVars = 0; + for (i = 0 ; i < vl.nvars ; i++) + if ((strstr(vl.varnames[i].c_str(), "vtk") == NULL) && + (strstr(vl.varnames[i].c_str(), "avt") == NULL)) + myVars++; + // // If we have more processors than domains, we have to handle that // gracefully. Communicate how many variables there are so that those // that don't have data can play well. // - int effectiveVars = UnifyMaximumValue(vl.nvars); + int effectiveVars = UnifyMaximumValue(myVars); vtkDataArray **vars = new vtkDataArray*[effectiveVars]; for (i = 0 ; i < effectiveVars ; i++) { vars[i] = vtkFloatArray::New(); } - if (vl.nvars <= 0) + if (myVars <= 0) { // // No variables -- this is probably because we didn't get any domains @@ -458,18 +473,20 @@ avtResampleFilter::ResampleInput(void) // // Attach this variable to our rectilinear grid. // + int varsSeen = 0; for (i = 0 ; i < vl.nvars ; i++) { const char *varname = vl.varnames[i].c_str(); + if ((strstr(varname, "vtk") != NULL) || + (strstr(varname, "avt") != NULL)) + continue; + + vars[varsSeen]->SetName(varname); if (strcmp(varname, primaryVariable) == 0) - { - rg->GetPointData()->SetScalars(vars[i]); - } + rg->GetPointData()->SetScalars(vars[varsSeen]); else - { - vars[i]->SetName(varname); - rg->GetPointData()->AddArray(vars[i]); - } + rg->GetPointData()->AddArray(vars[varsSeen]); + varsSeen++; } avtDataTree_p tree = new avtDataTree(rg, 0); @@ -484,7 +501,7 @@ avtResampleFilter::ResampleInput(void) SetOutputDataTree(dummy); } - for (i = 0 ; i < vl.nvars ; i++) + for (i = 0 ; i < effectiveVars ; i++) { vars[i]->Delete(); } diff --git a/components/Queries/Queries/avtCompactnessQuery.C b/components/Queries/Queries/avtCompactnessQuery.C index 2b54c60d8967f12975940aa13599a08a1e3639e2..975d34188f88a32d0a6b1784e718056506b8984e 100644 --- a/components/Queries/Queries/avtCompactnessQuery.C +++ b/components/Queries/Queries/avtCompactnessQuery.C @@ -23,6 +23,7 @@ #include using std::string; +using std::vector; #if !defined(M_PI) #define M_PI 3.14159265358979323846 @@ -74,6 +75,11 @@ avtCompactnessQuery::avtCompactnessQuery() : avtTwoPassDatasetQuery() // Jeremy Meredith, Thu Apr 17 12:52:13 PDT 2003 // Added more queries. // +// Jeremy Meredith, Wed Jul 23 13:28:57 PDT 2003 +// Turned xBound and yBound into class data members, and made them +// STL vectors. This way we can easily collect the boundary points +// across all domains and processors. +// // **************************************************************************** void @@ -101,6 +107,9 @@ avtCompactnessQuery::PreExecute(void) centMassY = 0; distBound_dv_den_vol = 0; distCMass_dv_den_vol = 0; + + xBound.clear(); + yBound.clear(); } // **************************************************************************** @@ -112,6 +121,12 @@ avtCompactnessQuery::PreExecute(void) // Programmer: Jeremy Meredith // Creation: April 17, 2003 // +// Modifications: +// Jeremy Meredith, Wed Jul 23 13:34:18 PDT 2003 +// Turned xBound and yBound into class data members, and made them +// STL vectors. Added code to collect the boundary points +// across all processors. +// // **************************************************************************** void @@ -128,6 +143,40 @@ avtCompactnessQuery::MidExecute(void) centMassX /= totalRotMass; centMassY /= totalRotMass; } + +#ifdef PARALLEL + // Calculate up the boundary points array across all processors. + int rank = PAR_Rank(); + int nprocs = PAR_Size(); + + int mySize = xBound.size(); + int totalSize; + MPI_Allreduce(&mySize, &totalSize, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); + + xBound.resize(totalSize); + yBound.resize(totalSize); + int position = mySize; + for (int proc = 0; proc < nprocs; proc++) + { + if (proc == rank) + { + // Sending + int len = mySize; + MPI_Bcast(&len, 1, MPI_INT, proc, MPI_COMM_WORLD); + MPI_Bcast(&xBound[0], len, MPI_FLOAT, proc, MPI_COMM_WORLD); + MPI_Bcast(&yBound[0], len, MPI_FLOAT, proc, MPI_COMM_WORLD); + } + else + { + // Receiving + int len; + MPI_Bcast(&len, 1, MPI_INT, proc, MPI_COMM_WORLD); + MPI_Bcast(&xBound[position], len, MPI_FLOAT, proc, MPI_COMM_WORLD); + MPI_Bcast(&yBound[position], len, MPI_FLOAT, proc, MPI_COMM_WORLD); + position += len; + } + } +#endif } // **************************************************************************** @@ -147,6 +196,9 @@ avtCompactnessQuery::MidExecute(void) // Kathleen Bonnell, Fri Jul 11 16:29:41 PDT 2003 // Renamed 'SetMessage' to 'SetResultMessage'. // +// Jeremy Meredith, Wed Jul 23 13:34:18 PDT 2003 +// Turned xBound and yBound into class data members, and free them here. +// // **************************************************************************** void @@ -175,6 +227,11 @@ avtCompactnessQuery::PostExecute(void) distCMass_dv_den_vol /= totalRotMass; } + // We're done with the xBound and yBound arrays now; free up + // their memory. + xBound.clear(); + yBound.clear(); + // // Parent class uses this message to set the Results message // in the Query Attributes that is sent back to the viewer. @@ -250,6 +307,10 @@ avtCompactnessQuery::PostExecute(void) // Split part of the former Execute method into this method. // Added new queries. // +// Jeremy Meredith, Wed Jul 23 13:34:18 PDT 2003 +// Turned xBound and yBound into class data members, and made them +// STL vectors. Made it collect the boundary points across all domains. +// // **************************************************************************** void @@ -318,37 +379,6 @@ avtCompactnessQuery::Execute1(vtkDataSet *ds, const int dom) densityValid = false; } - // - // Clean up - // - delete[] cellArea; - delete[] cellVol; - delete[] cellCentX; - delete[] cellCentY; - gzFilter2->Delete(); -} - -// **************************************************************************** -// Method: avtCompactnessQuery::Execute2 -// -// Purpose: -// Processes a single domain -- second pass. -// -// Programmer: Jeremy Meredith -// Creation: April 9, 2003 -// -// Modifications: -// Jeremy Meredith, Thu Apr 17 12:53:15 PDT 2003 -// Split part of the former Execute method into this method. -// Added new queries. -// -// **************************************************************************** - -void -avtCompactnessQuery::Execute2(vtkDataSet *ds, const int dom) -{ - int i,j; - // // Create the boundary edges and remove ghost zone edges // @@ -382,23 +412,66 @@ avtCompactnessQuery::Execute2(vtkDataSet *ds, const int dom) debug1 << "Did not get poly data from ghost zone filter output\n"; return; } - vtkPolyData *ps_1d_nogz = (vtkPolyData*)ds_1d_nogz; + vtkPolyData *pd_1d_nogz = (vtkPolyData*)ds_1d_nogz; // // Extract the boundary edges to a convenient format // - vtkPoints *pts1d = ps_1d_nogz->GetPoints(); + vtkPoints *pts1d = pd_1d_nogz->GetPoints(); int npts1d = pts1d->GetNumberOfPoints(); - float *xBound = new float[npts1d]; - float *yBound = new float[npts1d]; + int oldBoundSize = xBound.size(); + xBound.resize(oldBoundSize + npts1d); + yBound.resize(oldBoundSize + npts1d); for (i=0; iGetPoint(i, pt); - xBound[i] = pt[0]; - yBound[i] = pt[1]; + xBound[oldBoundSize+i] = pt[0]; + yBound[oldBoundSize+i] = pt[1]; } + // + // Clean up + // + delete[] cellArea; + delete[] cellVol; + delete[] cellCentX; + delete[] cellCentY; + gzFilter1->Delete(); + gzFilter2->Delete(); + geomFilter->Delete(); + boundaryFilter->Delete(); +} + +// **************************************************************************** +// Method: avtCompactnessQuery::Execute2 +// +// Purpose: +// Processes a single domain -- second pass. +// +// Programmer: Jeremy Meredith +// Creation: April 9, 2003 +// +// Modifications: +// Jeremy Meredith, Thu Apr 17 12:53:15 PDT 2003 +// Split part of the former Execute method into this method. +// Added new queries. +// +// Jeremy Meredith, Wed Jul 23 13:31:16 PDT 2003 +// Two things: +// 1. Moved the boundary point calculation out of here so we are now +// collecting the points across all domains and processors. +// 2. Put in a hack to disallow points along y=0 as being part of +// the "Boundary", since we are assuming a rotation around y=0 +// already. +// +// **************************************************************************** + +void +avtCompactnessQuery::Execute2(vtkDataSet *ds, const int dom) +{ + int i,j; + // // Remove ghost zones from the polygon dataset // @@ -431,6 +504,7 @@ avtCompactnessQuery::Execute2(vtkDataSet *ds, const int dom) // float *distOrigin = new float[ncells2d]; float *distBoundary = new float[ncells2d]; + int npts1d = xBound.size(); for (i = 0 ; i < ncells2d ; i++) { // distance to origin @@ -440,6 +514,14 @@ avtCompactnessQuery::Execute2(vtkDataSet *ds, const int dom) distBoundary[i] = FLT_MAX; for (j = 0 ; j < npts1d ; j++) { + // semi-hack: ignore points along the y=0 line, + // and assume they are not part of a boundary. + // This is safe because we are already assuming + // a rotation around y=0, and thus in 3D the y=0 + // points have no surface area. + if (yBound[j] < 0.00001) + continue; + float dx = cellCentX[i] - xBound[j]; float dy = cellCentY[i] - yBound[j]; float dist2 = dx*dx + dy*dy; @@ -496,26 +578,21 @@ avtCompactnessQuery::Execute2(vtkDataSet *ds, const int dom) delete[] cellVol; delete[] cellCentX; delete[] cellCentY; - delete[] xBound; - delete[] yBound; delete[] distOrigin; delete[] distBoundary; - geomFilter->Delete(); - boundaryFilter->Delete(); - gzFilter1->Delete(); gzFilter2->Delete(); } // **************************************************************************** -// Method: +// Method: avtCompactnessQuery::Get2DTriangleArea // // Purpose: -// +// Gets the area of a triangle. // // Arguments: -// +// p0,p1,p2 three two-float arrays // // Programmer: Jeremy Meredith // Creation: April 12, 2003 @@ -533,13 +610,13 @@ avtCompactnessQuery::Get2DTriangleArea(float *p0, float *p1, float *p2) } // **************************************************************************** -// Method: +// Method: avtCompactnessQuery::Get2DCellArea // // Purpose: -// +// Gets the area of a vtkCell, assuming it is 2D. // // Arguments: -// +// cell the vtkCell to get the area of // // Programmer: Jeremy Meredith // Creation: April 12, 2003 @@ -587,13 +664,14 @@ avtCompactnessQuery::Get2DCellArea(vtkCell *cell) } // **************************************************************************** -// Method: +// Method: avtCompactnessQuery::Get2DCellCentroid // // Purpose: -// +// Gets the x,y centroid of a vtkCell. // // Arguments: -// +// cell (i) the vtkCell to get the centroid of +// xCent,yCent (o) the x,y location of the centroid // // Programmer: Jeremy Meredith // Creation: April 12, 2003 diff --git a/components/Queries/Queries/avtCompactnessQuery.h b/components/Queries/Queries/avtCompactnessQuery.h index 7c7e690ba895a2ce3565bfbea8d8fec5a69e0410..70224f3964a9aae000587c461e2ba64a193ec429 100644 --- a/components/Queries/Queries/avtCompactnessQuery.h +++ b/components/Queries/Queries/avtCompactnessQuery.h @@ -9,6 +9,7 @@ #include #include +#include class vtkDataSet; class vtkCell; @@ -27,6 +28,11 @@ class vtkCell; // Added additional queries which use a density variable. // Made it inherit from the (new) two-pass query. // +// Jeremy Meredith, Wed Jul 23 13:29:57 PDT 2003 +// Turned xBound and yBound into class data members, and made them +// STL vectors, and made it collect the boundary points +// across all domains and processors. +// // **************************************************************************** class QUERY_API avtCompactnessQuery : public avtTwoPassDatasetQuery @@ -43,6 +49,8 @@ class QUERY_API avtCompactnessQuery : public avtTwoPassDatasetQuery protected: int numDomains; + std::vector xBound; + std::vector yBound; double totalXSectArea; double totalRotVolume; diff --git a/components/VisWindow/Makefile.in b/components/VisWindow/Makefile.in index 18b3138897a08b8644b078430fda3dc1c5b13c09..cfc7c8093474e1a076ef20885463949ab49ab341 100644 --- a/components/VisWindow/Makefile.in +++ b/components/VisWindow/Makefile.in @@ -1,4 +1,4 @@ -# Copyright 2000 - 2002 +# Copyright 2000 - 2003 # The Regents of the University of California. # All rights reserved. # @@ -86,6 +86,9 @@ # Akira Haddox, Thu Jun 12 15:47:32 PDT 2003 # Added the point tool. # +# Brad Whitlock, Tue Jul 15 16:46:04 PST 2003 +# Added VisWindowTypes.C +# ############################################################################## @SET_MAKE@ @@ -141,8 +144,8 @@ Tools_src= \ Tools/avtSphereToolInterface.C \ Tools/avtToolInterface.C VisWindow_src= \ - VisWindow/VisWindow.C - + VisWindow/VisWindow.C \ + VisWindow/VisWindowTypes.C CXXFLAGS=@CXXFLAGS@ @QT_CXXFLAGS@ CPPFLAGS=@COMPONENT_CPPFLAGS@ @VTKQT_CPPFLAGS@ @CPPFLAGS@ @ANNOTATION_FLAGS@ diff --git a/components/VisWindow/VisWindow/VisWindowTypes.C b/components/VisWindow/VisWindow/VisWindowTypes.C new file mode 100644 index 0000000000000000000000000000000000000000..e70de412668d3893cc6a2806d8d28efd45af87b8 --- /dev/null +++ b/components/VisWindow/VisWindow/VisWindowTypes.C @@ -0,0 +1,63 @@ +#include + +static const char *INTERACTION_MODE_strings[] = {"NAVIGATE", "ZONE_PICK", + "NODE_PICK", "ZOOM", "LINEOUT"}; + +// **************************************************************************** +// Function: INTERACTION_MODE_ToString +// +// Purpose: +// Returns a string version of INTERACTION_MODE. +// +// Programmer: Brad Whitlock +// Creation: Tue Jul 15 16:44:12 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +std::string +INTERACTION_MODE_ToString(INTERACTION_MODE m) +{ + int index = int(m); + if(m < NAVIGATE || m > LINEOUT) index = 0; + return INTERACTION_MODE_strings[index]; +} + +std::string +INTERACTION_MODE_ToString(int m) +{ + int index = m; + if(index < 0 || index > 4) index = 0; + return INTERACTION_MODE_strings[index]; +} + +// **************************************************************************** +// Function: INTERACTION_MODE_FromString +// +// Purpose: +// Returns an INTERACTION_MODE associated with a string value. +// +// Programmer: Brad Whitlock +// Creation: Tue Jul 15 16:44:44 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +bool +INTERACTION_MODE_FromString(const std::string &s, INTERACTION_MODE &m) +{ + m = NAVIGATE; + + for(int i = 0; i < 5; ++i) + { + if(s == INTERACTION_MODE_strings[i]) + { + m = INTERACTION_MODE(i); + return true; + } + } + + return false; +} diff --git a/components/VisWindow/VisWindow/VisWindowTypes.h b/components/VisWindow/VisWindow/VisWindowTypes.h index abb158849b1439c99204773447b05acc42814be4..3565184dc627e18a1cff996e95711189c4816fa9 100644 --- a/components/VisWindow/VisWindow/VisWindowTypes.h +++ b/components/VisWindow/VisWindow/VisWindowTypes.h @@ -6,6 +6,9 @@ // For INTERACTION_MODE, renamed PICK to ZONE_PICK, added NODE_PICK. // Removed QUERY_TYPE, no longer needed. // +// Brad Whitlock, Tue Jul 15 16:34:53 PST 2003 +// Added methods to convert INTERACTION_MODE to and from string. +// // ************************************************************************* // @@ -13,6 +16,8 @@ #define VIS_WINDOW_TYPES_H #include +#include +#include typedef enum { @@ -50,6 +55,12 @@ struct HotPoint hotPointCallback *callback; }; +// Functions to convert INTERACTION_MODE to/from string. +VISWINDOW_API std::string INTERACTION_MODE_ToString(INTERACTION_MODE); +VISWINDOW_API std::string INTERACTION_MODE_ToString(int); +VISWINDOW_API bool INTERACTION_MODE_FromString(const std::string &, + INTERACTION_MODE &); + // **************************************************************************** // Function: ValidMode // diff --git a/databases/Cosmos/avtCosmosFileFormat.C b/databases/Cosmos/avtCosmosFileFormat.C index 75e36a77541412e289b4414e028e18ed07d1c551..da5db15571516d74716bb421093fb174d1914809 100644 --- a/databases/Cosmos/avtCosmosFileFormat.C +++ b/databases/Cosmos/avtCosmosFileFormat.C @@ -5,10 +5,8 @@ #include -#include -#include +#include #include -#include #include #include @@ -28,7 +26,8 @@ #include #include -using namespace std; +using std::vector; +using std::string; static string GetDirName(const char *path); @@ -68,7 +67,7 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) dirname = GetDirName(fname); - std::ifstream ifile(fname); + ifstream ifile(fname); if (ifile.fail()) { @@ -78,6 +77,7 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) ntimesteps = ndomains = dimensions[0] = -1; existGhostZones = false; + readInTimes = false; int i; @@ -91,7 +91,7 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) for (;;) { string key; - ifile >> key; + ReadString(ifile, key); if (ifile.eof() || ifile.fail()) break; @@ -99,7 +99,7 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) if (key == "#COORDINATES") { string value; - ifile >> value; + ReadString(ifile, value); if (value == "spherical") coordType = spherical; else if (value == "cylindrical") @@ -124,7 +124,7 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) } else if (key == "#TIMEFILE") { - ifile >> timeFileName; + ReadString(ifile, timeFileName); timeFileName = dirname + timeFileName; } else if (key == "#DIMENSIONS") @@ -152,7 +152,7 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) string value; for (i = 0; i < ndomains; ++i) { - ifile >> value; + ReadString(ifile, value); gridFileNames[i] = dirname + value; } } @@ -166,13 +166,15 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) ifile.get(); string value; - getline(ifile, value); + char line[1024]; + ifile.getline(line, 1024); + value = line; scalarVarNames.push_back(value); for (i = 0; i < ndomains; ++i) { - ifile >> value; + ReadString(ifile, value); scalarFileNames[i].push_back(dirname + value); } } @@ -186,7 +188,10 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) ifile.get(); string value; - getline(ifile, value); + char line[1024]; + ifile.getline(line, 1024); + value = line; + int index = vectorVarNames.size(); vectorVarNames.push_back(value); @@ -194,12 +199,12 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) for (i = 0; i < ndomains; ++i) { vectorFileNames[i].push_back(TripleString()); - ifile >> value; + ReadString(ifile, value); vectorFileNames[i][index].x = dirname + value; } for (i = 0; i < ndomains; ++i) { - ifile >> value; + ReadString(ifile, value); vectorFileNames[i][index].y = dirname + value; } @@ -207,7 +212,7 @@ avtCosmosFileFormat::avtCosmosFileFormat(const char *fname) { for (i = 0; i < ndomains; ++i) { - ifile >> value; + ReadString(ifile, value); vectorFileNames[i][index].z = dirname + value; } } @@ -301,11 +306,18 @@ avtCosmosFileFormat::~avtCosmosFileFormat() // Programmer: Akira Haddox // Creation: June 4, 2003 // +// Modifications: +// Akira Haddox, Wed Jul 23 08:13:32 PDT 2003 +// Added in call to read in times. +// // **************************************************************************** vtkDataSet * avtCosmosFileFormat::GetMesh(int ts, int dom, const char *mesh) { + if (!readInTimes) + ReadInTimes(); + if (strcmp(mesh, "mesh")) EXCEPTION1(InvalidVariableException, mesh); @@ -803,6 +815,9 @@ avtCosmosFileFormat::GetNTimesteps() // Akira Haddox, Wed Jul 16 15:33:48 PDT 2003 // Added in renaming of axes for xz, yz 2D cartesian plots. // +// Akira Haddox, Wed Jul 23 08:14:56 PDT 2003 +// Moved time reading code to seperate function called by GetMesh. +// // **************************************************************************** void @@ -849,14 +864,25 @@ avtCosmosFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md) for (i = 0; i < nvectors; i++) md->Add(new avtVectorMetaData(vectorVarNames[i], "mesh", AVT_ZONECENT, 3)); - - // - // Read in the time - // +} + +// **************************************************************************** +// Method: avtCosmosFileFormat::ReadInTimes +// +// Purpose: +// Read in the time information. +// +// Programmer: Akira Haddox +// Creation: July 22, 2003 +// +// **************************************************************************** - md->SetNumStates(ntimesteps); +void +avtCosmosFileFormat::ReadInTimes() +{ + readInTimes = true; - std::ifstream tf; + ifstream tf; tf.open(timeFileName.c_str()); if (tf.fail()) EXCEPTION1(InvalidFilesException, timeFileName.c_str()); @@ -867,17 +893,17 @@ avtCosmosFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md) // // The first 6 numbers we don't use. // + int i; for (i = 0; i < 6; ++i) tf >> junk; for (i = 0; i < ntimesteps; ++i) { tf >> cycle >> time; - md->SetCycle(i, cycle); - md->SetTime(i, time); + metadata->SetTime(i, time); } - tf.close(); + tf.close(); } @@ -1061,7 +1087,7 @@ void avtCosmosFileFormat::ReadMeshInfo(int domain) { meshInfoLoaded[domain] = true; - std::ifstream file; + ifstream file; file.open(gridFileNames[domain].c_str()); if (file.fail()) EXCEPTION1(InvalidFilesException, gridFileNames[domain].c_str()); @@ -1775,6 +1801,41 @@ avtCosmosFileFormat::FillVectorVar2DCylindrical(float *ptr, float *values[3], } } + +// **************************************************************************** +// Method: avtCosmosFileFormat::ReadString +// +// Purpose: +// Read in a string from a file. Works like you would expect +// ifile >> str to work, except this will compile on all platforms. +// +// Programmer: Akira Haddox +// Creation: July 22, 2003 +// +// **************************************************************************** + +void +avtCosmosFileFormat::ReadString(ifstream &ifile, std::string &str) +{ + char c; + do + { + c = ifile.get(); + if (ifile.eof() || ifile.fail()) + return; + }while (isspace(c)); + + str = c; + + while (!isspace(ifile.peek())) + { + if (ifile.eof() || ifile.fail()) + return; + c = ifile.get(); + str += c; + } +} + // **************************************************************************** // Method: GetDirName // diff --git a/databases/Cosmos/avtCosmosFileFormat.h b/databases/Cosmos/avtCosmosFileFormat.h index 725ab96be8c071b0127b836cb0a6b174fa9ffcea..f548480fcf43a6d0ee9f218c856d02ab5560c52e 100644 --- a/databases/Cosmos/avtCosmosFileFormat.h +++ b/databases/Cosmos/avtCosmosFileFormat.h @@ -9,6 +9,7 @@ #include #include +#include class vtkDataSet; @@ -31,6 +32,10 @@ class vtkDataSet; // Added in 2D spherical, cylindrical, XZ and YZ cartesian support. // Added in support for reading in ghostzones. // +// Akira Haddox, Tue Jul 22 09:43:43 PDT 2003 +// Fixed some code to compile on IRIX. Separated time reading code +// to separate function. +// // **************************************************************************** class avtCosmosFileFormat : public avtMTMDFileFormat @@ -54,6 +59,9 @@ class avtCosmosFileFormat : public avtMTMDFileFormat enum CoordinateType { cartesian, spherical, cylindrical }; + bool readInTimes; + void ReadInTimes(); + void ReadMesh(int domain); void ReadMeshInfo(int domain); @@ -107,7 +115,7 @@ class avtCosmosFileFormat : public avtMTMDFileFormat // domain, then by start(x), end(x), start(y), end(y), start(z), end(z). // bool existGhostZones; - std::vector > ghostSet; + std::vector > ghostSet; std::vector scalarVarNames; std::vector vectorVarNames; @@ -125,6 +133,8 @@ class avtCosmosFileFormat : public avtMTMDFileFormat std::string x,y,z; }; std::vector > vectorFileNames; + + void ReadString(ifstream &ifile, std::string &str); }; #endif diff --git a/gui/QvisGUIApplication.C b/gui/QvisGUIApplication.C index 122551f1cf7e501049a2315078ae2df0389c4106..f6a4aad6287b69accf0ad1d239c0b56b0a84a92e 100644 --- a/gui/QvisGUIApplication.C +++ b/gui/QvisGUIApplication.C @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -238,6 +239,7 @@ QvisGUIApplication::QvisGUIApplication(int &argc, char **argv) : // Default values. localOnly = false; readConfig = true; + sessionCount = 0; // Create the viewer, statusSubject, and fileServer for GUIBase. viewer = new ViewerProxy; @@ -1350,6 +1352,9 @@ QvisGUIApplication::AddViewerSpaceArguments(int orientation) // Brad Whitlock, Wed Apr 9 12:46:06 PDT 2003 // I made the plot list widget capable of opening the subset window. // +// Brad Whitlock, Mon Jul 14 11:51:54 PDT 2003 +// I connected the main window to RestoreSession and SaveSession slots. +// // **************************************************************************** void @@ -1380,6 +1385,8 @@ QvisGUIApplication::CreateWindows(int orientation) connect(mainWin->GetPlotManager(), SIGNAL(activateOperatorWindow(int)), this, SLOT(ActivateOperatorWindow(int))); connect(mainWin, SIGNAL(refreshFileList()), this, SLOT(RefreshFileList())); + connect(mainWin, SIGNAL(restoreSession()), this, SLOT(RestoreSession())); + connect(mainWin, SIGNAL(saveSession()), this, SLOT(SaveSession())); mainWin->ConnectMessageAttr(&message); mainWin->ConnectGUIMessageAttributes(); mainWin->ConnectGlobalAttributes(viewer->GetGlobalAttributes()); @@ -1861,6 +1868,44 @@ QvisGUIApplication::WritePluginWindowConfigs(DataNode *parentNode) } } +// **************************************************************************** +// Method: QvisGUIApplication::SaveSession +// +// Purpose: +// This is a Qt slot function that tells the viewer to save out all of its +// state to an XML file. +// +// Programmer: Brad Whitlock +// Creation: Mon Jul 14 11:52:52 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +QvisGUIApplication::SaveSession() +{ + // Create the name of a VisIt session file to use. + QString defaultFile; defaultFile.sprintf("%svisit%04d.session", + GetUserVisItDirectory().c_str(), sessionCount); + + // Get the name of the file that the user saved. + QString fileName = QFileDialog::getSaveFileName(defaultFile, + "VisIt session (*.session)"); + + // If the user chose to save a file, tell the viewer to write its state + // to that file. + if(!fileName.isNull()) + { + ++sessionCount; + viewer->ExportEntireState(fileName.latin1()); + + // Write the gui part of the session with a ".gui" extension. + fileName += ".gui"; + WriteConfigFile(fileName.latin1()); + } +} + // **************************************************************************** // Method: QvisGUIApplication::ReadConfigFile // @@ -1937,6 +1982,61 @@ QvisGUIApplication::ReadConfigFile(const char *filename) return node; } +// **************************************************************************** +// Method: QvisGUIApplication::RestoreSession +// +// Purpose: +// This is a Qt slot function that allows the user to choose the name of +// a VisIt session to restore and then tells the viewer to restore the +// session using the file. +// +// Programmer: Brad Whitlock +// Creation: Mon Jul 14 11:54:10 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +QvisGUIApplication::RestoreSession() +{ + // Get the name of the session to load. + QString s(QFileDialog::getOpenFileName(GetUserVisItDirectory().c_str(), + "VisIt session (*.session)")); + + // If the user chose a file, tell the viewer to import that session file. + if(!s.isEmpty()) + { + // Have the viewer read in its part of the config. + std::string filename(s.latin1()); + viewer->ImportEntireState(filename); + + // Make the gui read in its part of the config. + filename += ".gui"; + DataNode *node = ReadConfigFile(filename.c_str()); + if(node) + { + ProcessConfigSettings(node, false); + ProcessWindowConfigSettings(node); + + // Look for the VisIt tree. + DataNode *visitRoot = node->GetNode("VisIt"); + if(visitRoot != 0) + { + // Get the gui node. + DataNode *guiNode = visitRoot->GetNode("GUI"); + if(guiNode != 0) + { + viewer->GetAppearanceAttributes()->SetFromNode(guiNode); + CustomizeAppearance(true); + } + } + + delete node; + } + } +} + // **************************************************************************** // Method: QvisGUIApplication::ProcessConfigSettings // diff --git a/gui/QvisGUIApplication.h b/gui/QvisGUIApplication.h index cb95ec3de89669708a20f90117ae87bd66cc6288..b60f77ac17b527a8a43ad8875f7d8238745abd2c 100644 --- a/gui/QvisGUIApplication.h +++ b/gui/QvisGUIApplication.h @@ -199,6 +199,9 @@ typedef std::vector WindowBaseVector; // Brad Whitlock, Mon Jun 23 11:42:54 PDT 2003 // I added RefreshFileList. // +// Brad Whitlock, Mon Jul 14 11:50:34 PDT 2003 +// I added RestoreSession and SaveSession. +// // **************************************************************************** class GUI_API QvisGUIApplication : public QObject, public ConfigManager, public GUIBase @@ -250,6 +253,8 @@ private slots: void SetPrinterOptions(); void PrintWindow(); void RefreshFileList(); + void RestoreSession(); + void SaveSession(); private: bool viewerIsAlive; @@ -331,6 +336,8 @@ private: // File to load on startup. QualifiedFilename loadFile; + + int sessionCount; }; #endif diff --git a/gui/QvisKeyframeWindow.C b/gui/QvisKeyframeWindow.C index 17ca454fb9c0a67dc4614770361497c36c949085..a7944600829228a994a1a37226ff97adc24c4abd 100644 --- a/gui/QvisKeyframeWindow.C +++ b/gui/QvisKeyframeWindow.C @@ -839,6 +839,10 @@ QvisKeyframeWindow::UpdatePlotList() // Brad Whitlock, Thu Mar 20 11:08:33 PDT 2003 // I updated the attribute numbering for GlobalAttributes. // +// Brad Whitlock, Wed Jul 23 15:21:13 PST 2003 +// I made the Keyframing enabled checkbox get set when the keyframing +// attributes are updated. +// // **************************************************************************** void @@ -861,7 +865,10 @@ QvisKeyframeWindow::UpdateWindow(bool doAll) switch(i) { - case 0: //enabled + case 0: //enabled + keyframeEnabledCheck->blockSignals(true); + keyframeEnabledCheck->setChecked(kfAtts->GetEnabled()); + keyframeEnabledCheck->blockSignals(false); break; } } diff --git a/gui/QvisMainWindow.C b/gui/QvisMainWindow.C index 1ba41f82385dca279c55b2231b3ef44316797051..00639fa12788a3513fd0f2c67d139a103c686716 100644 --- a/gui/QvisMainWindow.C +++ b/gui/QvisMainWindow.C @@ -172,6 +172,9 @@ // Brad Whitlock, Mon Jun 23 10:09:51 PDT 2003 // I added a button to refresh the file list. // +// Brad Whitlock, Mon Jul 14 11:47:34 PDT 2003 +// I added menu options for saving and restoring the session. +// // **************************************************************************** QvisMainWindow::QvisMainWindow(int orientation, const char *captionString) @@ -240,6 +243,9 @@ QvisMainWindow::QvisMainWindow(int orientation, const char *captionString) id = file->insertItem(printIcon, tr("Print window"), this, SIGNAL(printWindow())); id = file->insertItem(tr("Set Print options . . ."), this, SIGNAL(activatePrintWindow())); file->insertSeparator(); + id = file->insertItem(tr("Restore session . . ."), this, SIGNAL(restoreSession())); + id = file->insertItem(tr("Save session . . ."), this, SIGNAL(saveSession())); + file->insertSeparator(); file->insertItem( tr("E&xit"), qApp, SLOT(quit()), CTRL+Key_X ); // diff --git a/gui/QvisMainWindow.h b/gui/QvisMainWindow.h index 37a6d56ce5159541bd98bfe28568fea2127c5a5d..5dd16b3eb207b56cfee949e9cd681f8080b3c3d1 100644 --- a/gui/QvisMainWindow.h +++ b/gui/QvisMainWindow.h @@ -93,6 +93,9 @@ class WindowInformation; // Brad Whitlock, Mon Jun 23 10:14:54 PDT 2003 // I added refreshFileList. // +// Brad Whitlock, Mon Jul 14 11:46:45 PDT 2003 +// I added restoreSession, saveSession signals. +// // **************************************************************************** class GUI_API QvisMainWindow : public QvisWindowBase, public SimpleObserver @@ -156,6 +159,8 @@ signals: void printWindow(); void refreshFileList(); + void saveSession(); + void restoreSession(); public slots: void unreadOutput(bool); protected: diff --git a/java/ViewerProxy.java b/java/ViewerProxy.java index c84a2e7b5a553353c6ba541867ed72f9df6159ba..289a6d93e008cf6cfc092bcef49c510b0c633309 100644 --- a/java/ViewerProxy.java +++ b/java/ViewerProxy.java @@ -70,6 +70,9 @@ import java.util.Vector; // Brad Whitlock, Tue Jul 1 16:49:48 PST 2003 // I added a method to tell the viewer to export a colortable. // +// Brad Whitlock, Wed Jul 9 12:30:58 PDT 2003 +// I added methods to tell the viewer to export and import its entire state. +// // **************************************************************************** public class ViewerProxy implements SimpleObserver @@ -802,6 +805,22 @@ public class ViewerProxy implements SimpleObserver return synchronous ? Synchronize() : true; } + public boolean ExportEntireState(String filename) + { + rpc.SetRPCType(ViewerRPC.VIEWERRPCTYPE_EXPORTENTIRESTATERPC); + rpc.SetVariable(filename); + rpc.Notify(); + return synchronous ? Synchronize() : true; + } + + public boolean ImportEntireState(String filename) + { + rpc.SetRPCType(ViewerRPC.VIEWERRPCTYPE_IMPORTENTIRESTATERPC); + rpc.SetVariable(filename); + rpc.Notify(); + return synchronous ? Synchronize() : true; + } + public boolean SetRenderingAttributes() { rpc.SetRPCType(ViewerRPC.VIEWERRPCTYPE_SETRENDERINGATTRIBUTESRPC); diff --git a/java/ViewerRPC.java b/java/ViewerRPC.java index 22e1f74087faaec1152c76285bddc6d032dfacd0..46fc80ae48c30e946fec9fa6ff59f26829789c18 100644 --- a/java/ViewerRPC.java +++ b/java/ViewerRPC.java @@ -12,7 +12,7 @@ import java.lang.Integer; // Notes: Autogenerated by xml2java. // // Programmer: xml2java -// Creation: Tue Jul 1 16:49:20 PST 2003 +// Creation: Thu Jul 10 11:40:35 PDT 2003 // // Modifications: // @@ -135,7 +135,9 @@ public class ViewerRPC extends AttributeSubject public final static int VIEWERRPCTYPE_SETGLOBALLINEOUTATTRIBUTESRPC = 111; public final static int VIEWERRPCTYPE_SETPICKATTRIBUTESRPC = 112; public final static int VIEWERRPCTYPE_EXPORTCOLORTABLERPC = 113; - public final static int VIEWERRPCTYPE_MAXRPC = 114; + public final static int VIEWERRPCTYPE_EXPORTENTIRESTATERPC = 114; + public final static int VIEWERRPCTYPE_IMPORTENTIRESTATERPC = 115; + public final static int VIEWERRPCTYPE_MAXRPC = 116; public ViewerRPC() diff --git a/operators/Box/BoxAttributes.C b/operators/Box/BoxAttributes.C index 48f9b3910b9bee60f6d2db41264e4596cc458240..06187b6ef58b99670c4e0020fc8dd3314f954480 100644 --- a/operators/Box/BoxAttributes.C +++ b/operators/Box/BoxAttributes.C @@ -48,7 +48,7 @@ BoxAttributes::Amount_FromString(const std::string &s, BoxAttributes::Amount &va // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -74,7 +74,7 @@ BoxAttributes::BoxAttributes() : AttributeSubject("idddddd") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -102,7 +102,7 @@ BoxAttributes::BoxAttributes(const BoxAttributes &obj) : AttributeSubject("idddd // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -122,7 +122,7 @@ BoxAttributes::~BoxAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -151,7 +151,7 @@ BoxAttributes::operator = (const BoxAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -179,7 +179,7 @@ BoxAttributes::operator == (const BoxAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -200,7 +200,7 @@ BoxAttributes::operator != (const BoxAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -301,6 +301,33 @@ BoxAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: BoxAttributes::NewInstance +// +// Purpose: +// NewInstance method for the BoxAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:21:48 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +BoxAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new BoxAttributes(*this); + else + retval = new BoxAttributes; + + return retval; +} + // **************************************************************************** // Method: BoxAttributes::SelectAll // @@ -310,7 +337,7 @@ BoxAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -341,7 +368,7 @@ BoxAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -419,7 +446,7 @@ BoxAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -578,7 +605,7 @@ BoxAttributes::GetMaxz() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -609,7 +636,7 @@ BoxAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -640,7 +667,7 @@ BoxAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -671,7 +698,7 @@ BoxAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:44 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // diff --git a/operators/Box/BoxAttributes.h b/operators/Box/BoxAttributes.h index f16648c7b17bea0d21128eb32494bafd048474ea..c4c4b124f877eb03e1141112cbf22314c237f9c5 100644 --- a/operators/Box/BoxAttributes.h +++ b/operators/Box/BoxAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:43 PST 2003 +// Creation: Wed Jul 23 13:21:48 PST 2003 // // Modifications: // @@ -38,6 +38,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Clip/ClipAttributes.C b/operators/Clip/ClipAttributes.C index dc1b5dc2867614a57ff0fd9194d09093e27bc066..7b35ec76691bdbb869cca3f6ac4baa01dcb5bd2f 100644 --- a/operators/Clip/ClipAttributes.C +++ b/operators/Clip/ClipAttributes.C @@ -49,7 +49,7 @@ ClipAttributes::ClipStyle_FromString(const std::string &s, ClipAttributes::ClipS // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -96,7 +96,7 @@ ClipAttributes::ClipAttributes() : AttributeSubject("ibbbDDDDDDbDdb") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -152,7 +152,7 @@ ClipAttributes::ClipAttributes(const ClipAttributes &obj) : AttributeSubject("ib // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -172,7 +172,7 @@ ClipAttributes::~ClipAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -229,7 +229,7 @@ ClipAttributes::operator = (const ClipAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -301,7 +301,7 @@ ClipAttributes::operator == (const ClipAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -322,7 +322,7 @@ ClipAttributes::operator != (const ClipAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -459,6 +459,33 @@ ClipAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ClipAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ClipAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:21:51 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ClipAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ClipAttributes(*this); + else + retval = new ClipAttributes; + + return retval; +} + // **************************************************************************** // Method: ClipAttributes::SelectAll // @@ -468,7 +495,7 @@ ClipAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -506,7 +533,7 @@ ClipAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -626,7 +653,7 @@ ClipAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -992,7 +1019,7 @@ ClipAttributes::SelectCenter() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -1030,7 +1057,7 @@ ClipAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -1068,7 +1095,7 @@ ClipAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -1106,7 +1133,7 @@ ClipAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:51 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // diff --git a/operators/Clip/ClipAttributes.h b/operators/Clip/ClipAttributes.h index e1aa8634e59dbcd91199c0d5cf1b2447fc2d0591..1f2554cdb8cdfe7fa3a17ac46e8193284388d467 100644 --- a/operators/Clip/ClipAttributes.h +++ b/operators/Clip/ClipAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:55:50 PST 2003 +// Creation: Wed Jul 23 13:21:51 PST 2003 // // Modifications: // @@ -38,6 +38,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Cone/ConeAttributes.C b/operators/Cone/ConeAttributes.C index c7403adc104e0e8dbc82440ab5db49a95a7158cd..ab8d473b75e0b32acca14b05868cc72477834922 100644 --- a/operators/Cone/ConeAttributes.C +++ b/operators/Cone/ConeAttributes.C @@ -48,7 +48,7 @@ ConeAttributes::Representation_FromString(const std::string &s, ConeAttributes:: // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -80,7 +80,7 @@ ConeAttributes::ConeAttributes() : AttributeSubject("dDDiDbd") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -117,7 +117,7 @@ ConeAttributes::ConeAttributes(const ConeAttributes &obj) : AttributeSubject("dD // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -137,7 +137,7 @@ ConeAttributes::~ConeAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -175,7 +175,7 @@ ConeAttributes::operator = (const ConeAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -220,7 +220,7 @@ ConeAttributes::operator == (const ConeAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -241,7 +241,7 @@ ConeAttributes::operator != (const ConeAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -262,7 +262,7 @@ ConeAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -290,7 +290,7 @@ ConeAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -307,6 +307,33 @@ ConeAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ConeAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ConeAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:21:55 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ConeAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ConeAttributes(*this); + else + retval = new ConeAttributes; + + return retval; +} + // **************************************************************************** // Method: ConeAttributes::SelectAll // @@ -316,7 +343,7 @@ ConeAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -347,7 +374,7 @@ ConeAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -425,7 +452,7 @@ ConeAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -630,7 +657,7 @@ ConeAttributes::SelectUpAxis() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -661,7 +688,7 @@ ConeAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -692,7 +719,7 @@ ConeAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -723,7 +750,7 @@ ConeAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // diff --git a/operators/Cone/ConeAttributes.h b/operators/Cone/ConeAttributes.h index 1d5573ce509b8f9e7c19cdd7c1a84f1b510fd566..cc86440ebb170af5c75eb8ba090697b0fb2dd206 100644 --- a/operators/Cone/ConeAttributes.h +++ b/operators/Cone/ConeAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:02 PST 2003 +// Creation: Wed Jul 23 13:21:55 PST 2003 // // Modifications: // @@ -39,6 +39,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/ConnCompReduce/ConnCompReduceAttributes.C b/operators/ConnCompReduce/ConnCompReduceAttributes.C index dad59e5dd636742f6e99409892a5f9430f97c767..74723a6014e0abb40aa480e02c2632ea2c609bb9 100644 --- a/operators/ConnCompReduce/ConnCompReduceAttributes.C +++ b/operators/ConnCompReduce/ConnCompReduceAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -30,7 +30,7 @@ ConnCompReduceAttributes::ConnCompReduceAttributes() : AttributeSubject("d") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -52,7 +52,7 @@ ConnCompReduceAttributes::ConnCompReduceAttributes(const ConnCompReduceAttribute // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -72,7 +72,7 @@ ConnCompReduceAttributes::~ConnCompReduceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -95,7 +95,7 @@ ConnCompReduceAttributes::operator = (const ConnCompReduceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -117,7 +117,7 @@ ConnCompReduceAttributes::operator == (const ConnCompReduceAttributes &obj) cons // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -138,7 +138,7 @@ ConnCompReduceAttributes::operator != (const ConnCompReduceAttributes &obj) cons // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -159,7 +159,7 @@ ConnCompReduceAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -187,7 +187,7 @@ ConnCompReduceAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -204,6 +204,33 @@ ConnCompReduceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ConnCompReduceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ConnCompReduceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:21:58 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ConnCompReduceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ConnCompReduceAttributes(*this); + else + retval = new ConnCompReduceAttributes; + + return retval; +} + // **************************************************************************** // Method: ConnCompReduceAttributes::SelectAll // @@ -213,7 +240,7 @@ ConnCompReduceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -238,7 +265,7 @@ ConnCompReduceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -280,7 +307,7 @@ ConnCompReduceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -335,7 +362,7 @@ ConnCompReduceAttributes::GetTarget() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -360,7 +387,7 @@ ConnCompReduceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -385,7 +412,7 @@ ConnCompReduceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -410,7 +437,7 @@ ConnCompReduceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // diff --git a/operators/ConnCompReduce/ConnCompReduceAttributes.h b/operators/ConnCompReduce/ConnCompReduceAttributes.h index 6561006fc5117adc552d1ea85891e984759f49be..96ddbc15f0e42f66d252c45617b459868891247d 100644 --- a/operators/ConnCompReduce/ConnCompReduceAttributes.h +++ b/operators/ConnCompReduce/ConnCompReduceAttributes.h @@ -11,7 +11,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:50 PST 2003 +// Creation: Wed Jul 23 13:21:58 PST 2003 // // Modifications: // @@ -31,6 +31,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Context/ContextAttributes.C b/operators/Context/ContextAttributes.C index 8f7c9f10269196c6cae4b336adedab2ec4e65d17..209d1c6c2506a46aa52a7997a27e975d5721caa1 100644 --- a/operators/Context/ContextAttributes.C +++ b/operators/Context/ContextAttributes.C @@ -47,7 +47,7 @@ ContextAttributes::Amount_FromString(const std::string &s, ContextAttributes::Am // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -73,7 +73,7 @@ ContextAttributes::ContextAttributes() : AttributeSubject("dddsddd") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -101,7 +101,7 @@ ContextAttributes::ContextAttributes(const ContextAttributes &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -121,7 +121,7 @@ ContextAttributes::~ContextAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -150,7 +150,7 @@ ContextAttributes::operator = (const ContextAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -178,7 +178,7 @@ ContextAttributes::operator == (const ContextAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -199,7 +199,7 @@ ContextAttributes::operator != (const ContextAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -220,7 +220,7 @@ ContextAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -248,7 +248,7 @@ ContextAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -265,6 +265,33 @@ ContextAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ContextAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ContextAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:01 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ContextAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ContextAttributes(*this); + else + retval = new ContextAttributes; + + return retval; +} + // **************************************************************************** // Method: ContextAttributes::SelectAll // @@ -274,7 +301,7 @@ ContextAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -305,7 +332,7 @@ ContextAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -383,7 +410,7 @@ ContextAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -544,7 +571,7 @@ ContextAttributes::SelectContext() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -575,7 +602,7 @@ ContextAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -606,7 +633,7 @@ ContextAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -637,7 +664,7 @@ ContextAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // diff --git a/operators/Context/ContextAttributes.h b/operators/Context/ContextAttributes.h index e91c13169f16d129e5a714c43cf463ef338c61bb..74b547358dd67dff7ce1c0ce8e492a870c9f8f3e 100644 --- a/operators/Context/ContextAttributes.h +++ b/operators/Context/ContextAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:05 PST 2003 +// Creation: Wed Jul 23 13:22:01 PST 2003 // // Modifications: // @@ -38,6 +38,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Decimate/DecimateAttributes.C b/operators/Decimate/DecimateAttributes.C index cf5d90fad8610b780a4925b66aaf24db1101b951..409e4fea1b70987fe917bdd97732f5776d563c0e 100644 --- a/operators/Decimate/DecimateAttributes.C +++ b/operators/Decimate/DecimateAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -30,7 +30,7 @@ DecimateAttributes::DecimateAttributes() : AttributeSubject("d") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -52,7 +52,7 @@ DecimateAttributes::DecimateAttributes(const DecimateAttributes &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -72,7 +72,7 @@ DecimateAttributes::~DecimateAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -95,7 +95,7 @@ DecimateAttributes::operator = (const DecimateAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -117,7 +117,7 @@ DecimateAttributes::operator == (const DecimateAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -138,7 +138,7 @@ DecimateAttributes::operator != (const DecimateAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -159,7 +159,7 @@ DecimateAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -187,7 +187,7 @@ DecimateAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -204,6 +204,33 @@ DecimateAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: DecimateAttributes::NewInstance +// +// Purpose: +// NewInstance method for the DecimateAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:04 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +DecimateAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new DecimateAttributes(*this); + else + retval = new DecimateAttributes; + + return retval; +} + // **************************************************************************** // Method: DecimateAttributes::SelectAll // @@ -213,7 +240,7 @@ DecimateAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -238,7 +265,7 @@ DecimateAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -280,7 +307,7 @@ DecimateAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -335,7 +362,7 @@ DecimateAttributes::GetTarget() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -360,7 +387,7 @@ DecimateAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -385,7 +412,7 @@ DecimateAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -410,7 +437,7 @@ DecimateAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // diff --git a/operators/Decimate/DecimateAttributes.h b/operators/Decimate/DecimateAttributes.h index ad73684149769095d8606954c34aff8793d5cdc0..43e70f10e2fb519929fea2d1cbd8f6636abb47f7 100644 --- a/operators/Decimate/DecimateAttributes.h +++ b/operators/Decimate/DecimateAttributes.h @@ -11,7 +11,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:55 PST 2003 +// Creation: Wed Jul 23 13:22:04 PST 2003 // // Modifications: // @@ -31,6 +31,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Displace/DisplaceAttributes.C b/operators/Displace/DisplaceAttributes.C index 6e57f3849c797ca7a898d1887a0c3a3736ef77bc..88e71108eb4313a7b3d99cde4143c2a848f98ddd 100644 --- a/operators/Displace/DisplaceAttributes.C +++ b/operators/Displace/DisplaceAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -31,7 +31,7 @@ DisplaceAttributes::DisplaceAttributes() : AttributeSubject("ds") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -54,7 +54,7 @@ DisplaceAttributes::DisplaceAttributes(const DisplaceAttributes &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -74,7 +74,7 @@ DisplaceAttributes::~DisplaceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -98,7 +98,7 @@ DisplaceAttributes::operator = (const DisplaceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -121,7 +121,7 @@ DisplaceAttributes::operator == (const DisplaceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -142,7 +142,7 @@ DisplaceAttributes::operator != (const DisplaceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -163,7 +163,7 @@ DisplaceAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -191,7 +191,7 @@ DisplaceAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -208,6 +208,33 @@ DisplaceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: DisplaceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the DisplaceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:08 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +DisplaceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new DisplaceAttributes(*this); + else + retval = new DisplaceAttributes; + + return retval; +} + // **************************************************************************** // Method: DisplaceAttributes::SelectAll // @@ -217,7 +244,7 @@ DisplaceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -243,7 +270,7 @@ DisplaceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -291,7 +318,7 @@ DisplaceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -377,7 +404,7 @@ DisplaceAttributes::SelectVariable() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -403,7 +430,7 @@ DisplaceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -429,7 +456,7 @@ DisplaceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -455,7 +482,7 @@ DisplaceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // diff --git a/operators/Displace/DisplaceAttributes.h b/operators/Displace/DisplaceAttributes.h index fdbb3294d901d3b93dad11e65b73a4235d16e893..5c611c884319193377ca85cca6a02bd1ea92d76b 100644 --- a/operators/Displace/DisplaceAttributes.h +++ b/operators/Displace/DisplaceAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:49:58 PST 2003 +// Creation: Wed Jul 23 13:22:08 PST 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/ExternalSurface/ExternalSurfaceAttributes.C b/operators/ExternalSurface/ExternalSurfaceAttributes.C index 88901b130b40c55766b44dcbf9fb34264ffbc009..900e7a36878bd1e33979d477e3bdb06238ed68a0 100644 --- a/operators/ExternalSurface/ExternalSurfaceAttributes.C +++ b/operators/ExternalSurface/ExternalSurfaceAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -29,7 +29,7 @@ ExternalSurfaceAttributes::ExternalSurfaceAttributes() : AttributeSubject("b") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -51,7 +51,7 @@ ExternalSurfaceAttributes::ExternalSurfaceAttributes(const ExternalSurfaceAttrib // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -71,7 +71,7 @@ ExternalSurfaceAttributes::~ExternalSurfaceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -94,7 +94,7 @@ ExternalSurfaceAttributes::operator = (const ExternalSurfaceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -116,7 +116,7 @@ ExternalSurfaceAttributes::operator == (const ExternalSurfaceAttributes &obj) co // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -137,7 +137,7 @@ ExternalSurfaceAttributes::operator != (const ExternalSurfaceAttributes &obj) co // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -158,7 +158,7 @@ ExternalSurfaceAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -186,7 +186,7 @@ ExternalSurfaceAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -203,6 +203,33 @@ ExternalSurfaceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ExternalSurfaceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ExternalSurfaceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:11 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ExternalSurfaceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ExternalSurfaceAttributes(*this); + else + retval = new ExternalSurfaceAttributes; + + return retval; +} + // **************************************************************************** // Method: ExternalSurfaceAttributes::SelectAll // @@ -212,7 +239,7 @@ ExternalSurfaceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -237,7 +264,7 @@ ExternalSurfaceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -279,7 +306,7 @@ ExternalSurfaceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -334,7 +361,7 @@ ExternalSurfaceAttributes::GetDummy() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -359,7 +386,7 @@ ExternalSurfaceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -384,7 +411,7 @@ ExternalSurfaceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -409,7 +436,7 @@ ExternalSurfaceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // diff --git a/operators/ExternalSurface/ExternalSurfaceAttributes.h b/operators/ExternalSurface/ExternalSurfaceAttributes.h index 0781a05dcb62aa4fb44c62838cb5fe6a44e5aa81..fdaa8c1f3ca227ad1fb5c973359e030429e302fe 100644 --- a/operators/ExternalSurface/ExternalSurfaceAttributes.h +++ b/operators/ExternalSurface/ExternalSurfaceAttributes.h @@ -11,7 +11,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:01 PST 2003 +// Creation: Wed Jul 23 13:22:11 PST 2003 // // Modifications: // @@ -31,6 +31,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/IndexSelect/IndexSelectAttributes.C b/operators/IndexSelect/IndexSelectAttributes.C index 1808e04c693211420ec68d639d59c3e046ac73fb..f80f81ec691133dc1861b90601e9587dadab39c7 100644 --- a/operators/IndexSelect/IndexSelectAttributes.C +++ b/operators/IndexSelect/IndexSelectAttributes.C @@ -86,7 +86,7 @@ IndexSelectAttributes::DataType_FromString(const std::string &s, IndexSelectAttr // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -118,7 +118,7 @@ IndexSelectAttributes::IndexSelectAttributes() : AttributeSubject("iiiiiiiiiiiii // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -152,7 +152,7 @@ IndexSelectAttributes::IndexSelectAttributes(const IndexSelectAttributes &obj) : // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -172,7 +172,7 @@ IndexSelectAttributes::~IndexSelectAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -207,7 +207,7 @@ IndexSelectAttributes::operator = (const IndexSelectAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -241,7 +241,7 @@ IndexSelectAttributes::operator == (const IndexSelectAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -262,7 +262,7 @@ IndexSelectAttributes::operator != (const IndexSelectAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -283,7 +283,7 @@ IndexSelectAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -311,7 +311,7 @@ IndexSelectAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -328,6 +328,33 @@ IndexSelectAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: IndexSelectAttributes::NewInstance +// +// Purpose: +// NewInstance method for the IndexSelectAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:14 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +IndexSelectAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new IndexSelectAttributes(*this); + else + retval = new IndexSelectAttributes; + + return retval; +} + // **************************************************************************** // Method: IndexSelectAttributes::SelectAll // @@ -337,7 +364,7 @@ IndexSelectAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -374,7 +401,7 @@ IndexSelectAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -488,7 +515,7 @@ IndexSelectAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -751,7 +778,7 @@ IndexSelectAttributes::GetGroupIndex() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -788,7 +815,7 @@ IndexSelectAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -825,7 +852,7 @@ IndexSelectAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -862,7 +889,7 @@ IndexSelectAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:09 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // diff --git a/operators/IndexSelect/IndexSelectAttributes.h b/operators/IndexSelect/IndexSelectAttributes.h index be0e2e22937a176f0913a64e2a3c4140240491b2..85c889227d8a87087c941540052a9a030efa0d5f 100644 --- a/operators/IndexSelect/IndexSelectAttributes.h +++ b/operators/IndexSelect/IndexSelectAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:08 PST 2003 +// Creation: Wed Jul 23 13:22:14 PST 2003 // // Modifications: // @@ -45,6 +45,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/InverseGhostZone/InverseGhostZoneAttributes.C b/operators/InverseGhostZone/InverseGhostZoneAttributes.C index ba62c2777c137103100f0d105d5a43bc2630d975..3a57f688ea6ab36d15e0a8a6d303598870cac8d0 100644 --- a/operators/InverseGhostZone/InverseGhostZoneAttributes.C +++ b/operators/InverseGhostZone/InverseGhostZoneAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -30,7 +30,7 @@ InverseGhostZoneAttributes::InverseGhostZoneAttributes() : AttributeSubject("b") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -52,7 +52,7 @@ InverseGhostZoneAttributes::InverseGhostZoneAttributes(const InverseGhostZoneAtt // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -72,7 +72,7 @@ InverseGhostZoneAttributes::~InverseGhostZoneAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -95,7 +95,7 @@ InverseGhostZoneAttributes::operator = (const InverseGhostZoneAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -117,7 +117,7 @@ InverseGhostZoneAttributes::operator == (const InverseGhostZoneAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -138,7 +138,7 @@ InverseGhostZoneAttributes::operator != (const InverseGhostZoneAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -159,7 +159,7 @@ InverseGhostZoneAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -187,7 +187,7 @@ InverseGhostZoneAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -204,6 +204,33 @@ InverseGhostZoneAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: InverseGhostZoneAttributes::NewInstance +// +// Purpose: +// NewInstance method for the InverseGhostZoneAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:17 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +InverseGhostZoneAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new InverseGhostZoneAttributes(*this); + else + retval = new InverseGhostZoneAttributes; + + return retval; +} + // **************************************************************************** // Method: InverseGhostZoneAttributes::SelectAll // @@ -213,7 +240,7 @@ InverseGhostZoneAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -238,7 +265,7 @@ InverseGhostZoneAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -280,7 +307,7 @@ InverseGhostZoneAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -335,7 +362,7 @@ InverseGhostZoneAttributes::GetConstantData() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -360,7 +387,7 @@ InverseGhostZoneAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -385,7 +412,7 @@ InverseGhostZoneAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -410,7 +437,7 @@ InverseGhostZoneAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // diff --git a/operators/InverseGhostZone/InverseGhostZoneAttributes.h b/operators/InverseGhostZone/InverseGhostZoneAttributes.h index 81f5c7a6e735e88855b9fcbbfba383274c036fb1..f5c3212b26a340616afc854858c987206ff12da0 100644 --- a/operators/InverseGhostZone/InverseGhostZoneAttributes.h +++ b/operators/InverseGhostZone/InverseGhostZoneAttributes.h @@ -11,7 +11,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:07 PST 2003 +// Creation: Wed Jul 23 13:22:17 PST 2003 // // Modifications: // @@ -31,6 +31,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Isosurface/IsosurfaceAttributes.C b/operators/Isosurface/IsosurfaceAttributes.C index f5b0fcb04538fd235043fe3a7cf1433fb7dbfdb4..b6111772b812cf2fb72e5c7f4470d53d58e0fbde 100644 --- a/operators/Isosurface/IsosurfaceAttributes.C +++ b/operators/Isosurface/IsosurfaceAttributes.C @@ -85,7 +85,7 @@ IsosurfaceAttributes::Scaling_FromString(const std::string &s, IsosurfaceAttribu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -112,7 +112,7 @@ IsosurfaceAttributes::IsosurfaceAttributes() : AttributeSubject("id*d*ibdbdis") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -143,7 +143,7 @@ IsosurfaceAttributes::IsosurfaceAttributes(const IsosurfaceAttributes &obj) : At // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -163,7 +163,7 @@ IsosurfaceAttributes::~IsosurfaceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -195,7 +195,7 @@ IsosurfaceAttributes::operator = (const IsosurfaceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -226,7 +226,7 @@ IsosurfaceAttributes::operator == (const IsosurfaceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -247,7 +247,7 @@ IsosurfaceAttributes::operator != (const IsosurfaceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -268,7 +268,7 @@ IsosurfaceAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -296,7 +296,7 @@ IsosurfaceAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -313,6 +313,33 @@ IsosurfaceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: IsosurfaceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the IsosurfaceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:19 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +IsosurfaceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new IsosurfaceAttributes(*this); + else + retval = new IsosurfaceAttributes; + + return retval; +} + // **************************************************************************** // Method: IsosurfaceAttributes::SelectAll // @@ -322,7 +349,7 @@ IsosurfaceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -356,7 +383,7 @@ IsosurfaceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -452,7 +479,7 @@ IsosurfaceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -710,7 +737,7 @@ IsosurfaceAttributes::SelectVariable() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -744,7 +771,7 @@ IsosurfaceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -778,7 +805,7 @@ IsosurfaceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -812,7 +839,7 @@ IsosurfaceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:12 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // diff --git a/operators/Isosurface/IsosurfaceAttributes.h b/operators/Isosurface/IsosurfaceAttributes.h index 06d55f74f5546ba3cba922eecfed9fa4c75311c4..2682a7a978d4c2492dde81c07c3a82bdf3d0f9b9 100644 --- a/operators/Isosurface/IsosurfaceAttributes.h +++ b/operators/Isosurface/IsosurfaceAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:11 PST 2003 +// Creation: Wed Jul 23 13:22:19 PST 2003 // // Modifications: // @@ -44,6 +44,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Lineout/LineoutAttributes.C b/operators/Lineout/LineoutAttributes.C index 29c01bbcdf9cf5993ebb732ae5962b9080cc45f4..49627de03cd74a89b98a20d797a2771312234b74 100644 --- a/operators/Lineout/LineoutAttributes.C +++ b/operators/Lineout/LineoutAttributes.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -39,7 +39,7 @@ LineoutAttributes::LineoutAttributes() : AttributeSubject("DDibbs") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -72,7 +72,7 @@ LineoutAttributes::LineoutAttributes(const LineoutAttributes &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -92,7 +92,7 @@ LineoutAttributes::~LineoutAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -126,7 +126,7 @@ LineoutAttributes::operator = (const LineoutAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -165,7 +165,7 @@ LineoutAttributes::operator == (const LineoutAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -186,7 +186,7 @@ LineoutAttributes::operator != (const LineoutAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -246,6 +246,33 @@ LineoutAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: LineoutAttributes::NewInstance +// +// Purpose: +// NewInstance method for the LineoutAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:23 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +LineoutAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new LineoutAttributes(*this); + else + retval = new LineoutAttributes; + + return retval; +} + // **************************************************************************** // Method: LineoutAttributes::SelectAll // @@ -255,7 +282,7 @@ LineoutAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -285,7 +312,7 @@ LineoutAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -357,7 +384,7 @@ LineoutAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -531,7 +558,7 @@ LineoutAttributes::SelectDesignator() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -561,7 +588,7 @@ LineoutAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -591,7 +618,7 @@ LineoutAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -621,7 +648,7 @@ LineoutAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // diff --git a/operators/Lineout/LineoutAttributes.h b/operators/Lineout/LineoutAttributes.h index 6e5f67812c4b696769baee9056ec90d98ab20345..7cfdd1719b2a20c135b283aa57abff67222a0766 100644 --- a/operators/Lineout/LineoutAttributes.h +++ b/operators/Lineout/LineoutAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:12 PST 2003 +// Creation: Wed Jul 23 13:22:23 PST 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/MetricThreshold/MetricThresholdAttributes.C b/operators/MetricThreshold/MetricThresholdAttributes.C index 2045b493f112860096b239f1c83a7d658ddb26f9..491dfbc9ec26ef8cb889e15d7eb42adc983a1dd3 100644 --- a/operators/MetricThreshold/MetricThresholdAttributes.C +++ b/operators/MetricThreshold/MetricThresholdAttributes.C @@ -54,7 +54,7 @@ MetricThresholdAttributes::Preset_FromString(const std::string &s, MetricThresho // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -92,7 +92,7 @@ MetricThresholdAttributes::MetricThresholdAttributes() : AttributeSubject("ibddb // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -132,7 +132,7 @@ MetricThresholdAttributes::MetricThresholdAttributes(const MetricThresholdAttrib // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -152,7 +152,7 @@ MetricThresholdAttributes::~MetricThresholdAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -193,7 +193,7 @@ MetricThresholdAttributes::operator = (const MetricThresholdAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -233,7 +233,7 @@ MetricThresholdAttributes::operator == (const MetricThresholdAttributes &obj) co // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -254,7 +254,7 @@ MetricThresholdAttributes::operator != (const MetricThresholdAttributes &obj) co // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -275,7 +275,7 @@ MetricThresholdAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -303,7 +303,7 @@ MetricThresholdAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -320,6 +320,33 @@ MetricThresholdAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: MetricThresholdAttributes::NewInstance +// +// Purpose: +// NewInstance method for the MetricThresholdAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:26 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +MetricThresholdAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new MetricThresholdAttributes(*this); + else + retval = new MetricThresholdAttributes; + + return retval; +} + // **************************************************************************** // Method: MetricThresholdAttributes::SelectAll // @@ -329,7 +356,7 @@ MetricThresholdAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -372,7 +399,7 @@ MetricThresholdAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -522,7 +549,7 @@ MetricThresholdAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -861,7 +888,7 @@ MetricThresholdAttributes::GetQuad_upper() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -904,7 +931,7 @@ MetricThresholdAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -947,7 +974,7 @@ MetricThresholdAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -990,7 +1017,7 @@ MetricThresholdAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // diff --git a/operators/MetricThreshold/MetricThresholdAttributes.h b/operators/MetricThreshold/MetricThresholdAttributes.h index afc6b1da09289f2e9adeead507d9170193cf8b9f..609cd80dcbf25b2bae45bb57fbc072c726d225f9 100644 --- a/operators/MetricThreshold/MetricThresholdAttributes.h +++ b/operators/MetricThreshold/MetricThresholdAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:15 PST 2003 +// Creation: Wed Jul 23 13:22:26 PST 2003 // // Modifications: // @@ -57,6 +57,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/OnionPeel/OnionPeelAttributes.C b/operators/OnionPeel/OnionPeelAttributes.C index 69d0ce75eb24a4c83dd211983ebef270ab947f99..24fc3636bff36901657657395f7e4666d943e484 100644 --- a/operators/OnionPeel/OnionPeelAttributes.C +++ b/operators/OnionPeel/OnionPeelAttributes.C @@ -47,7 +47,7 @@ OnionPeelAttributes::NodeFace_FromString(const std::string &s, OnionPeelAttribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -72,7 +72,7 @@ OnionPeelAttributes::OnionPeelAttributes() : AttributeSubject("issi*bi") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -99,7 +99,7 @@ OnionPeelAttributes::OnionPeelAttributes(const OnionPeelAttributes &obj) : Attri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -119,7 +119,7 @@ OnionPeelAttributes::~OnionPeelAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -147,7 +147,7 @@ OnionPeelAttributes::operator = (const OnionPeelAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -174,7 +174,7 @@ OnionPeelAttributes::operator == (const OnionPeelAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -195,7 +195,7 @@ OnionPeelAttributes::operator != (const OnionPeelAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -216,7 +216,7 @@ OnionPeelAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -244,7 +244,7 @@ OnionPeelAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -261,6 +261,33 @@ OnionPeelAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: OnionPeelAttributes::NewInstance +// +// Purpose: +// NewInstance method for the OnionPeelAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:29 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +OnionPeelAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new OnionPeelAttributes(*this); + else + retval = new OnionPeelAttributes; + + return retval; +} + // **************************************************************************** // Method: OnionPeelAttributes::SelectAll // @@ -270,7 +297,7 @@ OnionPeelAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -300,7 +327,7 @@ OnionPeelAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -372,7 +399,7 @@ OnionPeelAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -556,7 +583,7 @@ OnionPeelAttributes::SelectIndex() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -586,7 +613,7 @@ OnionPeelAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -616,7 +643,7 @@ OnionPeelAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -646,7 +673,7 @@ OnionPeelAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // diff --git a/operators/OnionPeel/OnionPeelAttributes.h b/operators/OnionPeel/OnionPeelAttributes.h index 10f72e42f1ca388d33d94df68f7a3df347d62595..278419d1c6f3cec38718bd15a7468c618a9ccc28 100644 --- a/operators/OnionPeel/OnionPeelAttributes.h +++ b/operators/OnionPeel/OnionPeelAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:18 PST 2003 +// Creation: Wed Jul 23 13:22:29 PST 2003 // // Modifications: // @@ -38,6 +38,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Reflect/ReflectAttributes.C b/operators/Reflect/ReflectAttributes.C index c92469d412908744ce930a4c694b526371db213a..de13703b9c9e171af7d5ba60478010b8bd397840 100644 --- a/operators/Reflect/ReflectAttributes.C +++ b/operators/Reflect/ReflectAttributes.C @@ -49,7 +49,7 @@ ReflectAttributes::Octant_FromString(const std::string &s, ReflectAttributes::Oc // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -83,7 +83,7 @@ ReflectAttributes::ReflectAttributes() : AttributeSubject("ibdbdbdI") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -116,7 +116,7 @@ ReflectAttributes::ReflectAttributes(const ReflectAttributes &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -136,7 +136,7 @@ ReflectAttributes::~ReflectAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -170,7 +170,7 @@ ReflectAttributes::operator = (const ReflectAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -206,7 +206,7 @@ ReflectAttributes::operator == (const ReflectAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -227,7 +227,7 @@ ReflectAttributes::operator != (const ReflectAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -248,7 +248,7 @@ ReflectAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -276,7 +276,7 @@ ReflectAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -293,6 +293,33 @@ ReflectAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ReflectAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ReflectAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:32 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ReflectAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ReflectAttributes(*this); + else + retval = new ReflectAttributes; + + return retval; +} + // **************************************************************************** // Method: ReflectAttributes::SelectAll // @@ -302,7 +329,7 @@ ReflectAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -334,7 +361,7 @@ ReflectAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -418,7 +445,7 @@ ReflectAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -609,7 +636,7 @@ ReflectAttributes::SelectReflections() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -641,7 +668,7 @@ ReflectAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -673,7 +700,7 @@ ReflectAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -705,7 +732,7 @@ ReflectAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // diff --git a/operators/Reflect/ReflectAttributes.h b/operators/Reflect/ReflectAttributes.h index 4b3d80b02ac12a7abb459df48c1cb00d2d2ec333..5d2dfc9fa12b308319221d55bc7a3f4bde239621 100644 --- a/operators/Reflect/ReflectAttributes.h +++ b/operators/Reflect/ReflectAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:20 PST 2003 +// Creation: Wed Jul 23 13:22:32 PST 2003 // // Modifications: // @@ -44,6 +44,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/RemoveCells/RemoveCellsAttributes.C b/operators/RemoveCells/RemoveCellsAttributes.C index f438d107c6ac24d472574d34ff794183cea8f190..8094a4638cea4f71b6921262fc2e8a347b3c2d8b 100644 --- a/operators/RemoveCells/RemoveCellsAttributes.C +++ b/operators/RemoveCells/RemoveCellsAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -31,7 +31,7 @@ RemoveCellsAttributes::RemoveCellsAttributes() : AttributeSubject("iii*i*") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -56,7 +56,7 @@ RemoveCellsAttributes::RemoveCellsAttributes(const RemoveCellsAttributes &obj) : // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -76,7 +76,7 @@ RemoveCellsAttributes::~RemoveCellsAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -102,7 +102,7 @@ RemoveCellsAttributes::operator = (const RemoveCellsAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -127,7 +127,7 @@ RemoveCellsAttributes::operator == (const RemoveCellsAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -148,7 +148,7 @@ RemoveCellsAttributes::operator != (const RemoveCellsAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -169,7 +169,7 @@ RemoveCellsAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -197,7 +197,7 @@ RemoveCellsAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -214,6 +214,33 @@ RemoveCellsAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: RemoveCellsAttributes::NewInstance +// +// Purpose: +// NewInstance method for the RemoveCellsAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:35 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +RemoveCellsAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new RemoveCellsAttributes(*this); + else + retval = new RemoveCellsAttributes; + + return retval; +} + // **************************************************************************** // Method: RemoveCellsAttributes::SelectAll // @@ -223,7 +250,7 @@ RemoveCellsAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -251,7 +278,7 @@ RemoveCellsAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -311,7 +338,7 @@ RemoveCellsAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -439,7 +466,7 @@ RemoveCellsAttributes::SelectDomainList() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -467,7 +494,7 @@ RemoveCellsAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -495,7 +522,7 @@ RemoveCellsAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -523,7 +550,7 @@ RemoveCellsAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // diff --git a/operators/RemoveCells/RemoveCellsAttributes.h b/operators/RemoveCells/RemoveCellsAttributes.h index 0aebcc8afe8216a7249578d0cf042240d795f736..ae14ec9bffa08240ca1553bd49653fe86d9bae65 100644 --- a/operators/RemoveCells/RemoveCellsAttributes.h +++ b/operators/RemoveCells/RemoveCellsAttributes.h @@ -11,7 +11,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Mon Jul 21 09:53:49 PDT 2003 +// Creation: Wed Jul 23 13:22:35 PST 2003 // // Modifications: // @@ -31,6 +31,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Revolve/RevolveAttributes.C b/operators/Revolve/RevolveAttributes.C index e2be0c1767211e6ddacd88d9cc06dd57f197a3a2..955f6faedf0502c10d3cf1de8bc6fdf6111efe98 100644 --- a/operators/Revolve/RevolveAttributes.C +++ b/operators/Revolve/RevolveAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -35,7 +35,7 @@ RevolveAttributes::RevolveAttributes() : AttributeSubject("Dddi") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -63,7 +63,7 @@ RevolveAttributes::RevolveAttributes(const RevolveAttributes &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -83,7 +83,7 @@ RevolveAttributes::~RevolveAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -112,7 +112,7 @@ RevolveAttributes::operator = (const RevolveAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -144,7 +144,7 @@ RevolveAttributes::operator == (const RevolveAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -165,7 +165,7 @@ RevolveAttributes::operator != (const RevolveAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -186,7 +186,7 @@ RevolveAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -214,7 +214,7 @@ RevolveAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -231,6 +231,33 @@ RevolveAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: RevolveAttributes::NewInstance +// +// Purpose: +// NewInstance method for the RevolveAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:38 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +RevolveAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new RevolveAttributes(*this); + else + retval = new RevolveAttributes; + + return retval; +} + // **************************************************************************** // Method: RevolveAttributes::SelectAll // @@ -240,7 +267,7 @@ RevolveAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -268,7 +295,7 @@ RevolveAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -328,7 +355,7 @@ RevolveAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -446,7 +473,7 @@ RevolveAttributes::SelectAxis() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -474,7 +501,7 @@ RevolveAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -502,7 +529,7 @@ RevolveAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -530,7 +557,7 @@ RevolveAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // diff --git a/operators/Revolve/RevolveAttributes.h b/operators/Revolve/RevolveAttributes.h index 37b7e3b6fc310c7152c3f2825b9283e927b96325..2d9a7444f800e6c2819e6f744bcd84be78832cb4 100644 --- a/operators/Revolve/RevolveAttributes.h +++ b/operators/Revolve/RevolveAttributes.h @@ -11,7 +11,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:24 PST 2003 +// Creation: Wed Jul 23 13:22:38 PST 2003 // // Modifications: // @@ -31,6 +31,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/SiloDump/SiloDumpAttributes.C b/operators/SiloDump/SiloDumpAttributes.C index a390ff40569f96869b6a239499b57665894b8408..7e87e97ac7b17404ac4cf418cb31c3d630462e67 100644 --- a/operators/SiloDump/SiloDumpAttributes.C +++ b/operators/SiloDump/SiloDumpAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -31,7 +31,7 @@ SiloDumpAttributes::SiloDumpAttributes() : AttributeSubject("sb") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -54,7 +54,7 @@ SiloDumpAttributes::SiloDumpAttributes(const SiloDumpAttributes &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -74,7 +74,7 @@ SiloDumpAttributes::~SiloDumpAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -98,7 +98,7 @@ SiloDumpAttributes::operator = (const SiloDumpAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -121,7 +121,7 @@ SiloDumpAttributes::operator == (const SiloDumpAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -142,7 +142,7 @@ SiloDumpAttributes::operator != (const SiloDumpAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -163,7 +163,7 @@ SiloDumpAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -191,7 +191,7 @@ SiloDumpAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -208,6 +208,33 @@ SiloDumpAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SiloDumpAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SiloDumpAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:41 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SiloDumpAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SiloDumpAttributes(*this); + else + retval = new SiloDumpAttributes; + + return retval; +} + // **************************************************************************** // Method: SiloDumpAttributes::SelectAll // @@ -217,7 +244,7 @@ SiloDumpAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -243,7 +270,7 @@ SiloDumpAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -291,7 +318,7 @@ SiloDumpAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -377,7 +404,7 @@ SiloDumpAttributes::SelectFilename() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -403,7 +430,7 @@ SiloDumpAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -429,7 +456,7 @@ SiloDumpAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -455,7 +482,7 @@ SiloDumpAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // diff --git a/operators/SiloDump/SiloDumpAttributes.h b/operators/SiloDump/SiloDumpAttributes.h index d639ce0cbe63ddffedae91bbf75d98cd41de1929..f03b2afe0676e15c98bc5a0cf5abb58acde51f47 100644 --- a/operators/SiloDump/SiloDumpAttributes.h +++ b/operators/SiloDump/SiloDumpAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:27 PST 2003 +// Creation: Wed Jul 23 13:22:41 PST 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Slice/SliceAttributes.C b/operators/Slice/SliceAttributes.C index affc7fb0e601558836e91d19758b6ffe0d711fbd..72e06cd29887a947b8aaaac2af81afa0e0ccd943 100644 --- a/operators/Slice/SliceAttributes.C +++ b/operators/Slice/SliceAttributes.C @@ -87,7 +87,7 @@ SliceAttributes::OriginType_FromString(const std::string &s, SliceAttributes::Or // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -124,7 +124,7 @@ SliceAttributes::SliceAttributes() : AttributeSubject("iDddiiDiDbbbii") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -168,7 +168,7 @@ SliceAttributes::SliceAttributes(const SliceAttributes &obj) : AttributeSubject( // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -188,7 +188,7 @@ SliceAttributes::~SliceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -233,7 +233,7 @@ SliceAttributes::operator = (const SliceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -285,7 +285,7 @@ SliceAttributes::operator == (const SliceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -306,7 +306,7 @@ SliceAttributes::operator != (const SliceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -422,6 +422,33 @@ SliceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SliceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SliceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:44 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SliceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SliceAttributes(*this); + else + retval = new SliceAttributes; + + return retval; +} + // **************************************************************************** // Method: SliceAttributes::SelectAll // @@ -431,7 +458,7 @@ SliceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -469,7 +496,7 @@ SliceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -589,7 +616,7 @@ SliceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -917,7 +944,7 @@ SliceAttributes::SelectUpAxis() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -955,7 +982,7 @@ SliceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -993,7 +1020,7 @@ SliceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -1031,7 +1058,7 @@ SliceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // diff --git a/operators/Slice/SliceAttributes.h b/operators/Slice/SliceAttributes.h index 2a457a3e549d3b207d7f6df8de9e63220ebe6952..009d603b63b7ae669ff160062dca790ac907b91a 100644 --- a/operators/Slice/SliceAttributes.h +++ b/operators/Slice/SliceAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:23 PST 2003 +// Creation: Wed Jul 23 13:22:44 PST 2003 // // Modifications: // @@ -48,6 +48,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/SphereSlice/SphereSliceAttributes.C b/operators/SphereSlice/SphereSliceAttributes.C index 1a0719e2d6f9f26920bc7433b008048a33451392..646190393ec412cda33c9ece635364f4493d4502 100644 --- a/operators/SphereSlice/SphereSliceAttributes.C +++ b/operators/SphereSlice/SphereSliceAttributes.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -34,7 +34,7 @@ SphereSliceAttributes::SphereSliceAttributes() : AttributeSubject("Dd") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -60,7 +60,7 @@ SphereSliceAttributes::SphereSliceAttributes(const SphereSliceAttributes &obj) : // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -80,7 +80,7 @@ SphereSliceAttributes::~SphereSliceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -107,7 +107,7 @@ SphereSliceAttributes::operator = (const SphereSliceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -137,7 +137,7 @@ SphereSliceAttributes::operator == (const SphereSliceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -158,7 +158,7 @@ SphereSliceAttributes::operator != (const SphereSliceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -246,6 +246,33 @@ SphereSliceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SphereSliceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SphereSliceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:47 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SphereSliceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SphereSliceAttributes(*this); + else + retval = new SphereSliceAttributes; + + return retval; +} + // **************************************************************************** // Method: SphereSliceAttributes::SelectAll // @@ -255,7 +282,7 @@ SphereSliceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -281,7 +308,7 @@ SphereSliceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -329,7 +356,7 @@ SphereSliceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -417,7 +444,7 @@ SphereSliceAttributes::SelectOrigin() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -443,7 +470,7 @@ SphereSliceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -469,7 +496,7 @@ SphereSliceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -495,7 +522,7 @@ SphereSliceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // diff --git a/operators/SphereSlice/SphereSliceAttributes.h b/operators/SphereSlice/SphereSliceAttributes.h index 788222ba2b28c46bf2a27c5bfe0e13f44fecacdb..76d4d278fb4157c4c4fea4a7888d8f2922649598 100644 --- a/operators/SphereSlice/SphereSliceAttributes.h +++ b/operators/SphereSlice/SphereSliceAttributes.h @@ -11,7 +11,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:33 PST 2003 +// Creation: Wed Jul 23 13:22:47 PST 2003 // // Modifications: // @@ -31,6 +31,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/SurfCompPrep/SurfCompPrepAttributes.C b/operators/SurfCompPrep/SurfCompPrepAttributes.C index f3182de351daf4164daaca912579e352ea2a7760..be22ce82c17f2272965b43ef7c2fb16190e20fc4 100644 --- a/operators/SurfCompPrep/SurfCompPrepAttributes.C +++ b/operators/SurfCompPrep/SurfCompPrepAttributes.C @@ -86,7 +86,7 @@ SurfCompPrepAttributes::SurfaceType_FromString(const std::string &s, SurfCompPre // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -125,7 +125,7 @@ SurfCompPrepAttributes::SurfCompPrepAttributes() : AttributeSubject("iiddiddiddi // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -166,7 +166,7 @@ SurfCompPrepAttributes::SurfCompPrepAttributes(const SurfCompPrepAttributes &obj // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -186,7 +186,7 @@ SurfCompPrepAttributes::~SurfCompPrepAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -228,7 +228,7 @@ SurfCompPrepAttributes::operator = (const SurfCompPrepAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -269,7 +269,7 @@ SurfCompPrepAttributes::operator == (const SurfCompPrepAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -290,7 +290,7 @@ SurfCompPrepAttributes::operator != (const SurfCompPrepAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -311,7 +311,7 @@ SurfCompPrepAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -339,7 +339,7 @@ SurfCompPrepAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -356,6 +356,33 @@ SurfCompPrepAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SurfCompPrepAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SurfCompPrepAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:50 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SurfCompPrepAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SurfCompPrepAttributes(*this); + else + retval = new SurfCompPrepAttributes; + + return retval; +} + // **************************************************************************** // Method: SurfCompPrepAttributes::SelectAll // @@ -365,7 +392,7 @@ SurfCompPrepAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -409,7 +436,7 @@ SurfCompPrepAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -565,7 +592,7 @@ SurfCompPrepAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -933,7 +960,7 @@ SurfCompPrepAttributes::GetZSteps() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -977,7 +1004,7 @@ SurfCompPrepAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -1021,7 +1048,7 @@ SurfCompPrepAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -1065,7 +1092,7 @@ SurfCompPrepAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // diff --git a/operators/SurfCompPrep/SurfCompPrepAttributes.h b/operators/SurfCompPrep/SurfCompPrepAttributes.h index a867ff02502ee5e058b26ae754016907e557fd68..612bdc77126cdd2842a89ac64b2826202f4275d3 100644 --- a/operators/SurfCompPrep/SurfCompPrepAttributes.h +++ b/operators/SurfCompPrep/SurfCompPrepAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:26 PST 2003 +// Creation: Wed Jul 23 13:22:50 PST 2003 // // Modifications: // @@ -45,6 +45,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/ThreeSlice/ThreeSliceAttributes.C b/operators/ThreeSlice/ThreeSliceAttributes.C index a1ee6628bd900afd10bea8b46282efef5e99f002..70900633517c1481ac9796d8fe97bf089435c469 100644 --- a/operators/ThreeSlice/ThreeSliceAttributes.C +++ b/operators/ThreeSlice/ThreeSliceAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -33,7 +33,7 @@ ThreeSliceAttributes::ThreeSliceAttributes() : AttributeSubject("fffb") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -58,7 +58,7 @@ ThreeSliceAttributes::ThreeSliceAttributes(const ThreeSliceAttributes &obj) : At // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -78,7 +78,7 @@ ThreeSliceAttributes::~ThreeSliceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -104,7 +104,7 @@ ThreeSliceAttributes::operator = (const ThreeSliceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -129,7 +129,7 @@ ThreeSliceAttributes::operator == (const ThreeSliceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -150,7 +150,7 @@ ThreeSliceAttributes::operator != (const ThreeSliceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -238,6 +238,33 @@ ThreeSliceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ThreeSliceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ThreeSliceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:54 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ThreeSliceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ThreeSliceAttributes(*this); + else + retval = new ThreeSliceAttributes; + + return retval; +} + // **************************************************************************** // Method: ThreeSliceAttributes::SelectAll // @@ -247,7 +274,7 @@ ThreeSliceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -275,7 +302,7 @@ ThreeSliceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -335,7 +362,7 @@ ThreeSliceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -435,7 +462,7 @@ ThreeSliceAttributes::GetInteractive() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -463,7 +490,7 @@ ThreeSliceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -491,7 +518,7 @@ ThreeSliceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -519,7 +546,7 @@ ThreeSliceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // diff --git a/operators/ThreeSlice/ThreeSliceAttributes.h b/operators/ThreeSlice/ThreeSliceAttributes.h index 7af8c596b52bcf27931c6c0b3e3d325bd609e41a..42146df483029d4f7d69567fca44de692c4e824a 100644 --- a/operators/ThreeSlice/ThreeSliceAttributes.h +++ b/operators/ThreeSlice/ThreeSliceAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Wed Jul 2 15:36:50 PST 2003 +// Creation: Wed Jul 23 13:22:54 PST 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Threshold/ThresholdAttributes.C b/operators/Threshold/ThresholdAttributes.C index 8566aec277e29e8e259690827003a15950b6cbaf..3f3532bd01823840bd5ec228a0a204fd61d637f2 100644 --- a/operators/Threshold/ThresholdAttributes.C +++ b/operators/Threshold/ThresholdAttributes.C @@ -47,7 +47,7 @@ ThresholdAttributes::Amount_FromString(const std::string &s, ThresholdAttributes // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -70,7 +70,7 @@ ThresholdAttributes::ThresholdAttributes() : AttributeSubject("idds") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -95,7 +95,7 @@ ThresholdAttributes::ThresholdAttributes(const ThresholdAttributes &obj) : Attri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -115,7 +115,7 @@ ThresholdAttributes::~ThresholdAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -141,7 +141,7 @@ ThresholdAttributes::operator = (const ThresholdAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -166,7 +166,7 @@ ThresholdAttributes::operator == (const ThresholdAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -187,7 +187,7 @@ ThresholdAttributes::operator != (const ThresholdAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -208,7 +208,7 @@ ThresholdAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -236,7 +236,7 @@ ThresholdAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -253,6 +253,33 @@ ThresholdAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ThresholdAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ThresholdAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:56 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ThresholdAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ThresholdAttributes(*this); + else + retval = new ThresholdAttributes; + + return retval; +} + // **************************************************************************** // Method: ThresholdAttributes::SelectAll // @@ -262,7 +289,7 @@ ThresholdAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -290,7 +317,7 @@ ThresholdAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -350,7 +377,7 @@ ThresholdAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -480,7 +507,7 @@ ThresholdAttributes::SelectVariable() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -508,7 +535,7 @@ ThresholdAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -536,7 +563,7 @@ ThresholdAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -564,7 +591,7 @@ ThresholdAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // diff --git a/operators/Threshold/ThresholdAttributes.h b/operators/Threshold/ThresholdAttributes.h index 4eda2d3823d2f42d430678999d1089bff517dafa..24ed28469c6148caa680d4bfe046875f8f9ffb32 100644 --- a/operators/Threshold/ThresholdAttributes.h +++ b/operators/Threshold/ThresholdAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:56:29 PST 2003 +// Creation: Wed Jul 23 13:22:56 PST 2003 // // Modifications: // @@ -38,6 +38,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Transform/TransformAttributes.C b/operators/Transform/TransformAttributes.C index 791056c636387af9d5efd0ffa12599eec45debea..4e97973475a4c88b9360097199ec3d7b2b2cc40c 100644 --- a/operators/Transform/TransformAttributes.C +++ b/operators/Transform/TransformAttributes.C @@ -12,18 +12,22 @@ static const char *AngleType_strings[] = { std::string TransformAttributes::AngleType_ToString(TransformAttributes::AngleType t) { - return AngleType_strings[(int)t]; + int index = int(t); + if(index < 0 || index >= 2) index = 0; + return AngleType_strings[index]; } std::string TransformAttributes::AngleType_ToString(int t) { - return AngleType_strings[t]; + int index = (t < 0 || t >= 2) ? 0 : t; + return AngleType_strings[index]; } bool TransformAttributes::AngleType_FromString(const std::string &s, TransformAttributes::AngleType &val) { + val = TransformAttributes::Deg; for(int i = 0; i < 2; ++i) { if(s == AngleType_strings[i]) @@ -44,7 +48,7 @@ TransformAttributes::AngleType_FromString(const std::string &s, TransformAttribu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -83,7 +87,7 @@ TransformAttributes::TransformAttributes() : AttributeSubject("bFFfibFfffbfff") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -127,7 +131,7 @@ TransformAttributes::TransformAttributes(const TransformAttributes &obj) : Attri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -147,7 +151,7 @@ TransformAttributes::~TransformAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -192,7 +196,7 @@ TransformAttributes::operator = (const TransformAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -244,7 +248,7 @@ TransformAttributes::operator == (const TransformAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -265,7 +269,7 @@ TransformAttributes::operator != (const TransformAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -366,6 +370,33 @@ TransformAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: TransformAttributes::NewInstance +// +// Purpose: +// NewInstance method for the TransformAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:22:59 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +TransformAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new TransformAttributes(*this); + else + retval = new TransformAttributes; + + return retval; +} + // **************************************************************************** // Method: TransformAttributes::SelectAll // @@ -375,7 +406,7 @@ TransformAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -413,7 +444,7 @@ TransformAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -533,7 +564,7 @@ TransformAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -562,7 +593,11 @@ TransformAttributes::SetFromNode(DataNode *parentNode) { // Allow enums to be int or string in the config file if(node->GetNodeType() == INT_NODE) - SetRotateType(AngleType(node->AsInt())); + { + int ival = node->AsInt(); + if(ival >= 0 && ival < 2) + SetRotateType(AngleType(ival)); + } else if(node->GetNodeType() == STRING_NODE) { AngleType value; @@ -839,7 +874,7 @@ TransformAttributes::SelectScaleOrigin() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -877,7 +912,7 @@ TransformAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -915,7 +950,7 @@ TransformAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -953,7 +988,7 @@ TransformAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // diff --git a/operators/Transform/TransformAttributes.h b/operators/Transform/TransformAttributes.h index 78f747b98c04d84f458f18b8b212a81a31e32f77..9a7a394d736ac9bad9291f34d7c6325257bf6db6 100644 --- a/operators/Transform/TransformAttributes.h +++ b/operators/Transform/TransformAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:38 PST 2003 +// Creation: Wed Jul 23 13:22:59 PST 2003 // // Modifications: // @@ -38,6 +38,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/operators/Tube/TubeAttributes.C b/operators/Tube/TubeAttributes.C index e3a287ebac6efcd7bbbdb20c312f9c3fc68d9a35..d247a8f871d82b265f375347abc0a680764d4d3f 100644 --- a/operators/Tube/TubeAttributes.C +++ b/operators/Tube/TubeAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -32,7 +32,7 @@ TubeAttributes::TubeAttributes() : AttributeSubject("fib") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -56,7 +56,7 @@ TubeAttributes::TubeAttributes(const TubeAttributes &obj) : AttributeSubject("fi // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -76,7 +76,7 @@ TubeAttributes::~TubeAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -101,7 +101,7 @@ TubeAttributes::operator = (const TubeAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -125,7 +125,7 @@ TubeAttributes::operator == (const TubeAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -146,7 +146,7 @@ TubeAttributes::operator != (const TubeAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -167,7 +167,7 @@ TubeAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -195,7 +195,7 @@ TubeAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -212,6 +212,33 @@ TubeAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: TubeAttributes::NewInstance +// +// Purpose: +// NewInstance method for the TubeAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 13:23:02 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +TubeAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new TubeAttributes(*this); + else + retval = new TubeAttributes; + + return retval; +} + // **************************************************************************** // Method: TubeAttributes::SelectAll // @@ -221,7 +248,7 @@ TubeAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -248,7 +275,7 @@ TubeAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -302,7 +329,7 @@ TubeAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -387,7 +414,7 @@ TubeAttributes::GetCapping() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -414,7 +441,7 @@ TubeAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -441,7 +468,7 @@ TubeAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -468,7 +495,7 @@ TubeAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // diff --git a/operators/Tube/TubeAttributes.h b/operators/Tube/TubeAttributes.h index cfc72d81b64f662eedcd0a78d129450779d08c22..414a0440867e9caea8b61aad7fd7a3956e1d7e9f 100644 --- a/operators/Tube/TubeAttributes.h +++ b/operators/Tube/TubeAttributes.h @@ -11,7 +11,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 14:50:41 PST 2003 +// Creation: Wed Jul 23 13:23:02 PST 2003 // // Modifications: // @@ -31,6 +31,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Boundary/BoundaryAttributes.C b/plots/Boundary/BoundaryAttributes.C index d8e15ccc4f1aecedcd20275497dd98e4d238f394..e1b48814a70b57aecec32e6caf0f3749154c606c 100644 --- a/plots/Boundary/BoundaryAttributes.C +++ b/plots/Boundary/BoundaryAttributes.C @@ -86,7 +86,7 @@ BoundaryAttributes::ColoringMethod_FromString(const std::string &s, BoundaryAttr // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -115,7 +115,7 @@ BoundaryAttributes::BoundaryAttributes() : AttributeSubject("isbbiiaas*idbi"), // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -149,7 +149,7 @@ BoundaryAttributes::BoundaryAttributes(const BoundaryAttributes &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -169,7 +169,7 @@ BoundaryAttributes::~BoundaryAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -204,7 +204,7 @@ BoundaryAttributes::operator = (const BoundaryAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -238,7 +238,7 @@ BoundaryAttributes::operator == (const BoundaryAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -259,7 +259,7 @@ BoundaryAttributes::operator != (const BoundaryAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -280,7 +280,7 @@ BoundaryAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -308,7 +308,7 @@ BoundaryAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -325,6 +325,33 @@ BoundaryAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: BoundaryAttributes::NewInstance +// +// Purpose: +// NewInstance method for the BoundaryAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:08 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +BoundaryAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new BoundaryAttributes(*this); + else + retval = new BoundaryAttributes; + + return retval; +} + // **************************************************************************** // Method: BoundaryAttributes::SelectAll // @@ -334,7 +361,7 @@ BoundaryAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -371,7 +398,7 @@ BoundaryAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -497,7 +524,7 @@ BoundaryAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -812,7 +839,7 @@ BoundaryAttributes::SelectBoundaryNames() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -849,7 +876,7 @@ BoundaryAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -886,7 +913,7 @@ BoundaryAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -923,7 +950,7 @@ BoundaryAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // diff --git a/plots/Boundary/BoundaryAttributes.h b/plots/Boundary/BoundaryAttributes.h index 346bf567cecf4039eca99287600255ceb7769ca6..79be4f8e630e96ff2cf168156717d5e10e87a276 100644 --- a/plots/Boundary/BoundaryAttributes.h +++ b/plots/Boundary/BoundaryAttributes.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:39 PST 2003 +// Creation: Wed Jul 23 11:49:08 PDT 2003 // // Modifications: // @@ -48,6 +48,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Contour/ContourAttributes.C b/plots/Contour/ContourAttributes.C index 9675eed800fe0c7cdd35e3ef4bdcc837fe411022..8f19ef749e17df14cecfc38769c1146cc815dddd 100644 --- a/plots/Contour/ContourAttributes.C +++ b/plots/Contour/ContourAttributes.C @@ -126,7 +126,7 @@ ContourAttributes::ColoringMethod_FromString(const std::string &s, ContourAttrib // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -158,7 +158,7 @@ ContourAttributes::ContourAttributes() : AttributeSubject("au*isbiiaaid*d*ibbddi // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -198,7 +198,7 @@ ContourAttributes::ContourAttributes(const ContourAttributes &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -218,7 +218,7 @@ ContourAttributes::~ContourAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -259,7 +259,7 @@ ContourAttributes::operator = (const ContourAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -299,7 +299,7 @@ ContourAttributes::operator == (const ContourAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -320,7 +320,7 @@ ContourAttributes::operator != (const ContourAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -341,7 +341,7 @@ ContourAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -369,7 +369,7 @@ ContourAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -386,6 +386,33 @@ ContourAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ContourAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ContourAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:12 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ContourAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ContourAttributes(*this); + else + retval = new ContourAttributes; + + return retval; +} + // **************************************************************************** // Method: ContourAttributes::SelectAll // @@ -395,7 +422,7 @@ ContourAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -1045,7 +1072,7 @@ ContourAttributes::SelectContourPercent() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -1088,7 +1115,7 @@ ContourAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -1131,7 +1158,7 @@ ContourAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -1174,7 +1201,7 @@ ContourAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // diff --git a/plots/Contour/ContourAttributes.h b/plots/Contour/ContourAttributes.h index 97b1e8678807afe63e5c59e3538ea21c0c5995ff..06307a16d014a982962365fc97448f12779a8402 100644 --- a/plots/Contour/ContourAttributes.h +++ b/plots/Contour/ContourAttributes.h @@ -15,7 +15,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:20:01 PST 2003 +// Creation: Wed Jul 23 11:49:12 PDT 2003 // // Modifications: // @@ -54,6 +54,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Curve/CurveAttributes.C b/plots/Curve/CurveAttributes.C index 1420b08a6b0d5dcf3f2f115ace9662fd2fe2030b..b49f97262f143908a2090c5713654752dddf701d 100644 --- a/plots/Curve/CurveAttributes.C +++ b/plots/Curve/CurveAttributes.C @@ -11,7 +11,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -33,7 +33,7 @@ CurveAttributes::CurveAttributes() : AttributeSubject("iiabs") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -59,7 +59,7 @@ CurveAttributes::CurveAttributes(const CurveAttributes &obj) : AttributeSubject( // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -79,7 +79,7 @@ CurveAttributes::~CurveAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -106,7 +106,7 @@ CurveAttributes::operator = (const CurveAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -132,7 +132,7 @@ CurveAttributes::operator == (const CurveAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -153,7 +153,7 @@ CurveAttributes::operator != (const CurveAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -210,6 +210,33 @@ CurveAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: CurveAttributes::NewInstance +// +// Purpose: +// NewInstance method for the CurveAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:16 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +CurveAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new CurveAttributes(*this); + else + retval = new CurveAttributes; + + return retval; +} + // **************************************************************************** // Method: CurveAttributes::SelectAll // @@ -219,7 +246,7 @@ CurveAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -248,7 +275,7 @@ CurveAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -320,7 +347,7 @@ CurveAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -463,7 +490,7 @@ CurveAttributes::SelectDesignator() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -492,7 +519,7 @@ CurveAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -521,7 +548,7 @@ CurveAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -550,7 +577,7 @@ CurveAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // diff --git a/plots/Curve/CurveAttributes.h b/plots/Curve/CurveAttributes.h index 304958c495204983b80939840cb24618d2c1ab52..366246725ccc5a3333ebe2d0346ae308024cf1a9 100644 --- a/plots/Curve/CurveAttributes.h +++ b/plots/Curve/CurveAttributes.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:50 PST 2003 +// Creation: Wed Jul 23 11:49:16 PDT 2003 // // Modifications: // @@ -34,6 +34,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/FilledBoundary/FilledBoundaryAttributes.C b/plots/FilledBoundary/FilledBoundaryAttributes.C index b39b2a20b144c10994a733a4c316eb02a84983d7..4c861df571cd1ce84c8812f16e66f618e8de2f41 100644 --- a/plots/FilledBoundary/FilledBoundaryAttributes.C +++ b/plots/FilledBoundary/FilledBoundaryAttributes.C @@ -86,7 +86,7 @@ FilledBoundaryAttributes::ColoringMethod_FromString(const std::string &s, Filled // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -117,7 +117,7 @@ FilledBoundaryAttributes::FilledBoundaryAttributes() : AttributeSubject("isbbiia // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -153,7 +153,7 @@ FilledBoundaryAttributes::FilledBoundaryAttributes(const FilledBoundaryAttribute // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -173,7 +173,7 @@ FilledBoundaryAttributes::~FilledBoundaryAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -210,7 +210,7 @@ FilledBoundaryAttributes::operator = (const FilledBoundaryAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -246,7 +246,7 @@ FilledBoundaryAttributes::operator == (const FilledBoundaryAttributes &obj) cons // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -267,7 +267,7 @@ FilledBoundaryAttributes::operator != (const FilledBoundaryAttributes &obj) cons // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -288,7 +288,7 @@ FilledBoundaryAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -316,7 +316,7 @@ FilledBoundaryAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -333,6 +333,33 @@ FilledBoundaryAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: FilledBoundaryAttributes::NewInstance +// +// Purpose: +// NewInstance method for the FilledBoundaryAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:19 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +FilledBoundaryAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new FilledBoundaryAttributes(*this); + else + retval = new FilledBoundaryAttributes; + + return retval; +} + // **************************************************************************** // Method: FilledBoundaryAttributes::SelectAll // @@ -342,7 +369,7 @@ FilledBoundaryAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -381,7 +408,7 @@ FilledBoundaryAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -519,7 +546,7 @@ FilledBoundaryAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -864,7 +891,7 @@ FilledBoundaryAttributes::SelectBoundaryNames() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -903,7 +930,7 @@ FilledBoundaryAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -942,7 +969,7 @@ FilledBoundaryAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -981,7 +1008,7 @@ FilledBoundaryAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // diff --git a/plots/FilledBoundary/FilledBoundaryAttributes.h b/plots/FilledBoundary/FilledBoundaryAttributes.h index 25692e274f1256d765f7f2a05e185c3a0d1fab16..b81cfebfe2b0e22a9c17985f964f017fd764beeb 100644 --- a/plots/FilledBoundary/FilledBoundaryAttributes.h +++ b/plots/FilledBoundary/FilledBoundaryAttributes.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:45 PST 2003 +// Creation: Wed Jul 23 11:49:19 PDT 2003 // // Modifications: // @@ -48,6 +48,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Histogram/HistogramAttributes.C b/plots/Histogram/HistogramAttributes.C index bbed589179dd18096091cfa2fad97f042167a8b1..229a07dc9acc618f2d67d10bc7b4f565bb9ad50d 100644 --- a/plots/Histogram/HistogramAttributes.C +++ b/plots/Histogram/HistogramAttributes.C @@ -84,7 +84,7 @@ HistogramAttributes::TwoDAmount_FromString(const std::string &s, HistogramAttrib // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -111,7 +111,7 @@ HistogramAttributes::HistogramAttributes() : AttributeSubject("bddiiiiia") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -141,7 +141,7 @@ HistogramAttributes::HistogramAttributes(const HistogramAttributes &obj) : Attri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -161,7 +161,7 @@ HistogramAttributes::~HistogramAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -192,7 +192,7 @@ HistogramAttributes::operator = (const HistogramAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -222,7 +222,7 @@ HistogramAttributes::operator == (const HistogramAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -243,7 +243,7 @@ HistogramAttributes::operator != (const HistogramAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -264,7 +264,7 @@ HistogramAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -292,7 +292,7 @@ HistogramAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -309,6 +309,33 @@ HistogramAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: HistogramAttributes::NewInstance +// +// Purpose: +// NewInstance method for the HistogramAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:23 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +HistogramAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new HistogramAttributes(*this); + else + retval = new HistogramAttributes; + + return retval; +} + // **************************************************************************** // Method: HistogramAttributes::SelectAll // @@ -318,7 +345,7 @@ HistogramAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -492,7 +519,7 @@ HistogramAttributes::SelectColor() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -525,7 +552,7 @@ HistogramAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -558,7 +585,7 @@ HistogramAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -591,7 +618,7 @@ HistogramAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // diff --git a/plots/Histogram/HistogramAttributes.h b/plots/Histogram/HistogramAttributes.h index 1ab58449bb9bafabe634ab1c111c03e786978c52..5a5f0254080a00cc3aa8a14dd68e6fcd424f6ce4 100644 --- a/plots/Histogram/HistogramAttributes.h +++ b/plots/Histogram/HistogramAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:48 PST 2003 +// Creation: Wed Jul 23 11:49:23 PDT 2003 // // Modifications: // @@ -44,6 +44,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Kerbel/KerbelAttributes.C b/plots/Kerbel/KerbelAttributes.C index a1c5d8225a5d363aab6cfc2b6b465ab9be0663eb..129ceb25593f0b5496594d97d43b0db936368e1e 100644 --- a/plots/Kerbel/KerbelAttributes.C +++ b/plots/Kerbel/KerbelAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -34,7 +34,7 @@ KerbelAttributes::KerbelAttributes() : AttributeSubject("Ffs") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -61,7 +61,7 @@ KerbelAttributes::KerbelAttributes(const KerbelAttributes &obj) : AttributeSubje // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -81,7 +81,7 @@ KerbelAttributes::~KerbelAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -109,7 +109,7 @@ KerbelAttributes::operator = (const KerbelAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -140,7 +140,7 @@ KerbelAttributes::operator == (const KerbelAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -161,7 +161,7 @@ KerbelAttributes::operator != (const KerbelAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -182,7 +182,7 @@ KerbelAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -210,7 +210,7 @@ KerbelAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -227,6 +227,33 @@ KerbelAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: KerbelAttributes::NewInstance +// +// Purpose: +// NewInstance method for the KerbelAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:26 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +KerbelAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new KerbelAttributes(*this); + else + retval = new KerbelAttributes; + + return retval; +} + // **************************************************************************** // Method: KerbelAttributes::SelectAll // @@ -236,7 +263,7 @@ KerbelAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -263,7 +290,7 @@ KerbelAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -317,7 +344,7 @@ KerbelAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -432,7 +459,7 @@ KerbelAttributes::SelectFilename() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -459,7 +486,7 @@ KerbelAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -486,7 +513,7 @@ KerbelAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -513,7 +540,7 @@ KerbelAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // diff --git a/plots/Kerbel/KerbelAttributes.h b/plots/Kerbel/KerbelAttributes.h index 6609ea60639b42073cc07c26a0a3075c4ee00a1b..03026e87d1f055e697dab4cbde2ff72a7dbe8fb4 100644 --- a/plots/Kerbel/KerbelAttributes.h +++ b/plots/Kerbel/KerbelAttributes.h @@ -12,7 +12,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:56 PST 2003 +// Creation: Wed Jul 23 11:49:26 PDT 2003 // // Modifications: // @@ -32,6 +32,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Mesh/MeshAttributes.C b/plots/Mesh/MeshAttributes.C index 77bdb27638e9cc9154851396606677e55177bc9d..65630cb8b1940976ae2be5803b2bdef31bd5764f 100644 --- a/plots/Mesh/MeshAttributes.C +++ b/plots/Mesh/MeshAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -42,7 +42,7 @@ MeshAttributes::MeshAttributes() : AttributeSubject("biiabdbdabbibs"), // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -77,7 +77,7 @@ MeshAttributes::MeshAttributes(const MeshAttributes &obj) : AttributeSubject("bi // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -97,7 +97,7 @@ MeshAttributes::~MeshAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -133,7 +133,7 @@ MeshAttributes::operator = (const MeshAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -168,7 +168,7 @@ MeshAttributes::operator == (const MeshAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -189,7 +189,7 @@ MeshAttributes::operator != (const MeshAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -210,7 +210,7 @@ MeshAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -238,7 +238,7 @@ MeshAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -255,6 +255,33 @@ MeshAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: MeshAttributes::NewInstance +// +// Purpose: +// NewInstance method for the MeshAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:30 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +MeshAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new MeshAttributes(*this); + else + retval = new MeshAttributes; + + return retval; +} + // **************************************************************************** // Method: MeshAttributes::SelectAll // @@ -264,7 +291,7 @@ MeshAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -302,7 +329,7 @@ MeshAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -434,7 +461,7 @@ MeshAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -724,7 +751,7 @@ MeshAttributes::SelectPointSizeVar() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -762,7 +789,7 @@ MeshAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -800,7 +827,7 @@ MeshAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -838,7 +865,7 @@ MeshAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // diff --git a/plots/Mesh/MeshAttributes.h b/plots/Mesh/MeshAttributes.h index af2bd90f6e8b2bb492d762edd9fff73e4dfbb950..af2b649e103bbafbc2e1d6062083d57c7083ed54 100644 --- a/plots/Mesh/MeshAttributes.h +++ b/plots/Mesh/MeshAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:51:59 PST 2003 +// Creation: Wed Jul 23 11:49:30 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Pseudocolor/PseudocolorAttributes.C b/plots/Pseudocolor/PseudocolorAttributes.C index 08bf40619a3fcaeaf8c3df234f7308c7e3aa2e84..5ff01ae436c923892094bbf4e4fc6cb56d8fed6f 100644 --- a/plots/Pseudocolor/PseudocolorAttributes.C +++ b/plots/Pseudocolor/PseudocolorAttributes.C @@ -123,7 +123,7 @@ PseudocolorAttributes::LimitsMode_FromString(const std::string &s, PseudocolorAt // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -158,7 +158,7 @@ PseudocolorAttributes::PseudocolorAttributes() : AttributeSubject("bbbbiiiddddds // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -195,7 +195,7 @@ PseudocolorAttributes::PseudocolorAttributes(const PseudocolorAttributes &obj) : // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -215,7 +215,7 @@ PseudocolorAttributes::~PseudocolorAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -253,7 +253,7 @@ PseudocolorAttributes::operator = (const PseudocolorAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -290,7 +290,7 @@ PseudocolorAttributes::operator == (const PseudocolorAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -311,7 +311,7 @@ PseudocolorAttributes::operator != (const PseudocolorAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -332,7 +332,7 @@ PseudocolorAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -360,7 +360,7 @@ PseudocolorAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -377,6 +377,33 @@ PseudocolorAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: PseudocolorAttributes::NewInstance +// +// Purpose: +// NewInstance method for the PseudocolorAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:34 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +PseudocolorAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new PseudocolorAttributes(*this); + else + retval = new PseudocolorAttributes; + + return retval; +} + // **************************************************************************** // Method: PseudocolorAttributes::SelectAll // @@ -386,7 +413,7 @@ PseudocolorAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -426,7 +453,7 @@ PseudocolorAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -558,7 +585,7 @@ PseudocolorAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -908,7 +935,7 @@ PseudocolorAttributes::SelectPointSizeVar() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -948,7 +975,7 @@ PseudocolorAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -988,7 +1015,7 @@ PseudocolorAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -1028,7 +1055,7 @@ PseudocolorAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // diff --git a/plots/Pseudocolor/PseudocolorAttributes.h b/plots/Pseudocolor/PseudocolorAttributes.h index da55a6c67680618d0dba49911aa8c2dd58ec4151..4ab277049e699301177e6f520e24ebfbbd0466ff 100644 --- a/plots/Pseudocolor/PseudocolorAttributes.h +++ b/plots/Pseudocolor/PseudocolorAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:51 PST 2003 +// Creation: Wed Jul 23 11:49:34 PDT 2003 // // Modifications: // @@ -51,6 +51,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Streamline/StreamlineAttributes.C b/plots/Streamline/StreamlineAttributes.C index ed8046a86e7e8443a234d407171aa5353ac6ac88..997ce4bc093b7b4478b748657a8e4d25640a4206 100644 --- a/plots/Streamline/StreamlineAttributes.C +++ b/plots/Streamline/StreamlineAttributes.C @@ -53,7 +53,7 @@ StreamlineAttributes::SourceType_FromString(const std::string &s, StreamlineAttr // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -113,7 +113,7 @@ StreamlineAttributes::StreamlineAttributes() : AttributeSubject("iddDDDDDDdDdDib // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -182,7 +182,7 @@ StreamlineAttributes::StreamlineAttributes(const StreamlineAttributes &obj) : At // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -202,7 +202,7 @@ StreamlineAttributes::~StreamlineAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -272,7 +272,7 @@ StreamlineAttributes::operator = (const StreamlineAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -358,7 +358,7 @@ StreamlineAttributes::operator == (const StreamlineAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -379,7 +379,7 @@ StreamlineAttributes::operator != (const StreamlineAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -520,6 +520,33 @@ StreamlineAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: StreamlineAttributes::NewInstance +// +// Purpose: +// NewInstance method for the StreamlineAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:38 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +StreamlineAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new StreamlineAttributes(*this); + else + retval = new StreamlineAttributes; + + return retval; +} + // **************************************************************************** // Method: StreamlineAttributes::SelectAll // @@ -529,7 +556,7 @@ StreamlineAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -576,7 +603,7 @@ StreamlineAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -756,7 +783,7 @@ StreamlineAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -1294,7 +1321,7 @@ StreamlineAttributes::SelectSingleColor() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -1341,7 +1368,7 @@ StreamlineAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -1388,7 +1415,7 @@ StreamlineAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -1435,7 +1462,7 @@ StreamlineAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // diff --git a/plots/Streamline/StreamlineAttributes.h b/plots/Streamline/StreamlineAttributes.h index 9f05cca05241a104305fc71cf51dd67ffb37d22c..ba7f64e58b218ac0c0a47d9d2de374f99df2dd05 100644 --- a/plots/Streamline/StreamlineAttributes.h +++ b/plots/Streamline/StreamlineAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 14:04:48 PST 2003 +// Creation: Wed Jul 23 11:49:38 PDT 2003 // // Modifications: // @@ -42,6 +42,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Subset/SubsetAttributes.C b/plots/Subset/SubsetAttributes.C index 96327dc04faaa06b89c45a6079f52a6e0423f376..611d44e89d9d38c32b4443ad19115eca43e9a216 100644 --- a/plots/Subset/SubsetAttributes.C +++ b/plots/Subset/SubsetAttributes.C @@ -86,7 +86,7 @@ SubsetAttributes::ColoringMethod_FromString(const std::string &s, SubsetAttribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -116,7 +116,7 @@ SubsetAttributes::SubsetAttributes() : AttributeSubject("isbbiiaas*idbbi"), // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -151,7 +151,7 @@ SubsetAttributes::SubsetAttributes(const SubsetAttributes &obj) : AttributeSubje // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -171,7 +171,7 @@ SubsetAttributes::~SubsetAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -207,7 +207,7 @@ SubsetAttributes::operator = (const SubsetAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -242,7 +242,7 @@ SubsetAttributes::operator == (const SubsetAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -263,7 +263,7 @@ SubsetAttributes::operator != (const SubsetAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -284,7 +284,7 @@ SubsetAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -312,7 +312,7 @@ SubsetAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -329,6 +329,33 @@ SubsetAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SubsetAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SubsetAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:42 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SubsetAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SubsetAttributes(*this); + else + retval = new SubsetAttributes; + + return retval; +} + // **************************************************************************** // Method: SubsetAttributes::SelectAll // @@ -338,7 +365,7 @@ SubsetAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -376,7 +403,7 @@ SubsetAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -508,7 +535,7 @@ SubsetAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -838,7 +865,7 @@ SubsetAttributes::SelectSubsetNames() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -876,7 +903,7 @@ SubsetAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -914,7 +941,7 @@ SubsetAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -952,7 +979,7 @@ SubsetAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // diff --git a/plots/Subset/SubsetAttributes.h b/plots/Subset/SubsetAttributes.h index c8ce58283a2cea3f675732670d9e4db3c0076fe6..5055c732f0f40035ad688172a93fd6dc5a86dd14 100644 --- a/plots/Subset/SubsetAttributes.h +++ b/plots/Subset/SubsetAttributes.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:57:57 PST 2003 +// Creation: Wed Jul 23 11:49:42 PDT 2003 // // Modifications: // @@ -48,6 +48,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Surface/SurfaceAttributes.C b/plots/Surface/SurfaceAttributes.C index 72366b3da1cf550dca365173a988b2c6d4a2ceb5..f6f9d1aa10ecad1e1d505c15aa11d4ca1473c41a 100644 --- a/plots/Surface/SurfaceAttributes.C +++ b/plots/Surface/SurfaceAttributes.C @@ -122,7 +122,7 @@ SurfaceAttributes::LimitsMode_FromString(const std::string &s, SurfaceAttributes // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -157,7 +157,7 @@ SurfaceAttributes::SurfaceAttributes() : AttributeSubject("bbbbibbbiiiaaddds"), // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -195,7 +195,7 @@ SurfaceAttributes::SurfaceAttributes(const SurfaceAttributes &obj) : AttributeSu // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -215,7 +215,7 @@ SurfaceAttributes::~SurfaceAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -254,7 +254,7 @@ SurfaceAttributes::operator = (const SurfaceAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -292,7 +292,7 @@ SurfaceAttributes::operator == (const SurfaceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -313,7 +313,7 @@ SurfaceAttributes::operator != (const SurfaceAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -334,7 +334,7 @@ SurfaceAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -362,7 +362,7 @@ SurfaceAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -379,6 +379,33 @@ SurfaceAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: SurfaceAttributes::NewInstance +// +// Purpose: +// NewInstance method for the SurfaceAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:45 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +SurfaceAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new SurfaceAttributes(*this); + else + retval = new SurfaceAttributes; + + return retval; +} + // **************************************************************************** // Method: SurfaceAttributes::SelectAll // @@ -388,7 +415,7 @@ SurfaceAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -429,7 +456,7 @@ SurfaceAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -579,7 +606,7 @@ SurfaceAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -942,7 +969,7 @@ SurfaceAttributes::SelectColorTableName() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -983,7 +1010,7 @@ SurfaceAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -1024,7 +1051,7 @@ SurfaceAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -1065,7 +1092,7 @@ SurfaceAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // diff --git a/plots/Surface/SurfaceAttributes.h b/plots/Surface/SurfaceAttributes.h index 5d61dc3449aba3b2f96773bba0cccbc598304c33..136b394175aace7e4e3906ce9c9a32c964c93e43 100644 --- a/plots/Surface/SurfaceAttributes.h +++ b/plots/Surface/SurfaceAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 15 13:58:00 PST 2003 +// Creation: Wed Jul 23 11:49:45 PDT 2003 // // Modifications: // @@ -50,6 +50,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Topology/TopologyAttributes.C b/plots/Topology/TopologyAttributes.C index a6e8165c41bfc2340721d3459d2115e153d6fb49..19e640702ea4c8ca15b5ee8e2e52b999e7add934 100644 --- a/plots/Topology/TopologyAttributes.C +++ b/plots/Topology/TopologyAttributes.C @@ -10,26 +10,26 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // // **************************************************************************** -TopologyAttributes::TopologyAttributes() : AttributeSubject("daiiddddd") +TopologyAttributes::TopologyAttributes() : AttributeSubject("iiadddddd") { - tolerance = 1e-06; + lineWidth = 2; + lineStyle = 0; multiColor.AddColorAttribute(ColorAttribute(255,0,0)); multiColor.AddColorAttribute(ColorAttribute(0,255,0)); multiColor.AddColorAttribute(ColorAttribute(0,0,255)); multiColor.AddColorAttribute(ColorAttribute(0,255,255)); - lineWidth = 2; - lineStyle = 0; - hitpercent = 0.0; minOpacity = 1; minPlateauOpacity = 1; maxPlateauOpacity = 1; maxOpacity = 1; + tolerance = 1e-06; + hitpercent = 0; } // **************************************************************************** @@ -41,23 +41,23 @@ TopologyAttributes::TopologyAttributes() : AttributeSubject("daiiddddd") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // // **************************************************************************** -TopologyAttributes::TopologyAttributes(const TopologyAttributes &obj) : AttributeSubject("daiiddddd") +TopologyAttributes::TopologyAttributes(const TopologyAttributes &obj) : AttributeSubject("iiadddddd") { - tolerance = obj.tolerance; - multiColor = obj.multiColor; lineWidth = obj.lineWidth; lineStyle = obj.lineStyle; - hitpercent = obj.hitpercent; + multiColor = obj.multiColor; minOpacity = obj.minOpacity; minPlateauOpacity = obj.minPlateauOpacity; maxPlateauOpacity = obj.maxPlateauOpacity; maxOpacity = obj.maxOpacity; + tolerance = obj.tolerance; + hitpercent = obj.hitpercent; SelectAll(); } @@ -71,7 +71,7 @@ TopologyAttributes::TopologyAttributes(const TopologyAttributes &obj) : Attribut // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -91,7 +91,7 @@ TopologyAttributes::~TopologyAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -100,15 +100,15 @@ TopologyAttributes::~TopologyAttributes() void TopologyAttributes::operator = (const TopologyAttributes &obj) { - tolerance = obj.tolerance; - multiColor = obj.multiColor; lineWidth = obj.lineWidth; lineStyle = obj.lineStyle; - hitpercent = obj.hitpercent; + multiColor = obj.multiColor; minOpacity = obj.minOpacity; minPlateauOpacity = obj.minPlateauOpacity; maxPlateauOpacity = obj.maxPlateauOpacity; maxOpacity = obj.maxOpacity; + tolerance = obj.tolerance; + hitpercent = obj.hitpercent; SelectAll(); } @@ -122,7 +122,7 @@ TopologyAttributes::operator = (const TopologyAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -132,15 +132,15 @@ bool TopologyAttributes::operator == (const TopologyAttributes &obj) const { // Create the return value - return ((tolerance == obj.tolerance) && - (multiColor == obj.multiColor) && - (lineWidth == obj.lineWidth) && + return ((lineWidth == obj.lineWidth) && (lineStyle == obj.lineStyle) && - (hitpercent == obj.hitpercent) && + (multiColor == obj.multiColor) && (minOpacity == obj.minOpacity) && (minPlateauOpacity == obj.minPlateauOpacity) && (maxPlateauOpacity == obj.maxPlateauOpacity) && - (maxOpacity == obj.maxOpacity)); + (maxOpacity == obj.maxOpacity) && + (tolerance == obj.tolerance) && + (hitpercent == obj.hitpercent)); } // **************************************************************************** @@ -152,7 +152,7 @@ TopologyAttributes::operator == (const TopologyAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -173,7 +173,7 @@ TopologyAttributes::operator != (const TopologyAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -194,7 +194,7 @@ TopologyAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -222,7 +222,7 @@ TopologyAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -239,6 +239,33 @@ TopologyAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: TopologyAttributes::NewInstance +// +// Purpose: +// NewInstance method for the TopologyAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:48 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +TopologyAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new TopologyAttributes(*this); + else + retval = new TopologyAttributes; + + return retval; +} + // **************************************************************************** // Method: TopologyAttributes::SelectAll // @@ -248,7 +275,7 @@ TopologyAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -257,15 +284,15 @@ TopologyAttributes::CreateCompatible(const std::string &tname) const void TopologyAttributes::SelectAll() { - Select(0, (void *)&tolerance); - Select(1, (void *)&multiColor); - Select(2, (void *)&lineWidth); - Select(3, (void *)&lineStyle); - Select(4, (void *)&hitpercent); - Select(5, (void *)&minOpacity); - Select(6, (void *)&minPlateauOpacity); - Select(7, (void *)&maxPlateauOpacity); - Select(8, (void *)&maxOpacity); + Select(0, (void *)&lineWidth); + Select(1, (void *)&lineStyle); + Select(2, (void *)&multiColor); + Select(3, (void *)&minOpacity); + Select(4, (void *)&minPlateauOpacity); + Select(5, (void *)&maxPlateauOpacity); + Select(6, (void *)&maxOpacity); + Select(7, (void *)&tolerance); + Select(8, (void *)&hitpercent); } /////////////////////////////////////////////////////////////////////////////// @@ -281,7 +308,7 @@ TopologyAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -301,10 +328,16 @@ TopologyAttributes::CreateNode(DataNode *parentNode, bool forceAdd) if(!FieldsEqual(0, &defaultObject)) { addToParent = true; - node->AddNode(new DataNode("tolerance", tolerance)); + node->AddNode(new DataNode("lineWidth", lineWidth)); } if(!FieldsEqual(1, &defaultObject)) + { + addToParent = true; + node->AddNode(new DataNode("lineStyle", lineStyle)); + } + + if(!FieldsEqual(2, &defaultObject)) { DataNode *multiColorNode = new DataNode("multiColor"); if(multiColor.CreateNode(multiColorNode, false)) @@ -316,46 +349,40 @@ TopologyAttributes::CreateNode(DataNode *parentNode, bool forceAdd) delete multiColorNode; } - if(!FieldsEqual(2, &defaultObject)) - { - addToParent = true; - node->AddNode(new DataNode("lineWidth", lineWidth)); - } - if(!FieldsEqual(3, &defaultObject)) { addToParent = true; - node->AddNode(new DataNode("lineStyle", lineStyle)); + node->AddNode(new DataNode("minOpacity", minOpacity)); } if(!FieldsEqual(4, &defaultObject)) { addToParent = true; - node->AddNode(new DataNode("hitpercent", hitpercent)); + node->AddNode(new DataNode("minPlateauOpacity", minPlateauOpacity)); } if(!FieldsEqual(5, &defaultObject)) { addToParent = true; - node->AddNode(new DataNode("minOpacity", minOpacity)); + node->AddNode(new DataNode("maxPlateauOpacity", maxPlateauOpacity)); } if(!FieldsEqual(6, &defaultObject)) { addToParent = true; - node->AddNode(new DataNode("minPlateauOpacity", minPlateauOpacity)); + node->AddNode(new DataNode("maxOpacity", maxOpacity)); } if(!FieldsEqual(7, &defaultObject)) { addToParent = true; - node->AddNode(new DataNode("maxPlateauOpacity", maxPlateauOpacity)); + node->AddNode(new DataNode("tolerance", tolerance)); } if(!FieldsEqual(8, &defaultObject)) { addToParent = true; - node->AddNode(new DataNode("maxOpacity", maxOpacity)); + node->AddNode(new DataNode("hitpercent", hitpercent)); } @@ -377,7 +404,7 @@ TopologyAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -394,16 +421,12 @@ TopologyAttributes::SetFromNode(DataNode *parentNode) return; DataNode *node; - if((node = searchNode->GetNode("tolerance")) != 0) - SetTolerance(node->AsDouble()); - if((node = searchNode->GetNode("multiColor")) != 0) - multiColor.SetFromNode(node); if((node = searchNode->GetNode("lineWidth")) != 0) SetLineWidth(node->AsInt()); if((node = searchNode->GetNode("lineStyle")) != 0) SetLineStyle(node->AsInt()); - if((node = searchNode->GetNode("hitpercent")) != 0) - SetHitpercent(node->AsDouble()); + if((node = searchNode->GetNode("multiColor")) != 0) + multiColor.SetFromNode(node); if((node = searchNode->GetNode("minOpacity")) != 0) SetMinOpacity(node->AsDouble()); if((node = searchNode->GetNode("minPlateauOpacity")) != 0) @@ -412,96 +435,82 @@ TopologyAttributes::SetFromNode(DataNode *parentNode) SetMaxPlateauOpacity(node->AsDouble()); if((node = searchNode->GetNode("maxOpacity")) != 0) SetMaxOpacity(node->AsDouble()); + if((node = searchNode->GetNode("tolerance")) != 0) + SetTolerance(node->AsDouble()); + if((node = searchNode->GetNode("hitpercent")) != 0) + SetHitpercent(node->AsDouble()); } /////////////////////////////////////////////////////////////////////////////// // Set property methods /////////////////////////////////////////////////////////////////////////////// -void -TopologyAttributes::SetTolerance(double tolerance_) -{ - tolerance = tolerance_; - Select(0, (void *)&tolerance); -} - -void -TopologyAttributes::SetMultiColor(const ColorAttributeList &multiColor_) -{ - multiColor = multiColor_; - Select(1, (void *)&multiColor); -} - void TopologyAttributes::SetLineWidth(int lineWidth_) { lineWidth = lineWidth_; - Select(2, (void *)&lineWidth); + Select(0, (void *)&lineWidth); } void TopologyAttributes::SetLineStyle(int lineStyle_) { lineStyle = lineStyle_; - Select(3, (void *)&lineStyle); + Select(1, (void *)&lineStyle); } void -TopologyAttributes::SetHitpercent(double hitpercent_) +TopologyAttributes::SetMultiColor(const ColorAttributeList &multiColor_) { - hitpercent = hitpercent_; - Select(4, (void *)&hitpercent); + multiColor = multiColor_; + Select(2, (void *)&multiColor); } void TopologyAttributes::SetMinOpacity(double minOpacity_) { minOpacity = minOpacity_; - Select(5, (void *)&minOpacity); + Select(3, (void *)&minOpacity); } void TopologyAttributes::SetMinPlateauOpacity(double minPlateauOpacity_) { minPlateauOpacity = minPlateauOpacity_; - Select(6, (void *)&minPlateauOpacity); + Select(4, (void *)&minPlateauOpacity); } void TopologyAttributes::SetMaxPlateauOpacity(double maxPlateauOpacity_) { maxPlateauOpacity = maxPlateauOpacity_; - Select(7, (void *)&maxPlateauOpacity); + Select(5, (void *)&maxPlateauOpacity); } void TopologyAttributes::SetMaxOpacity(double maxOpacity_) { maxOpacity = maxOpacity_; - Select(8, (void *)&maxOpacity); + Select(6, (void *)&maxOpacity); } -/////////////////////////////////////////////////////////////////////////////// -// Get property methods -/////////////////////////////////////////////////////////////////////////////// - -double -TopologyAttributes::GetTolerance() const +void +TopologyAttributes::SetTolerance(double tolerance_) { - return tolerance; + tolerance = tolerance_; + Select(7, (void *)&tolerance); } -const ColorAttributeList & -TopologyAttributes::GetMultiColor() const +void +TopologyAttributes::SetHitpercent(double hitpercent_) { - return multiColor; + hitpercent = hitpercent_; + Select(8, (void *)&hitpercent); } -ColorAttributeList & -TopologyAttributes::GetMultiColor() -{ - return multiColor; -} +/////////////////////////////////////////////////////////////////////////////// +// Get property methods +/////////////////////////////////////////////////////////////////////////////// int TopologyAttributes::GetLineWidth() const @@ -515,10 +524,16 @@ TopologyAttributes::GetLineStyle() const return lineStyle; } -double -TopologyAttributes::GetHitpercent() const +const ColorAttributeList & +TopologyAttributes::GetMultiColor() const { - return hitpercent; + return multiColor; +} + +ColorAttributeList & +TopologyAttributes::GetMultiColor() +{ + return multiColor; } double @@ -545,6 +560,18 @@ TopologyAttributes::GetMaxOpacity() const return maxOpacity; } +double +TopologyAttributes::GetTolerance() const +{ + return tolerance; +} + +double +TopologyAttributes::GetHitpercent() const +{ + return hitpercent; +} + /////////////////////////////////////////////////////////////////////////////// // Select property methods /////////////////////////////////////////////////////////////////////////////// @@ -552,7 +579,7 @@ TopologyAttributes::GetMaxOpacity() const void TopologyAttributes::SelectMultiColor() { - Select(1, (void *)&multiColor); + Select(2, (void *)&multiColor); } /////////////////////////////////////////////////////////////////////////////// @@ -568,7 +595,7 @@ TopologyAttributes::SelectMultiColor() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -579,15 +606,15 @@ TopologyAttributes::GetFieldName(int index) const { switch (index) { - case 0: return "tolerance"; - case 1: return "multiColor"; - case 2: return "Line width"; - case 3: return "Line style"; - case 4: return "hitpercent"; + case 0: return "Line width"; + case 1: return "Line style"; + case 2: return "multiColor"; + case 3: return "Opacity"; + case 4: return "Opacity"; case 5: return "Opacity"; case 6: return "Opacity"; - case 7: return "Opacity"; - case 8: return "Opacity"; + case 7: return "tolerance"; + case 8: return "hitpercent"; default: return "invalid index"; } } @@ -601,7 +628,7 @@ TopologyAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -612,15 +639,15 @@ TopologyAttributes::GetFieldType(int index) const { switch (index) { - case 0: return FieldType_double; - case 1: return FieldType_att; - case 2: return FieldType_linewidth; - case 3: return FieldType_linestyle; - case 4: return FieldType_double; + case 0: return FieldType_linewidth; + case 1: return FieldType_linestyle; + case 2: return FieldType_att; + case 3: return FieldType_opacity; + case 4: return FieldType_opacity; case 5: return FieldType_opacity; case 6: return FieldType_opacity; - case 7: return FieldType_opacity; - case 8: return FieldType_opacity; + case 7: return FieldType_double; + case 8: return FieldType_double; default: return FieldType_unknown; } } @@ -634,7 +661,7 @@ TopologyAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -645,15 +672,15 @@ TopologyAttributes::GetFieldTypeName(int index) const { switch (index) { - case 0: return "double"; - case 1: return "att"; - case 2: return "linewidth"; - case 3: return "linestyle"; - case 4: return "double"; + case 0: return "linewidth"; + case 1: return "linestyle"; + case 2: return "att"; + case 3: return "opacity"; + case 4: return "opacity"; case 5: return "opacity"; case 6: return "opacity"; - case 7: return "opacity"; - case 8: return "opacity"; + case 7: return "double"; + case 8: return "double"; default: return "invalid index"; } } @@ -667,7 +694,7 @@ TopologyAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -682,47 +709,47 @@ TopologyAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const { case 0: { // new scope - retval = (tolerance == obj.tolerance); + retval = (lineWidth == obj.lineWidth); } break; case 1: { // new scope - retval = (multiColor == obj.multiColor); + retval = (lineStyle == obj.lineStyle); } break; case 2: { // new scope - retval = (lineWidth == obj.lineWidth); + retval = (multiColor == obj.multiColor); } break; case 3: { // new scope - retval = (lineStyle == obj.lineStyle); + retval = (minOpacity == obj.minOpacity); } break; case 4: { // new scope - retval = (hitpercent == obj.hitpercent); + retval = (minPlateauOpacity == obj.minPlateauOpacity); } break; case 5: { // new scope - retval = (minOpacity == obj.minOpacity); + retval = (maxPlateauOpacity == obj.maxPlateauOpacity); } break; case 6: { // new scope - retval = (minPlateauOpacity == obj.minPlateauOpacity); + retval = (maxOpacity == obj.maxOpacity); } break; case 7: { // new scope - retval = (maxPlateauOpacity == obj.maxPlateauOpacity); + retval = (tolerance == obj.tolerance); } break; case 8: { // new scope - retval = (maxOpacity == obj.maxOpacity); + retval = (hitpercent == obj.hitpercent); } break; default: retval = false; diff --git a/plots/Topology/TopologyAttributes.h b/plots/Topology/TopologyAttributes.h index 206d45158838b15981e1aab06f67b2271141258d..76d7d52ede8401ba84ad51a18ea9cb0372defc61 100644 --- a/plots/Topology/TopologyAttributes.h +++ b/plots/Topology/TopologyAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 08:44:44 PDT 2003 +// Creation: Wed Jul 23 11:49:48 PDT 2003 // // Modifications: // @@ -33,33 +33,34 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); void SelectMultiColor(); // Property setting methods - void SetTolerance(double tolerance_); - void SetMultiColor(const ColorAttributeList &multiColor_); void SetLineWidth(int lineWidth_); void SetLineStyle(int lineStyle_); - void SetHitpercent(double hitpercent_); + void SetMultiColor(const ColorAttributeList &multiColor_); void SetMinOpacity(double minOpacity_); void SetMinPlateauOpacity(double minPlateauOpacity_); void SetMaxPlateauOpacity(double maxPlateauOpacity_); void SetMaxOpacity(double maxOpacity_); + void SetTolerance(double tolerance_); + void SetHitpercent(double hitpercent_); // Property getting methods - double GetTolerance() const; - const ColorAttributeList &GetMultiColor() const; - ColorAttributeList &GetMultiColor(); int GetLineWidth() const; int GetLineStyle() const; - double GetHitpercent() const; + const ColorAttributeList &GetMultiColor() const; + ColorAttributeList &GetMultiColor(); double GetMinOpacity() const; double GetMinPlateauOpacity() const; double GetMaxPlateauOpacity() const; double GetMaxOpacity() const; + double GetTolerance() const; + double GetHitpercent() const; // Persistence methods virtual bool CreateNode(DataNode *node, bool forceAdd); @@ -75,15 +76,15 @@ public: // User-defined methods bool ChangesRequireRecalculation(const TopologyAttributes &obj); private: - double tolerance; - ColorAttributeList multiColor; int lineWidth; int lineStyle; - double hitpercent; + ColorAttributeList multiColor; double minOpacity; double minPlateauOpacity; double maxPlateauOpacity; double maxOpacity; + double tolerance; + double hitpercent; }; #endif diff --git a/plots/Vector/VectorAttributes.C b/plots/Vector/VectorAttributes.C index 30860660bf180b10583b1a9a5651f2d0a64295c3..e7015b4d725d6f298d95bda868505df492638306 100644 --- a/plots/Vector/VectorAttributes.C +++ b/plots/Vector/VectorAttributes.C @@ -10,7 +10,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -40,7 +40,7 @@ VectorAttributes::VectorAttributes() : AttributeSubject("biiiiddbbbas"), // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -73,7 +73,7 @@ VectorAttributes::VectorAttributes(const VectorAttributes &obj) : AttributeSubje // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -93,7 +93,7 @@ VectorAttributes::~VectorAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -127,7 +127,7 @@ VectorAttributes::operator = (const VectorAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -160,7 +160,7 @@ VectorAttributes::operator == (const VectorAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -181,7 +181,7 @@ VectorAttributes::operator != (const VectorAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -202,7 +202,7 @@ VectorAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -230,7 +230,7 @@ VectorAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -247,6 +247,33 @@ VectorAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: VectorAttributes::NewInstance +// +// Purpose: +// NewInstance method for the VectorAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:52 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +VectorAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new VectorAttributes(*this); + else + retval = new VectorAttributes; + + return retval; +} + // **************************************************************************** // Method: VectorAttributes::SelectAll // @@ -256,7 +283,7 @@ VectorAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -292,7 +319,7 @@ VectorAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -406,7 +433,7 @@ VectorAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -654,7 +681,7 @@ VectorAttributes::SelectColorTableName() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -690,7 +717,7 @@ VectorAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -726,7 +753,7 @@ VectorAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -762,7 +789,7 @@ VectorAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // diff --git a/plots/Vector/VectorAttributes.h b/plots/Vector/VectorAttributes.h index aac642accb2e8375ca3352a9acb27d927b4309e6..1aafc33fdc0e9c749fbe8b48de31a1544334b290 100644 --- a/plots/Vector/VectorAttributes.h +++ b/plots/Vector/VectorAttributes.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:14 PST 2003 +// Creation: Wed Jul 23 11:49:52 PDT 2003 // // Modifications: // @@ -33,6 +33,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/plots/Volume/VolumeAttributes.C b/plots/Volume/VolumeAttributes.C index fb8cfde76a234a6ed626b1d0a76f80a1b28f974b..a8458a638c4053a10fc5cae51faf52850e05c3ee 100644 --- a/plots/Volume/VolumeAttributes.C +++ b/plots/Volume/VolumeAttributes.C @@ -12,7 +12,7 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -51,7 +51,7 @@ VolumeAttributes::VolumeAttributes() : AttributeSubject("bbafbaisUbbfbfbfbfbi") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -96,7 +96,7 @@ VolumeAttributes::VolumeAttributes(const VolumeAttributes &obj) : AttributeSubje // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -116,7 +116,7 @@ VolumeAttributes::~VolumeAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -162,7 +162,7 @@ VolumeAttributes::operator = (const VolumeAttributes &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -210,7 +210,7 @@ VolumeAttributes::operator == (const VolumeAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -231,7 +231,7 @@ VolumeAttributes::operator != (const VolumeAttributes &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -252,7 +252,7 @@ VolumeAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -280,7 +280,7 @@ VolumeAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -297,6 +297,33 @@ VolumeAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: VolumeAttributes::NewInstance +// +// Purpose: +// NewInstance method for the VolumeAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 11:49:56 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +VolumeAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new VolumeAttributes(*this); + else + retval = new VolumeAttributes; + + return retval; +} + // **************************************************************************** // Method: VolumeAttributes::SelectAll // @@ -306,7 +333,7 @@ VolumeAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -350,7 +377,7 @@ VolumeAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -518,7 +545,7 @@ VolumeAttributes::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -914,7 +941,7 @@ VolumeAttributes::SelectFreeformOpacity() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -958,7 +985,7 @@ VolumeAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -1002,7 +1029,7 @@ VolumeAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -1046,7 +1073,7 @@ VolumeAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // diff --git a/plots/Volume/VolumeAttributes.h b/plots/Volume/VolumeAttributes.h index d99c80fe37ccc9ee721e6c481b04bdd69841e57a..70ed232d1c37a275fd95244e2bbba1264461a813 100644 --- a/plots/Volume/VolumeAttributes.h +++ b/plots/Volume/VolumeAttributes.h @@ -14,7 +14,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue May 20 13:52:18 PST 2003 +// Creation: Wed Jul 23 11:49:56 PDT 2003 // // Modifications: // @@ -34,6 +34,7 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); diff --git a/tools/xml/GenerateAtts.h b/tools/xml/GenerateAtts.h index ddbfdb6e7e6df25a8591e33685f966e6b13d93ef..b6c1c6e1b9100fa7f8b8d3404dac780fca6c2fff 100644 --- a/tools/xml/GenerateAtts.h +++ b/tools/xml/GenerateAtts.h @@ -89,6 +89,9 @@ using std::vector; // Brad Whitlock, Tue Jul 15 13:22:36 PST 2003 // I added range checking for enums so reading from config files is safer. // +// Brad Whitlock, Wed Jul 23 11:17:25 PDT 2003 +// I added code to generate a NewInstance method. +// // **************************************************************************** // ---------------------------------------------------------------------------- @@ -1541,6 +1544,7 @@ class AttsGeneratorAttribute h << " virtual const std::string TypeName() const;" << endl; h << " virtual bool CopyAttributes(const AttributeGroup *);" << endl; h << " virtual AttributeSubject *CreateCompatible(const std::string &) const;" << endl; + h << " virtual AttributeSubject *NewInstance(bool) const;" << endl; h << endl; h << " // Property selection methods" << endl; h << " virtual void SelectAll();" << endl; @@ -1851,6 +1855,33 @@ class AttsGeneratorAttribute c << " return true;" << endl; c << "}" << endl << endl; } + void WriteSourceNewInstance(ostream &c) + { + if (HasFunction("NewInstance")) + { + PrintFunction(c, "NewInstance"); + c << endl; + return; + } + + // Write the method comment. + QString purposeString("NewInstance method for the "); + purposeString += (name + " class."); + QString methodName("NewInstance"); + WriteMethodComment(c, name, methodName, purposeString); + + c << "AttributeSubject *" << endl; + c << name << "::NewInstance(bool copy) const" << endl; + c << "{" << endl; + c << " AttributeSubject *retval = 0;" << endl; + c << " if(copy)" << endl; + c << " retval = new " << name << "(*this);" << endl; + c << " else" << endl; + c << " retval = new " << name << ";" << endl; + c << endl; + c << " return retval;" << endl; + c << "}" << endl << endl; + } void WriteSourceCreateCompatible(ostream &c) { if (HasFunction("CreateCompatible")) @@ -2298,6 +2329,7 @@ class AttsGeneratorAttribute WriteSourceTypeName(c); WriteSourceCopyAttributes(c); WriteSourceCreateCompatible(c); + WriteSourceNewInstance(c); WriteSourceSelectAll(c); WriteSourceSubAttributeGroup(c); diff --git a/viewer/main/ViewerAnimation.C b/viewer/main/ViewerAnimation.C index 540352cc1dc6b0641c7f54c4a1fa81a79e12cda0..8e36bc458745eba7fddc8e4991a795d29e6cd501 100644 --- a/viewer/main/ViewerAnimation.C +++ b/viewer/main/ViewerAnimation.C @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -826,3 +827,89 @@ ViewerAnimation::SetWindowAtts(const char *hostName) AnnotationAttributes annotAtts = *(w->GetAnnotationAttributes()); return ViewerEngineManager::Instance()->SetWinAnnotAtts(hostName, &winAtts, &annotAtts); } + +// **************************************************************************** +// Method: ViewerAnimation::CreateNode +// +// Purpose: +// Lets the animation save its information for a config file's DataNode. +// +// Arguments: +// parentNode : The node to which we're saving information. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 16 13:09:04 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerAnimation::CreateNode(DataNode *parentNode) +{ + if(parentNode == 0) + return; + + DataNode *animationNode = new DataNode("ViewerAnimation"); + parentNode->AddNode(animationNode); + + // + // Add information specific to the animation. + // + animationNode->AddNode(new DataNode("nFrames", nFrames)); + animationNode->AddNode(new DataNode("curFrame", curFrame)); + animationNode->AddNode(new DataNode("pipelineCaching", pipelineCaching)); + + // + // Let the plot list save its information. + // + plotList->CreateNode(animationNode); +} + +// **************************************************************************** +// Method: ViewerAnimation::SetFromNode +// +// Purpose: +// Lets the animation reset its values from a config file. +// +// Arguments: +// parentNode : The config file information DataNode pointer. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 16 13:10:51 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +bool +ViewerAnimation::SetFromNode(DataNode *parentNode) +{ + DataNode *node; + + if(parentNode == 0) + return false; + + DataNode *animationNode = parentNode->GetNode("ViewerAnimation"); + if(animationNode == 0) + return false; + + // + // Read in a few flags for the animation. + // + if((node = animationNode->GetNode("nFrames")) != 0) + { + int nf = node->AsInt(); + if(nf < 1) nf = 1; + SetNFrames(nf); + } + if((node = animationNode->GetNode("curFrame")) != 0) + SetFrameIndex(node->AsInt()); + if((node = animationNode->GetNode("pipelineCaching")) != 0) + SetPipelineCaching(node->AsBool()); + + // + // Let the plot list read in its values. + // + return plotList->SetFromNode(animationNode); +} diff --git a/viewer/main/ViewerAnimation.h b/viewer/main/ViewerAnimation.h index afcb47669362932969375b678483078517c2302f..8d108c5348b4c0a75fc25f3359704d6e974933c2 100644 --- a/viewer/main/ViewerAnimation.h +++ b/viewer/main/ViewerAnimation.h @@ -6,6 +6,7 @@ #define VIEWER_ANIMATION_H #include +class DataNode; class ViewerPlotList; class ViewerWindow; @@ -66,6 +67,9 @@ class ViewerWindow; // I removed the concept of database time state since it's really a // plot-oriented concept and not related to the animation. // +// Brad Whitlock, Wed Jul 16 13:05:27 PST 2003 +// Added CreateNode and SetFromNode. +// // **************************************************************************** class VIEWER_API ViewerAnimation @@ -105,6 +109,9 @@ class VIEWER_API ViewerAnimation bool SetWindowAtts(const char *hostName); + void CreateNode(DataNode *); + bool SetFromNode(DataNode *); + private: int nFrames; int curFrame; diff --git a/viewer/main/ViewerConfigManager.C b/viewer/main/ViewerConfigManager.C index ecce3cd610ead3b014fe4954e8223165f1f624c0..52a6c6b6986994a65c56d1cdf6900da5d1b73d44 100644 --- a/viewer/main/ViewerConfigManager.C +++ b/viewer/main/ViewerConfigManager.C @@ -4,6 +4,7 @@ // For the state objects we're going to save out/read in. #include #include +#include // **************************************************************************** // Method: ViewerConfigManager::ViewerConfigManager @@ -36,6 +37,7 @@ ViewerConfigManager::ViewerConfigManager(ViewerSubject *vs) : ConfigManager() { parent = vs; + writeDetail = false; } // **************************************************************************** @@ -114,16 +116,19 @@ ViewerConfigManager::WriteConfigFile(const char *filename) DataNode *viewerNode = new DataNode("VIEWER"); visitNode->AddNode(viewerNode); - // Add the attributes under the "VIEWER" node. - std::vector::iterator pos; + // Create a "DEFAULT_VALUES" node and add it under "VIEWER". + DataNode *defaultsNode = new DataNode("DEFAULT_VALUES"); + viewerNode->AddNode(defaultsNode); + // Add the attributes under the "DEFAULT_VALUES" node. + std::vector::iterator pos; for (pos = subjectList.begin(); pos != subjectList.end(); ++pos) { - (*pos)->CreateNode(viewerNode, false); + (*pos)->CreateNode(defaultsNode, false); } - // Let the parent write its data. - parent->CreateNode(viewerNode); + // Let the parent write its data to the "VIEWER" node. + parent->CreateNode(viewerNode, writeDetail); // Try to open the output file. if((fp = fopen(filename, "wb")) == 0) @@ -230,6 +235,12 @@ ViewerConfigManager::ProcessConfigSettings(DataNode *node) if(viewerNode == 0) return; + // Get the defaults node. If it cannot be found, use the VIEWER node so + // we still support older config files. + DataNode *defaultsNode = visitRoot->GetNode("DEFAULT_VALUES"); + if(defaultsNode == 0) + defaultsNode = viewerNode; + // Get the version DataNode *version = visitRoot->GetNode("Version"); if(version != 0) @@ -239,7 +250,7 @@ ViewerConfigManager::ProcessConfigSettings(DataNode *node) std::vector::iterator pos; for (pos = subjectList.begin(); pos != subjectList.end(); ++pos) { - (*pos)->ProcessOldVersions(viewerNode, configVersion.c_str()); + (*pos)->ProcessOldVersions(defaultsNode, configVersion.c_str()); } } @@ -247,7 +258,7 @@ ViewerConfigManager::ProcessConfigSettings(DataNode *node) std::vector::iterator pos; for (pos = subjectList.begin(); pos != subjectList.end(); ++pos) { - (*pos)->SetFromNode(viewerNode); + (*pos)->SetFromNode(defaultsNode); } } @@ -317,3 +328,82 @@ ViewerConfigManager::Add(AttributeSubject *subject) subjectList.push_back(subject); } +// **************************************************************************** +// Method: ViewerConfigManager::ExportEntireState +// +// Purpose: +// Exports the viewer's entire state to an XML file. +// +// Arguments: +// filename : The name of the file to which the state is exported. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 9 13:06:12 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerConfigManager::ExportEntireState(const std::string &filename) +{ + writeDetail = true; + WriteConfigFile(filename.c_str()); + writeDetail = false; + + std::string str("VisIt exported the current session to: "); + str += filename; + str += "."; + Message(str.c_str()); +} + +// **************************************************************************** +// Method: ViewerConfigManager::ImportEntireState +// +// Purpose: +// Imports the entire state from the named file. +// +// Arguments: +// filename : The state file to use. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 9 13:06:37 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerConfigManager::ImportEntireState(const std::string &filename) +{ + DataNode *node = ReadConfigFile(filename.c_str()); + if(node) + { + // Make the hooked up objects get their settings. + ProcessConfigSettings(node); + + // Get the VisIt node. + DataNode *visitRoot = node->GetNode("VisIt"); + if(visitRoot != 0) + { + // Get the viewer node. + DataNode *viewerNode = visitRoot->GetNode("VIEWER"); + if(viewerNode != 0) + { + // Let the parent read its settings. + parent->SetFromNode(viewerNode); + + std::string str("VisIt imported an old session from: "); + str += filename; + str += "."; + Message(str.c_str()); + return; + } + } + } + + std::string str("VisIt could not import a session from the file: " + + filename); + Warning(str.c_str()); +} + diff --git a/viewer/main/ViewerConfigManager.h b/viewer/main/ViewerConfigManager.h index 12bcaca359447214ac67a83ffb8fc32630cf517e..e8b6446b4b75f255f113ed67933fbbbcfcc0f7e3 100644 --- a/viewer/main/ViewerConfigManager.h +++ b/viewer/main/ViewerConfigManager.h @@ -2,6 +2,7 @@ #define VIEWER_CONFIGURATION_MANAGER_H #include #include +#include // Forward declarations class AttributeSubject; @@ -47,6 +48,9 @@ class ViewerSubject; // Brad Whitlock, Mon Jun 30 12:24:43 PDT 2003 // I made it require a pointer to its parent ViewerSubject. // +// Brad Whitlock, Wed Jul 9 12:44:08 PDT 2003 +// I added methods to export the entire state and import the entire state. +// // **************************************************************************** class VIEWER_API ViewerConfigManager : public ConfigManager @@ -63,7 +67,11 @@ public: void Add(AttributeSubject *subject); + void ExportEntireState(const std::string &filename); + void ImportEntireState(const std::string &filename); + private: + bool writeDetail; std::vector subjectList; ViewerSubject *parent; }; diff --git a/viewer/main/ViewerOperator.C b/viewer/main/ViewerOperator.C index 3cbccdd5d696d64fb2769023c7a4eaad5fb44a55..1a0d69d784f3719130becf9dddd97acc67bf3315 100644 --- a/viewer/main/ViewerOperator.C +++ b/viewer/main/ViewerOperator.C @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -266,6 +267,26 @@ ViewerOperator::GetName() const return viewerPluginInfo->GetName(); } +// **************************************************************************** +// Method: ViewerOperator::GetPluginID +// +// Purpose: Returns the operator's plugin id. +// +// Returns: A string that tells which plugin created the operator. +// +// Programmer: Brad Whitlock +// Creation: Thu Jul 17 09:20:00 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +const char * +ViewerOperator::GetPluginID() const +{ + return viewerPluginInfo->GetID(); +} + // **************************************************************************** // Method: ViewerOperator::Removeable // @@ -354,3 +375,67 @@ ViewerOperator::NeedsRecalculation() const { return needsRecalculation; } + + +// **************************************************************************** +// Method: ViewerOperator::CreateNode +// +// Purpose: +// Lets the operator save its information for a config file's DataNode. +// +// Arguments: +// parentNode : The node to which we're saving information. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 16 13:09:04 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerOperator::CreateNode(DataNode *parentNode) +{ + if(parentNode == 0) + return; + + DataNode *operatorNode = new DataNode("ViewerOperator"); + + // Add the operator attributes. + if(operatorAtts->CreateNode(operatorNode, false)) + parentNode->AddNode(operatorNode); + else + delete operatorNode; +} + +// **************************************************************************** +// Method: ViewerOperator::SetFromNode +// +// Purpose: +// Lets the operator reset its values from a config file. +// +// Arguments: +// parentNode : The config file information DataNode pointer. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 16 13:10:51 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerOperator::SetFromNode(DataNode *parentNode) +{ + DataNode *node; + + if(parentNode == 0) + return; + + DataNode *operatorNode = parentNode->GetNode("ViewerOperator"); + if(operatorNode == 0) + return; + + // Let the operator try to initialize its attributes. + operatorAtts->SetFromNode(operatorNode); +} diff --git a/viewer/main/ViewerOperator.h b/viewer/main/ViewerOperator.h index 296d1243e47b84de7334096425d96455ca896d22..4c73a104aa6620d792558732caf3c786bd04233b 100644 --- a/viewer/main/ViewerOperator.h +++ b/viewer/main/ViewerOperator.h @@ -8,6 +8,7 @@ // Forward declarations class AttributeSubject; +class DataNode; class ViewerPlot; class ViewerOperatorPluginInfo; class avtPluginFilter; @@ -58,6 +59,9 @@ class avtPluginFilter; // Jeremy Meredith, Wed May 21 13:08:31 PDT 2003 // Added NeedsRecalculation. // +// Brad Whitlock, Wed Jul 16 17:08:10 PST 2003 +// Added GetPluginID, CreateNode, SetFromNode. +// // **************************************************************************** class VIEWER_API ViewerOperator @@ -68,20 +72,24 @@ class VIEWER_API ViewerOperator ViewerPlot *plot_); virtual ~ViewerOperator(); - bool ExecuteEngineRPC() const; int GetType() const; + const char *GetPluginID() const; + const char *GetName() const; void SetClientAttsFromOperator(); void SetOperatorAttsFromClient(); bool SetOperatorAtts(const AttributeSubject *toolAtts); const AttributeSubject *GetOperatorAtts() const; - const char * GetName() const; bool Removeable() const; bool Moveable() const; bool AllowsSubsequentOperators() const; bool NeedsRecalculation() const; + bool ExecuteEngineRPC() const; + + void CreateNode(DataNode *); + void SetFromNode(DataNode *); protected: ViewerPlot *plot; diff --git a/viewer/main/ViewerPlot.C b/viewer/main/ViewerPlot.C index b1b7acd182ff9c49ee6cc1a1289434aa21dfaa1d..86ce11e1e8a335b86e51f3353d58e89d8ab4fc4e 100644 --- a/viewer/main/ViewerPlot.C +++ b/viewer/main/ViewerPlot.C @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -31,6 +32,7 @@ #include #include +#include #include #include #include @@ -1186,9 +1188,12 @@ ViewerPlot::SetErrorFlag(bool val) // I got rid of a bad check that used an actual operator name. I added // code to set the active operator index. // +// Brad Whitlock, Thu Jul 17 10:05:04 PDT 2003 +// I made it return the index of the new operator in the operators array. +// // **************************************************************************** -void +int ViewerPlot::AddOperator(const int type) { if (nOperators > 0) @@ -1199,7 +1204,7 @@ ViewerPlot::AddOperator(const int type) SNPRINTF(msg, 200, "VisIt cannot apply other operators after a " "%s operator.", operators[nOperators-1]->GetName()); Error(msg); - return; + return -1; } } @@ -1242,6 +1247,8 @@ ViewerPlot::AddOperator(const int type) // Clear the actor cache. // ClearActors(); + + return nOperators-1; } // **************************************************************************** @@ -3431,3 +3438,185 @@ ViewerPlot::CheckCache(const int f0, const int f1, const bool force) queryAtts->Notify(); } } +// **************************************************************************** +// Method: ViewerPlot::CreateNode +// +// Purpose: +// Lets the plot save its information for a config file's DataNode. +// +// Arguments: +// parentNode : The node to which we're saving information. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 16 13:09:04 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerPlot::CreateNode(DataNode *parentNode) +{ + if(parentNode == 0) + return; + + DataNode *plotNode = new DataNode("ViewerPlot"); + parentNode->AddNode(plotNode); + + // + // Add information specific to the plot. + // + plotNode->AddNode(new DataNode("spatialExtentsType", + avtExtentType_ToString(spatialExtentsType))); + plotNode->AddNode(new DataNode("bgColor", bgColor, 3)); + plotNode->AddNode(new DataNode("fgColor", fgColor, 3)); + plotNode->AddNode(new DataNode("expandedFlag", expandedFlag)); + + // + // Store the current plot attributes. + // + curPlotAtts->CreateNode(plotNode, false); + + // + // Store the operators + // + if(nOperators > 0) + { + DataNode *operatorNode = new DataNode("Operators"); + operatorNode->AddNode(new DataNode("activeOperatorIndex", + activeOperatorIndex)); + + for(int i = 0; i < nOperators; ++i) + { + char tmp[20]; + SNPRINTF(tmp, 20, "operator%02d", i); + DataNode *opNode = new DataNode(std::string(tmp)); + operatorNode->AddNode(opNode); + opNode->AddNode(new DataNode("operatorType", + std::string(operators[i]->GetPluginID()))); + operators[i]->CreateNode(opNode); + } + + plotNode->AddNode(operatorNode); + } + + // + // Store the keyframed plot attributes. + // + DataNode *plotKFNode = new DataNode("plotKeyframes"); + if(plotAtts->CreateNode(plotKFNode)) + plotNode->AddNode(plotKFNode); + else + delete plotKFNode; + + // + // Store the keyframed database attributes. + // + DataNode *databaseKFNode = new DataNode("databaseKeyframes"); + if(databaseAtts->CreateNode(databaseKFNode)) + plotNode->AddNode(databaseKFNode); + else + delete databaseKFNode; +} + +// **************************************************************************** +// Method: ViewerPlot::SetFromNode +// +// Purpose: +// Lets the plot reset its values from a config file. +// +// Arguments: +// parentNode : The config file information DataNode pointer. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 16 13:10:51 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerPlot::SetFromNode(DataNode *parentNode) +{ + DataNode *node; + + if(parentNode == 0) + return; + + DataNode *plotNode = parentNode->GetNode("ViewerPlot"); + if(plotNode == 0) + return; + + // Read in some plot attributes. + if((node = plotNode->GetNode("spatialExtentsType")) != 0) + { + avtExtentType t; + if(avtExtentType_FromString(node->AsString(), t)) + SetSpatialExtentsType(t); + } + if((node = plotNode->GetNode("bgColor")) != 0) + SetBackgroundColor(node->AsDoubleArray()); + if((node = plotNode->GetNode("fgColor")) != 0) + SetForegroundColor(node->AsDoubleArray()); + if((node = plotNode->GetNode("expandedFlag")) != 0) + expandedFlag = node->AsBool(); + + // Read in the current plot attributes. + curPlotAtts->SetFromNode(plotNode); + SetPlotAtts(curPlotAtts); + + // + // Read in the plot keyframes. + // + if((node = plotNode->GetNode("plotKeyframes")) != 0) + plotAtts->SetFromNode(node, curPlotAtts); + + // + // Read in the database keyframes. + // + if((node = plotNode->GetNode("databaseKeyframes")) != 0) + databaseAtts->SetFromNode(node, curDatabaseAtts); + + // + // Add operators. + // + DataNode *operatorNode = plotNode->GetNode("Operators"); + if(operatorNode) + { + bool addOperator = true; + for(int i = 0; addOperator; ++i) + { + char key[20]; + SNPRINTF(key, 20, "operator%02d", i); + DataNode *opNode = operatorNode->GetNode(key); + if(opNode) + { + // + // Add the operator. + // + if((node = opNode->GetNode("operatorType")) != 0) + { + int type = OperatorPluginManager::Instance()-> + GetEnabledIndex(node->AsString()); + if(type != -1) + { + int index = AddOperator(type); + + // Let the operator finish initializing itself. + if(index != -1) + operators[index]->SetFromNode(opNode); + } + } + } + else + addOperator = false; + } + + // Now that operators are created, set the active operator index. + if((node = operatorNode->GetNode("activeOperatorIndex")) != 0) + { + if(node->AsInt() < nOperators && node->AsInt() >= 0) + activeOperatorIndex = node->AsInt(); + } + } +} diff --git a/viewer/main/ViewerPlot.h b/viewer/main/ViewerPlot.h index 080134773e5c184e133d77d24496ec48954270f0..c8be8b5dc13903ca1c01a9d10e9603fe3381cfd2 100644 --- a/viewer/main/ViewerPlot.h +++ b/viewer/main/ViewerPlot.h @@ -14,6 +14,7 @@ class AttributeSubject; class AttributeSubjectMap; class DatabaseAttributes; +class DataNode; class EngineProxy; class PickAttributes; class PlotQueryInfo; @@ -136,6 +137,9 @@ class avtToolInterface; // RemoveOperator methods. I also added methods to set/get the new // activeOperator index and the expanded flag. // +// Brad Whitlock, Wed Jul 16 13:29:03 PST 2003 +// Added CreateNode and SetFromNode. +// // **************************************************************************** class VIEWER_API ViewerPlot @@ -176,7 +180,7 @@ class VIEWER_API ViewerPlot void SetSILRestriction(avtSILRestriction_p silr); avtSILRestriction_p GetSILRestriction() const; - void AddOperator(const int type); + int AddOperator(const int type); bool PromoteOperator(const int operatorIndex); bool DemoteOperator(const int operatorIndex); bool RemoveOperator(const int operatorIndex); @@ -242,6 +246,9 @@ class VIEWER_API ViewerPlot PlotQueryInfo* GetPlotQueryInfo(); avtVarType GetVarType(); + void CreateNode(DataNode *); + void SetFromNode(DataNode *); + protected: bool MoveOperator(const int operatorIndex, bool promote); diff --git a/viewer/main/ViewerPlotList.C b/viewer/main/ViewerPlotList.C index 5b175a89b96f9b167b12d2f59cd8faa37b8d9aa0..9fa5862918c22ee545150ab9b7b8d3920cfceccd 100644 --- a/viewer/main/ViewerPlotList.C +++ b/viewer/main/ViewerPlotList.C @@ -13,6 +13,8 @@ #include #include +#include +#include #include #include #include @@ -1245,6 +1247,7 @@ ViewerPlotList::NewPlot(int type, const std::string &host, const std::string &db { if(plot) delete plot; + plot = 0; } ENDTRY @@ -3541,17 +3544,14 @@ ViewerPlotList::UpdatePlotList() const // Set the keyframe indices. int nIndices; const int *keyframeIndices=plots[i].plot->GetKeyframeIndices(nIndices); - vector keyframeIndices2; + intVector keyframeIndices2; for (j = 0; j < nIndices; j++) - { keyframeIndices2.push_back(keyframeIndices[j]); - } plot.SetKeyframes(keyframeIndices2); - // Set the database keyframe indices. const int *databaseKeyframeIndices= plots[i].plot->GetDatabaseKeyframeIndices(nIndices); - vector databaseKeyframeIndices2; + intVector databaseKeyframeIndices2; for (j = 0; j < nIndices; j++) { databaseKeyframeIndices2.push_back(databaseKeyframeIndices[j]); @@ -4190,3 +4190,274 @@ ViewerPlotList::GetKeyframeMode() const { return keyframeMode; } + +// **************************************************************************** +// Method: ViewerPlotList::CreateNode +// +// Purpose: +// Lets the plot list save its information for a config file's DataNode. +// +// Arguments: +// parentNode : The node to which we're saving information. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 16 13:09:04 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerPlotList::CreateNode(DataNode *parentNode) +{ + if(parentNode == 0) + return; + + DataNode *plotlistNode = new DataNode("ViewerPlotList"); + parentNode->AddNode(plotlistNode); + + // + // Add information specific to the animation. + // + plotlistNode->AddNode(new DataNode("hostDatabaseName", hostDatabaseName)); + plotlistNode->AddNode(new DataNode("hostName", hostName)); + plotlistNode->AddNode(new DataNode("databaseName", databaseName)); + plotlistNode->AddNode(new DataNode("nPlots", nPlots)); + plotlistNode->AddNode(new DataNode("keyframeMode", keyframeMode)); + + // + // Let all of the plots save themselves to the config file. + // + for(int i = 0; i < nPlots; ++i) + { + char tmp[20]; + SNPRINTF(tmp, 20, "plot%02d", i); + DataNode *plotNode = new DataNode(tmp); + plotlistNode->AddNode(plotNode); + + // + // Store the plot's attributes up one level, here, so when we read + // the state back in SetFromNode, it is easier to get at the fields + // that we need to recreate the right type of ViewerPlot. + // + plotNode->AddNode(new DataNode("pluginID", + std::string(plots[i].plot->GetPluginID()))); + plotNode->AddNode(new DataNode("hostName", + std::string(plots[i].plot->GetHostName()))); + plotNode->AddNode(new DataNode("databaseName", + std::string(plots[i].plot->GetDatabaseName()))); + plotNode->AddNode(new DataNode("variableName", + std::string(plots[i].plot->GetVariableName()))); + plotNode->AddNode(new DataNode("beginFrame", plots[i].plot->GetBeginFrame())); + plotNode->AddNode(new DataNode("endFrame", plots[i].plot->GetEndFrame())); + plotNode->AddNode(new DataNode("active", plots[i].active)); + plotNode->AddNode(new DataNode("hidden", plots[i].hidden)); + plotNode->AddNode(new DataNode("realized", plots[i].realized)); + + // Store the SIL restriction + CompactSILRestrictionAttributes *csilr = + plots[i].plot->GetSILRestriction()->MakeCompactAttributes(); + csilr->CreateNode(plotNode, true); + delete csilr; + + // Let the plot add its attributes to the node. + plots[i].plot->CreateNode(plotNode); + } +} + +// **************************************************************************** +// Method: ViewerPlotList::SetFromNode +// +// Purpose: +// Lets the plot list reset its values from a config file. +// +// Arguments: +// parentNode : The config file information DataNode pointer. +// +// Returns: True if we have created plots that should be realized; +// False otherwise. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 16 13:10:51 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +bool +ViewerPlotList::SetFromNode(DataNode *parentNode) +{ + DataNode *node; + + if(parentNode == 0) + return false; + + DataNode *plotlistNode = parentNode->GetNode("ViewerPlotList"); + if(plotlistNode == 0) + return false; + + if((node = plotlistNode->GetNode("hostDatabaseName")) != 0) + hostDatabaseName = node->AsString(); + if((node = plotlistNode->GetNode("hostName")) != 0) + hostName = node->AsString(); + if((node = plotlistNode->GetNode("databaseName")) != 0) + databaseName = node->AsString(); + int expectedPlots = 0; + if((node = plotlistNode->GetNode("nPlots")) != 0) + { + // Delete any plots that we may have. + while(nPlots > 0) + DeletePlot(plots[0].plot, false); + + // Set the number of plots that we expect to create. + expectedPlots = (node->AsInt() < 0) ? 0 : node->AsInt(); + } + if((node = plotlistNode->GetNode("keyframeMode")) != 0) + keyframeMode = node->AsBool(); + + // + // Try and recreate the plots + // + bool sendUpdateFrame = false; + bool createdPlots = false; + intVector plotSelected; + for(int i = 0; i < expectedPlots; ++i) + { + char key[20]; + SNPRINTF(key, 20, "plot%02d", i); + DataNode *plotNode = plotlistNode->GetNode(key); + if(plotNode == 0) + continue; + + // + // Look for the required bits of information to recreate the plot. + // + bool haveRequiredFields = true; + std::string pluginID, plotHost, plotDB, plotVar; + if((node = plotNode->GetNode("pluginID")) != 0) + pluginID = node->AsString(); + else + haveRequiredFields = false; + if((node = plotNode->GetNode("hostName")) != 0) + plotHost = node->AsString(); + else + haveRequiredFields = false; + if((node = plotNode->GetNode("databaseName")) != 0) + plotDB = node->AsString(); + else + haveRequiredFields = false; + if((node = plotNode->GetNode("variableName")) != 0) + plotVar = node->AsString(); + else + haveRequiredFields = false; + + bool createdPlot = false; + if(haveRequiredFields) + { + // + // Use the plot plugin manager to get the plot type index from + // the plugin id. + // + int type = PlotPluginManager::Instance()->GetEnabledIndex(pluginID); + if(type != -1) + { + // + // Try and create the plot. + // + ViewerPlot *plot = NewPlot(type, plotHost, plotDB, plotVar, false); + + if(plot) + { + // + // Get the start and end frames. + // + bool haveFrameNumbers = true; + int beginFrame = 0, endFrame = 0; + if((node = plotNode->GetNode("endFrame")) != 0) + endFrame = (node->AsInt() < 0) ? 0 : node->AsInt(); + else + haveFrameNumbers = false; + if((node = plotNode->GetNode("beginFrame")) != 0) + { + int f = node->AsInt(); + beginFrame = (f < 0 || f > endFrame) ? 0 : f; + } + else + haveFrameNumbers = false; + if(haveFrameNumbers) + plot->SetFrameRange(beginFrame, endFrame); + + // Let the plot finish initializing itself. + plot->SetFromNode(plotNode); + + // Add the plot to the plot list. + int plotId = SimpleAddPlot(plot, false); + + // Set the active, hidden flags for the new plot. + if((node = plotNode->GetNode("active")) != 0) + plotSelected.push_back(node->AsBool()?1:0); + else + plotSelected.push_back(0); + if((node = plotNode->GetNode("hidden")) != 0) + plots[plotId].hidden = node->AsBool(); + if((node = plotNode->GetNode("realized")) != 0) + { + plots[plotId].realized = node->AsBool(); + sendUpdateFrame |= node->AsBool(); + } + + // Read the SIL restriction + if((node = plotNode->GetNode("CompactSILRestrictionAttributes")) != 0) + { + CompactSILRestrictionAttributes csilr; + csilr.SetFromNode(plotNode); + + // If the sil restriction from the config file has the same + // number of sets, then initialize the plot's real SIL restriction + // from the compact SIL restriction. + avtSILRestriction_p silr = plot->GetSILRestriction(); + const unsignedCharVector &usedSets = csilr.GetUseSet(); + int nSets = silr->GetNumSets(); + if(nSets == usedSets.size()) + { + silr->SuspendCorrectnessChecking(); + silr->TurnOffAll(); + silr->SetTopSet(csilr.GetTopSet()); + for(int i = 0; i < nSets; ++i) + { + if(usedSets[i] == 2 /* AllUsed */) + silr->TurnOnSet(i); + } + silr->EnableCorrectnessChecking(); + } + else + { + debug1 << "Could not use the stored SIL restriction because " + << "it was not the right size." << endl; + } + } + + createdPlot = true; + createdPlots = true; + } + } + } + + // If we could not create the plot, record it in the logs. + if(!createdPlot) + { + debug1 << "Could not create \"" << pluginID.c_str() + << "\" plot of: " << plotHost.c_str() + << ":" << plotDB.c_str() << " (" << plotVar.c_str() << ")" + << endl; + } + } // end for + + // Now that all of the plots are added, set the selected flag on each plot. + // We can't do it as the plots are added because SimpleAddPlot contains + // code to set all plots but the new one to inactive. + for(int j = 0; j < nPlots; ++j) + plots[j].active = (plotSelected[j] > 0); + + return sendUpdateFrame; +} diff --git a/viewer/main/ViewerPlotList.h b/viewer/main/ViewerPlotList.h index 86eadc6c6abe958bc843ee948dd4f8434f3ce76b..616f6a011a6f17e7b20e05268ae246893873cbaa 100644 --- a/viewer/main/ViewerPlotList.h +++ b/viewer/main/ViewerPlotList.h @@ -13,6 +13,7 @@ // Forward declarations. class AttributeSubject; +class DataNode; class PlotList; class SILRestrictionAttributes; class ViewerAnimation; @@ -138,6 +139,9 @@ typedef std::map SILRestrictionMap; // I added PromoteOperator, DemoteOperator, and RemoveOperator methods and // added 3 new arguments to SetActivePlots. // +// Brad Whitlock, Wed Jul 16 13:15:58 PST 2003 +// I added CreateNode and SetFromNode. +// // **************************************************************************** @@ -248,6 +252,8 @@ class VIEWER_API ViewerPlotList static void ClearDefaultSILRestrictions(const std::string &host, const std::string &database); + void CreateNode(DataNode *); + bool SetFromNode(DataNode *); protected: ViewerPlot *NewPlot(int type, const std::string &host, const std::string &db, const std::string &var, diff --git a/viewer/main/ViewerQueryManager.C b/viewer/main/ViewerQueryManager.C index d5beaf84febca6e43037d62cdd3bf85e79e54d64..7a0ec63ceb9a9ff3058dc65c2d94bb997ee87e9c 100644 --- a/viewer/main/ViewerQueryManager.C +++ b/viewer/main/ViewerQueryManager.C @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -1946,3 +1947,77 @@ ViewerQueryManager::ViewDimChanged(ViewerWindow *modWin) } } +// **************************************************************************** +// Method: ViewerQueryManager::CreateNode +// +// Purpose: +// Lets the query manager add its data to the tree that gets written to +// the config file. +// +// Arguments: +// parentNode : The node on which the query manager can add its data. +// +// Programmer: Brad Whitlock +// Creation: Tue Jul 22 10:15:14 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerQueryManager::CreateNode(DataNode *parentNode) +{ + if(parentNode == 0) + return; + + DataNode *mgrNode = new DataNode("ViewerQueryManager"); + parentNode->AddNode(mgrNode); + + // + // Add information about the ViewerQueryManager. + // + mgrNode->AddNode(new DataNode("baseDesignator", baseDesignator)); + mgrNode->AddNode(new DataNode("cycleDesignator", cycleDesignator)); + mgrNode->AddNode(new DataNode("colorIndex", colorIndex)); +} + +// **************************************************************************** +// Method: ViewerQueryManager::SetFromNode +// +// Purpose: +// Lets the query manager initialize itself from data read in from the +// config file. +// +// Arguments: +// parentNode : The node where the query manager's data is stored. +// +// Programmer: Brad Whitlock +// Creation: Tue Jul 22 10:16:07 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerQueryManager::SetFromNode(DataNode *parentNode) +{ + if(parentNode == 0) + return; + + DataNode *mgrNode = parentNode->GetNode("ViewerQueryManager"); + if(mgrNode == 0) + return; + + DataNode *node; + if((node = mgrNode->GetNode("cycleDesignator")) != 0) + cycleDesignator = node->AsBool(); + + if((node = mgrNode->GetNode("baseDesignator")) != 0) + { + baseDesignator = node->AsChar() - 1; + UpdateDesignator(); + } + + if((node = mgrNode->GetNode("colorIndex")) != 0) + colorIndex = node->AsInt(); +} diff --git a/viewer/main/ViewerQueryManager.h b/viewer/main/ViewerQueryManager.h index ddf85301a3702f2c1196614347f0e021946f0ac2..bdc4d6a53a629b8b0f8574e8449836e8c107314a 100644 --- a/viewer/main/ViewerQueryManager.h +++ b/viewer/main/ViewerQueryManager.h @@ -13,7 +13,7 @@ #include // Forward declarations. - +class DataNode; class GlobalLineoutAttributes; class Line; class LineoutListItem; @@ -91,6 +91,9 @@ class avtToolInterface; // Kathleen Bonnell, Wed Jul 9 08:58:27 PDT 2003 // Add method ViewDimChanged. // +// Brad Whitlock, Tue Jul 22 10:14:14 PDT 2003 +// Added methods that let the query manager write its data to a config file. +// // **************************************************************************** class VIEWER_API ViewerQueryManager @@ -147,6 +150,9 @@ class VIEWER_API ViewerQueryManager void StopPickMode(); void ViewDimChanged(ViewerWindow *); + void CreateNode(DataNode *); + void SetFromNode(DataNode *); + protected: ViewerQueryManager(); ColorAttribute GetColor(); diff --git a/viewer/main/ViewerSubject.C b/viewer/main/ViewerSubject.C index 73afe76eb33632c982858cac665e1fbe53e798b7..771ba472486fdde5481f502f986f368e7a42cb4d 100644 --- a/viewer/main/ViewerSubject.C +++ b/viewer/main/ViewerSubject.C @@ -211,6 +211,9 @@ using std::string; // Brad Whitlock, Mon Jun 30 12:30:18 PDT 2003 // I passed this pointer to ViewerConfigManager's constructor. // +// Brad Whitlock, Wed Jul 23 13:49:48 PST 2003 +// Initialized the launchingCompoent flag. +// // **************************************************************************** ViewerSubject::ViewerSubject(int *argc, char ***argv) : borders(), shift(), @@ -221,6 +224,11 @@ ViewerSubject::ViewerSubject(int *argc, char ***argv) : borders(), shift(), // interruptionEnabled = true; + // + // Set a flag indicating that we're not presently launching a component. + // + launchingComponent = false; + // // Will be set by the -launchengine flag. // @@ -910,7 +918,10 @@ ViewerSubject::Connect(int *argc, char ***argv) // // Kathleen Bonnell, Fri Feb 7 09:09:47 PST 2003 // Added registration of the authentication callback. (moved from viewer.C) -// +// +// Brad Whitlock, Wed Jul 23 13:55:03 PST 2003 +// I replaced AddInitialWindows with AddWindow. +// // **************************************************************************** int @@ -931,8 +942,8 @@ ViewerSubject::Execute() // Initialize the area that will be used to place the windows. InitializeWorkArea(); - // Make the window manager add its initial number of windows. - windowManager->AddInitialWindows(); + // Make the window manager add an initial window. + windowManager->AddWindow(); } // @@ -1962,16 +1973,19 @@ ViewerSubject::ClearStatus(const char *sender) // // Arguments: // parentNode : The node to which the state is added. +// detailed : Tells whether lots of details should be added to the nodes. // // Programmer: Brad Whitlock // Creation: Mon Jun 30 12:32:00 PDT 2003 // // Modifications: -// +// Brad Whitlock, Fri Jul 18 10:47:20 PDT 2003 +// Added detailed argument. Made query manager add its data. +// // **************************************************************************** void -ViewerSubject::CreateNode(DataNode *parentNode) +ViewerSubject::CreateNode(DataNode *parentNode, bool detailed) { if(parentNode == 0) return; @@ -1979,7 +1993,9 @@ ViewerSubject::CreateNode(DataNode *parentNode) DataNode *vsNode = new DataNode("ViewerSubject"); parentNode->AddNode(vsNode); - ViewerWindowManager::Instance()->CreateNode(vsNode); + ViewerWindowManager::Instance()->CreateNode(vsNode, detailed); + if(detailed) + ViewerQueryManager::Instance()->CreateNode(vsNode); } // **************************************************************************** @@ -1995,7 +2011,9 @@ ViewerSubject::CreateNode(DataNode *parentNode) // Creation: Mon Jun 30 12:36:00 PDT 2003 // // Modifications: -// +// Brad Whitlock, Tue Jul 22 10:12:59 PDT 2003 +// Added code to let the query manager initialize itself. +// // **************************************************************************** void @@ -2010,6 +2028,7 @@ ViewerSubject::SetFromNode(DataNode *parentNode) // Let the other objects set themselves up using data from searchNode. ViewerWindowManager::Instance()->SetFromNode(searchNode); + ViewerQueryManager::Instance()->SetFromNode(searchNode); } // **************************************************************************** @@ -3105,6 +3124,44 @@ ViewerSubject::WriteConfigFile() delete [] defaultConfigFile; } +// **************************************************************************** +// Method: ViewerSubject::ExportEntireState +// +// Purpose: +// Exports the viewer's entire state to an XML file. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 9 12:38:35 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerSubject::ExportEntireState() +{ + configMgr->ExportEntireState(viewerRPC.GetVariable()); +} + +// **************************************************************************** +// Method: ViewerSubject::ImportEntireState +// +// Purpose: +// Imports the viewer's entire state from an XML file. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 9 12:38:35 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerSubject::ImportEntireState() +{ + configMgr->ImportEntireState(viewerRPC.GetVariable()); +} + // **************************************************************************** // Method: ViewerSubject::SetAnimationAttributes // @@ -3937,6 +3994,12 @@ ViewerSubject::BlockSocketSignals(bool b) // delete can happen using the window decorations which is outside our // normal control paths. // +// Brad Whitlock, Fri Jul 18 12:20:06 PDT 2003 +// I added code to handle updateFrame, setInteractiveMode, and +// activateTool. I also made the routine reschedule itself with the event +// loop and return early if the engine is executing or if we're launching +// a component. +// // **************************************************************************** void @@ -3985,6 +4048,18 @@ ViewerSubject::ProcessRendererMessage() window->RedrawWindow(); } + // + // If the engine manager is executing, return early but tell the + // event loop to try to process the message again later. + // + else if(ViewerEngineManager::Instance()->InExecute() || + launchingComponent) + { + // Add the message back into the buffer. + messageBuffer->AddString(msg); + QTimer::singleShot(400, this, SLOT(ProcessRendererMessage())); + return; + } else if (strncmp(msg, "deleteWindow", 12) == 0) { ViewerWindow *window=0; @@ -3996,6 +4071,39 @@ ViewerSubject::ProcessRendererMessage() ViewerWindowManager::Instance()->DeleteWindow(window); ViewerWindowManager::Instance()->UpdateActions(); } + else if (strncmp(msg, "activateTool", 12) == 0) + { + ViewerWindow *window = 0; + int toolId = 0; + int offset = 15; // = strlen("activateTool 0x"); + sscanf (&msg[offset], "%p %d", &window, &toolId); + + // Tell the viewer window manager to delete the window. + window->SetToolEnabled(toolId, true); + ViewerWindowManager::Instance()->UpdateActions(); + } + else if (strncmp(msg, "setInteractionMode", 18) == 0) + { + ViewerWindow *window = 0; + int windowMode = 0; + int offset = 21; // = strlen("setInteractionMode 0x"); + sscanf (&msg[offset], "%p %d", &window, &windowMode); + + // Tell the window to set its interaction mode. + window->SetInteractionMode(INTERACTION_MODE(windowMode)); + ViewerWindowManager::Instance()->UpdateActions(); + } + else if (strncmp(msg, "updateFrame", 11) == 0) + { + ViewerWindow *window = 0; + + int offset = 14; // = strlen("updateFrame 0x"); + sscanf (&msg[offset], "%p", &window); + + // Tell the window's animation to update. + window->GetAnimation()->UpdateFrame(); + ViewerWindowManager::Instance()->UpdateActions(); + } } } @@ -4010,12 +4118,15 @@ ViewerSubject::ProcessRendererMessage() // Creation: Fri Sep 27 15:50:30 PST 2002 // // Modifications: -// +// Brad Whitlock, Wed Jul 23 13:51:04 PST 2003 +// Set the launchingComponent flag. +// // **************************************************************************** void ViewerSubject::StartLaunchProgress() { + launchingComponent = true; checkParent->setEnabled(false); } @@ -4030,12 +4141,15 @@ ViewerSubject::StartLaunchProgress() // Creation: Fri Sep 27 15:50:30 PST 2002 // // Modifications: +// Brad Whitlock, Wed Jul 23 13:51:04 PST 2003 +// Set the launchingComponent flag. // // **************************************************************************** void ViewerSubject::EndLaunchProgress() { + launchingComponent = false; checkParent->setEnabled(true); } @@ -4154,6 +4268,9 @@ ViewerSubject::LaunchProgressCB(void *d, int stage) // Brad Whitlock, Tue Jul 1 17:00:30 PST 2003 // Added ExportColorTable. // +// Brad Whitlock, Wed Jul 9 12:35:44 PDT 2003 +// Added ExportEntireState and ImportEntireState. +// // **************************************************************************** void @@ -4351,6 +4468,12 @@ ViewerSubject::HandleViewerRPC() case ViewerRPC::ExportColorTableRPC: ExportColorTable(); break; + case ViewerRPC::ExportEntireStateRPC: + ExportEntireState(); + break; + case ViewerRPC::ImportEntireStateRPC: + ImportEntireState(); + break; case ViewerRPC::MaxRPC: break; default: diff --git a/viewer/main/ViewerSubject.h b/viewer/main/ViewerSubject.h index c96b0127db7c6f55d04d8fea0ac17f99672c0fa5..017cadd643035a0d6d19616aa4c1fd4807dbda03 100644 --- a/viewer/main/ViewerSubject.h +++ b/viewer/main/ViewerSubject.h @@ -265,6 +265,9 @@ class MaterialAttributes; // Brad Whitlock, Tue Jul 1 16:59:00 PST 2003 // Added ExportColorTable. // +// Brad Whitlock, Wed Jul 9 12:33:40 PDT 2003 +// Added ExportEntireState and ImportEntireState. +// // **************************************************************************** class VIEWER_API ViewerSubject : public QObject @@ -302,7 +305,7 @@ public: void EndLaunchProgress(); void BlockSocketSignals(bool); - void CreateNode(DataNode *node); + void CreateNode(DataNode *node, bool detailed); void SetFromNode(DataNode *node); private: void ProcessEvents(); @@ -341,6 +344,8 @@ private: void UpdateColorTable(); void ExportColorTable(); void WriteConfigFile(); + void ExportEntireState(); + void ImportEntireState(); void SetAnnotationAttributes(); void SetDefaultAnnotationAttributes(); void ResetAnnotationAttributes(); @@ -400,6 +405,7 @@ private: QApplication *mainApp; QSocketNotifier *checkParent; QSocketNotifier *checkRenderer; + bool launchingComponent; bool interruptionEnabled; std::string launchEngineAtStartup; bool blockSocketSignals; diff --git a/viewer/main/ViewerWindow.C b/viewer/main/ViewerWindow.C index 8a59a653a02195d19090dce6a613fce2bb0e8256..2ba16e03c710512c47f100e98083a7585282b79c 100644 --- a/viewer/main/ViewerWindow.C +++ b/viewer/main/ViewerWindow.C @@ -26,6 +26,7 @@ using std::string; #include #include #include +#include #include #include #include @@ -647,7 +648,10 @@ ViewerWindow::GetInteractionMode() const // Modifications: // Kathleen Bonnell, Sat Jul 13 18:03:18 PDT 2002 // Notify ViewerQueryManager of the tool's enabled state. -// +// +// Brad Whitlock, Fri Jul 18 12:28:17 PDT 2003 +// Added code to protect us from a bad toolId. +// // **************************************************************************** void @@ -657,20 +661,23 @@ ViewerWindow::SetToolEnabled(int toolId, bool enabled) // If we're turning the tool on, send attributes to it so it can // initialize itself if it wants to. // - if(enabled) - { - ViewerPlotList *pl = animation->GetPlotList(); - pl->InitializeTool(visWindow->GetToolInterface(toolId)); - ViewerQueryManager::Instance()-> - InitializeTool(this, visWindow->GetToolInterface(toolId)); - } - else + if(toolId >= 0 && toolId < GetNumTools()) { - ViewerQueryManager::Instance()-> - DisableTool(this, visWindow->GetToolInterface(toolId)); - } + if(enabled) + { + ViewerPlotList *pl = animation->GetPlotList(); + pl->InitializeTool(visWindow->GetToolInterface(toolId)); + ViewerQueryManager::Instance()-> + InitializeTool(this, visWindow->GetToolInterface(toolId)); + } + else + { + ViewerQueryManager::Instance()-> + DisableTool(this, visWindow->GetToolInterface(toolId)); + } - visWindow->SetToolEnabled(toolId, enabled); + visWindow->SetToolEnabled(toolId, enabled); + } } // **************************************************************************** @@ -4702,6 +4709,7 @@ ViewerWindow::SetPopupEnabled(bool val) // // Arguments: // parentNode : The node to which we're saving information. +// detailed : Indicates whether detailed information should be added. // // Programmer: Brad Whitlock // Creation: Mon Jun 30 13:10:30 PST 2003 @@ -4711,7 +4719,7 @@ ViewerWindow::SetPopupEnabled(bool val) // **************************************************************************** void -ViewerWindow::CreateNode(DataNode *parentNode) +ViewerWindow::CreateNode(DataNode *parentNode, bool detailed) { if(parentNode == 0) return; @@ -4719,9 +4727,121 @@ ViewerWindow::CreateNode(DataNode *parentNode) DataNode *windowNode = new DataNode("ViewerWindow"); parentNode->AddNode(windowNode); + // + // Save the window size and location. + // + int windowSize[2], windowLocation[2]; + GetWindowSize(windowSize[0], windowSize[1]); + GetLocation(windowLocation[0], windowLocation[1]); + windowNode->AddNode(new DataNode("windowSize", windowSize, 2)); + windowNode->AddNode(new DataNode("windowLocation", windowLocation, 2)); + // // Add information specific to the ViewerWindow. // + if(detailed) + { + windowNode->AddNode(new DataNode("cameraView", cameraView)); + windowNode->AddNode(new DataNode("maintainView", maintainView)); + windowNode->AddNode(new DataNode("viewIsLocked", viewIsLocked)); + windowNode->AddNode(new DataNode("curveWindow", GetTypeIsCurve())); + windowNode->AddNode(new DataNode("viewDimension", viewDimension)); + windowNode->AddNode(new DataNode("viewExtentsType", avtExtentType_ToString(plotExtentsType))); + windowNode->AddNode(new DataNode("timeLocked", timeLocked)); + windowNode->AddNode(new DataNode("toolsLocked", toolsLocked)); + windowNode->AddNode(new DataNode("fullFrame", fullFrame)); + + // + // Interaction mode. + // + windowNode->AddNode(new DataNode("interactionMode", + INTERACTION_MODE_ToString(GetInteractionMode()))); + + // + // Active tools. + // + stringVector activeTools; + for(int i = 0; i < GetNumTools(); ++i) + { + if(GetToolEnabled(i)) + activeTools.push_back(GetToolName(i)); + } + if(activeTools.size() > 0) + windowNode->AddNode(new DataNode("activeTools", activeTools)); + + // + // Save out the annotations. + // + AnnotationAttributes annot(*visWindow->GetAnnotationAtts()); + annot.CreateNode(windowNode, false); + + // + // Save out the lights + // + LightList lights(*visWindow->GetLightList()); + lights.CreateNode(windowNode, false); + + // + // Save out important rendering attributes. + // + windowNode->AddNode(new DataNode("scalableRendering", GetScalableRendering())); + windowNode->AddNode(new DataNode("scalableThreshold", GetScalableThreshold())); + windowNode->AddNode(new DataNode("notifyForEachRender", GetNotifyForEachRender())); + windowNode->AddNode(new DataNode("surfaceRepresentation", GetSurfaceRepresentation())); + windowNode->AddNode(new DataNode("immediateModeRendering", GetImmediateModeRendering())); + windowNode->AddNode(new DataNode("stereoRendering", GetStereo())); + windowNode->AddNode(new DataNode("stereoType", GetStereoType())); + windowNode->AddNode(new DataNode("antialiasing", GetAntialiasing())); + + // + // View + // + ViewAttributes viewAtts; + if (viewDimension == 2) + { + if (!GetTypeIsCurve()) + { + const avtView2D &view2d = GetView2D(); + view2d.SetToViewAttributes(&viewAtts); + } + else + { + const avtViewCurve &viewCurve = GetViewCurve(); + viewCurve.SetToViewAttributes(&viewAtts); + } + } + else + { + const avtView3D &view3d = GetView3D(); + view3d.SetToViewAttributes(&viewAtts); + } + viewAtts.CreateNode(windowNode, false); + + // + // Save out the view keyframes. + // + if(viewDimension == 3) + { + DataNode *view3DNode = new DataNode("view3DKeyframes"); + if(view3DAtts->CreateNode(view3DNode)) + windowNode->AddNode(view3DNode); + else + delete view3DNode; + } + else + { + DataNode *view2DNode = new DataNode("view2DKeyframes"); + if(view2DAtts->CreateNode(view2DNode)) + windowNode->AddNode(view2DNode); + else + delete view2DNode; + } + + // + // Let the animation add its information. + // + animation->CreateNode(windowNode); + } // // Let other objects add their information. @@ -4748,6 +4868,8 @@ ViewerWindow::CreateNode(DataNode *parentNode) void ViewerWindow::SetFromNode(DataNode *parentNode) { + DataNode *node; + if(parentNode == 0) return; @@ -4756,15 +4878,243 @@ ViewerWindow::SetFromNode(DataNode *parentNode) return; // - // Get information specific to ViewerWindow. + // Read in the animation. // + if(animation->SetFromNode(windowNode)) + SendUpdateFrameMessage(); + + // + // Read in the view and set the view. + // + if((node = windowNode->GetNode("viewDimension")) != 0) + viewDimension = node->AsInt(); + if((node = windowNode->GetNode("curveWindow")) != 0) + SetTypeIsCurve(node->AsBool()); + if(windowNode->GetNode("ViewAttributes") != 0) + { + ViewAttributes viewAtts; + viewAtts.SetFromNode(windowNode); + if (viewDimension == 2) + { + if (!GetTypeIsCurve()) + { + avtView2D view2d; + view2d.SetFromViewAttributes(&viewAtts); + SetView2D(view2d); + } + else + { + avtViewCurve viewCurve; + viewCurve.SetFromViewAttributes(&viewAtts); + SetViewCurve(viewCurve); + } + } + else + { + avtView3D view3d; + view3d.SetFromViewAttributes(&viewAtts); + SetView3D(view3d); + } + } + if((node = windowNode->GetNode("cameraView")) != 0) + SetCameraViewMode(node->AsBool()); + if((node = windowNode->GetNode("maintainView")) != 0) + SetMaintainViewMode(node->AsBool()); + if((node = windowNode->GetNode("fullFrame")) != 0) + SetFullFrameMode(node->AsBool()); + + // + // Read in lock flags. + // + if((node = windowNode->GetNode("viewIsLocked")) != 0) + SetViewIsLocked(node->AsBool()); + if((node = windowNode->GetNode("timeLocked")) != 0) + timeLocked = node->AsBool(); + if((node = windowNode->GetNode("toolsLocked")) != 0) + toolsLocked = node->AsBool(); + + // + // Read in and set any rendering attributes. + // + if((node = windowNode->GetNode("scalableRendering")) != 0) + SetScalableRendering(node->AsBool()); + if((node = windowNode->GetNode("scalableThreshold")) != 0) + SetScalableThreshold(node->AsInt()); + if((node = windowNode->GetNode("notifyForEachRender")) != 0) + SetNotifyForEachRender(node->AsBool()); + if((node = windowNode->GetNode("surfaceRepresentation")) != 0) + SetSurfaceRepresentation(node->AsInt()); + if((node = windowNode->GetNode("immediateModeRendering")) != 0) + SetImmediateModeRendering(node->AsBool()); + int stereoType = 0; + if((node = windowNode->GetNode("stereoType")) != 0) + stereoType = node->AsInt(); + if((node = windowNode->GetNode("stereoRendering")) != 0) + SetStereoRendering(node->AsBool(), stereoType); + if((node = windowNode->GetNode("antialiasing")) != 0) + SetAntialiasing(node->AsBool()); + + // + // Read in and set the annotation attributes. + // + if((node = windowNode->GetNode("AnnotationAttributes")) != 0) + { + AnnotationAttributes annot; + annot.SetFromNode(windowNode); + SetAnnotationAttributes(&annot); + } + + // + // Read in and set the light list. + // + if((node = windowNode->GetNode("LightList")) != 0) + { + LightList lights; + lights.SetFromNode(windowNode); + SetLightList(&lights); + } + + // + // Read in the view keyframes. + // + ViewAttributes v; + if((node = windowNode->GetNode("view2DKeyframes")) != 0) + view2DAtts->SetFromNode(node, &v); + if((node = windowNode->GetNode("view3DKeyframes")) != 0) + view3DAtts->SetFromNode(node, &v); // // Let other objects get their information. // actionMgr->SetFromNode(windowNode); + + // + // Set the view extents type. + // + if((node = windowNode->GetNode("viewExtentsType")) != 0) + { + // Allow enums to be int or string in the config file + if(node->GetNodeType() == INT_NODE) + { + int ival = windowNode->AsInt(); + ival = (ival < 0 || ival > 3) ? 0 : ival; + SetViewExtentsType(avtExtentType(ival)); + } + else if(node->GetNodeType() == STRING_NODE) + { + avtExtentType value; + if(avtExtentType_FromString(node->AsString(), value)) + SetViewExtentsType(value); + } + } + + // + // Read in and set the interaction mode. + // + if((node = windowNode->GetNode("interactionMode")) != 0) + { + INTERACTION_MODE m; + if(INTERACTION_MODE_FromString(node->AsString(), m)) + SendInteractionModeMessage(m); + } + + // + // Read in the list of active tools and send a message to the + // viewer's message buffer so that the tool will be activated later + // when control returns to the event loop. + // + if((node = windowNode->GetNode("activeTools")) != 0) + { + const stringVector &activeTools = node->AsStringVector(); + for(int i = 0; i < activeTools.size(); ++i) + { + int toolIndex = -1; + for(int j = 0; j < GetNumTools(); ++j) + { + if(GetToolName(j) == activeTools[i]) + { + SendActivateToolMessage(j); + break; + } + } + } + } } +// **************************************************************************** +// Method: ViewerWindow::SendUpdateFrameMessage +// +// Purpose: +// Sends a message to the viewer's event loop that tells it to update the +// current animation frame, which will cause plots to be regenerated. +// +// Programmer: Brad Whitlock +// Creation: Fri Jul 18 12:50:15 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerWindow::SendUpdateFrameMessage() const +{ + char msg[256]; + + SNPRINTF(msg, 256, "updateFrame 0x%p;", this); + viewerSubject->MessageRendererThread(msg); +} + +// **************************************************************************** +// Method: ViewerWindow::SendInteractionModeMessage +// +// Purpose: +// Sends a message to the viewer's event loop that tells it to set the +// window's interaction mode. +// +// Arguments: +// m : The interaction mode to set. +// +// Programmer: Brad Whitlock +// Creation: Fri Jul 18 12:31:16 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerWindow::SendInteractionModeMessage(const INTERACTION_MODE m) const +{ + char msg[256]; + + SNPRINTF(msg, 256, "setInteractionMode 0x%p %d;", this, int(m)); + viewerSubject->MessageRendererThread(msg); +} + +// **************************************************************************** +// Method: ViewerWindow::SendActivateToolMessage +// +// Purpose: +// Sends a message to the viewer's event loop that tells it to activate +// the specified tool. +// +// Arguments: +// toolId : The index of the tool to activate. +// +// Programmer: Brad Whitlock +// Creation: Fri Jul 18 12:18:47 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerWindow::SendActivateToolMessage(const int toolId) const +{ + char msg[256]; + + SNPRINTF(msg, 256, "activateTool 0x%p %d;", this, toolId); + viewerSubject->MessageRendererThread(msg); +} // Only place where ViewerWindow should need to talk to ViewerEngineManager #include diff --git a/viewer/main/ViewerWindow.h b/viewer/main/ViewerWindow.h index 32b762373c856784f38f2b003ae7a5f27e160b28..b446f87e5234d3fc2ea3aa1a812d5cc8f652c814 100644 --- a/viewer/main/ViewerWindow.h +++ b/viewer/main/ViewerWindow.h @@ -244,7 +244,8 @@ struct ExternalRenderRequestInfo // Removed Start/StopPickMode. Added INTERACTION_MODE argument to Pick. // // Brad Whitlock, Mon Jun 30 13:03:48 PST 2003 -// Added CreateNode, SetFromNode. +// Added CreateNode, SetFromNode, and a few new methods to send messages +// to the main event loop. // // Mark C. Miller, 07Jul03 // Added GetWindowSize method @@ -264,7 +265,7 @@ public: ViewerActionManager *GetActionManager() const; int GetWindowId() const; - void CreateNode(DataNode *parentNode); + void CreateNode(DataNode *parentNode, bool detailed); void SetFromNode(DataNode *parentNode); void SetSize(const int width, const int height); @@ -325,6 +326,9 @@ public: void SendRedrawMessage(); void SendUpdateMessage(); void SendDeleteMessage(); + void SendUpdateFrameMessage() const; + void SendActivateToolMessage(const int toolId) const; + void SendInteractionModeMessage(const INTERACTION_MODE m) const; bool IsTheSameWindow(VisWindow *); diff --git a/viewer/main/ViewerWindowManager.C b/viewer/main/ViewerWindowManager.C index 0ca4d860449d9c55165423399f04bff6b2b57f96..ecaeb440bc8955a6cedf6f2b36e74fb5789edbc1 100644 --- a/viewer/main/ViewerWindowManager.C +++ b/viewer/main/ViewerWindowManager.C @@ -403,109 +403,6 @@ ViewerWindowManager::SetGeometry(const char *windowGeometry) InitWindowLimits(); } -// **************************************************************************** -// Method: ViewerWindowManager::AddInitialWindows -// -// Purpose: -// Uses the windowAtts object to determine the number of windows that will -// be displayed initially and their size, position. -// -// Programmer: Brad Whitlock -// Creation: Fri Nov 2 11:36:15 PDT 2001 -// -// Modifications: -// Eric Brugger, Wed Nov 21 12:12:45 PST 2001 -// I added animation attributes. -// -// Kathleen Bonnell, Tue Nov 27 16:03:00 PST 2001 -// Added pick attributes. -// -// Brad Whitlock, Mon Feb 4 10:34:59 PDT 2002 -// Added code to minimize extra windows. -// -// Brad Whitlock, Mon Sep 16 14:55:08 PST 2002 -// I made the layout be part of the clientAtts instead of the windowAtts. -// -// **************************************************************************** - -void -ViewerWindowManager::AddInitialWindows() -{ - // Check the windowAtts for a bad number of windows. - int windowIndex; - int nwin = windowAtts->GetNWindows(); - bool badNWindows = (nwin > maxWindows) || (nwin < 2); - // Check the windowAtts for a bad number of sizes, etc. - bool arraysBadSize = (windowAtts->GetWindowWidth().size() != nwin) || - (windowAtts->GetWindowHeight().size() != nwin) || - (windowAtts->GetWindowX().size() != nwin) || - (windowAtts->GetWindowY().size() != nwin); - - // Check the clientAtts for a bad layout. - bool badLayout = true; - int lIndex = 0; - for(int i = 0; i < maxLayouts; ++i) - { - if(clientAtts->GetWindowLayout() == validLayouts[i]) - { - lIndex = i; - badLayout = false; - break; - } - } - - // If there were inconsistencies in the indowAtts then we should - // create a single window and return. - if(badNWindows || arraysBadSize || badLayout) - { - AddWindow(); - return; - } - - // Create a new window for each window listed in the windowAtts. - for(windowIndex = 0; windowIndex < nwin; ++windowIndex) - { - int winW = windowAtts->GetWindowWidth()[windowIndex]; - int winH = windowAtts->GetWindowHeight()[windowIndex]; - int winX = windowAtts->GetWindowX()[windowIndex]; - int winY = windowAtts->GetWindowY()[windowIndex]; - - // Add the shift and border into the mix. - winX = winX + borderLeft - shiftX; - winY = winY + borderTop - shiftY; - - // - // Create the new window along with its animation. - // - CreateVisWindow(windowIndex, winW, winH, winX, winY); - } - - // Set the layout to be used for future AddWindow calls. - layout = clientAtts->GetWindowLayout(); - layoutIndex = lIndex; - - // - // Make the first window the active window. - // - activeWindow = 0; - - // - // Since the number of windows may be greater the the saved layout, - // minimize the windows that are above the number of windows allowed - // in the layout. - // - for(windowIndex = layout; windowIndex < nwin; ++windowIndex) - { - if(windows[windowIndex] != 0) - windows[windowIndex]->Iconify(); - } - - // - // Update all of the attributes for the window. - // - UpdateAllAtts(); -} - // **************************************************************************** // Method: ViewerWindowManager::AddWindow // @@ -3325,6 +3222,8 @@ ViewerWindowManager::UpdateAllAtts() plotList->UpdatePlotList(); plotList->UpdatePlotAtts(); plotList->UpdateSILRestrictionAtts(); + keyframeClientAtts->SetEnabled(plotList->GetKeyframeMode()); + keyframeClientAtts->Notify(); } // @@ -4204,6 +4103,9 @@ ViewerWindowManager::GetWindowAtts() // Brad Whitlock, Wed Feb 5 14:22:29 PST 2003 // I added support for saving toolbar settings. // +// Brad Whitlock, Wed Jul 23 13:57:48 PST 2003 +// I removed the window size, location from windowAtts. +// // **************************************************************************** void @@ -4212,33 +4114,6 @@ ViewerWindowManager::UpdateWindowAtts() // Make sure the ViewerWindowManager atts object is created. GetWindowAtts(); - // Go through the list of windows and store their locations, etc. into - // the windowAtts. - intVector vecX, vecY, vecW, vecH; - for(int i = 0; i < maxWindows; ++i) - { - if(windows[i] != 0) - { - int x, y, w, h; - // Get the size and location. - windows[i]->GetWindowSize(w, h); - windows[i]->GetLocation(x, y); - - // Add the info to the vectors. - vecX.push_back(x); - vecY.push_back(y); - vecW.push_back(w); - vecH.push_back(h); - } - } - - // Set the window information into the state object. - windowAtts->SetNWindows(vecX.size()); - windowAtts->SetWindowX(vecX); - windowAtts->SetWindowY(vecY); - windowAtts->SetWindowWidth(vecW); - windowAtts->SetWindowHeight(vecH); - // Let the active window's action manager update the window atts so we // save the current toolbar settings. windows[activeWindow]->GetActionManager()->UpdateActionInformation(windowAtts); @@ -5522,36 +5397,40 @@ ViewerWindowManager::EndEngineExecute() // // Arguments: // parentNode : The node to which we're adding information. +// detailed : A flag that tells whether we should write detailed info. // // Programmer: Brad Whitlock // Creation: Mon Jun 30 12:58:36 PDT 2003 // // Modifications: -// +// Brad Whitlock, Thu Jul 17 14:20:27 PST 2003 +// Added information for a full restart. +// // **************************************************************************** void -ViewerWindowManager::CreateNode(DataNode *parentNode) +ViewerWindowManager::CreateNode(DataNode *parentNode, bool detailed) { if(parentNode == 0) return; - DataNode *vsNode = new DataNode("ViewerWindowManager"); - parentNode->AddNode(vsNode); + DataNode *mgrNode = new DataNode("ViewerWindowManager"); + parentNode->AddNode(mgrNode); // // Add information about the ViewerWindowManager. // + mgrNode->AddNode(new DataNode("activeWindow", activeWindow)); // // Let each window add its own data. // DataNode *windowsNode = new DataNode("Windows"); - vsNode->AddNode(windowsNode); + mgrNode->AddNode(windowsNode); for(int i = 0; i < maxWindows; ++i) { if(windows[i] != 0) - windows[i]->CreateNode(windowsNode); + windows[i]->CreateNode(windowsNode, detailed); } } @@ -5570,7 +5449,9 @@ ViewerWindowManager::CreateNode(DataNode *parentNode) // Creation: Mon Jun 30 12:56:30 PDT 2003 // // Modifications: -// +// Brad Whitlock, Thu Jul 17 14:25:02 PST 2003 +// Added code to reconstruct all of the windows in the config file. +// // **************************************************************************** void @@ -5594,31 +5475,158 @@ ViewerWindowManager::SetFromNode(DataNode *parentNode) if(windowsNode == 0) return; -#if 0 - // Reactivate this later when the viewer does a full restart. + int i, c; int newNWindows = windowsNode->GetNumChildren(); + DataNode *sizeNode = 0; + DataNode *locationNode = 0; + if(nWindows > newNWindows) { int d = nWindows - newNWindows; - for(int i = 0; i < d; ++i) + for(i = 0; i < d; ++i) DeleteWindow(); + + // + // Create an array of pointers to the existing windows such that + // the pointer array has no gaps. + // + ViewerWindow **existingWindows = new ViewerWindow *[nWindows + 1]; + for(i = 0, c = 0; i < maxWindows; ++i) + { + if(windows[i] != 0) + existingWindows[c++] = windows[i]; + } + + // + // Try and resize or reposition the existing windows. + // + for(i = 0; i < newNWindows; ++i) + { + DataNode *windowINode = windowsNode->GetChildren()[i]; + if((sizeNode = windowINode->GetNode("windowSize")) != 0 && + (locationNode = windowINode->GetNode("windowLocation")) != 0) + { + // We're able to read in the size and location. + int w, h, x, y; + w = sizeNode->AsIntArray()[0]; + h = sizeNode->AsIntArray()[1]; + x = locationNode->AsIntArray()[0]; + y = locationNode->AsIntArray()[1]; + + // If we're considering an existing window, just set the + // size and position. + existingWindows[i]->SetSize(w, h); + existingWindows[i]->SetLocation(x, y); + } + } + + delete [] existingWindows; } else if(nWindows < newNWindows) { - int d = newNWindows - nWindows; - for(int i = 0; i < d; ++i) - AddWindow(); + // + // Create an array of pointers to the existing windows such that + // the pointer array has no gaps. + // + ViewerWindow **existingWindows = new ViewerWindow *[nWindows + 1]; + for(i = 0, c = 0; i < maxWindows; ++i) + { + if(windows[i] != 0) + existingWindows[c++] = windows[i]; + } + + // + // Loop over the saved windows either using their information to + // resize existing windows or to create new windows. + // + int numExistingWindows = nWindows; + for(i = 0; i < newNWindows; ++i) + { + // + // Read the location and size for the window. + // + DataNode *windowINode = windowsNode->GetChildren()[i]; + if((sizeNode = windowINode->GetNode("windowSize")) != 0 && + (locationNode = windowINode->GetNode("windowLocation")) != 0) + { + // We're able to read in the size and location. + int w, h, x, y; + w = sizeNode->AsIntArray()[0]; + h = sizeNode->AsIntArray()[1]; + x = locationNode->AsIntArray()[0]; + y = locationNode->AsIntArray()[1]; + + // If we're considering an existing window, just set the + // size and position. + if(i < numExistingWindows) + { + existingWindows[i]->SetSize(w, h); + existingWindows[i]->SetLocation(x, y); + } + // We have the size for a window that does not exist yet so + // create the vis window with the correct size. + else + { + for(int windowIndex = 0; + windowIndex < maxWindows; + ++windowIndex) + { + if(windows[windowIndex] == 0) + { + // Create the vis window so that it has the + // right size and location. + CreateVisWindow(windowIndex, w, h, x, y); + + // HACK - set the location again because it could + // be shifted a little by some window managers. + windows[windowIndex]->SetLocation(x, y); + break; + } + } + } + } + else if(nWindows < newNWindows) + AddWindow(); + } + + delete [] existingWindows; } -#endif // // Load window-specific information. // DataNode **wNodes = windowsNode->GetChildren(); int childCount = 0; - for(int i = 0; i < maxWindows; ++i) + for(i = 0; i < maxWindows; ++i) { - if(windows[i] != 0 && childCount < windowsNode->GetNumChildren()) + if(windows[i] != 0 && childCount < newNWindows) windows[i]->SetFromNode(wNodes[childCount++]); } + + // + // Set the active window. + // + DataNode *node; + if((node = searchNode->GetNode("activeWindow")) != 0) + { + int n = node->AsInt(); + if(n >= 0 && n < nWindows && windows[n] != 0) + SetActiveWindow(n + 1); + else + UpdateAllAtts(); + } + else + UpdateAllAtts(); + + // + // Set the lineout window. + // + for(i = 0; i < maxWindows; ++i) + { + if(windows[i] != 0 && windows[i]->GetTypeIsCurve()) + { + lineoutWindow = i; + break; + } + } } diff --git a/viewer/main/ViewerWindowManager.h b/viewer/main/ViewerWindowManager.h index 2538cc3ac6d4ccc5eed15dfc4a2db638c954418a..ce688c7302d9e24d6c04bbb35b0eaa7beecc7edb 100644 --- a/viewer/main/ViewerWindowManager.h +++ b/viewer/main/ViewerWindowManager.h @@ -234,6 +234,9 @@ typedef struct { // Brad Whitlock, Mon Jun 30 12:39:19 PDT 2003 // Added methods to save/read state. // +// Brad Whitlock, Wed Jul 23 13:56:03 PST 2003 +// Removed AddInitialWindows method. +// // **************************************************************************** class VIEWER_API ViewerWindowManager : public QObject @@ -249,7 +252,6 @@ class VIEWER_API ViewerWindowManager : public QObject void SetPreshift(const char *windowPreshift); void SetGeometry(const char *windowGeometry); - void AddInitialWindows(); void AddWindow(bool copyAtts = false); void CloneWindow(); void ClearAllWindows(); @@ -336,7 +338,7 @@ class VIEWER_API ViewerWindowManager : public QObject void BeginEngineExecute(); void EndEngineExecute(); - void CreateNode(DataNode *parentNode); + void CreateNode(DataNode *parentNode, bool detailed); void SetFromNode(DataNode *parentNode); static GlobalAttributes *GetClientAtts(); diff --git a/viewer/main/ViewerWindowManagerAttributes.C b/viewer/main/ViewerWindowManagerAttributes.C index 23c7726512bcbf81d260e42fe6d3d42908e5ec49..9f1f9f765c0ecd8c9f5382c08c4ae29dd79168a4 100644 --- a/viewer/main/ViewerWindowManagerAttributes.C +++ b/viewer/main/ViewerWindowManagerAttributes.C @@ -11,15 +11,14 @@ // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // // **************************************************************************** -ViewerWindowManagerAttributes::ViewerWindowManagerAttributes() : AttributeSubject("ii*i*i*i*a*") +ViewerWindowManagerAttributes::ViewerWindowManagerAttributes() : AttributeSubject("a*") { - nWindows = 1; // Initialize the action groups. DataNode *parentNode = new DataNode("parent"); parentNode->AddNode(new DataNode("ViewerWindowManagerAttributes")); @@ -37,21 +36,16 @@ ViewerWindowManagerAttributes::ViewerWindowManagerAttributes() : AttributeSubjec // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // // **************************************************************************** -ViewerWindowManagerAttributes::ViewerWindowManagerAttributes(const ViewerWindowManagerAttributes &obj) : AttributeSubject("ii*i*i*i*a*") +ViewerWindowManagerAttributes::ViewerWindowManagerAttributes(const ViewerWindowManagerAttributes &obj) : AttributeSubject("a*") { AttributeGroupVector::const_iterator pos; - nWindows = obj.nWindows; - windowX = obj.windowX; - windowY = obj.windowY; - windowWidth = obj.windowWidth; - windowHeight = obj.windowHeight; // *** Copy the actionConfigurations field *** // Delete the AttributeGroup objects and clear the vector. for(pos = actionConfigurations.begin(); pos != actionConfigurations.end(); ++pos) @@ -80,7 +74,7 @@ ViewerWindowManagerAttributes::ViewerWindowManagerAttributes(const ViewerWindowM // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -104,7 +98,7 @@ ViewerWindowManagerAttributes::~ViewerWindowManagerAttributes() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -115,11 +109,6 @@ ViewerWindowManagerAttributes::operator = (const ViewerWindowManagerAttributes & { AttributeGroupVector::const_iterator pos; - nWindows = obj.nWindows; - windowX = obj.windowX; - windowY = obj.windowY; - windowWidth = obj.windowWidth; - windowHeight = obj.windowHeight; // *** Copy the actionConfigurations field *** // Delete the AttributeGroup objects and clear the vector. for(pos = actionConfigurations.begin(); pos != actionConfigurations.end(); ++pos) @@ -148,7 +137,7 @@ ViewerWindowManagerAttributes::operator = (const ViewerWindowManagerAttributes & // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -169,12 +158,7 @@ ViewerWindowManagerAttributes::operator == (const ViewerWindowManagerAttributes } // Create the return value - return ((nWindows == obj.nWindows) && - (windowX == obj.windowX) && - (windowY == obj.windowY) && - (windowWidth == obj.windowWidth) && - (windowHeight == obj.windowHeight) && - actionConfigurations_equal); + return (actionConfigurations_equal); } // **************************************************************************** @@ -186,7 +170,7 @@ ViewerWindowManagerAttributes::operator == (const ViewerWindowManagerAttributes // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -207,7 +191,7 @@ ViewerWindowManagerAttributes::operator != (const ViewerWindowManagerAttributes // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -228,7 +212,7 @@ ViewerWindowManagerAttributes::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -256,7 +240,7 @@ ViewerWindowManagerAttributes::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -273,6 +257,33 @@ ViewerWindowManagerAttributes::CreateCompatible(const std::string &tname) const return retval; } +// **************************************************************************** +// Method: ViewerWindowManagerAttributes::NewInstance +// +// Purpose: +// NewInstance method for the ViewerWindowManagerAttributes class. +// +// Note: Autogenerated by xml2atts. +// +// Programmer: xml2atts +// Creation: Wed Jul 23 14:02:19 PST 2003 +// +// Modifications: +// +// **************************************************************************** + +AttributeSubject * +ViewerWindowManagerAttributes::NewInstance(bool copy) const +{ + AttributeSubject *retval = 0; + if(copy) + retval = new ViewerWindowManagerAttributes(*this); + else + retval = new ViewerWindowManagerAttributes; + + return retval; +} + // **************************************************************************** // Method: ViewerWindowManagerAttributes::SelectAll // @@ -282,7 +293,7 @@ ViewerWindowManagerAttributes::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -291,12 +302,7 @@ ViewerWindowManagerAttributes::CreateCompatible(const std::string &tname) const void ViewerWindowManagerAttributes::SelectAll() { - Select(0, (void *)&nWindows); - Select(1, (void *)&windowX); - Select(2, (void *)&windowY); - Select(3, (void *)&windowWidth); - Select(4, (void *)&windowHeight); - Select(5, (void *)&actionConfigurations); + Select(0, (void *)&actionConfigurations); } // **************************************************************************** @@ -308,7 +314,7 @@ ViewerWindowManagerAttributes::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -336,6 +342,8 @@ ViewerWindowManagerAttributes::CreateSubAttributeGroup(int) // Creation: Wed Feb 5 12:27:55 PDT 2003 // // Modifications: +// Brad Whitlock, Wed Jul 23 14:00:55 PST 2003 +// Removed window size, location coding. // // **************************************************************************** @@ -347,11 +355,6 @@ ViewerWindowManagerAttributes::CreateNode(DataNode *parentNode, bool) // Create a node for ViewerWindowManagerAttributes. DataNode *node = new DataNode("ViewerWindowManagerAttributes"); - node->AddNode(new DataNode("nWindows", nWindows)); - node->AddNode(new DataNode("windowX", windowX)); - node->AddNode(new DataNode("windowY", windowY)); - node->AddNode(new DataNode("windowWidth", windowWidth)); - node->AddNode(new DataNode("windowHeight", windowHeight)); DataNode *attNode = new DataNode("ActionConfigurations"); for(int i = 0; i < actionConfigurations.size(); ++i) actionConfigurations[i]->CreateNode(attNode, true); @@ -374,6 +377,8 @@ ViewerWindowManagerAttributes::CreateNode(DataNode *parentNode, bool) // Creation: Wed Feb 5 12:27:55 PDT 2003 // // Modifications: +// Brad Whitlock, Wed Jul 23 14:00:55 PST 2003 +// Removed window size, location coding. // // **************************************************************************** @@ -387,19 +392,6 @@ ViewerWindowManagerAttributes::SetFromNode(DataNode *parentNode) if(searchNode == 0) return; - DataNode *node; - DataNode **children; - if((node = searchNode->GetNode("nWindows")) != 0) - SetNWindows(node->AsInt()); - if((node = searchNode->GetNode("windowX")) != 0) - SetWindowX(node->AsIntVector()); - if((node = searchNode->GetNode("windowY")) != 0) - SetWindowY(node->AsIntVector()); - if((node = searchNode->GetNode("windowWidth")) != 0) - SetWindowWidth(node->AsIntVector()); - if((node = searchNode->GetNode("windowHeight")) != 0) - SetWindowHeight(node->AsIntVector()); - // Look for the action configuration. DataNode *attNode = searchNode->GetNode("ActionConfigurations"); if(attNode) @@ -409,7 +401,7 @@ ViewerWindowManagerAttributes::SetFromNode(DataNode *parentNode) // Go through all of the children and construct a new // ActionGroupDescription for each one of them. - children = attNode->GetChildren(); + DataNode **children = attNode->GetChildren(); for(int i = 0; i < attNode->GetNumChildren(); ++i) { if(children[i]->GetKey() == "ActionGroupDescription") @@ -425,99 +417,10 @@ ViewerWindowManagerAttributes::SetFromNode(DataNode *parentNode) // Set property methods /////////////////////////////////////////////////////////////////////////////// -void -ViewerWindowManagerAttributes::SetNWindows(int nWindows_) -{ - nWindows = nWindows_; - Select(0, (void *)&nWindows); -} - -void -ViewerWindowManagerAttributes::SetWindowX(const intVector &windowX_) -{ - windowX = windowX_; - Select(1, (void *)&windowX); -} - -void -ViewerWindowManagerAttributes::SetWindowY(const intVector &windowY_) -{ - windowY = windowY_; - Select(2, (void *)&windowY); -} - -void -ViewerWindowManagerAttributes::SetWindowWidth(const intVector &windowWidth_) -{ - windowWidth = windowWidth_; - Select(3, (void *)&windowWidth); -} - -void -ViewerWindowManagerAttributes::SetWindowHeight(const intVector &windowHeight_) -{ - windowHeight = windowHeight_; - Select(4, (void *)&windowHeight); -} - /////////////////////////////////////////////////////////////////////////////// // Get property methods /////////////////////////////////////////////////////////////////////////////// -int -ViewerWindowManagerAttributes::GetNWindows() const -{ - return nWindows; -} - -const intVector & -ViewerWindowManagerAttributes::GetWindowX() const -{ - return windowX; -} - -intVector & -ViewerWindowManagerAttributes::GetWindowX() -{ - return windowX; -} - -const intVector & -ViewerWindowManagerAttributes::GetWindowY() const -{ - return windowY; -} - -intVector & -ViewerWindowManagerAttributes::GetWindowY() -{ - return windowY; -} - -const intVector & -ViewerWindowManagerAttributes::GetWindowWidth() const -{ - return windowWidth; -} - -intVector & -ViewerWindowManagerAttributes::GetWindowWidth() -{ - return windowWidth; -} - -const intVector & -ViewerWindowManagerAttributes::GetWindowHeight() const -{ - return windowHeight; -} - -intVector & -ViewerWindowManagerAttributes::GetWindowHeight() -{ - return windowHeight; -} - const AttributeGroupVector & ViewerWindowManagerAttributes::GetActionConfigurations() const { @@ -530,40 +433,6 @@ ViewerWindowManagerAttributes::GetActionConfigurations() return actionConfigurations; } -/////////////////////////////////////////////////////////////////////////////// -// Select property methods -/////////////////////////////////////////////////////////////////////////////// - -void -ViewerWindowManagerAttributes::SelectWindowX() -{ - Select(1, (void *)&windowX); -} - -void -ViewerWindowManagerAttributes::SelectWindowY() -{ - Select(2, (void *)&windowY); -} - -void -ViewerWindowManagerAttributes::SelectWindowWidth() -{ - Select(3, (void *)&windowWidth); -} - -void -ViewerWindowManagerAttributes::SelectWindowHeight() -{ - Select(4, (void *)&windowHeight); -} - -void -ViewerWindowManagerAttributes::SelectActionConfigurations() -{ - Select(5, (void *)&actionConfigurations); -} - /////////////////////////////////////////////////////////////////////////////// // AttributeGroupVector convenience methods. /////////////////////////////////////////////////////////////////////////////// @@ -577,7 +446,7 @@ ViewerWindowManagerAttributes::SelectActionConfigurations() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -590,7 +459,7 @@ ViewerWindowManagerAttributes::AddActionGroupDescription(const ActionGroupDescri actionConfigurations.push_back(newActionGroupDescription); // Indicate that things have changed by selecting it. - Select(5, (void *)&actionConfigurations); + Select(0, (void *)&actionConfigurations); } // **************************************************************************** @@ -602,7 +471,7 @@ ViewerWindowManagerAttributes::AddActionGroupDescription(const ActionGroupDescri // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -618,7 +487,7 @@ ViewerWindowManagerAttributes::ClearActionGroupDescriptions() actionConfigurations.clear(); // Indicate that things have changed by selecting the list. - Select(5, (void *)&actionConfigurations); + Select(0, (void *)&actionConfigurations); } // **************************************************************************** @@ -630,7 +499,7 @@ ViewerWindowManagerAttributes::ClearActionGroupDescriptions() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -653,7 +522,7 @@ ViewerWindowManagerAttributes::RemoveActionGroupDescription(int index) } // Indicate that things have changed by selecting the list. - Select(5, (void *)&actionConfigurations); + Select(0, (void *)&actionConfigurations); } // **************************************************************************** @@ -665,7 +534,7 @@ ViewerWindowManagerAttributes::RemoveActionGroupDescription(int index) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -686,7 +555,7 @@ ViewerWindowManagerAttributes::GetNumActionGroupDescriptions() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -707,7 +576,7 @@ ViewerWindowManagerAttributes::GetActionGroupDescription(int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -728,7 +597,7 @@ ViewerWindowManagerAttributes::GetActionGroupDescription(int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -749,7 +618,7 @@ ViewerWindowManagerAttributes::operator [] (int i) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -774,7 +643,7 @@ ViewerWindowManagerAttributes::operator [] (int i) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -785,12 +654,7 @@ ViewerWindowManagerAttributes::GetFieldName(int index) const { switch (index) { - case 0: return "nWindows"; - case 1: return "windowX"; - case 2: return "windowY"; - case 3: return "windowWidth"; - case 4: return "windowHeight"; - case 5: return "actionConfigurations"; + case 0: return "actionConfigurations"; default: return "invalid index"; } } @@ -804,7 +668,7 @@ ViewerWindowManagerAttributes::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -815,12 +679,7 @@ ViewerWindowManagerAttributes::GetFieldType(int index) const { switch (index) { - case 0: return FieldType_int; - case 1: return FieldType_intVector; - case 2: return FieldType_intVector; - case 3: return FieldType_intVector; - case 4: return FieldType_intVector; - case 5: return FieldType_attVector; + case 0: return FieldType_attVector; default: return FieldType_unknown; } } @@ -834,7 +693,7 @@ ViewerWindowManagerAttributes::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -845,12 +704,7 @@ ViewerWindowManagerAttributes::GetFieldTypeName(int index) const { switch (index) { - case 0: return "int"; - case 1: return "intVector"; - case 2: return "intVector"; - case 3: return "intVector"; - case 4: return "intVector"; - case 5: return "attVector"; + case 0: return "attVector"; default: return "invalid index"; } } @@ -864,7 +718,7 @@ ViewerWindowManagerAttributes::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -880,31 +734,6 @@ ViewerWindowManagerAttributes::FieldsEqual(int index_, const AttributeGroup *rhs switch (index_) { case 0: - { // new scope - retval = (nWindows == obj.nWindows); - } - break; - case 1: - { // new scope - retval = (windowX == obj.windowX); - } - break; - case 2: - { // new scope - retval = (windowY == obj.windowY); - } - break; - case 3: - { // new scope - retval = (windowWidth == obj.windowWidth); - } - break; - case 4: - { // new scope - retval = (windowHeight == obj.windowHeight); - } - break; - case 5: { // new scope bool actionConfigurations_equal = (obj.actionConfigurations.size() == actionConfigurations.size()); for(i = 0; (i < actionConfigurations.size()) && actionConfigurations_equal; ++i) diff --git a/viewer/main/ViewerWindowManagerAttributes.code b/viewer/main/ViewerWindowManagerAttributes.code index b74025d719481804115aac3ac417f0eb4970b603..3e05e19f6870d07637600f09e4ac03c4b5b990bb 100644 --- a/viewer/main/ViewerWindowManagerAttributes.code +++ b/viewer/main/ViewerWindowManagerAttributes.code @@ -21,6 +21,8 @@ Definition: // Creation: Wed Feb 5 12:27:55 PDT 2003 // // Modifications: +// Brad Whitlock, Wed Jul 23 14:00:55 PST 2003 +// Removed window size, location coding. // // **************************************************************************** @@ -32,11 +34,6 @@ ViewerWindowManagerAttributes::CreateNode(DataNode *parentNode, bool) // Create a node for ViewerWindowManagerAttributes. DataNode *node = new DataNode("ViewerWindowManagerAttributes"); - node->AddNode(new DataNode("nWindows", nWindows)); - node->AddNode(new DataNode("windowX", windowX)); - node->AddNode(new DataNode("windowY", windowY)); - node->AddNode(new DataNode("windowWidth", windowWidth)); - node->AddNode(new DataNode("windowHeight", windowHeight)); DataNode *attNode = new DataNode("ActionConfigurations"); for(int i = 0; i < actionConfigurations.size(); ++i) actionConfigurations[i]->CreateNode(attNode, true); @@ -63,6 +60,8 @@ Definition: // Creation: Wed Feb 5 12:27:55 PDT 2003 // // Modifications: +// Brad Whitlock, Wed Jul 23 14:00:55 PST 2003 +// Removed window size, location coding. // // **************************************************************************** @@ -76,19 +75,6 @@ ViewerWindowManagerAttributes::SetFromNode(DataNode *parentNode) if(searchNode == 0) return; - DataNode *node; - DataNode **children; - if((node = searchNode->GetNode("nWindows")) != 0) - SetNWindows(node->AsInt()); - if((node = searchNode->GetNode("windowX")) != 0) - SetWindowX(node->AsIntVector()); - if((node = searchNode->GetNode("windowY")) != 0) - SetWindowY(node->AsIntVector()); - if((node = searchNode->GetNode("windowWidth")) != 0) - SetWindowWidth(node->AsIntVector()); - if((node = searchNode->GetNode("windowHeight")) != 0) - SetWindowHeight(node->AsIntVector()); - // Look for the action configuration. DataNode *attNode = searchNode->GetNode("ActionConfigurations"); if(attNode) @@ -98,7 +84,7 @@ ViewerWindowManagerAttributes::SetFromNode(DataNode *parentNode) // Go through all of the children and construct a new // ActionGroupDescription for each one of them. - children = attNode->GetChildren(); + DataNode **children = attNode->GetChildren(); for(int i = 0; i < attNode->GetNumChildren(); ++i) { if(children[i]->GetKey() == "ActionGroupDescription") diff --git a/viewer/main/ViewerWindowManagerAttributes.h b/viewer/main/ViewerWindowManagerAttributes.h index 239c5f63e2384b5356a55d9dc7bae8d317070206..015752515b3302ca724d4d8db99acc0276b68153 100644 --- a/viewer/main/ViewerWindowManagerAttributes.h +++ b/viewer/main/ViewerWindowManagerAttributes.h @@ -13,7 +13,7 @@ class ActionGroupDescription; // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jun 24 11:35:39 PDT 2003 +// Creation: Wed Jul 23 14:02:19 PST 2003 // // Modifications: // @@ -33,33 +33,16 @@ public: virtual const std::string TypeName() const; virtual bool CopyAttributes(const AttributeGroup *); virtual AttributeSubject *CreateCompatible(const std::string &) const; + virtual AttributeSubject *NewInstance(bool) const; // Property selection methods virtual void SelectAll(); - void SelectWindowX(); - void SelectWindowY(); - void SelectWindowWidth(); - void SelectWindowHeight(); void SelectActionConfigurations(); // Property setting methods - void SetNWindows(int nWindows_); - void SetWindowX(const intVector &windowX_); - void SetWindowY(const intVector &windowY_); - void SetWindowWidth(const intVector &windowWidth_); - void SetWindowHeight(const intVector &windowHeight_); void SetActionConfigurations(const AttributeGroupVector &actionConfigurations_); // Property getting methods - int GetNWindows() const; - const intVector &GetWindowX() const; - intVector &GetWindowX(); - const intVector &GetWindowY() const; - intVector &GetWindowY(); - const intVector &GetWindowWidth() const; - intVector &GetWindowWidth(); - const intVector &GetWindowHeight() const; - intVector &GetWindowHeight(); const AttributeGroupVector &GetActionConfigurations() const; AttributeGroupVector &GetActionConfigurations(); @@ -94,11 +77,6 @@ public: protected: AttributeGroup *CreateSubAttributeGroup(int index); private: - int nWindows; - intVector windowX; - intVector windowY; - intVector windowWidth; - intVector windowHeight; AttributeGroupVector actionConfigurations; }; diff --git a/viewer/main/ViewerWindowManagerAttributes.xml b/viewer/main/ViewerWindowManagerAttributes.xml index 56d6d89192fd5e905090a99c37a0baf54c92da37..c42cfa3d5d311dbcdbbb5ce0688d348607fbfe56 100644 --- a/viewer/main/ViewerWindowManagerAttributes.xml +++ b/viewer/main/ViewerWindowManagerAttributes.xml @@ -1,16 +1,5 @@ - - 1 - - - - - - - - - diff --git a/viewer/proxy/ViewerProxy.C b/viewer/proxy/ViewerProxy.C index d02350e535f4243efcb185330657fbd5875c5b08..4893e6ab0dc4291a12e359f36598475e24c61c10 100644 --- a/viewer/proxy/ViewerProxy.C +++ b/viewer/proxy/ViewerProxy.C @@ -3069,6 +3069,55 @@ ViewerProxy::WriteConfigFile() viewerRPC->Notify(); } +// **************************************************************************** +// Method: ViewerProxy::ExportEntireState +// +// Purpose: +// Tells the viewer to dump its entire state to an XML file. +// +// Arguments: +// filename : The name of the file used to write the state. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 9 11:58:00 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerProxy::ExportEntireState(const std::string &filename) +{ + viewerRPC->SetRPCType(ViewerRPC::ExportEntireStateRPC); + viewerRPC->SetVariable(filename); + viewerRPC->Notify(); +} + +// **************************************************************************** +// Method: ViewerProxy::ImportEntireState +// +// Purpose: +// Tells the viewer to set its entire state using the values stored in +// the named file. +// +// Arguments: +// filename : The name of the file to read for the state. +// +// Programmer: Brad Whitlock +// Creation: Wed Jul 9 11:58:23 PDT 2003 +// +// Modifications: +// +// **************************************************************************** + +void +ViewerProxy::ImportEntireState(const std::string &filename) +{ + viewerRPC->SetRPCType(ViewerRPC::ImportEntireStateRPC); + viewerRPC->SetVariable(filename); + viewerRPC->Notify(); +} + // **************************************************************************** // Method: ViewerProxy::SetView2D // diff --git a/viewer/proxy/ViewerProxy.h b/viewer/proxy/ViewerProxy.h index e1d49e718494f2903402bc3b0da8ea740ab39a27..dc86ae3083d4964a61bad1d67fa3a863b2b8ec65 100644 --- a/viewer/proxy/ViewerProxy.h +++ b/viewer/proxy/ViewerProxy.h @@ -281,6 +281,9 @@ class Xfer; // Brad Whitlock, Tue Jul 1 16:45:31 PST 2003 // I added a method to export color tables. // +// Brad Whitlock, Wed Jul 9 11:54:15 PDT 2003 +// I added methods to export and import the viewer's entire state. +// // **************************************************************************** class VIEWER_PROXY_API ViewerProxy : public SimpleObserver @@ -429,6 +432,8 @@ class VIEWER_PROXY_API ViewerProxy : public SimpleObserver void SetPickAttributes(); void WriteConfigFile(); + void ExportEntireState(const std::string &filename); + void ImportEntireState(const std::string &filename); // Methods for dealing with plot SIL restrictions. avtSILRestriction_p GetPlotSILRestriction() diff --git a/viewer/rpc/ViewerRPC.C b/viewer/rpc/ViewerRPC.C index 4e35f8abf4341df604c92cc5b0bf253f2b7006c7..a943a74964a11e3fd8acde6f8b378dbc32479e0a 100644 --- a/viewer/rpc/ViewerRPC.C +++ b/viewer/rpc/ViewerRPC.C @@ -45,7 +45,8 @@ static const char *ViewerRPCType_strings[] = { "EnableToolbarRPC", "HideToolbarsRPC", "HideToolbarsForAllWindowsRPC", "ShowToolbarsRPC", "ShowToolbarsForAllWindowsRPC", "SaveViewRPC", "SetGlobalLineoutAttributesRPC", "SetPickAttributesRPC", "ExportColorTableRPC", -"MaxRPC"}; +"ExportEntireStateRPC", "ImportEntireStateRPC", "MaxRPC" +}; std::string ViewerRPC::ViewerRPCType_ToString(ViewerRPC::ViewerRPCType t) @@ -62,7 +63,7 @@ ViewerRPC::ViewerRPCType_ToString(int t) bool ViewerRPC::ViewerRPCType_FromString(const std::string &s, ViewerRPC::ViewerRPCType &val) { - for(int i = 0; i < 115; ++i) + for(int i = 0; i < 117; ++i) { if(s == ViewerRPCType_strings[i]) { @@ -82,7 +83,7 @@ ViewerRPC::ViewerRPCType_FromString(const std::string &s, ViewerRPC::ViewerRPCTy // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -123,7 +124,7 @@ ViewerRPC::ViewerRPC() : AttributeSubject("iiiissss*iiIiiisi*i*i*ssDDs*ibiii") // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -180,7 +181,7 @@ ViewerRPC::ViewerRPC(const ViewerRPC &obj) : AttributeSubject("iiiissss*iiIiiisi // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -200,7 +201,7 @@ ViewerRPC::~ViewerRPC() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -258,7 +259,7 @@ ViewerRPC::operator = (const ViewerRPC &obj) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -324,7 +325,7 @@ ViewerRPC::operator == (const ViewerRPC &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -345,7 +346,7 @@ ViewerRPC::operator != (const ViewerRPC &obj) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -366,7 +367,7 @@ ViewerRPC::TypeName() const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -394,7 +395,7 @@ ViewerRPC::CopyAttributes(const AttributeGroup *atts) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -420,7 +421,7 @@ ViewerRPC::CreateCompatible(const std::string &tname) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -472,7 +473,7 @@ ViewerRPC::SelectAll() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -676,7 +677,7 @@ ViewerRPC::CreateNode(DataNode *parentNode, bool forceAdd) // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -1323,7 +1324,7 @@ ViewerRPC::SelectQueryVariables() // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -1375,7 +1376,7 @@ ViewerRPC::GetFieldName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -1427,7 +1428,7 @@ ViewerRPC::GetFieldType(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -1479,7 +1480,7 @@ ViewerRPC::GetFieldTypeName(int index) const // Note: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // diff --git a/viewer/rpc/ViewerRPC.h b/viewer/rpc/ViewerRPC.h index 515314de6a9f0b1d2a1dc6856cadeeb35190936a..42ab73958327b8f1dbe24ac802313951af04a3a8 100644 --- a/viewer/rpc/ViewerRPC.h +++ b/viewer/rpc/ViewerRPC.h @@ -13,7 +13,7 @@ // Notes: Autogenerated by xml2atts. // // Programmer: xml2atts -// Creation: Tue Jul 1 16:49:15 PST 2003 +// Creation: Thu Jul 10 11:40:29 PDT 2003 // // Modifications: // @@ -138,6 +138,8 @@ public: SetGlobalLineoutAttributesRPC, SetPickAttributesRPC, ExportColorTableRPC, + ExportEntireStateRPC, + ImportEntireStateRPC, MaxRPC }; diff --git a/viewer/rpc/ViewerRPC.xml b/viewer/rpc/ViewerRPC.xml index 48e0e90025fc2e791d2b2246dcd6a1219ffdbd55..a2e421f4975fff596b1089c8e4ce2706e17fbc14 100644 --- a/viewer/rpc/ViewerRPC.xml +++ b/viewer/rpc/ViewerRPC.xml @@ -115,6 +115,8 @@ SetGlobalLineoutAttributesRPC SetPickAttributesRPC ExportColorTableRPC + ExportEntireStateRPC + ImportEntireStateRPC MaxRPC