Commit 56a01276 authored by allens's avatar allens

added test for recomputing and removed topo test in teh set atts

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23515 18c085ea-50e0-402c-830e-de6fd14e8384
parent c08749b6
......@@ -69,18 +69,33 @@ Definition:
bool
PseudocolorAttributes::ChangesRequireRecalculation(const PseudocolorAttributes &obj) const
{
bool needSecondaryVar = obj.pointSizeVarEnabled &&
pointSizeVar != obj.pointSizeVar &&
obj.pointSizeVar != "default" &&
obj.pointSizeVar != "" &&
obj.pointSizeVar != "\0";
bool needSecondaryVar = (obj.pointType != Point &&
obj.pointType != Sphere &&
obj.pointSizeVarEnabled &&
pointSizeVar != obj.pointSizeVar &&
obj.pointSizeVar != "default" &&
obj.pointSizeVar != "" &&
obj.pointSizeVar != "\0") ||
(obj.lineType == Tube &&
obj.varyTubeRadius &&
varyTubeRadiusVariable != obj.varyTubeRadiusVariable &&
obj.varyTubeRadiusVariable != "default" &&
obj.varyTubeRadiusVariable != "" &&
obj.varyTubeRadiusVariable != "\0") ||
(obj.opacityType == VariableRange &&
opacityVariable != obj.opacityVariable &&
obj.opacityVariable != "default" &&
obj.opacityVariable != "" &&
obj.opacityVariable != "\0");
return (centering != obj.centering ||
needSecondaryVar ||
smoothingLevel != obj.smoothingLevel ||
renderSurfaces != obj.renderSurfaces ||
renderWireframe != obj.renderWireframe ||
renderPoints != obj.renderPoints ||
// renderSurfaces != obj.renderSurfaces ||
// renderWireframe != obj.renderWireframe ||
// renderPoints != obj.renderPoints ||
0);
}
......
......@@ -2575,18 +2575,33 @@ PseudocolorAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
bool
PseudocolorAttributes::ChangesRequireRecalculation(const PseudocolorAttributes &obj) const
{
bool needSecondaryVar = obj.pointSizeVarEnabled &&
pointSizeVar != obj.pointSizeVar &&
obj.pointSizeVar != "default" &&
obj.pointSizeVar != "" &&
obj.pointSizeVar != "\0";
bool needSecondaryVar = (obj.pointType != Point &&
obj.pointType != Sphere &&
obj.pointSizeVarEnabled &&
pointSizeVar != obj.pointSizeVar &&
obj.pointSizeVar != "default" &&
obj.pointSizeVar != "" &&
obj.pointSizeVar != "\0") ||
(obj.lineType == Tube &&
obj.varyTubeRadius &&
varyTubeRadiusVariable != obj.varyTubeRadiusVariable &&
obj.varyTubeRadiusVariable != "default" &&
obj.varyTubeRadiusVariable != "" &&
obj.varyTubeRadiusVariable != "\0") ||
(obj.opacityType == VariableRange &&
opacityVariable != obj.opacityVariable &&
obj.opacityVariable != "default" &&
obj.opacityVariable != "" &&
obj.opacityVariable != "\0");
return (centering != obj.centering ||
needSecondaryVar ||
smoothingLevel != obj.smoothingLevel ||
renderSurfaces != obj.renderSurfaces ||
renderWireframe != obj.renderWireframe ||
renderPoints != obj.renderPoints ||
// renderSurfaces != obj.renderSurfaces ||
// renderWireframe != obj.renderWireframe ||
// renderPoints != obj.renderPoints ||
0);
}
......
......@@ -584,6 +584,8 @@ avtPseudocolorPlot::SetAtts(const AttributeGroup *a)
SetLighting(atts.GetLightingFlag());
SetLegend(atts.GetLegendFlag());
SetScaling(atts.GetScaling(), atts.GetSkewFactor());
SetLimitsMode(atts.GetLimitsMode());
glyphMapper->SetLineWidth(Int2LineWidth(atts.GetLineWidth()));
glyphMapper->SetLineStyle(Int2LineStyle(atts.GetLineStyle()));
......@@ -615,7 +617,7 @@ avtPseudocolorPlot::SetAtts(const AttributeGroup *a)
}
// ARS - FIX ME - FIX ME - FIX ME - FIX ME - FIX ME
if( (topoDim == 1 || (topoDim > 1 && atts.GetRenderWireframe())) &&
if( //(topoDim == 1 || (topoDim > 1 && atts.GetRenderWireframe())) &&
atts.GetLineType() == PseudocolorAttributes::Tube &&
atts.GetVaryTubeRadius() == true &&
atts.GetVaryTubeRadiusVariable() != "" &&
......@@ -636,7 +638,7 @@ avtPseudocolorPlot::SetAtts(const AttributeGroup *a)
// glyphMapper->TubeScalingOff();
}
if( (topoDim == 0 || (topoDim > 0 && atts.GetRenderPoints())) &&
if( //(topoDim == 0 || (topoDim > 0 && atts.GetRenderPoints())) &&
atts.GetPointType() != PseudocolorAttributes::Point &&
atts.GetPointType() != PseudocolorAttributes::Sphere &&
atts.GetPointSizeVarEnabled() &&
......@@ -647,7 +649,7 @@ avtPseudocolorPlot::SetAtts(const AttributeGroup *a)
{
if (varname != NULL)
glyphMapper->ScaleByVar(varname);
}
}
else
{
glyphMapper->ScaleByVar(atts.GetPointSizeVar());
......@@ -681,9 +683,6 @@ avtPseudocolorPlot::SetAtts(const AttributeGroup *a)
{
glyphMapper->ColorByScalarOn(std::string(varname));
}
SetScaling(atts.GetScaling(), atts.GetSkewFactor());
SetLimitsMode(atts.GetLimitsMode());
}
......
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