Commit b3bdd69c authored by hrchilds's avatar hrchilds
Browse files

Merge RC to trunk, picking up Chombo UMR fix and Cyrus' expression

windows fix.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10154 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4c474c29
......@@ -116,6 +116,9 @@ using std::string;
// Gunther H. Weber, Tue Sep 15 11:26:12 PDT 2009
// Added support for 3D mappings for 2D files.
//
// Hank Childs, Fri Mar 5 13:16:52 PST 2010
// Initialize hasParticles.
//
// ****************************************************************************
avtChomboFileFormat::avtChomboFileFormat(const char *filename,
......@@ -130,6 +133,7 @@ avtChomboFileFormat::avtChomboFileFormat(const char *filename,
checkForMappingFile = true;
mappingFileExists = false;
mappingIs3D = false;
hasParticles = false;
if (atts != NULL)
{
for (int i = 0; i < atts->GetNumberOfOptions(); ++i)
......
......@@ -923,14 +923,20 @@ QvisExpressionsWindow::UpdateWindowSensitivity()
// Programmer: Jeremy Meredith
// Creation: October 10, 2004
//
// Modifications:
// Cyrus Harrison, Fri Mar 5 13:22:24 PST 2010
// Block signals from all edits related to python filters.
//
// ****************************************************************************
void
QvisExpressionsWindow::BlockAllSignals(bool block)
{
exprListBox->blockSignals(block);
nameEdit->blockSignals(block);
stdEditorWidget->blockSignals(block);
pyEditorWidget->blockSignals(block);
stdDefinitionEdit->blockSignals(block);
pyArgsEdit->blockSignals(block);
pyFilterEdit->blockSignals(block);
}
// ****************************************************************************
......@@ -1388,7 +1394,7 @@ QvisExpressionsWindow::UpdatePythonExpression()
}
// ****************************************************************************
// Method: QvisExpressionsWindow::UpdatePythonExpressionEditor
// Method: QvisExpressionsWindow::ParsePythonExpression
//
// Purpose:
// Attempts to extract a python expression from given expression
......
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