Commit 7d101a01 authored by hrchilds's avatar hrchilds

Update from March 27, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@644 18c085ea-50e0-402c-830e-de6fd14e8384
parent 014c66b7
......@@ -786,6 +786,10 @@ avtDatabase::GetNewMetaData(int timeState, bool forceReadAllCyclesTimes)
// Hank Childs, Thu Sep 22 15:49:34 PDT 2005
// Change side_volume to min_side_volume. Add edge length as well.
//
// Brad Whitlock, Thu Mar 23 09:38:44 PDT 2006
// Added code to limit the number of meshes that receive mesh quality
// expressions to 10.
//
// ****************************************************************************
void
......@@ -800,6 +804,8 @@ avtDatabase::AddMeshQualityExpressions(avtDatabaseMetaData *md)
};
int nmeshes = md->GetNumMeshes();
if (nmeshes > 10)
nmeshes = 10;
for (int i = 0 ; i < nmeshes ; i++)
{
const avtMeshMetaData *mmd = md->GetMesh(i);
......
......@@ -1397,6 +1397,9 @@ QvisGUIApplication::Quit()
// Brad Whitlock, Wed Jan 11 17:17:45 PST 2006
// I added code to parse -nowindowmetrics.
//
// Brad Whitlock, Fri Mar 24 14:17:48 PST 2006
// Added support for specifying virtual databases on the command line.
//
// ****************************************************************************
void
......@@ -1446,12 +1449,46 @@ QvisGUIApplication::ProcessArguments(int &argc, char **argv)
{
#if defined(_WIN32)
std::string tmpFileName(LongFileName(argv[i+1]));
#else
std::string tmpFileName(argv[i+1]);
#endif
// Remove quotes around the string if any exist.
if(tmpFileName.size() > 0 &&
(tmpFileName[0] == '\'' || tmpFileName[0] == '\"'))
{
tmpFileName = tmpFileName.substr(1, tmpFileName.size()-1);
}
// Remove quotes around the string if any exist.
if(tmpFileName.size() > 0 &&
(tmpFileName[tmpFileName.size()-1] == '\'' ||
tmpFileName[tmpFileName.size()-1] == '\"'))
{
tmpFileName = tmpFileName.substr(0, tmpFileName.size()-1);
}
// If the string contains a "*" and the end of the string is
// not " database" then add that suffix.
std::string suffix(" database");
if(tmpFileName.find("*") != std::string::npos)
{
if(tmpFileName.size() > suffix.size())
{
std::string tail(tmpFileName.substr(
tmpFileName.size()-suffix.size(), suffix.size()));
if(tail != suffix)
tmpFileName += suffix;
}
else
tmpFileName += suffix;
}
#if defined(_WIN32)
// Add localhost to the start if a drive was given.
if(tmpFileName.substr(1,2) == ":\\")
tmpFileName = std::string("localhost:") + tmpFileName;
loadFile = QualifiedFilename(tmpFileName);
#else
loadFile = QualifiedFilename(argv[i + 1]);
#endif
debug1 << "The -o option filename is: " << tmpFileName.c_str() << endl;
loadFile = QualifiedFilename(tmpFileName);
}
else
{
......
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