Skip to content

GitLab

Commit 6a95cb98 authored by allens's avatar allens
Browse files
Options

clean up of the secondary vars for tubes and moved adding them from the plot to the filter 

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@27631 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1c792ad4
Hide whitespace changes
Inline Side-by-side
Showing with 277 additions and 382 deletions
plots/Pseudocolor/Pseudocolor.code
View file @ 6a95cb98
......@@ -78,11 +78,11 @@ PseudocolorAttributes::ChangesRequireRecalculation(const PseudocolorAttributes &
obj.pointSizeVar != "\0") ||
(obj.lineType == Tube &&
obj.varyTubeRadius &&
varyTubeRadiusVariable != obj.varyTubeRadiusVariable &&
obj.varyTubeRadiusVariable != "default" &&
obj.varyTubeRadiusVariable != "" &&
obj.varyTubeRadiusVariable != "\0") ||
obj.tubeRadiusVarEnabled &&
tubeRadiusVar != obj.tubeRadiusVar &&
obj.tubeRadiusVar != "default" &&
obj.tubeRadiusVar != "" &&
obj.tubeRadiusVar != "\0") ||
(obj.opacityType == VariableRange &&
opacityVariable != obj.opacityVariable &&
......@@ -286,4 +286,3 @@ PseudocolorAttributes::ProcessOldVersions(DataNode *parentNode,
}
}
}
plots/Pseudocolor/Pseudocolor.xml
View file @ 6a95cb98
......@@ -116,7 +116,7 @@
<Field name="pointSizeVarEnabled" label="Point size by var enabled" type="bool">
false
</Field>
<Field name="pointSizeVar" label="Point size by var" type="variablename" vartypes="01000000000">
<Field name="pointSizeVar" label="Point size variable" type="variablename" vartypes="01000000000">
default
</Field>
<Field name="pointSizePixels" label="Point size pixels" type="int">
......@@ -143,12 +143,12 @@
<Field name="tubeRadiusBBox" label="Radius (BBox Fraction)" type="double" enabler="tubeRadiusSizeType:FractionOfBBox">
0.005000
</Field>
<Field name="varyTubeRadius" label="varyTubeRadius" type="bool">
<Field name="tubeRadiusVarEnabled" label="Tube Radius by var enabled" type="bool">
false
</Field>
<Field name="varyTubeRadiusVariable" label="varyTubeRadiusVariable" type="string">
<Field name="tubeRadiusVar" label="Tube radius variable" type="string">
</Field>
<Field name="varyTubeRadiusFactor" label="varyTubeRadiusFactor" type="double">
<Field name="tubeRadiusVarFactor" label="Tube radius variable factor" type="double">
10.000000
</Field>
<Field name="endPointType" label="End point type" type="enum" subtype="EndPointType">
......
plots/Pseudocolor/PseudocolorAttributes.C
View file @ 6a95cb98
......@@ -422,8 +422,8 @@ void PseudocolorAttributes::Init()
tubeRadiusSizeType = FractionOfBBox;
tubeRadiusAbsolute = 0.125;
tubeRadiusBBox = 0.005;
varyTubeRadius = false;
varyTubeRadiusFactor = 10;
tubeRadiusVarEnabled = false;
tubeRadiusVarFactor = 10;
endPointType = None;
endPointStyle = Spheres;
endPointRadiusSizeType = FractionOfBBox;
......@@ -486,9 +486,9 @@ void PseudocolorAttributes::Copy(const PseudocolorAttributes &obj)
tubeRadiusSizeType = obj.tubeRadiusSizeType;
tubeRadiusAbsolute = obj.tubeRadiusAbsolute;
tubeRadiusBBox = obj.tubeRadiusBBox;
varyTubeRadius = obj.varyTubeRadius;
varyTubeRadiusVariable = obj.varyTubeRadiusVariable;
varyTubeRadiusFactor = obj.varyTubeRadiusFactor;
tubeRadiusVarEnabled = obj.tubeRadiusVarEnabled;
tubeRadiusVar = obj.tubeRadiusVar;
tubeRadiusVarFactor = obj.tubeRadiusVarFactor;
endPointType = obj.endPointType;
endPointStyle = obj.endPointStyle;
endPointRadiusSizeType = obj.endPointRadiusSizeType;
......@@ -689,9 +689,9 @@ PseudocolorAttributes::operator == (const PseudocolorAttributes &obj) const
(tubeRadiusSizeType == obj.tubeRadiusSizeType) &&
(tubeRadiusAbsolute == obj.tubeRadiusAbsolute) &&
(tubeRadiusBBox == obj.tubeRadiusBBox) &&
(varyTubeRadius == obj.varyTubeRadius) &&
(varyTubeRadiusVariable == obj.varyTubeRadiusVariable) &&
(varyTubeRadiusFactor == obj.varyTubeRadiusFactor) &&
(tubeRadiusVarEnabled == obj.tubeRadiusVarEnabled) &&
(tubeRadiusVar == obj.tubeRadiusVar) &&
(tubeRadiusVarFactor == obj.tubeRadiusVarFactor) &&
(endPointType == obj.endPointType) &&
(endPointStyle == obj.endPointStyle) &&
(endPointRadiusSizeType == obj.endPointRadiusSizeType) &&
......@@ -876,9 +876,9 @@ PseudocolorAttributes::SelectAll()
Select(ID_tubeRadiusSizeType, (void *)&tubeRadiusSizeType);
Select(ID_tubeRadiusAbsolute, (void *)&tubeRadiusAbsolute);
Select(ID_tubeRadiusBBox, (void *)&tubeRadiusBBox);
Select(ID_varyTubeRadius, (void *)&varyTubeRadius);
Select(ID_varyTubeRadiusVariable, (void *)&varyTubeRadiusVariable);
Select(ID_varyTubeRadiusFactor, (void *)&varyTubeRadiusFactor);
Select(ID_tubeRadiusVarEnabled, (void *)&tubeRadiusVarEnabled);
Select(ID_tubeRadiusVar, (void *)&tubeRadiusVar);
Select(ID_tubeRadiusVarFactor, (void *)&tubeRadiusVarFactor);
Select(ID_endPointType, (void *)&endPointType);
Select(ID_endPointStyle, (void *)&endPointStyle);
Select(ID_endPointRadiusSizeType, (void *)&endPointRadiusSizeType);
......@@ -1097,22 +1097,22 @@ PseudocolorAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool
node->AddNode(new DataNode("tubeRadiusBBox", tubeRadiusBBox));
}
if(completeSave || !FieldsEqual(ID_varyTubeRadius, &defaultObject))
if(completeSave || !FieldsEqual(ID_tubeRadiusVarEnabled, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("varyTubeRadius", varyTubeRadius));
node->AddNode(new DataNode("tubeRadiusVarEnabled", tubeRadiusVarEnabled));
}
if(completeSave || !FieldsEqual(ID_varyTubeRadiusVariable, &defaultObject))
if(completeSave || !FieldsEqual(ID_tubeRadiusVar, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("varyTubeRadiusVariable", varyTubeRadiusVariable));
node->AddNode(new DataNode("tubeRadiusVar", tubeRadiusVar));
}
if(completeSave || !FieldsEqual(ID_varyTubeRadiusFactor, &defaultObject))
if(completeSave || !FieldsEqual(ID_tubeRadiusVarFactor, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("varyTubeRadiusFactor", varyTubeRadiusFactor));
node->AddNode(new DataNode("tubeRadiusVarFactor", tubeRadiusVarFactor));
}
if(completeSave || !FieldsEqual(ID_endPointType, &defaultObject))
......@@ -1379,12 +1379,12 @@ PseudocolorAttributes::SetFromNode(DataNode *parentNode)
SetTubeRadiusAbsolute(node->AsDouble());
if((node = searchNode->GetNode("tubeRadiusBBox")) != 0)
SetTubeRadiusBBox(node->AsDouble());
if((node = searchNode->GetNode("varyTubeRadius")) != 0)
SetVaryTubeRadius(node->AsBool());
if((node = searchNode->GetNode("varyTubeRadiusVariable")) != 0)
SetVaryTubeRadiusVariable(node->AsString());
if((node = searchNode->GetNode("varyTubeRadiusFactor")) != 0)
SetVaryTubeRadiusFactor(node->AsDouble());
if((node = searchNode->GetNode("tubeRadiusVarEnabled")) != 0)
SetTubeRadiusVarEnabled(node->AsBool());
if((node = searchNode->GetNode("tubeRadiusVar")) != 0)
SetTubeRadiusVar(node->AsString());
if((node = searchNode->GetNode("tubeRadiusVarFactor")) != 0)
SetTubeRadiusVarFactor(node->AsDouble());
if((node = searchNode->GetNode("endPointType")) != 0)
{
// Allow enums to be int or string in the config file
......@@ -1661,24 +1661,24 @@ PseudocolorAttributes::SetTubeRadiusBBox(double tubeRadiusBBox_)
}
void
PseudocolorAttributes::SetVaryTubeRadius(bool varyTubeRadius_)
PseudocolorAttributes::SetTubeRadiusVarEnabled(bool tubeRadiusVarEnabled_)
{
varyTubeRadius = varyTubeRadius_;
Select(ID_varyTubeRadius, (void *)&varyTubeRadius);
tubeRadiusVarEnabled = tubeRadiusVarEnabled_;
Select(ID_tubeRadiusVarEnabled, (void *)&tubeRadiusVarEnabled);
}
void
PseudocolorAttributes::SetVaryTubeRadiusVariable(const std::string &varyTubeRadiusVariable_)
PseudocolorAttributes::SetTubeRadiusVar(const std::string &tubeRadiusVar_)
{
varyTubeRadiusVariable = varyTubeRadiusVariable_;
Select(ID_varyTubeRadiusVariable, (void *)&varyTubeRadiusVariable);
tubeRadiusVar = tubeRadiusVar_;
Select(ID_tubeRadiusVar, (void *)&tubeRadiusVar);
}
void
PseudocolorAttributes::SetVaryTubeRadiusFactor(double varyTubeRadiusFactor_)
PseudocolorAttributes::SetTubeRadiusVarFactor(double tubeRadiusVarFactor_)
{
varyTubeRadiusFactor = varyTubeRadiusFactor_;
Select(ID_varyTubeRadiusFactor, (void *)&varyTubeRadiusFactor);
tubeRadiusVarFactor = tubeRadiusVarFactor_;
Select(ID_tubeRadiusVarFactor, (void *)&tubeRadiusVarFactor);
}
void
......@@ -1962,27 +1962,27 @@ PseudocolorAttributes::GetTubeRadiusBBox() const
}
bool
PseudocolorAttributes::GetVaryTubeRadius() const
PseudocolorAttributes::GetTubeRadiusVarEnabled() const
{
return varyTubeRadius;
return tubeRadiusVarEnabled;
}
const std::string &
PseudocolorAttributes::GetVaryTubeRadiusVariable() const
PseudocolorAttributes::GetTubeRadiusVar() const
{
return varyTubeRadiusVariable;
return tubeRadiusVar;
}
std::string &
PseudocolorAttributes::GetVaryTubeRadiusVariable()
PseudocolorAttributes::GetTubeRadiusVar()
{
return varyTubeRadiusVariable;
return tubeRadiusVar;
}
double
PseudocolorAttributes::GetVaryTubeRadiusFactor() const
PseudocolorAttributes::GetTubeRadiusVarFactor() const
{
return varyTubeRadiusFactor;
return tubeRadiusVarFactor;
}
PseudocolorAttributes::EndPointType
......@@ -2080,9 +2080,9 @@ PseudocolorAttributes::SelectPointSizeVar()
}
void
PseudocolorAttributes::SelectVaryTubeRadiusVariable()
PseudocolorAttributes::SelectTubeRadiusVar()
{
Select(ID_varyTubeRadiusVariable, (void *)&varyTubeRadiusVariable);
Select(ID_tubeRadiusVar, (void *)&tubeRadiusVar);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -2138,9 +2138,9 @@ PseudocolorAttributes::GetFieldName(int index) const
case ID_tubeRadiusSizeType: return "tubeRadiusSizeType";
case ID_tubeRadiusAbsolute: return "tubeRadiusAbsolute";
case ID_tubeRadiusBBox: return "tubeRadiusBBox";
case ID_varyTubeRadius: return "varyTubeRadius";
case ID_varyTubeRadiusVariable: return "varyTubeRadiusVariable";
case ID_varyTubeRadiusFactor: return "varyTubeRadiusFactor";
case ID_tubeRadiusVarEnabled: return "tubeRadiusVarEnabled";
case ID_tubeRadiusVar: return "tubeRadiusVar";
case ID_tubeRadiusVarFactor: return "tubeRadiusVarFactor";
case ID_endPointType: return "endPointType";
case ID_endPointStyle: return "endPointStyle";
case ID_endPointRadiusSizeType: return "endPointRadiusSizeType";
......@@ -2206,9 +2206,9 @@ PseudocolorAttributes::GetFieldType(int index) const
case ID_tubeRadiusSizeType: return FieldType_enum;
case ID_tubeRadiusAbsolute: return FieldType_double;
case ID_tubeRadiusBBox: return FieldType_double;
case ID_varyTubeRadius: return FieldType_bool;
case ID_varyTubeRadiusVariable: return FieldType_string;
case ID_varyTubeRadiusFactor: return FieldType_double;
case ID_tubeRadiusVarEnabled: return FieldType_bool;
case ID_tubeRadiusVar: return FieldType_string;
case ID_tubeRadiusVarFactor: return FieldType_double;
case ID_endPointType: return FieldType_enum;
case ID_endPointStyle: return FieldType_enum;
case ID_endPointRadiusSizeType: return FieldType_enum;
......@@ -2274,9 +2274,9 @@ PseudocolorAttributes::GetFieldTypeName(int index) const
case ID_tubeRadiusSizeType: return "enum";
case ID_tubeRadiusAbsolute: return "double";
case ID_tubeRadiusBBox: return "double";
case ID_varyTubeRadius: return "bool";
case ID_varyTubeRadiusVariable: return "string";
case ID_varyTubeRadiusFactor: return "double";
case ID_tubeRadiusVarEnabled: return "bool";
case ID_tubeRadiusVar: return "string";
case ID_tubeRadiusVarFactor: return "double";
case ID_endPointType: return "enum";
case ID_endPointStyle: return "enum";
case ID_endPointRadiusSizeType: return "enum";
......@@ -2460,19 +2460,19 @@ PseudocolorAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (tubeRadiusBBox == obj.tubeRadiusBBox);
}
break;
case ID_varyTubeRadius:
case ID_tubeRadiusVarEnabled:
{ // new scope
retval = (varyTubeRadius == obj.varyTubeRadius);
retval = (tubeRadiusVarEnabled == obj.tubeRadiusVarEnabled);
}
break;
case ID_varyTubeRadiusVariable:
case ID_tubeRadiusVar:
{ // new scope
retval = (varyTubeRadiusVariable == obj.varyTubeRadiusVariable);
retval = (tubeRadiusVar == obj.tubeRadiusVar);
}
break;
case ID_varyTubeRadiusFactor:
case ID_tubeRadiusVarFactor:
{ // new scope
retval = (varyTubeRadiusFactor == obj.varyTubeRadiusFactor);
retval = (tubeRadiusVarFactor == obj.tubeRadiusVarFactor);
}
break;
case ID_endPointType:
......@@ -2584,11 +2584,11 @@ PseudocolorAttributes::ChangesRequireRecalculation(const PseudocolorAttributes &
obj.pointSizeVar != "\0") ||
(obj.lineType == Tube &&
obj.varyTubeRadius &&
varyTubeRadiusVariable != obj.varyTubeRadiusVariable &&
obj.varyTubeRadiusVariable != "default" &&
obj.varyTubeRadiusVariable != "" &&
obj.varyTubeRadiusVariable != "\0") ||
obj.tubeRadiusVarEnabled &&
tubeRadiusVar != obj.tubeRadiusVar &&
obj.tubeRadiusVar != "default" &&
obj.tubeRadiusVar != "" &&
obj.tubeRadiusVar != "\0") ||
(obj.opacityType == VariableRange &&
opacityVariable != obj.opacityVariable &&
......
plots/Pseudocolor/PseudocolorAttributes.h
View file @ 6a95cb98
......@@ -149,7 +149,7 @@ public:
void SelectColorTableName();
void SelectOpacityVariable();
void SelectPointSizeVar();
void SelectVaryTubeRadiusVariable();
void SelectTubeRadiusVar();
// Property setting methods
void SetScaling(Scaling scaling_);
......@@ -181,9 +181,9 @@ public:
void SetTubeRadiusSizeType(SizeType tubeRadiusSizeType_);
void SetTubeRadiusAbsolute(double tubeRadiusAbsolute_);
void SetTubeRadiusBBox(double tubeRadiusBBox_);
void SetVaryTubeRadius(bool varyTubeRadius_);
void SetVaryTubeRadiusVariable(const std::string &varyTubeRadiusVariable_);
void SetVaryTubeRadiusFactor(double varyTubeRadiusFactor_);
void SetTubeRadiusVarEnabled(bool tubeRadiusVarEnabled_);
void SetTubeRadiusVar(const std::string &tubeRadiusVar_);
void SetTubeRadiusVarFactor(double tubeRadiusVarFactor_);
void SetEndPointType(EndPointType endPointType_);
void SetEndPointStyle(EndPointStyle endPointStyle_);
void SetEndPointRadiusSizeType(SizeType endPointRadiusSizeType_);
......@@ -230,10 +230,10 @@ public:
SizeType GetTubeRadiusSizeType() const;
double GetTubeRadiusAbsolute() const;
double GetTubeRadiusBBox() const;
bool GetVaryTubeRadius() const;
const std::string &GetVaryTubeRadiusVariable() const;
std::string &GetVaryTubeRadiusVariable();
double GetVaryTubeRadiusFactor() const;
bool GetTubeRadiusVarEnabled() const;
const std::string &GetTubeRadiusVar() const;
std::string &GetTubeRadiusVar();
double GetTubeRadiusVarFactor() const;
EndPointType GetEndPointType() const;
EndPointStyle GetEndPointStyle() const;
SizeType GetEndPointRadiusSizeType() const;
......@@ -340,9 +340,9 @@ public:
ID_tubeRadiusSizeType,
ID_tubeRadiusAbsolute,
ID_tubeRadiusBBox,
ID_varyTubeRadius,
ID_varyTubeRadiusVariable,
ID_varyTubeRadiusFactor,
ID_tubeRadiusVarEnabled,
ID_tubeRadiusVar,
ID_tubeRadiusVarFactor,
ID_endPointType,
ID_endPointStyle,
ID_endPointRadiusSizeType,
......@@ -388,9 +388,9 @@ private:
int tubeRadiusSizeType;
double tubeRadiusAbsolute;
double tubeRadiusBBox;
bool varyTubeRadius;
std::string varyTubeRadiusVariable;
double varyTubeRadiusFactor;
bool tubeRadiusVarEnabled;
std::string tubeRadiusVar;
double tubeRadiusVarFactor;
int endPointType;
int endPointStyle;
int endPointRadiusSizeType;
......
plots/Pseudocolor/PseudocolorAttributes.java
View file @ 6a95cb98
......@@ -137,9 +137,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
tubeRadiusSizeType = SIZETYPE_FRACTIONOFBBOX;
tubeRadiusAbsolute = 0.125;
tubeRadiusBBox = 0.005;
varyTubeRadius = false;
varyTubeRadiusVariable = new String("");
varyTubeRadiusFactor = 10;
tubeRadiusVarEnabled = false;
tubeRadiusVar = new String("");
tubeRadiusVarFactor = 10;
endPointType = ENDPOINTTYPE_NONE;
endPointStyle = ENDPOINTSTYLE_SPHERES;
endPointRadiusSizeType = SIZETYPE_FRACTIONOFBBOX;
......@@ -187,9 +187,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
tubeRadiusSizeType = SIZETYPE_FRACTIONOFBBOX;
tubeRadiusAbsolute = 0.125;
tubeRadiusBBox = 0.005;
varyTubeRadius = false;
varyTubeRadiusVariable = new String("");
varyTubeRadiusFactor = 10;
tubeRadiusVarEnabled = false;
tubeRadiusVar = new String("");
tubeRadiusVarFactor = 10;
endPointType = ENDPOINTTYPE_NONE;
endPointStyle = ENDPOINTSTYLE_SPHERES;
endPointRadiusSizeType = SIZETYPE_FRACTIONOFBBOX;
......@@ -237,9 +237,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
tubeRadiusSizeType = obj.tubeRadiusSizeType;
tubeRadiusAbsolute = obj.tubeRadiusAbsolute;
tubeRadiusBBox = obj.tubeRadiusBBox;
varyTubeRadius = obj.varyTubeRadius;
varyTubeRadiusVariable = new String(obj.varyTubeRadiusVariable);
varyTubeRadiusFactor = obj.varyTubeRadiusFactor;
tubeRadiusVarEnabled = obj.tubeRadiusVarEnabled;
tubeRadiusVar = new String(obj.tubeRadiusVar);
tubeRadiusVarFactor = obj.tubeRadiusVarFactor;
endPointType = obj.endPointType;
endPointStyle = obj.endPointStyle;
endPointRadiusSizeType = obj.endPointRadiusSizeType;
......@@ -298,9 +298,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
(tubeRadiusSizeType == obj.tubeRadiusSizeType) &&
(tubeRadiusAbsolute == obj.tubeRadiusAbsolute) &&
(tubeRadiusBBox == obj.tubeRadiusBBox) &&
(varyTubeRadius == obj.varyTubeRadius) &&
(varyTubeRadiusVariable.equals(obj.varyTubeRadiusVariable)) &&
(varyTubeRadiusFactor == obj.varyTubeRadiusFactor) &&
(tubeRadiusVarEnabled == obj.tubeRadiusVarEnabled) &&
(tubeRadiusVar.equals(obj.tubeRadiusVar)) &&
(tubeRadiusVarFactor == obj.tubeRadiusVarFactor) &&
(endPointType == obj.endPointType) &&
(endPointStyle == obj.endPointStyle) &&
(endPointRadiusSizeType == obj.endPointRadiusSizeType) &&
......@@ -493,21 +493,21 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
Select(28);
}
public void SetVaryTubeRadius(boolean varyTubeRadius_)
public void SetTubeRadiusVarEnabled(boolean tubeRadiusVarEnabled_)
{
varyTubeRadius = varyTubeRadius_;
tubeRadiusVarEnabled = tubeRadiusVarEnabled_;
Select(29);
}
public void SetVaryTubeRadiusVariable(String varyTubeRadiusVariable_)
public void SetTubeRadiusVar(String tubeRadiusVar_)
{
varyTubeRadiusVariable = varyTubeRadiusVariable_;
tubeRadiusVar = tubeRadiusVar_;
Select(30);
}
public void SetVaryTubeRadiusFactor(double varyTubeRadiusFactor_)
public void SetTubeRadiusVarFactor(double tubeRadiusVarFactor_)
{
varyTubeRadiusFactor = varyTubeRadiusFactor_;
tubeRadiusVarFactor = tubeRadiusVarFactor_;
Select(31);
}
......@@ -613,9 +613,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
public int GetTubeRadiusSizeType() { return tubeRadiusSizeType; }
public double GetTubeRadiusAbsolute() { return tubeRadiusAbsolute; }
public double GetTubeRadiusBBox() { return tubeRadiusBBox; }
public boolean GetVaryTubeRadius() { return varyTubeRadius; }
public String GetVaryTubeRadiusVariable() { return varyTubeRadiusVariable; }
public double GetVaryTubeRadiusFactor() { return varyTubeRadiusFactor; }
public boolean GetTubeRadiusVarEnabled() { return tubeRadiusVarEnabled; }
public String GetTubeRadiusVar() { return tubeRadiusVar; }
public double GetTubeRadiusVarFactor() { return tubeRadiusVarFactor; }
public int GetEndPointType() { return endPointType; }
public int GetEndPointStyle() { return endPointStyle; }
public int GetEndPointRadiusSizeType() { return endPointRadiusSizeType; }
......@@ -691,11 +691,11 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
if(WriteSelect(28, buf))
buf.WriteDouble(tubeRadiusBBox);
if(WriteSelect(29, buf))
buf.WriteBool(varyTubeRadius);
buf.WriteBool(tubeRadiusVarEnabled);
if(WriteSelect(30, buf))
buf.WriteString(varyTubeRadiusVariable);
buf.WriteString(tubeRadiusVar);
if(WriteSelect(31, buf))
buf.WriteDouble(varyTubeRadiusFactor);
buf.WriteDouble(tubeRadiusVarFactor);
if(WriteSelect(32, buf))
buf.WriteInt(endPointType);
if(WriteSelect(33, buf))
......@@ -814,13 +814,13 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
SetTubeRadiusBBox(buf.ReadDouble());
break;
case 29:
SetVaryTubeRadius(buf.ReadBool());
SetTubeRadiusVarEnabled(buf.ReadBool());
break;
case 30:
SetVaryTubeRadiusVariable(buf.ReadString());
SetTubeRadiusVar(buf.ReadString());
break;
case 31:
SetVaryTubeRadiusFactor(buf.ReadDouble());
SetTubeRadiusVarFactor(buf.ReadDouble());
break;
case 32:
SetEndPointType(buf.ReadInt());
......@@ -952,9 +952,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
str = str + "\n";
str = str + doubleToString("tubeRadiusAbsolute", tubeRadiusAbsolute, indent) + "\n";
str = str + doubleToString("tubeRadiusBBox", tubeRadiusBBox, indent) + "\n";
str = str + boolToString("varyTubeRadius", varyTubeRadius, indent) + "\n";
str = str + stringToString("varyTubeRadiusVariable", varyTubeRadiusVariable, indent) + "\n";
str = str + doubleToString("varyTubeRadiusFactor", varyTubeRadiusFactor, indent) + "\n";
str = str + boolToString("tubeRadiusVarEnabled", tubeRadiusVarEnabled, indent) + "\n";
str = str + stringToString("tubeRadiusVar", tubeRadiusVar, indent) + "\n";
str = str + doubleToString("tubeRadiusVarFactor", tubeRadiusVarFactor, indent) + "\n";
str = str + indent + "endPointType = ";
if(endPointType == ENDPOINTTYPE_NONE)
str = str + "ENDPOINTTYPE_NONE";
......@@ -1020,9 +1020,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
private int tubeRadiusSizeType;
private double tubeRadiusAbsolute;
private double tubeRadiusBBox;
private boolean varyTubeRadius;
private String varyTubeRadiusVariable;
private double varyTubeRadiusFactor;
private boolean tubeRadiusVarEnabled;
private String tubeRadiusVar;
private double tubeRadiusVarFactor;
private int endPointType;
private int endPointStyle;
private int endPointRadiusSizeType;
......
plots/Pseudocolor/PyPseudocolorAttributes.C
View file @ 6a95cb98
......@@ -293,14 +293,14 @@ PyPseudocolorAttributes_ToString(const PseudocolorAttributes *atts, const char *
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%stubeRadiusBBox = %g\n", prefix, atts->GetTubeRadiusBBox());
str += tmpStr;
if(atts->GetVaryTubeRadius())
SNPRINTF(tmpStr, 1000, "%svaryTubeRadius = 1\n", prefix);
if(atts->GetTubeRadiusVarEnabled())
SNPRINTF(tmpStr, 1000, "%stubeRadiusVarEnabled = 1\n", prefix);
else
SNPRINTF(tmpStr, 1000, "%svaryTubeRadius = 0\n", prefix);
SNPRINTF(tmpStr, 1000, "%stubeRadiusVarEnabled = 0\n", prefix);
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%svaryTubeRadiusVariable = \"%s\"\n", prefix, atts->GetVaryTubeRadiusVariable().c_str());
SNPRINTF(tmpStr, 1000, "%stubeRadiusVar = \"%s\"\n", prefix, atts->GetTubeRadiusVar().c_str());
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%svaryTubeRadiusFactor = %g\n", prefix, atts->GetVaryTubeRadiusFactor());
SNPRINTF(tmpStr, 1000, "%stubeRadiusVarFactor = %g\n", prefix, atts->GetTubeRadiusVarFactor());
str += tmpStr;
const char *endPointType_names = "None, Tails, Heads, Both";
switch (atts->GetEndPointType())
......@@ -1162,7 +1162,7 @@ PseudocolorAttributes_GetTubeRadiusBBox(PyObject *self, PyObject *args)
}
/*static*/ PyObject *
PseudocolorAttributes_SetVaryTubeRadius(PyObject *self, PyObject *args)
PseudocolorAttributes_SetTubeRadiusVarEnabled(PyObject *self, PyObject *args)
{
PseudocolorAttributesObject *obj = (PseudocolorAttributesObject *)self;
......@@ -1170,23 +1170,23 @@ PseudocolorAttributes_SetVaryTubeRadius(PyObject *self, PyObject *args)
if(!PyArg_ParseTuple(args, "i", &ival))
return NULL;
// Set the varyTubeRadius in the object.
obj->data->SetVaryTubeRadius(ival != 0);
// Set the tubeRadiusVarEnabled in the object.
obj->data->SetTubeRadiusVarEnabled(ival != 0);
Py_INCREF(Py_None);
return Py_None;
}
/*static*/ PyObject *
PseudocolorAttributes_GetVaryTubeRadius(PyObject *self, PyObject *args)
PseudocolorAttributes_GetTubeRadiusVarEnabled(PyObject *self, PyObject *args)
{
PseudocolorAttributesObject *obj = (PseudocolorAttributesObject *)self;
PyObject *retval = PyInt_FromLong(obj->data->GetVaryTubeRadius()?1L:0L);
PyObject *retval = PyInt_FromLong(obj->data->GetTubeRadiusVarEnabled()?1L:0L);
return retval;
}
/*static*/ PyObject *
PseudocolorAttributes_SetVaryTubeRadiusVariable(PyObject *self, PyObject *args)
PseudocolorAttributes_SetTubeRadiusVar(PyObject *self, PyObject *args)
{
PseudocolorAttributesObject *obj = (PseudocolorAttributesObject *)self;
......@@ -1194,23 +1194,23 @@ PseudocolorAttributes_SetVaryTubeRadiusVariable(PyObject *self, PyObject *args)
if(!PyArg_ParseTuple(args, "s", &str))
return NULL;
// Set the varyTubeRadiusVariable in the object.
obj->data->SetVaryTubeRadiusVariable(std::string(str));
// Set the tubeRadiusVar in the object.
obj->data->SetTubeRadiusVar(std::string(str));
Py_INCREF(Py_None);
return Py_None;
}
/*static*/ PyObject *
PseudocolorAttributes_GetVaryTubeRadiusVariable(PyObject *self, PyObject *args)
PseudocolorAttributes_GetTubeRadiusVar(PyObject *self, PyObject *args)
{
PseudocolorAttributesObject *obj = (PseudocolorAttributesObject *)self;