Commit dfa400a8 authored by bonnell's avatar bonnell
Browse files

Fix data level comparison wizard so it does not create expression with nested <>

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23330 18c085ea-50e0-402c-830e-de6fd14e8384
parent 86ef8efe
......@@ -1547,13 +1547,13 @@ QvisCMFEWizard::AddCMFEExpression(void)
else if (decision_donorType == DONOR_TIME_SLICES)
{
if (decision_timeType == TIME_TYPE_SIMTIME)
SNPRINTF(file_var_part, 1024, "<[%f]t%s:%s>", decision_time,
SNPRINTF(file_var_part, 1024, "[%f]t%s:%s", decision_time,
(decision_absolute ? "" : "d"), decision_variable.c_str());
else if (decision_timeType == TIME_TYPE_SIMCYCLE)
SNPRINTF(file_var_part, 1024, "<[%d]c%s:%s>", decision_cycle,
SNPRINTF(file_var_part, 1024, "[%d]c%s:%s", decision_cycle,
(decision_absolute ? "" : "d"), decision_variable.c_str());
else if (decision_timeType == TIME_TYPE_INDEX)
SNPRINTF(file_var_part, 1024, "<[%d]i%s:%s>", decision_index,
SNPRINTF(file_var_part, 1024, "[%d]i%s:%s", decision_index,
(decision_absolute ? "" : "d"), decision_variable.c_str());
}
......@@ -1572,9 +1572,9 @@ QvisCMFEWizard::AddCMFEExpression(void)
if (decision_fill == FILL_CONSTANT)
SNPRINTF(fillstr, 1024, "%f", decision_fillval);
else
strcpy(fillstr, decision_fillvar.c_str());
SNPRINTF(fillstr, 1024, "<%s>", decision_fillvar.c_str());
SNPRINTF(cmfe_part, 1024, "pos_cmfe(<%s>, <%s>, <%s>)",
SNPRINTF(cmfe_part, 1024, "pos_cmfe(<%s>, <%s>, %s)",
file_var_part, decision_mesh.c_str(), fillstr);
}
......@@ -2408,10 +2408,9 @@ QvisCMFEWizard::addDonor()
std::string donor;
if( decision_donorType == DONOR_SINGLE_DATABASE )
donor = std::string("<[0]id:") + decision_variable + std::string(">");
donor = std::string("[0]id:") + decision_variable;
else if( decision_donorType == DONOR_MULTIPLE_DATABASES )
donor = std::string("<") + std::string(src) + std::string(":") +
decision_variable + std::string(">");
donor = std::string(src) + std::string(":") + decision_variable ;
QListWidgetItem *item;
......
......@@ -37,6 +37,7 @@ list of changes in release 2.7.</p>
<li>Fixed a bug in saving multiple lineout curves.</li>
<li>The internal launcher was modified so that VisIt would work on systems where the OpenGL libraries were located in the LD_LIBRARY_PATH.</li>
<li>The VisItSetMPICommunicator() function in libsim was fixed.</li>
<li>Datalevel comparison wizard was fixed so that it doesn't create expressions with nested <>.</li>
</ul>
<p><b><font size="4">Enhancements in version 2.7.3</font></b></p>
......
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