Commit 90a17551 authored by pugmire's avatar pugmire
Browse files

Merge from 2.0RC


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10139 18c085ea-50e0-402c-830e-de6fd14e8384
parent 347a415f
......@@ -3697,7 +3697,6 @@ avtDatabaseMetaData::IsTimeAccurate(int ts) const
// Modifications:
// Mark C. Miller, Tue Mar 6 23:40:10 PST 2007
// Corrected logic for monotone increasing
//
// ****************************************************************************
bool
......@@ -3947,7 +3946,6 @@ avtDatabaseMetaData::ReplaceForbiddenCharacters(std::vector<char> &badChars,
GetCurves(i).originalName.c_str(),
replacementName.c_str());
IssueWarning(msg);
cout<<msg<<endl;
GetCurves(i).name = replacementName;
}
}
......
......@@ -429,6 +429,9 @@ Definition:
// Hank Childs, Tue Jul 19 13:24:19 PDT 2005
// Added support for arrays.
//
// Dave Pugmire, Thu Mar 4 10:27:17 EST 2010
// Added support for curves.
//
// ****************************************************************************
static bool IsForbidden(std::string &origName, std::string &newName,
......@@ -618,10 +621,23 @@ avtDatabaseMetaData::ReplaceForbiddenCharacters(std::vector<char> &badChars,
replacementStr))
GetMaterials(i).meshName = replacementName;
}
/*
* Do not do curves. They have so many spaces, special chars, etc.
*
*/
for (i = 0; i < GetNumCurves(); i++)
{
if (GetCurves(i).originalName == "")
GetCurves(i).originalName = GetCurves(i).name;
if (IsForbidden(GetCurves(i).originalName, replacementName, badChars,
replacementStr))
{
char msg[1024];
SNPRINTF(msg, 1024, "The database contains an object named \"%s\""
", which contains characters not supported by "
"VisIt. VisIt is renaming it to \"%s\"",
GetCurves(i).originalName.c_str(),
replacementName.c_str());
IssueWarning(msg);
GetCurves(i).name = replacementName;
}
}
for (i = 0 ; i < GetNumLabels() ; i++)
{
if (GetLabels(i).originalName == "")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment