Commit d36a1861 authored by whitlocb's avatar whitlocb

Fixed the invertColorTable setting in the Contour plot.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@25643 18c085ea-50e0-402c-830e-de6fd14e8384
parent e0a3f2a8
......@@ -981,7 +981,6 @@ GlobalAttributes::SetFromNode(DataNode *parentNode)
}
if((node = searchNode->GetNode("removeDuplicateNodes")) != 0)
{
cerr <<" setting SetRemoveDup to " << node->AsBool() << endl;
SetRemoveDuplicateNodes(node->AsBool());
}
}
......
......@@ -647,31 +647,31 @@ ContourAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forc
else
delete defaultPaletteNode;
if(completeSave || completeSave || !FieldsEqual(2, &defaultObject))
if(completeSave || !FieldsEqual(ID_colorType, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("colorType", ColoringMethod_ToString(colorType)));
}
if(completeSave || completeSave || !FieldsEqual(3, &defaultObject))
if(completeSave || !FieldsEqual(ID_colorTableName, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("colorTableName", colorTableName));
}
if(completeSave || completeSave || !FieldsEqual(4, &defaultObject))
if(completeSave || !FieldsEqual(ID_legendFlag, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("legendFlag", legendFlag));
}
if(completeSave || !FieldsEqual(5, &defaultObject))
if(completeSave || !FieldsEqual(ID_lineStyle, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("lineStyle", lineStyle));
}
if(completeSave || !FieldsEqual(6, &defaultObject))
if(completeSave || !FieldsEqual(ID_lineWidth, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("lineWidth", lineWidth));
......@@ -686,66 +686,71 @@ ContourAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forc
else
delete singleColorNode;
if(completeSave || !FieldsEqual(9, &defaultObject))
if(completeSave || !FieldsEqual(ID_contourNLevels, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("contourNLevels", contourNLevels));
}
if(completeSave || !FieldsEqual(10, &defaultObject))
if(completeSave || !FieldsEqual(ID_contourValue, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("contourValue", contourValue));
}
if(completeSave || !FieldsEqual(11, &defaultObject))
if(completeSave || !FieldsEqual(ID_contourPercent, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("contourPercent", contourPercent));
}
if(completeSave || !FieldsEqual(12, &defaultObject))
if(completeSave || !FieldsEqual(ID_contourMethod, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("contourMethod", Select_by_ToString(contourMethod)));
}
if(completeSave || !FieldsEqual(13, &defaultObject))
if(completeSave || !FieldsEqual(ID_minFlag, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("minFlag", minFlag));
}
if(completeSave || !FieldsEqual(14, &defaultObject))
if(completeSave || !FieldsEqual(ID_maxFlag, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("maxFlag", maxFlag));
}
if(completeSave || !FieldsEqual(15, &defaultObject))
if(completeSave || !FieldsEqual(ID_min, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("min", min));
}
if(completeSave || !FieldsEqual(16, &defaultObject))
if(completeSave || !FieldsEqual(ID_max, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("max", max));
}
if(completeSave || !FieldsEqual(17, &defaultObject))
if(completeSave || !FieldsEqual(ID_scaling, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("scaling", Scaling_ToString(scaling)));
}
if(completeSave || !FieldsEqual(18, &defaultObject))
if(completeSave || !FieldsEqual(ID_wireframe, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("wireframe", wireframe));
}
if(completeSave || !FieldsEqual(ID_invertColorTable, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("invertColorTable", invertColorTable));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
......@@ -806,6 +811,8 @@ ContourAttributes::SetFromNode(DataNode *parentNode)
SetColorTableName(node->AsString());
if((node = searchNode->GetNode("legendFlag")) != 0)
SetLegendFlag(node->AsBool());
if((node = searchNode->GetNode("invertColorTable")) != 0)
SetInvertColorTable(node->AsBool());
if((node = searchNode->GetNode("lineStyle")) != 0)
SetLineStyle(node->AsInt());
if((node = searchNode->GetNode("lineWidth")) != 0)
......
......@@ -293,31 +293,31 @@ ContourAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forc
else
delete defaultPaletteNode;
if(completeSave || completeSave || !FieldsEqual(2, &defaultObject))
if(completeSave || !FieldsEqual(ID_colorType, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("colorType", ColoringMethod_ToString(colorType)));
}
if(completeSave || completeSave || !FieldsEqual(3, &defaultObject))
if(completeSave || !FieldsEqual(ID_colorTableName, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("colorTableName", colorTableName));
}
if(completeSave || completeSave || !FieldsEqual(4, &defaultObject))
if(completeSave || !FieldsEqual(ID_legendFlag, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("legendFlag", legendFlag));
}
if(completeSave || !FieldsEqual(5, &defaultObject))
if(completeSave || !FieldsEqual(ID_lineStyle, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("lineStyle", lineStyle));
}
if(completeSave || !FieldsEqual(6, &defaultObject))
if(completeSave || !FieldsEqual(ID_lineWidth, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("lineWidth", lineWidth));
......@@ -332,66 +332,71 @@ ContourAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool forc
else
delete singleColorNode;
if(completeSave || !FieldsEqual(9, &defaultObject))
if(completeSave || !FieldsEqual(ID_contourNLevels, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("contourNLevels", contourNLevels));
}
if(completeSave || !FieldsEqual(10, &defaultObject))
if(completeSave || !FieldsEqual(ID_contourValue, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("contourValue", contourValue));
}
if(completeSave || !FieldsEqual(11, &defaultObject))
if(completeSave || !FieldsEqual(ID_contourPercent, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("contourPercent", contourPercent));
}
if(completeSave || !FieldsEqual(12, &defaultObject))
if(completeSave || !FieldsEqual(ID_contourMethod, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("contourMethod", Select_by_ToString(contourMethod)));
}
if(completeSave || !FieldsEqual(13, &defaultObject))
if(completeSave || !FieldsEqual(ID_minFlag, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("minFlag", minFlag));
}
if(completeSave || !FieldsEqual(14, &defaultObject))
if(completeSave || !FieldsEqual(ID_maxFlag, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("maxFlag", maxFlag));
}
if(completeSave || !FieldsEqual(15, &defaultObject))
if(completeSave || !FieldsEqual(ID_min, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("min", min));
}
if(completeSave || !FieldsEqual(16, &defaultObject))
if(completeSave || !FieldsEqual(ID_max, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("max", max));
}
if(completeSave || !FieldsEqual(17, &defaultObject))
if(completeSave || !FieldsEqual(ID_scaling, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("scaling", Scaling_ToString(scaling)));
}
if(completeSave || !FieldsEqual(18, &defaultObject))
if(completeSave || !FieldsEqual(ID_wireframe, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("wireframe", wireframe));
}
if(completeSave || !FieldsEqual(ID_invertColorTable, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("invertColorTable", invertColorTable));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
......@@ -456,6 +461,8 @@ ContourAttributes::SetFromNode(DataNode *parentNode)
SetColorTableName(node->AsString());
if((node = searchNode->GetNode("legendFlag")) != 0)
SetLegendFlag(node->AsBool());
if((node = searchNode->GetNode("invertColorTable")) != 0)
SetInvertColorTable(node->AsBool());
if((node = searchNode->GetNode("lineStyle")) != 0)
SetLineStyle(node->AsInt());
if((node = searchNode->GetNode("lineWidth")) != 0)
......
......@@ -99,6 +99,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Fixed the Histogram plot so that individual bins can count up to the largest integer that can be stored in a double.</li>
<li>Added the full path to the szip and zlib libraries for both OSX and Linux in the bv_cgns.sh build_visit support file.</li>
<li>The visual representations for the Line, Sphere, and Box tools have been fixed so that they are once again visible.</li>
<li>The Contour plot's invertColorTable setting was not stored in session files.</li>
</ul>
<a name="Dev_changes"></a>
......
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