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

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
...@@ -78,11 +78,11 @@ PseudocolorAttributes::ChangesRequireRecalculation(const PseudocolorAttributes & ...@@ -78,11 +78,11 @@ PseudocolorAttributes::ChangesRequireRecalculation(const PseudocolorAttributes &
obj.pointSizeVar != "\0") || obj.pointSizeVar != "\0") ||
(obj.lineType == Tube && (obj.lineType == Tube &&
obj.varyTubeRadius && obj.tubeRadiusVarEnabled &&
varyTubeRadiusVariable != obj.varyTubeRadiusVariable && tubeRadiusVar != obj.tubeRadiusVar &&
obj.varyTubeRadiusVariable != "default" && obj.tubeRadiusVar != "default" &&
obj.varyTubeRadiusVariable != "" && obj.tubeRadiusVar != "" &&
obj.varyTubeRadiusVariable != "\0") || obj.tubeRadiusVar != "\0") ||
(obj.opacityType == VariableRange && (obj.opacityType == VariableRange &&
opacityVariable != obj.opacityVariable && opacityVariable != obj.opacityVariable &&
...@@ -286,4 +286,3 @@ PseudocolorAttributes::ProcessOldVersions(DataNode *parentNode, ...@@ -286,4 +286,3 @@ PseudocolorAttributes::ProcessOldVersions(DataNode *parentNode,
} }
} }
} }
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<Field name="pointSizeVarEnabled" label="Point size by var enabled" type="bool"> <Field name="pointSizeVarEnabled" label="Point size by var enabled" type="bool">
false false
</Field> </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 default
</Field> </Field>
<Field name="pointSizePixels" label="Point size pixels" type="int"> <Field name="pointSizePixels" label="Point size pixels" type="int">
...@@ -143,12 +143,12 @@ ...@@ -143,12 +143,12 @@
<Field name="tubeRadiusBBox" label="Radius (BBox Fraction)" type="double" enabler="tubeRadiusSizeType:FractionOfBBox"> <Field name="tubeRadiusBBox" label="Radius (BBox Fraction)" type="double" enabler="tubeRadiusSizeType:FractionOfBBox">
0.005000 0.005000
</Field> </Field>
<Field name="varyTubeRadius" label="varyTubeRadius" type="bool"> <Field name="tubeRadiusVarEnabled" label="Tube Radius by var enabled" type="bool">
false false
</Field> </Field>
<Field name="varyTubeRadiusVariable" label="varyTubeRadiusVariable" type="string"> <Field name="tubeRadiusVar" label="Tube radius variable" type="string">
</Field> </Field>
<Field name="varyTubeRadiusFactor" label="varyTubeRadiusFactor" type="double"> <Field name="tubeRadiusVarFactor" label="Tube radius variable factor" type="double">
10.000000 10.000000
</Field> </Field>
<Field name="endPointType" label="End point type" type="enum" subtype="EndPointType"> <Field name="endPointType" label="End point type" type="enum" subtype="EndPointType">
......
...@@ -422,8 +422,8 @@ void PseudocolorAttributes::Init() ...@@ -422,8 +422,8 @@ void PseudocolorAttributes::Init()
tubeRadiusSizeType = FractionOfBBox; tubeRadiusSizeType = FractionOfBBox;
tubeRadiusAbsolute = 0.125; tubeRadiusAbsolute = 0.125;
tubeRadiusBBox = 0.005; tubeRadiusBBox = 0.005;
varyTubeRadius = false; tubeRadiusVarEnabled = false;
varyTubeRadiusFactor = 10; tubeRadiusVarFactor = 10;
endPointType = None; endPointType = None;
endPointStyle = Spheres; endPointStyle = Spheres;
endPointRadiusSizeType = FractionOfBBox; endPointRadiusSizeType = FractionOfBBox;
...@@ -486,9 +486,9 @@ void PseudocolorAttributes::Copy(const PseudocolorAttributes &obj) ...@@ -486,9 +486,9 @@ void PseudocolorAttributes::Copy(const PseudocolorAttributes &obj)
tubeRadiusSizeType = obj.tubeRadiusSizeType; tubeRadiusSizeType = obj.tubeRadiusSizeType;
tubeRadiusAbsolute = obj.tubeRadiusAbsolute; tubeRadiusAbsolute = obj.tubeRadiusAbsolute;
tubeRadiusBBox = obj.tubeRadiusBBox; tubeRadiusBBox = obj.tubeRadiusBBox;
varyTubeRadius = obj.varyTubeRadius; tubeRadiusVarEnabled = obj.tubeRadiusVarEnabled;
varyTubeRadiusVariable = obj.varyTubeRadiusVariable; tubeRadiusVar = obj.tubeRadiusVar;
varyTubeRadiusFactor = obj.varyTubeRadiusFactor; tubeRadiusVarFactor = obj.tubeRadiusVarFactor;
endPointType = obj.endPointType; endPointType = obj.endPointType;
endPointStyle = obj.endPointStyle; endPointStyle = obj.endPointStyle;
endPointRadiusSizeType = obj.endPointRadiusSizeType; endPointRadiusSizeType = obj.endPointRadiusSizeType;
...@@ -689,9 +689,9 @@ PseudocolorAttributes::operator == (const PseudocolorAttributes &obj) const ...@@ -689,9 +689,9 @@ PseudocolorAttributes::operator == (const PseudocolorAttributes &obj) const
(tubeRadiusSizeType == obj.tubeRadiusSizeType) && (tubeRadiusSizeType == obj.tubeRadiusSizeType) &&
(tubeRadiusAbsolute == obj.tubeRadiusAbsolute) && (tubeRadiusAbsolute == obj.tubeRadiusAbsolute) &&
(tubeRadiusBBox == obj.tubeRadiusBBox) && (tubeRadiusBBox == obj.tubeRadiusBBox) &&
(varyTubeRadius == obj.varyTubeRadius) && (tubeRadiusVarEnabled == obj.tubeRadiusVarEnabled) &&
(varyTubeRadiusVariable == obj.varyTubeRadiusVariable) && (tubeRadiusVar == obj.tubeRadiusVar) &&
(varyTubeRadiusFactor == obj.varyTubeRadiusFactor) && (tubeRadiusVarFactor == obj.tubeRadiusVarFactor) &&
(endPointType == obj.endPointType) && (endPointType == obj.endPointType) &&
(endPointStyle == obj.endPointStyle) && (endPointStyle == obj.endPointStyle) &&
(endPointRadiusSizeType == obj.endPointRadiusSizeType) && (endPointRadiusSizeType == obj.endPointRadiusSizeType) &&
...@@ -876,9 +876,9 @@ PseudocolorAttributes::SelectAll() ...@@ -876,9 +876,9 @@ PseudocolorAttributes::SelectAll()
Select(ID_tubeRadiusSizeType, (void *)&tubeRadiusSizeType); Select(ID_tubeRadiusSizeType, (void *)&tubeRadiusSizeType);
Select(ID_tubeRadiusAbsolute, (void *)&tubeRadiusAbsolute); Select(ID_tubeRadiusAbsolute, (void *)&tubeRadiusAbsolute);
Select(ID_tubeRadiusBBox, (void *)&tubeRadiusBBox); Select(ID_tubeRadiusBBox, (void *)&tubeRadiusBBox);
Select(ID_varyTubeRadius, (void *)&varyTubeRadius); Select(ID_tubeRadiusVarEnabled, (void *)&tubeRadiusVarEnabled);
Select(ID_varyTubeRadiusVariable, (void *)&varyTubeRadiusVariable); Select(ID_tubeRadiusVar, (void *)&tubeRadiusVar);
Select(ID_varyTubeRadiusFactor, (void *)&varyTubeRadiusFactor); Select(ID_tubeRadiusVarFactor, (void *)&tubeRadiusVarFactor);
Select(ID_endPointType, (void *)&endPointType); Select(ID_endPointType, (void *)&endPointType);
Select(ID_endPointStyle, (void *)&endPointStyle); Select(ID_endPointStyle, (void *)&endPointStyle);
Select(ID_endPointRadiusSizeType, (void *)&endPointRadiusSizeType); Select(ID_endPointRadiusSizeType, (void *)&endPointRadiusSizeType);
...@@ -1097,22 +1097,22 @@ PseudocolorAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool ...@@ -1097,22 +1097,22 @@ PseudocolorAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool
node->AddNode(new DataNode("tubeRadiusBBox", tubeRadiusBBox)); node->AddNode(new DataNode("tubeRadiusBBox", tubeRadiusBBox));
} }
if(completeSave || !FieldsEqual(ID_varyTubeRadius, &defaultObject)) if(completeSave || !FieldsEqual(ID_tubeRadiusVarEnabled, &defaultObject))
{ {
addToParent = true; 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; 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; addToParent = true;
node->AddNode(new DataNode("varyTubeRadiusFactor", varyTubeRadiusFactor)); node->AddNode(new DataNode("tubeRadiusVarFactor", tubeRadiusVarFactor));
} }
if(completeSave || !FieldsEqual(ID_endPointType, &defaultObject)) if(completeSave || !FieldsEqual(ID_endPointType, &defaultObject))
...@@ -1379,12 +1379,12 @@ PseudocolorAttributes::SetFromNode(DataNode *parentNode) ...@@ -1379,12 +1379,12 @@ PseudocolorAttributes::SetFromNode(DataNode *parentNode)
SetTubeRadiusAbsolute(node->AsDouble()); SetTubeRadiusAbsolute(node->AsDouble());
if((node = searchNode->GetNode("tubeRadiusBBox")) != 0) if((node = searchNode->GetNode("tubeRadiusBBox")) != 0)
SetTubeRadiusBBox(node->AsDouble()); SetTubeRadiusBBox(node->AsDouble());
if((node = searchNode->GetNode("varyTubeRadius")) != 0) if((node = searchNode->GetNode("tubeRadiusVarEnabled")) != 0)
SetVaryTubeRadius(node->AsBool()); SetTubeRadiusVarEnabled(node->AsBool());
if((node = searchNode->GetNode("varyTubeRadiusVariable")) != 0) if((node = searchNode->GetNode("tubeRadiusVar")) != 0)
SetVaryTubeRadiusVariable(node->AsString()); SetTubeRadiusVar(node->AsString());
if((node = searchNode->GetNode("varyTubeRadiusFactor")) != 0) if((node = searchNode->GetNode("tubeRadiusVarFactor")) != 0)
SetVaryTubeRadiusFactor(node->AsDouble()); SetTubeRadiusVarFactor(node->AsDouble());
if((node = searchNode->GetNode("endPointType")) != 0) if((node = searchNode->GetNode("endPointType")) != 0)
{ {
// Allow enums to be int or string in the config file // Allow enums to be int or string in the config file
...@@ -1661,24 +1661,24 @@ PseudocolorAttributes::SetTubeRadiusBBox(double tubeRadiusBBox_) ...@@ -1661,24 +1661,24 @@ PseudocolorAttributes::SetTubeRadiusBBox(double tubeRadiusBBox_)
} }
void void
PseudocolorAttributes::SetVaryTubeRadius(bool varyTubeRadius_) PseudocolorAttributes::SetTubeRadiusVarEnabled(bool tubeRadiusVarEnabled_)
{ {
varyTubeRadius = varyTubeRadius_; tubeRadiusVarEnabled = tubeRadiusVarEnabled_;
Select(ID_varyTubeRadius, (void *)&varyTubeRadius); Select(ID_tubeRadiusVarEnabled, (void *)&tubeRadiusVarEnabled);
} }
void void
PseudocolorAttributes::SetVaryTubeRadiusVariable(const std::string &varyTubeRadiusVariable_) PseudocolorAttributes::SetTubeRadiusVar(const std::string &tubeRadiusVar_)
{ {
varyTubeRadiusVariable = varyTubeRadiusVariable_; tubeRadiusVar = tubeRadiusVar_;
Select(ID_varyTubeRadiusVariable, (void *)&varyTubeRadiusVariable); Select(ID_tubeRadiusVar, (void *)&tubeRadiusVar);
} }
void void
PseudocolorAttributes::SetVaryTubeRadiusFactor(double varyTubeRadiusFactor_) PseudocolorAttributes::SetTubeRadiusVarFactor(double tubeRadiusVarFactor_)
{ {
varyTubeRadiusFactor = varyTubeRadiusFactor_; tubeRadiusVarFactor = tubeRadiusVarFactor_;
Select(ID_varyTubeRadiusFactor, (void *)&varyTubeRadiusFactor); Select(ID_tubeRadiusVarFactor, (void *)&tubeRadiusVarFactor);
} }
void void
...@@ -1962,27 +1962,27 @@ PseudocolorAttributes::GetTubeRadiusBBox() const ...@@ -1962,27 +1962,27 @@ PseudocolorAttributes::GetTubeRadiusBBox() const
} }
bool bool
PseudocolorAttributes::GetVaryTubeRadius() const PseudocolorAttributes::GetTubeRadiusVarEnabled() const
{ {
return varyTubeRadius; return tubeRadiusVarEnabled;
} }
const std::string & const std::string &
PseudocolorAttributes::GetVaryTubeRadiusVariable() const PseudocolorAttributes::GetTubeRadiusVar() const
{ {
return varyTubeRadiusVariable; return tubeRadiusVar;
} }
std::string & std::string &
PseudocolorAttributes::GetVaryTubeRadiusVariable() PseudocolorAttributes::GetTubeRadiusVar()
{ {
return varyTubeRadiusVariable; return tubeRadiusVar;
} }
double double
PseudocolorAttributes::GetVaryTubeRadiusFactor() const PseudocolorAttributes::GetTubeRadiusVarFactor() const
{ {
return varyTubeRadiusFactor; return tubeRadiusVarFactor;
} }
PseudocolorAttributes::EndPointType PseudocolorAttributes::EndPointType
...@@ -2080,9 +2080,9 @@ PseudocolorAttributes::SelectPointSizeVar() ...@@ -2080,9 +2080,9 @@ PseudocolorAttributes::SelectPointSizeVar()
} }
void void
PseudocolorAttributes::SelectVaryTubeRadiusVariable() PseudocolorAttributes::SelectTubeRadiusVar()
{ {
Select(ID_varyTubeRadiusVariable, (void *)&varyTubeRadiusVariable); Select(ID_tubeRadiusVar, (void *)&tubeRadiusVar);
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
...@@ -2138,9 +2138,9 @@ PseudocolorAttributes::GetFieldName(int index) const ...@@ -2138,9 +2138,9 @@ PseudocolorAttributes::GetFieldName(int index) const
case ID_tubeRadiusSizeType: return "tubeRadiusSizeType"; case ID_tubeRadiusSizeType: return "tubeRadiusSizeType";
case ID_tubeRadiusAbsolute: return "tubeRadiusAbsolute"; case ID_tubeRadiusAbsolute: return "tubeRadiusAbsolute";
case ID_tubeRadiusBBox: return "tubeRadiusBBox"; case ID_tubeRadiusBBox: return "tubeRadiusBBox";
case ID_varyTubeRadius: return "varyTubeRadius"; case ID_tubeRadiusVarEnabled: return "tubeRadiusVarEnabled";
case ID_varyTubeRadiusVariable: return "varyTubeRadiusVariable"; case ID_tubeRadiusVar: return "tubeRadiusVar";
case ID_varyTubeRadiusFactor: return "varyTubeRadiusFactor"; case ID_tubeRadiusVarFactor: return "tubeRadiusVarFactor";
case ID_endPointType: return "endPointType"; case ID_endPointType: return "endPointType";
case ID_endPointStyle: return "endPointStyle"; case ID_endPointStyle: return "endPointStyle";
case ID_endPointRadiusSizeType: return "endPointRadiusSizeType"; case ID_endPointRadiusSizeType: return "endPointRadiusSizeType";
...@@ -2206,9 +2206,9 @@ PseudocolorAttributes::GetFieldType(int index) const ...@@ -2206,9 +2206,9 @@ PseudocolorAttributes::GetFieldType(int index) const
case ID_tubeRadiusSizeType: return FieldType_enum; case ID_tubeRadiusSizeType: return FieldType_enum;
case ID_tubeRadiusAbsolute: return FieldType_double; case ID_tubeRadiusAbsolute: return FieldType_double;
case ID_tubeRadiusBBox: return FieldType_double; case ID_tubeRadiusBBox: return FieldType_double;
case ID_varyTubeRadius: return FieldType_bool; case ID_tubeRadiusVarEnabled: return FieldType_bool;
case ID_varyTubeRadiusVariable: return FieldType_string; case ID_tubeRadiusVar: return FieldType_string;
case ID_varyTubeRadiusFactor: return FieldType_double; case ID_tubeRadiusVarFactor: return FieldType_double;
case ID_endPointType: return FieldType_enum; case ID_endPointType: return FieldType_enum;
case ID_endPointStyle: return FieldType_enum; case ID_endPointStyle: return FieldType_enum;
case ID_endPointRadiusSizeType: return FieldType_enum; case ID_endPointRadiusSizeType: return FieldType_enum;
...@@ -2274,9 +2274,9 @@ PseudocolorAttributes::GetFieldTypeName(int index) const ...@@ -2274,9 +2274,9 @@ PseudocolorAttributes::GetFieldTypeName(int index) const
case ID_tubeRadiusSizeType: return "enum"; case ID_tubeRadiusSizeType: return "enum";
case ID_tubeRadiusAbsolute: return "double"; case ID_tubeRadiusAbsolute: return "double";
case ID_tubeRadiusBBox: return "double"; case ID_tubeRadiusBBox: return "double";
case ID_varyTubeRadius: return "bool"; case ID_tubeRadiusVarEnabled: return "bool";
case ID_varyTubeRadiusVariable: return "string"; case ID_tubeRadiusVar: return "string";
case ID_varyTubeRadiusFactor: return "double"; case ID_tubeRadiusVarFactor: return "double";
case ID_endPointType: return "enum"; case ID_endPointType: return "enum";
case ID_endPointStyle: return "enum"; case ID_endPointStyle: return "enum";
case ID_endPointRadiusSizeType: return "enum"; case ID_endPointRadiusSizeType: return "enum";
...@@ -2460,19 +2460,19 @@ PseudocolorAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const ...@@ -2460,19 +2460,19 @@ PseudocolorAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (tubeRadiusBBox == obj.tubeRadiusBBox); retval = (tubeRadiusBBox == obj.tubeRadiusBBox);
} }
break; break;
case ID_varyTubeRadius: case ID_tubeRadiusVarEnabled:
{ // new scope { // new scope
retval = (varyTubeRadius == obj.varyTubeRadius); retval = (tubeRadiusVarEnabled == obj.tubeRadiusVarEnabled);
} }
break; break;
case ID_varyTubeRadiusVariable: case ID_tubeRadiusVar:
{ // new scope { // new scope
retval = (varyTubeRadiusVariable == obj.varyTubeRadiusVariable); retval = (tubeRadiusVar == obj.tubeRadiusVar);
} }
break; break;
case ID_varyTubeRadiusFactor: case ID_tubeRadiusVarFactor:
{ // new scope { // new scope
retval = (varyTubeRadiusFactor == obj.varyTubeRadiusFactor); retval = (tubeRadiusVarFactor == obj.tubeRadiusVarFactor);
} }
break; break;
case ID_endPointType: case ID_endPointType:
...@@ -2584,11 +2584,11 @@ PseudocolorAttributes::ChangesRequireRecalculation(const PseudocolorAttributes & ...@@ -2584,11 +2584,11 @@ PseudocolorAttributes::ChangesRequireRecalculation(const PseudocolorAttributes &
obj.pointSizeVar != "\0") || obj.pointSizeVar != "\0") ||
(obj.lineType == Tube && (obj.lineType == Tube &&
obj.varyTubeRadius && obj.tubeRadiusVarEnabled &&
varyTubeRadiusVariable != obj.varyTubeRadiusVariable && tubeRadiusVar != obj.tubeRadiusVar &&
obj.varyTubeRadiusVariable != "default" && obj.tubeRadiusVar != "default" &&
obj.varyTubeRadiusVariable != "" && obj.tubeRadiusVar != "" &&
obj.varyTubeRadiusVariable != "\0") || obj.tubeRadiusVar != "\0") ||
(obj.opacityType == VariableRange && (obj.opacityType == VariableRange &&
opacityVariable != obj.opacityVariable && opacityVariable != obj.opacityVariable &&
......
...@@ -149,7 +149,7 @@ public: ...@@ -149,7 +149,7 @@ public:
void SelectColorTableName(); void SelectColorTableName();
void SelectOpacityVariable(); void SelectOpacityVariable();
void SelectPointSizeVar(); void SelectPointSizeVar();
void SelectVaryTubeRadiusVariable(); void SelectTubeRadiusVar();
// Property setting methods // Property setting methods
void SetScaling(Scaling scaling_); void SetScaling(Scaling scaling_);
...@@ -181,9 +181,9 @@ public: ...@@ -181,9 +181,9 @@ public:
void SetTubeRadiusSizeType(SizeType tubeRadiusSizeType_); void SetTubeRadiusSizeType(SizeType tubeRadiusSizeType_);
void SetTubeRadiusAbsolute(double tubeRadiusAbsolute_); void SetTubeRadiusAbsolute(double tubeRadiusAbsolute_);
void SetTubeRadiusBBox(double tubeRadiusBBox_); void SetTubeRadiusBBox(double tubeRadiusBBox_);
void SetVaryTubeRadius(bool varyTubeRadius_); void SetTubeRadiusVarEnabled(bool tubeRadiusVarEnabled_);
void SetVaryTubeRadiusVariable(const std::string &varyTubeRadiusVariable_); void SetTubeRadiusVar(const std::string &tubeRadiusVar_);
void SetVaryTubeRadiusFactor(double varyTubeRadiusFactor_); void SetTubeRadiusVarFactor(double tubeRadiusVarFactor_);
void SetEndPointType(EndPointType endPointType_); void SetEndPointType(EndPointType endPointType_);
void SetEndPointStyle(EndPointStyle endPointStyle_); void SetEndPointStyle(EndPointStyle endPointStyle_);
void SetEndPointRadiusSizeType(SizeType endPointRadiusSizeType_); void SetEndPointRadiusSizeType(SizeType endPointRadiusSizeType_);
...@@ -230,10 +230,10 @@ public: ...@@ -230,10 +230,10 @@ public:
SizeType GetTubeRadiusSizeType() const; SizeType GetTubeRadiusSizeType() const;
double GetTubeRadiusAbsolute() const; double GetTubeRadiusAbsolute() const;
double GetTubeRadiusBBox() const; double GetTubeRadiusBBox() const;
bool GetVaryTubeRadius() const; bool GetTubeRadiusVarEnabled() const;
const std::string &GetVaryTubeRadiusVariable() const; const std::string &GetTubeRadiusVar() const;
std::string &GetVaryTubeRadiusVariable(); std::string &GetTubeRadiusVar();
double GetVaryTubeRadiusFactor() const; double GetTubeRadiusVarFactor() const;
EndPointType GetEndPointType() const; EndPointType GetEndPointType() const;
EndPointStyle GetEndPointStyle() const; EndPointStyle GetEndPointStyle() const;
SizeType GetEndPointRadiusSizeType() const; SizeType GetEndPointRadiusSizeType() const;
...@@ -340,9 +340,9 @@ public: ...@@ -340,9 +340,9 @@ public:
ID_tubeRadiusSizeType, ID_tubeRadiusSizeType,
ID_tubeRadiusAbsolute, ID_tubeRadiusAbsolute,
ID_tubeRadiusBBox, ID_tubeRadiusBBox,
ID_varyTubeRadius, ID_tubeRadiusVarEnabled,
ID_varyTubeRadiusVariable, ID_tubeRadiusVar,
ID_varyTubeRadiusFactor, ID_tubeRadiusVarFactor,
ID_endPointType, ID_endPointType,
ID_endPointStyle, ID_endPointStyle,
ID_endPointRadiusSizeType, ID_endPointRadiusSizeType,
...@@ -388,9 +388,9 @@ private: ...@@ -388,9 +388,9 @@ private:
int tubeRadiusSizeType; int tubeRadiusSizeType;
double tubeRadiusAbsolute; double tubeRadiusAbsolute;
double tubeRadiusBBox; double tubeRadiusBBox;
bool varyTubeRadius; bool tubeRadiusVarEnabled;
std::string varyTubeRadiusVariable; std::string tubeRadiusVar;
double varyTubeRadiusFactor; double tubeRadiusVarFactor;
int endPointType; int endPointType;
int endPointStyle; int endPointStyle;
int endPointRadiusSizeType; int endPointRadiusSizeType;
......
...@@ -137,9 +137,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin ...@@ -137,9 +137,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
tubeRadiusSizeType = SIZETYPE_FRACTIONOFBBOX; tubeRadiusSizeType = SIZETYPE_FRACTIONOFBBOX;
tubeRadiusAbsolute = 0.125; tubeRadiusAbsolute = 0.125;
tubeRadiusBBox = 0.005; tubeRadiusBBox = 0.005;
varyTubeRadius = false; tubeRadiusVarEnabled = false;
varyTubeRadiusVariable = new String(""); tubeRadiusVar = new String("");
varyTubeRadiusFactor = 10; tubeRadiusVarFactor = 10;
endPointType = ENDPOINTTYPE_NONE; endPointType = ENDPOINTTYPE_NONE;
endPointStyle = ENDPOINTSTYLE_SPHERES; endPointStyle = ENDPOINTSTYLE_SPHERES;
endPointRadiusSizeType = SIZETYPE_FRACTIONOFBBOX; endPointRadiusSizeType = SIZETYPE_FRACTIONOFBBOX;
...@@ -187,9 +187,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin ...@@ -187,9 +187,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
tubeRadiusSizeType = SIZETYPE_FRACTIONOFBBOX; tubeRadiusSizeType = SIZETYPE_FRACTIONOFBBOX;
tubeRadiusAbsolute = 0.125; tubeRadiusAbsolute = 0.125;
tubeRadiusBBox = 0.005; tubeRadiusBBox = 0.005;
varyTubeRadius = false; tubeRadiusVarEnabled = false;
varyTubeRadiusVariable = new String(""); tubeRadiusVar = new String("");
varyTubeRadiusFactor = 10; tubeRadiusVarFactor = 10;
endPointType = ENDPOINTTYPE_NONE; endPointType = ENDPOINTTYPE_NONE;
endPointStyle = ENDPOINTSTYLE_SPHERES; endPointStyle = ENDPOINTSTYLE_SPHERES;
endPointRadiusSizeType = SIZETYPE_FRACTIONOFBBOX; endPointRadiusSizeType = SIZETYPE_FRACTIONOFBBOX;
...@@ -237,9 +237,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin ...@@ -237,9 +237,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
tubeRadiusSizeType = obj.tubeRadiusSizeType; tubeRadiusSizeType = obj.tubeRadiusSizeType;
tubeRadiusAbsolute = obj.tubeRadiusAbsolute; tubeRadiusAbsolute = obj.tubeRadiusAbsolute;
tubeRadiusBBox = obj.tubeRadiusBBox; tubeRadiusBBox = obj.tubeRadiusBBox;
varyTubeRadius = obj.varyTubeRadius; tubeRadiusVarEnabled = obj.tubeRadiusVarEnabled;
varyTubeRadiusVariable = new String(obj.varyTubeRadiusVariable); tubeRadiusVar = new String(obj.tubeRadiusVar);
varyTubeRadiusFactor = obj.varyTubeRadiusFactor; tubeRadiusVarFactor = obj.tubeRadiusVarFactor;
endPointType = obj.endPointType; endPointType = obj.endPointType;
endPointStyle = obj.endPointStyle; endPointStyle = obj.endPointStyle;
endPointRadiusSizeType = obj.endPointRadiusSizeType; endPointRadiusSizeType = obj.endPointRadiusSizeType;
...@@ -298,9 +298,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin ...@@ -298,9 +298,9 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
(tubeRadiusSizeType == obj.tubeRadiusSizeType) && (tubeRadiusSizeType == obj.tubeRadiusSizeType) &&
(tubeRadiusAbsolute == obj.tubeRadiusAbsolute) && (tubeRadiusAbsolute == obj.tubeRadiusAbsolute) &&
(tubeRadiusBBox == obj.tubeRadiusBBox) && (tubeRadiusBBox == obj.tubeRadiusBBox) &&
(varyTubeRadius == obj.varyTubeRadius) && (tubeRadiusVarEnabled == obj.tubeRadiusVarEnabled) &&
(varyTubeRadiusVariable.equals(obj.varyTubeRadiusVariable)) && (tubeRadiusVar.equals(obj.tubeRadiusVar)) &&
(varyTubeRadiusFactor == obj.varyTubeRadiusFactor) && (tubeRadiusVarFactor == obj.tubeRadiusVarFactor) &&
(endPointType == obj.endPointType) && (endPointType == obj.endPointType) &&
(endPointStyle == obj.endPointStyle) && (endPointStyle == obj.endPointStyle) &&
(endPointRadiusSizeType == obj.endPointRadiusSizeType) && (endPointRadiusSizeType == obj.endPointRadiusSizeType) &&
...@@ -493,21 +493,21 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin ...@@ -493,21 +493,21 @@ public class PseudocolorAttributes extends AttributeSubject implements Plugin
Select(28); Select(28);
} }
public void SetVaryTubeRadius(boolean varyTubeRadius_) public void SetTubeRadiusVarEnabled(boolean tubeRadiusVarEnabled_)
{ {
varyTubeRadius = varyTubeRadius_; tubeRadiusVarEnabled = tubeRadiusVarEnabled_;
Select(29); Select(29);
} }
public void SetVaryTubeRadiusVariable(String varyTubeRadiusVariable_) public void SetTubeRadiusVar(String tubeRadiusVar_)
{ {
varyTubeRadiusVariable = varyTubeRadiusVariable_; tubeRadiusVar = tubeRadiusVar_;
Select(30); Select(30);
} }