Commit 87439c66 authored by bonnell's avatar bonnell

Correct parsing error for ray-casted volume plots in log-scale mode for...

Correct parsing error for ray-casted volume plots in log-scale mode for compound vars (foo/bar/density).

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23047 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3a3d9b41
......@@ -1178,6 +1178,9 @@ CreateViewInfoFromViewAttributes(avtViewInfo &vi, const View3DAttributes &view)
// Simplify setup of log/skew variables for ease of reference in rest of
// volume plot.
//
// Kathleen Biagas, Thu Mar 20 14:58:49 PDT 2014
// Surround var with '<>' when used in expression. (Log and Skew scaling).
//
// ****************************************************************************
avtContract_p
......@@ -1215,11 +1218,11 @@ avtVolumeFilter::ModifyContract(avtContract_p contract)
{
char m[16];
SNPRINTF(m, 16, "%f", atts.GetColorVarMin());
SNPRINTF(exprDef, 128, "log10withmin(%s, %s)", var, m);
SNPRINTF(exprDef, 128, "log10withmin(<%s>, %s)", var, m);
}
else
{
SNPRINTF(exprDef, 128, "log10(%s)", var);
SNPRINTF(exprDef, 128, "log10(<%s>)", var);
}
avtDataRequest_p nds = new avtDataRequest(exprName.c_str(),
ds->GetTimestep(), ds->GetRestriction());
......@@ -1236,7 +1239,7 @@ avtVolumeFilter::ModifyContract(avtContract_p contract)
else // VolumeAttributes::Skew)
{
setupExpr = true;
SNPRINTF(exprDef, 128, "var_skew(%s, %f)", var,
SNPRINTF(exprDef, 128, "var_skew(<%s>, %f)", var,
atts.GetSkewFactor());
avtDataRequest_p nds =
new avtDataRequest(exprName.c_str(),
......
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="Content-Language" content="en-us">
<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
<title>VisIt 2.7.3 Release Notes</title>
</head>
<body>
<center><b><font size="6">VisIt 2.7.3 Release Notes</font></b></center>
<p>Welcome to VisIt's release notes page. Release 2.7.3 is primarily a
bug fix release to release 2.7. It fixes additional bugs in release
2.7. Look <a href="relnotes2.7.0.html">here</a> to see a complete
list of changes in release 2.7.</p>
<p><b><font size="4">Configuration changes in version 2.7.3</font></b></p>
<ul>
<li></li>
<li></li>
</ul>
<p><b><font size="4">Bugs fixed in version 2.7.3</font></b></p>
<ul>
<li>The failure of ray-casted volume plot to correctly parse a compound var (eg <i>"foo/bar/density"</i>) when in log-scale mode was corrected (<a href="https://visitbugs.ornl.gov/issues/1778">ticket #1778</a>).</li>
<li></li>
</ul>
<p><b><font size="4">Enhancements in version 2.7.3</font></b></p>
<ul>
<li></li>
<li></li>
</ul>
<a name="Dev_changes"></a>
<p><b><font size="4">Changes for VisIt developers in version 2.7.3</font></b></p>
<ul>
<li></li>
<li></li>
</ul>
<p>Click the following link to view the release notes for the previous
version of VisIt: <a href="relnotes2.7.2.html">VisIt 2.7.2 Release Notes</a>.</p>
</body>
</html>
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