Commit 278afbb5 authored by allens's avatar allens

name for variable

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16143 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6acb70fd
......@@ -2274,6 +2274,7 @@ FieldlineLib::fieldlineProperties( std::vector< Point > &ptList,
unsigned int overridePoloidalWinding,
unsigned int maxToroidalWinding,
double windingPairConfidence,
double rationalSurfaceFactor,
bool detectIslandCenters )
{
std::vector< Point > poloidal_puncture_pts;
......@@ -2704,7 +2705,7 @@ FieldlineLib::fieldlineProperties( std::vector< Point > &ptList,
if( rationalCheck( poloidal_puncture_pts,
toroidalWinding / GCD( toroidalWinding,
poloidalWinding ),
nnodes, delta*0.1 ) )
nnodes, delta*rationalSurfaceFactor ) )
{
type = FieldlineProperties::RATIONAL;
islands = 0;
......@@ -2713,7 +2714,7 @@ FieldlineLib::fieldlineProperties( std::vector< Point > &ptList,
if( verboseFlag )
std::cerr << "Appears to be a rational surface "
<< delta*0.1 << std::endl;
<< delta*rationalSurfaceFactor << std::endl;
}
else
{
......@@ -3071,13 +3072,13 @@ FieldlineLib::fieldlineProperties( std::vector< Point > &ptList,
// surface. Thus divide by the GCD.
if( rationalCheck( poloidal_puncture_pts,
toroidalWinding / GCD(toroidalWinding, poloidalWinding ),
nnodes, delta*0.1 ) )
nnodes, delta*rationalSurfaceFactor ) )
{
type = FieldlineProperties::O_POINT;
analysisState = FieldlineProperties::COMPLETED;
if( verboseFlag )
std::cerr << "Appears to be an O point " << delta*0.1 << std::endl;
std::cerr << "Appears to be an O point " << delta*rationalSurfaceFactor << std::endl;
}
}
......@@ -3185,7 +3186,7 @@ FieldlineLib::fieldlineProperties( std::vector< Point > &ptList,
// probably on a rational surface.
else if( rationalCheck( poloidal_puncture_pts,
toroidalWinding / GCD(toroidalWinding, poloidalWinding ),
nnodes, delta*0.1 ) )
nnodes, delta*rationalSurfaceFactor ) )
{
type = FieldlineProperties::RATIONAL;
islands = 0;
......@@ -3194,7 +3195,8 @@ FieldlineLib::fieldlineProperties( std::vector< Point > &ptList,
analysisState = FieldlineProperties::COMPLETED;
if( verboseFlag )
std::cerr << "Appears to be a rational surface " << delta*0.1 << std::endl;
std::cerr << "Appears to be a rational surface "
<< delta*rationalSurfaceFactor << std::endl;
windingGroupOffset = Blankinship( toroidalWinding, poloidalWinding );
}
......@@ -3489,6 +3491,7 @@ FieldlineLib::fieldlineProperties( std::vector< Point > &ptList,
void
FieldlineLib::fieldlineProperties2( std::vector< Point > &ptList,
double rationalSurfaceFactor,
FieldlineProperties &fi )
{
std::vector< Point > poloidal_puncture_pts;
......@@ -3497,7 +3500,7 @@ FieldlineLib::fieldlineProperties2( std::vector< Point > &ptList,
std::vector< double > rotationalSums;
std::vector< unsigned int > poloidalWindingCounts;
float delta = 0.0;
float delta = 0.0;
getPunctures( ptList, Vector(0,1,0), poloidal_puncture_pts );
......@@ -3803,13 +3806,14 @@ FieldlineLib::fieldlineProperties2( std::vector< Point > &ptList,
// probably on a rational surface.
if( rationalCheck( poloidal_puncture_pts,
toroidalWinding,
nnodes, delta*0.1 ) )
nnodes, delta*rationalSurfaceFactor ) )
{
type = FieldlineProperties::O_POINT;
analysisState = FieldlineProperties::COMPLETED;
if( verboseFlag )
std::cerr << "Appears to be an O point " << delta*0.1 << std::endl;
std::cerr << "Appears to be an O point "
<< delta*rationalSurfaceFactor << std::endl;
}
}
}
......@@ -3819,7 +3823,7 @@ FieldlineLib::fieldlineProperties2( std::vector< Point > &ptList,
// probably on a rational surface.
else if( rationalCheck( poloidal_puncture_pts,
toroidalWinding,
nnodes, delta*0.1 ) )
nnodes, delta*rationalSurfaceFactor ) )
{
type = FieldlineProperties::RATIONAL;
islands = 0;
......@@ -3828,7 +3832,8 @@ FieldlineLib::fieldlineProperties2( std::vector< Point > &ptList,
analysisState = FieldlineProperties::COMPLETED;
if( verboseFlag )
std::cerr << "Appears to be a rational surface " << delta*0.1 << std::endl;
std::cerr << "Appears to be a rational surface "
<< delta*rationalSurfaceFactor << std::endl;
}
// At this point assume the surface is irrational.
......
......@@ -301,10 +301,12 @@ public:
unsigned int overridePoloidalWinding,
unsigned int maxToroidalWinding,
double windingPairConfidence,
double rationalSurfaceFactor,
bool detectIslandCenters );
void
fieldlineProperties2( std::vector< Point > &ptList,
double rationalSurfaceFactor,
FieldlineProperties &fi );
void findIslandCenters( std::vector< Point > &puncturePts,
......
......@@ -196,7 +196,7 @@ PoincareAttributes::PoincareAttsRequireRecalculation(const PoincareAttributes &o
overrideToroidalWinding != obj.overrideToroidalWinding ||
overridePoloidalWinding != obj.overridePoloidalWinding ||
windingPairConfidence != obj.windingPairConfidence ||
rationalTemplateSeedParm != obj.rationalTemplateSeedParm ||
rationalSurfaceFactor != obj.rationalSurfaceFactor ||
showOPoints != obj.showOPoints ||
OPointMaxIterations != obj.OPointMaxIterations ||
......
......@@ -96,10 +96,10 @@
1.000000
</Field>
<Field name="minPunctures" label="Minimum number of Punctures" type="int">
10
50
</Field>
<Field name="maxPunctures" label="Maximum number of Punctures" type="int">
100
500
</Field>
<Field name="puncturePlane" label="Puncture Plane" type="enum" subtype="PuncturePlaneType">
Poloidal
......@@ -178,9 +178,8 @@
<Field name="windingPairConfidence" label="Winding Pair Confidence" type="double">
0.900000
</Field>
<Field name="rationalTemplateSeedParm" label="Rational Template
Seed Parameter" type="double">
0.900000
<Field name="rationalSurfaceFactor" label="Rational surface factor" type="double">
0.100000
</Field>
<Field name="adjustPlane" label="Adjust plane" type="int">
-1
......
......@@ -590,8 +590,8 @@ void PoincareAttributes::Init()
{
opacityType = Explicit;
opacity = 1;
minPunctures = 10;
maxPunctures = 100;
minPunctures = 50;
maxPunctures = 500;
puncturePlane = Poloidal;
sourceType = SpecifiedPoint;
pointSource[0] = 0;
......@@ -623,7 +623,7 @@ void PoincareAttributes::Init()
overrideToroidalWinding = 0;
overridePoloidalWinding = 0;
windingPairConfidence = 0.9;
rationalTemplateSeedParm = 0.9;
rationalSurfaceFactor = 0.1;
adjustPlane = -1;
overlaps = Remove;
meshType = Curves;
......@@ -717,7 +717,7 @@ void PoincareAttributes::Copy(const PoincareAttributes &obj)
overrideToroidalWinding = obj.overrideToroidalWinding;
overridePoloidalWinding = obj.overridePoloidalWinding;
windingPairConfidence = obj.windingPairConfidence;
rationalTemplateSeedParm = obj.rationalTemplateSeedParm;
rationalSurfaceFactor = obj.rationalSurfaceFactor;
adjustPlane = obj.adjustPlane;
overlaps = obj.overlaps;
meshType = obj.meshType;
......@@ -959,7 +959,7 @@ PoincareAttributes::operator == (const PoincareAttributes &obj) const
(overrideToroidalWinding == obj.overrideToroidalWinding) &&
(overridePoloidalWinding == obj.overridePoloidalWinding) &&
(windingPairConfidence == obj.windingPairConfidence) &&
(rationalTemplateSeedParm == obj.rationalTemplateSeedParm) &&
(rationalSurfaceFactor == obj.rationalSurfaceFactor) &&
(adjustPlane == obj.adjustPlane) &&
(overlaps == obj.overlaps) &&
(meshType == obj.meshType) &&
......@@ -1190,7 +1190,7 @@ PoincareAttributes::SelectAll()
Select(ID_overrideToroidalWinding, (void *)&overrideToroidalWinding);
Select(ID_overridePoloidalWinding, (void *)&overridePoloidalWinding);
Select(ID_windingPairConfidence, (void *)&windingPairConfidence);
Select(ID_rationalTemplateSeedParm, (void *)&rationalTemplateSeedParm);
Select(ID_rationalSurfaceFactor, (void *)&rationalSurfaceFactor);
Select(ID_adjustPlane, (void *)&adjustPlane);
Select(ID_overlaps, (void *)&overlaps);
Select(ID_meshType, (void *)&meshType);
......@@ -1420,10 +1420,10 @@ PoincareAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool for
node->AddNode(new DataNode("windingPairConfidence", windingPairConfidence));
}
if(completeSave || !FieldsEqual(ID_rationalTemplateSeedParm, &defaultObject))
if(completeSave || !FieldsEqual(ID_rationalSurfaceFactor, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("rationalTemplateSeedParm", rationalTemplateSeedParm));
node->AddNode(new DataNode("rationalSurfaceFactor", rationalSurfaceFactor));
}
if(completeSave || !FieldsEqual(ID_adjustPlane, &defaultObject))
......@@ -1840,8 +1840,8 @@ PoincareAttributes::SetFromNode(DataNode *parentNode)
SetOverridePoloidalWinding(node->AsInt());
if((node = searchNode->GetNode("windingPairConfidence")) != 0)
SetWindingPairConfidence(node->AsDouble());
if((node = searchNode->GetNode("rationalTemplateSeedParm")) != 0)
SetRationalTemplateSeedParm(node->AsDouble());
if((node = searchNode->GetNode("rationalSurfaceFactor")) != 0)
SetRationalSurfaceFactor(node->AsDouble());
if((node = searchNode->GetNode("adjustPlane")) != 0)
SetAdjustPlane(node->AsInt());
if((node = searchNode->GetNode("overlaps")) != 0)
......@@ -2200,10 +2200,10 @@ PoincareAttributes::SetWindingPairConfidence(double windingPairConfidence_)
}
void
PoincareAttributes::SetRationalTemplateSeedParm(double rationalTemplateSeedParm_)
PoincareAttributes::SetRationalSurfaceFactor(double rationalSurfaceFactor_)
{
rationalTemplateSeedParm = rationalTemplateSeedParm_;
Select(ID_rationalTemplateSeedParm, (void *)&rationalTemplateSeedParm);
rationalSurfaceFactor = rationalSurfaceFactor_;
Select(ID_rationalSurfaceFactor, (void *)&rationalSurfaceFactor);
}
void
......@@ -2642,9 +2642,9 @@ PoincareAttributes::GetWindingPairConfidence() const
}
double
PoincareAttributes::GetRationalTemplateSeedParm() const
PoincareAttributes::GetRationalSurfaceFactor() const
{
return rationalTemplateSeedParm;
return rationalSurfaceFactor;
}
int
......@@ -2960,7 +2960,7 @@ PoincareAttributes::GetFieldName(int index) const
case ID_overrideToroidalWinding: return "overrideToroidalWinding";
case ID_overridePoloidalWinding: return "overridePoloidalWinding";
case ID_windingPairConfidence: return "windingPairConfidence";
case ID_rationalTemplateSeedParm: return "rationalTemplateSeedParm";
case ID_rationalSurfaceFactor: return "rationalSurfaceFactor";
case ID_adjustPlane: return "adjustPlane";
case ID_overlaps: return "overlaps";
case ID_meshType: return "meshType";
......@@ -3047,7 +3047,7 @@ PoincareAttributes::GetFieldType(int index) const
case ID_overrideToroidalWinding: return FieldType_int;
case ID_overridePoloidalWinding: return FieldType_int;
case ID_windingPairConfidence: return FieldType_double;
case ID_rationalTemplateSeedParm: return FieldType_double;
case ID_rationalSurfaceFactor: return FieldType_double;
case ID_adjustPlane: return FieldType_int;
case ID_overlaps: return FieldType_enum;
case ID_meshType: return FieldType_enum;
......@@ -3134,7 +3134,7 @@ PoincareAttributes::GetFieldTypeName(int index) const
case ID_overrideToroidalWinding: return "int";
case ID_overridePoloidalWinding: return "int";
case ID_windingPairConfidence: return "double";
case ID_rationalTemplateSeedParm: return "double";
case ID_rationalSurfaceFactor: return "double";
case ID_adjustPlane: return "int";
case ID_overlaps: return "enum";
case ID_meshType: return "enum";
......@@ -3351,9 +3351,9 @@ PoincareAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (windingPairConfidence == obj.windingPairConfidence);
}
break;
case ID_rationalTemplateSeedParm:
case ID_rationalSurfaceFactor:
{ // new scope
retval = (rationalTemplateSeedParm == obj.rationalTemplateSeedParm);
retval = (rationalSurfaceFactor == obj.rationalSurfaceFactor);
}
break;
case ID_adjustPlane:
......@@ -3645,7 +3645,7 @@ PoincareAttributes::PoincareAttsRequireRecalculation(const PoincareAttributes &o
overrideToroidalWinding != obj.overrideToroidalWinding ||
overridePoloidalWinding != obj.overridePoloidalWinding ||
windingPairConfidence != obj.windingPairConfidence ||
rationalTemplateSeedParm != obj.rationalTemplateSeedParm ||
rationalSurfaceFactor != obj.rationalSurfaceFactor ||
showOPoints != obj.showOPoints ||
OPointMaxIterations != obj.OPointMaxIterations ||
......
......@@ -218,7 +218,7 @@ public:
void SetOverrideToroidalWinding(int overrideToroidalWinding_);
void SetOverridePoloidalWinding(int overridePoloidalWinding_);
void SetWindingPairConfidence(double windingPairConfidence_);
void SetRationalTemplateSeedParm(double rationalTemplateSeedParm_);
void SetRationalSurfaceFactor(double rationalSurfaceFactor_);
void SetAdjustPlane(int adjustPlane_);
void SetOverlaps(OverlapType overlaps_);
void SetMeshType(ShowMeshType meshType_);
......@@ -287,7 +287,7 @@ public:
int GetOverrideToroidalWinding() const;
int GetOverridePoloidalWinding() const;
double GetWindingPairConfidence() const;
double GetRationalTemplateSeedParm() const;
double GetRationalSurfaceFactor() const;
int GetAdjustPlane() const;
OverlapType GetOverlaps() const;
ShowMeshType GetMeshType() const;
......@@ -442,7 +442,7 @@ public:
ID_overrideToroidalWinding,
ID_overridePoloidalWinding,
ID_windingPairConfidence,
ID_rationalTemplateSeedParm,
ID_rationalSurfaceFactor,
ID_adjustPlane,
ID_overlaps,
ID_meshType,
......@@ -509,7 +509,7 @@ private:
int overrideToroidalWinding;
int overridePoloidalWinding;
double windingPairConfidence;
double rationalTemplateSeedParm;
double rationalSurfaceFactor;
int adjustPlane;
int overlaps;
int meshType;
......
......@@ -138,8 +138,8 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
opacityType = OPACITY_EXPLICIT;
opacity = 1;
minPunctures = 10;
maxPunctures = 100;
minPunctures = 50;
maxPunctures = 500;
puncturePlane = PUNCTUREPLANETYPE_POLOIDAL;
sourceType = SOURCETYPE_SPECIFIEDPOINT;
pointSource = new double[3];
......@@ -175,7 +175,7 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
overrideToroidalWinding = 0;
overridePoloidalWinding = 0;
windingPairConfidence = 0.9;
rationalTemplateSeedParm = 0.9;
rationalSurfaceFactor = 0.1;
adjustPlane = -1;
overlaps = OVERLAPTYPE_REMOVE;
meshType = SHOWMESHTYPE_CURVES;
......@@ -219,8 +219,8 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
opacityType = OPACITY_EXPLICIT;
opacity = 1;
minPunctures = 10;
maxPunctures = 100;
minPunctures = 50;
maxPunctures = 500;
puncturePlane = PUNCTUREPLANETYPE_POLOIDAL;
sourceType = SOURCETYPE_SPECIFIEDPOINT;
pointSource = new double[3];
......@@ -256,7 +256,7 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
overrideToroidalWinding = 0;
overridePoloidalWinding = 0;
windingPairConfidence = 0.9;
rationalTemplateSeedParm = 0.9;
rationalSurfaceFactor = 0.1;
adjustPlane = -1;
overlaps = OVERLAPTYPE_REMOVE;
meshType = SHOWMESHTYPE_CURVES;
......@@ -343,7 +343,7 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
overrideToroidalWinding = obj.overrideToroidalWinding;
overridePoloidalWinding = obj.overridePoloidalWinding;
windingPairConfidence = obj.windingPairConfidence;
rationalTemplateSeedParm = obj.rationalTemplateSeedParm;
rationalSurfaceFactor = obj.rationalSurfaceFactor;
adjustPlane = obj.adjustPlane;
overlaps = obj.overlaps;
meshType = obj.meshType;
......@@ -445,7 +445,7 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
(overrideToroidalWinding == obj.overrideToroidalWinding) &&
(overridePoloidalWinding == obj.overridePoloidalWinding) &&
(windingPairConfidence == obj.windingPairConfidence) &&
(rationalTemplateSeedParm == obj.rationalTemplateSeedParm) &&
(rationalSurfaceFactor == obj.rationalSurfaceFactor) &&
(adjustPlane == obj.adjustPlane) &&
(overlaps == obj.overlaps) &&
(meshType == obj.meshType) &&
......@@ -689,9 +689,9 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
Select(26);
}
public void SetRationalTemplateSeedParm(double rationalTemplateSeedParm_)
public void SetRationalSurfaceFactor(double rationalSurfaceFactor_)
{
rationalTemplateSeedParm = rationalTemplateSeedParm_;
rationalSurfaceFactor = rationalSurfaceFactor_;
Select(27);
}
......@@ -933,7 +933,7 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
public int GetOverrideToroidalWinding() { return overrideToroidalWinding; }
public int GetOverridePoloidalWinding() { return overridePoloidalWinding; }
public double GetWindingPairConfidence() { return windingPairConfidence; }
public double GetRationalTemplateSeedParm() { return rationalTemplateSeedParm; }
public double GetRationalSurfaceFactor() { return rationalSurfaceFactor; }
public int GetAdjustPlane() { return adjustPlane; }
public int GetOverlaps() { return overlaps; }
public int GetMeshType() { return meshType; }
......@@ -1028,7 +1028,7 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
if(WriteSelect(26, buf))
buf.WriteDouble(windingPairConfidence);
if(WriteSelect(27, buf))
buf.WriteDouble(rationalTemplateSeedParm);
buf.WriteDouble(rationalSurfaceFactor);
if(WriteSelect(28, buf))
buf.WriteInt(adjustPlane);
if(WriteSelect(29, buf))
......@@ -1187,7 +1187,7 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
SetWindingPairConfidence(buf.ReadDouble());
break;
case 27:
SetRationalTemplateSeedParm(buf.ReadDouble());
SetRationalSurfaceFactor(buf.ReadDouble());
break;
case 28:
SetAdjustPlane(buf.ReadInt());
......@@ -1384,7 +1384,7 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
str = str + intToString("overrideToroidalWinding", overrideToroidalWinding, indent) + "\n";
str = str + intToString("overridePoloidalWinding", overridePoloidalWinding, indent) + "\n";
str = str + doubleToString("windingPairConfidence", windingPairConfidence, indent) + "\n";
str = str + doubleToString("rationalTemplateSeedParm", rationalTemplateSeedParm, indent) + "\n";
str = str + doubleToString("rationalSurfaceFactor", rationalSurfaceFactor, indent) + "\n";
str = str + intToString("adjustPlane", adjustPlane, indent) + "\n";
str = str + indent + "overlaps = ";
if(overlaps == OVERLAPTYPE_RAW)
......@@ -1518,7 +1518,7 @@ public class PoincareAttributes extends AttributeSubject implements Plugin
private int overrideToroidalWinding;
private int overridePoloidalWinding;
private double windingPairConfidence;
private double rationalTemplateSeedParm;
private double rationalSurfaceFactor;
private int adjustPlane;
private int overlaps;
private int meshType;
......
......@@ -327,7 +327,7 @@ PyPoincareAttributes_ToString(const PoincareAttributes *atts, const char *prefix
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%swindingPairConfidence = %g\n", prefix, atts->GetWindingPairConfidence());
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%srationalTemplateSeedParm = %g\n", prefix, atts->GetRationalTemplateSeedParm());
SNPRINTF(tmpStr, 1000, "%srationalSurfaceFactor = %g\n", prefix, atts->GetRationalSurfaceFactor());
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%sadjustPlane = %d\n", prefix, atts->GetAdjustPlane());
str += tmpStr;
......@@ -1448,7 +1448,7 @@ PoincareAttributes_GetWindingPairConfidence(PyObject *self, PyObject *args)
}
/*static*/ PyObject *
PoincareAttributes_SetRationalTemplateSeedParm(PyObject *self, PyObject *args)
PoincareAttributes_SetRationalSurfaceFactor(PyObject *self, PyObject *args)
{
PoincareAttributesObject *obj = (PoincareAttributesObject *)self;
......@@ -1456,18 +1456,18 @@ PoincareAttributes_SetRationalTemplateSeedParm(PyObject *self, PyObject *args)
if(!PyArg_ParseTuple(args, "d", &dval))
return NULL;
// Set the rationalTemplateSeedParm in the object.
obj->data->SetRationalTemplateSeedParm(dval);
// Set the rationalSurfaceFactor in the object.
obj->data->SetRationalSurfaceFactor(dval);
Py_INCREF(Py_None);
return Py_None;
}
/*static*/ PyObject *
PoincareAttributes_GetRationalTemplateSeedParm(PyObject *self, PyObject *args)
PoincareAttributes_GetRationalSurfaceFactor(PyObject *self, PyObject *args)
{
PoincareAttributesObject *obj = (PoincareAttributesObject *)self;
PyObject *retval = PyFloat_FromDouble(obj->data->GetRationalTemplateSeedParm());
PyObject *retval = PyFloat_FromDouble(obj->data->GetRationalSurfaceFactor());
return retval;
}
......@@ -2489,8 +2489,8 @@ PyMethodDef PyPoincareAttributes_methods[POINCAREATTRIBUTES_NMETH] = {
{"GetOverridePoloidalWinding", PoincareAttributes_GetOverridePoloidalWinding, METH_VARARGS},
{"SetWindingPairConfidence", PoincareAttributes_SetWindingPairConfidence, METH_VARARGS},
{"GetWindingPairConfidence", PoincareAttributes_GetWindingPairConfidence, METH_VARARGS},
{"SetRationalTemplateSeedParm", PoincareAttributes_SetRationalTemplateSeedParm, METH_VARARGS},
{"GetRationalTemplateSeedParm", PoincareAttributes_GetRationalTemplateSeedParm, METH_VARARGS},
{"SetRationalSurfaceFactor", PoincareAttributes_SetRationalSurfaceFactor, METH_VARARGS},
{"GetRationalSurfaceFactor", PoincareAttributes_GetRationalSurfaceFactor, METH_VARARGS},
{"SetAdjustPlane", PoincareAttributes_SetAdjustPlane, METH_VARARGS},
{"GetAdjustPlane", PoincareAttributes_GetAdjustPlane, METH_VARARGS},
{"SetOverlaps", PoincareAttributes_SetOverlaps, METH_VARARGS},
......@@ -2699,8 +2699,8 @@ PyPoincareAttributes_getattr(PyObject *self, char *name)
return PoincareAttributes_GetOverridePoloidalWinding(self, NULL);
if(strcmp(name, "windingPairConfidence") == 0)
return PoincareAttributes_GetWindingPairConfidence(self, NULL);
if(strcmp(name, "rationalTemplateSeedParm") == 0)
return PoincareAttributes_GetRationalTemplateSeedParm(self, NULL);
if(strcmp(name, "rationalSurfaceFactor") == 0)
return PoincareAttributes_GetRationalSurfaceFactor(self, NULL);
if(strcmp(name, "adjustPlane") == 0)
return PoincareAttributes_GetAdjustPlane(self, NULL);
if(strcmp(name, "overlaps") == 0)
......@@ -2914,8 +2914,8 @@ PyPoincareAttributes_setattr(PyObject *self, char *name, PyObject *args)
obj = PoincareAttributes_SetOverridePoloidalWinding(self, tuple);
else if(strcmp(name, "windingPairConfidence") == 0)
obj = PoincareAttributes_SetWindingPairConfidence(self, tuple);
else if(strcmp(name, "rationalTemplateSeedParm") == 0)
obj = PoincareAttributes_SetRationalTemplateSeedParm(self, tuple);
else if(strcmp(name, "rationalSurfaceFactor") == 0)
obj = PoincareAttributes_SetRationalSurfaceFactor(self, tuple);
else if(strcmp(name, "adjustPlane") == 0)
obj = PoincareAttributes_SetAdjustPlane(self, tuple);
else if(strcmp(name, "overlaps") == 0)
......
......@@ -147,7 +147,7 @@ QvisPoincarePlotWindow::CreateWindowContents()
// First tab
// ----------------------------------------------------------------------
firstTab = new QWidget(central);
propertyTabs->addTab(firstTab, tr("Streamlines"));
propertyTabs->addTab(firstTab, tr("Fieldlines"));
QGridLayout *mainLayout = new QGridLayout(firstTab);
......@@ -463,13 +463,13 @@ QvisPoincarePlotWindow::CreateWindowContents()
analysisLayout->addWidget(windingPairConfidence, 3, 1);
rationalTemplateSeedParmLabel =
new QLabel(tr("Rational Template Seed Parameter"), secondTab);
analysisLayout->addWidget(rationalTemplateSeedParmLabel, 4, 0);
rationalTemplateSeedParm = new QLineEdit(secondTab);
connect(rationalTemplateSeedParm, SIGNAL(returnPressed()),
this, SLOT(rationalTemplateSeedParmProcessText()));
analysisLayout->addWidget(rationalTemplateSeedParm, 4, 1);
rationalSurfaceFactorLabel =
new QLabel(tr("Rational surface factor"), secondTab);
analysisLayout->addWidget(rationalSurfaceFactorLabel, 4, 0);
rationalSurfaceFactor = new QLineEdit(secondTab);
connect(rationalSurfaceFactor, SIGNAL(returnPressed()),
this, SLOT(rationalSurfaceFactorProcessText()));
analysisLayout->addWidget(rationalSurfaceFactor, 4, 1);
// Create the O/X Point group box.
QGroupBox *criticalPointGroup = new QGroupBox(secondTab);
......@@ -810,7 +810,7 @@ QvisPoincarePlotWindow::CreateWindowContents()
mainLayout = new QGridLayout(fourthTab);
QGroupBox *algoGrp = new QGroupBox(fourthTab);
algoGrp->setTitle(tr("Parallel streamline options"));
algoGrp->setTitle(tr("Parallel fieldline options"));
mainLayout->addWidget(algoGrp, 0, 0, 1, 4);
// Algorithm group.
......@@ -820,9 +820,9 @@ QvisPoincarePlotWindow::CreateWindowContents()
slAlgoLabel = new QLabel(tr("Parallelize across"), algoGrp);
slAlgo = new QComboBox(algoGrp);
slAlgo->addItem(tr("Streamlines"));
slAlgo->addItem(tr("Fieldlines"));
slAlgo->addItem(tr("Domains"));
slAlgo->addItem(tr("Streamlines and Domains"));
slAlgo->addItem(tr("Fieldlines and Domains"));
connect(slAlgo, SIGNAL(activated(int)),
this, SLOT(streamlineAlgorithmChanged(int)));
algoGLayout->addWidget( slAlgoLabel, 1,0);
......@@ -1118,8 +1118,8 @@ QvisPoincarePlotWindow::UpdateWindow(bool doAll)
windingPairConfidence->setText(DoubleToQString(atts->GetWindingPairConfidence()));
break;
case PoincareAttributes::ID_rationalTemplateSeedParm:
rationalTemplateSeedParm->setText(DoubleToQString(atts->GetRationalTemplateSeedParm()));
case PoincareAttributes::ID_rationalSurfaceFactor:
rationalSurfaceFactor->setText(DoubleToQString(atts->GetRationalSurfaceFactor()));
break;
case PoincareAttributes::ID_adjustPlane:
adjustPlane->blockSignals(true);
......@@ -1523,17 +1523,17 @@ QvisPoincarePlotWindow::GetCurrentValues(int which_widget)
}
}
// Do rationalTemplateSeedParm
if(which_widget == PoincareAttributes::ID_rationalTemplateSeedParm || doAll)
// Do rationalSurfaceFactor
if(which_widget == PoincareAttributes::ID_rationalSurfaceFactor || doAll)
{
double val;
if(LineEditGetDouble(rationalTemplateSeedParm, val))
atts->SetRationalTemplateSeedParm(val);
if(LineEditGetDouble(rationalSurfaceFactor, val))
atts->SetRationalSurfaceFactor(val);
else
{
ResettingError(tr("rationalTemplateSeedParm"),
DoubleToQString(atts->GetRationalTemplateSeedParm()));
atts->SetRationalTemplateSeedParm(atts->GetRationalTemplateSeedParm());
ResettingError(tr("rationalSurfaceFactor"),
DoubleToQString(atts->GetRationalSurfaceFactor()));
atts->SetRationalSurfaceFactor(atts->GetRationalSurfaceFactor());
}
}
......@@ -1622,7 +1622,7 @@ QvisPoincarePlotWindow::UpdateMeshTypeAttributes()