Commit e7525333 authored by allens's avatar allens
Browse files

removed the coordinate transfrom from the operator

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23700 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7c686361
......@@ -250,7 +250,6 @@ IntegralCurveAttributes::ChangesRequireRecalculation(const IntegralCurveAttribut
cropEndFlag != obj.cropEndFlag ||
cropEnd != obj.cropEnd ||
cropValue != obj.cropValue ||
coordinateSystem != obj.coordinateSystem ||
showPoints != obj.showPoints ||
showLines != obj.showLines ||
pathlines != obj.pathlines ||
......
......@@ -45,11 +45,6 @@
Tubes
Ribbons
</Enum>
<Enum name="CoordinateSystem">
AsIs
CylindricalToCartesian
CartesianToCylindrical
</Enum>
<Enum name="IntegrationDirection">
Forward
Backward
......@@ -245,9 +240,6 @@
<Field name="displayGeometry" label="Display geometry" type="enum" subtype="DisplayGeometry">
Lines
</Field>
<Field name="coordinateSystem" label="coordinateSystem" type="enum" subtype="CoordinateSystem">
AsIs
</Field>
<Field name="showLines" label="Show Lines" type="bool">
true
</Field>
......
......@@ -201,44 +201,6 @@ IntegralCurveAttributes::DisplayGeometry_FromString(const std::string &s, Integr
return false;
}
//
// Enum conversion methods for IntegralCurveAttributes::CoordinateSystem
//
static const char *CoordinateSystem_strings[] = {
"AsIs", "CylindricalToCartesian", "CartesianToCylindrical"
};
std::string
IntegralCurveAttributes::CoordinateSystem_ToString(IntegralCurveAttributes::CoordinateSystem t)
{
int index = int(t);
if(index < 0 || index >= 3) index = 0;
return CoordinateSystem_strings[index];
}
std::string
IntegralCurveAttributes::CoordinateSystem_ToString(int t)
{
int index = (t < 0 || t >= 3) ? 0 : t;
return CoordinateSystem_strings[index];
}
bool
IntegralCurveAttributes::CoordinateSystem_FromString(const std::string &s, IntegralCurveAttributes::CoordinateSystem &val)
{
val = IntegralCurveAttributes::AsIs;
for(int i = 0; i < 3; ++i)
{
if(s == CoordinateSystem_strings[i])
{
val = (CoordinateSystem)i;
return true;
}
}
return false;
}
//
// Enum conversion methods for IntegralCurveAttributes::IntegrationDirection
//
......@@ -556,7 +518,6 @@ void IntegralCurveAttributes::Init()
pathlinesPeriod = 0;
pathlinesCMFE = POS_CMFE;
displayGeometry = Lines;
coordinateSystem = AsIs;
showLines = true;
showPoints = false;
cropBeginFlag = false;
......@@ -672,7 +633,6 @@ void IntegralCurveAttributes::Copy(const IntegralCurveAttributes &obj)
pathlinesPeriod = obj.pathlinesPeriod;
pathlinesCMFE = obj.pathlinesCMFE;
displayGeometry = obj.displayGeometry;
coordinateSystem = obj.coordinateSystem;
showLines = obj.showLines;
showPoints = obj.showPoints;
cropBeginFlag = obj.cropBeginFlag;
......@@ -943,7 +903,6 @@ IntegralCurveAttributes::operator == (const IntegralCurveAttributes &obj) const
(pathlinesPeriod == obj.pathlinesPeriod) &&
(pathlinesCMFE == obj.pathlinesCMFE) &&
(displayGeometry == obj.displayGeometry) &&
(coordinateSystem == obj.coordinateSystem) &&
(showLines == obj.showLines) &&
(showPoints == obj.showPoints) &&
(cropBeginFlag == obj.cropBeginFlag) &&
......@@ -1268,7 +1227,6 @@ IntegralCurveAttributes::SelectAll()
Select(ID_pathlinesPeriod, (void *)&pathlinesPeriod);
Select(ID_pathlinesCMFE, (void *)&pathlinesCMFE);
Select(ID_displayGeometry, (void *)&displayGeometry);
Select(ID_coordinateSystem, (void *)&coordinateSystem);
Select(ID_showLines, (void *)&showLines);
Select(ID_showPoints, (void *)&showPoints);
Select(ID_cropBeginFlag, (void *)&cropBeginFlag);
......@@ -1589,12 +1547,6 @@ IntegralCurveAttributes::CreateNode(DataNode *parentNode, bool completeSave, boo
node->AddNode(new DataNode("displayGeometry", DisplayGeometry_ToString(displayGeometry)));
}
if(completeSave || !FieldsEqual(ID_coordinateSystem, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("coordinateSystem", CoordinateSystem_ToString(coordinateSystem)));
}
if(completeSave || !FieldsEqual(ID_showLines, &defaultObject))
{
addToParent = true;
......@@ -1989,22 +1941,6 @@ IntegralCurveAttributes::SetFromNode(DataNode *parentNode)
SetDisplayGeometry(value);
}
}
if((node = searchNode->GetNode("coordinateSystem")) != 0)
{
// Allow enums to be int or string in the config file
if(node->GetNodeType() == INT_NODE)
{
int ival = node->AsInt();
if(ival >= 0 && ival < 3)
SetCoordinateSystem(CoordinateSystem(ival));
}
else if(node->GetNodeType() == STRING_NODE)
{
CoordinateSystem value;
if(CoordinateSystem_FromString(node->AsString(), value))
SetCoordinateSystem(value);
}
}
if((node = searchNode->GetNode("showLines")) != 0)
SetShowLines(node->AsBool());
if((node = searchNode->GetNode("showPoints")) != 0)
......@@ -2412,13 +2348,6 @@ IntegralCurveAttributes::SetDisplayGeometry(IntegralCurveAttributes::DisplayGeom
Select(ID_displayGeometry, (void *)&displayGeometry);
}
void
IntegralCurveAttributes::SetCoordinateSystem(IntegralCurveAttributes::CoordinateSystem coordinateSystem_)
{
coordinateSystem = coordinateSystem_;
Select(ID_coordinateSystem, (void *)&coordinateSystem);
}
void
IntegralCurveAttributes::SetShowLines(bool showLines_)
{
......@@ -2921,12 +2850,6 @@ IntegralCurveAttributes::GetDisplayGeometry() const
return DisplayGeometry(displayGeometry);
}
IntegralCurveAttributes::CoordinateSystem
IntegralCurveAttributes::GetCoordinateSystem() const
{
return CoordinateSystem(coordinateSystem);
}
bool
IntegralCurveAttributes::GetShowLines() const
{
......@@ -3221,7 +3144,6 @@ IntegralCurveAttributes::GetFieldName(int index) const
case ID_pathlinesPeriod: return "pathlinesPeriod";
case ID_pathlinesCMFE: return "pathlinesCMFE";
case ID_displayGeometry: return "displayGeometry";
case ID_coordinateSystem: return "coordinateSystem";
case ID_showLines: return "showLines";
case ID_showPoints: return "showPoints";
case ID_cropBeginFlag: return "cropBeginFlag";
......@@ -3314,7 +3236,6 @@ IntegralCurveAttributes::GetFieldType(int index) const
case ID_pathlinesPeriod: return FieldType_double;
case ID_pathlinesCMFE: return FieldType_enum;
case ID_displayGeometry: return FieldType_enum;
case ID_coordinateSystem: return FieldType_enum;
case ID_showLines: return FieldType_bool;
case ID_showPoints: return FieldType_bool;
case ID_cropBeginFlag: return FieldType_bool;
......@@ -3407,7 +3328,6 @@ IntegralCurveAttributes::GetFieldTypeName(int index) const
case ID_pathlinesPeriod: return "double";
case ID_pathlinesCMFE: return "enum";
case ID_displayGeometry: return "enum";
case ID_coordinateSystem: return "enum";
case ID_showLines: return "bool";
case ID_showPoints: return "bool";
case ID_cropBeginFlag: return "bool";
......@@ -3723,11 +3643,6 @@ IntegralCurveAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) cons
retval = (displayGeometry == obj.displayGeometry);
}
break;
case ID_coordinateSystem:
{ // new scope
retval = (coordinateSystem == obj.coordinateSystem);
}
break;
case ID_showLines:
{ // new scope
retval = (showLines == obj.showLines);
......@@ -3931,7 +3846,6 @@ IntegralCurveAttributes::ChangesRequireRecalculation(const IntegralCurveAttribut
cropEndFlag != obj.cropEndFlag ||
cropEnd != obj.cropEnd ||
cropValue != obj.cropValue ||
coordinateSystem != obj.coordinateSystem ||
showPoints != obj.showPoints ||
showLines != obj.showLines ||
pathlines != obj.pathlines ||
......
......@@ -97,12 +97,6 @@ public:
Tubes,
Ribbons
};
enum CoordinateSystem
{
AsIs,
CylindricalToCartesian,
CartesianToCylindrical
};
enum IntegrationDirection
{
Forward,
......@@ -228,7 +222,6 @@ public:
void SetPathlinesPeriod(double pathlinesPeriod_);
void SetPathlinesCMFE(PathlinesCMFE pathlinesCMFE_);
void SetDisplayGeometry(DisplayGeometry displayGeometry_);
void SetCoordinateSystem(CoordinateSystem coordinateSystem_);
void SetShowLines(bool showLines_);
void SetShowPoints(bool showPoints_);
void SetCropBeginFlag(bool cropBeginFlag_);
......@@ -310,7 +303,6 @@ public:
double GetPathlinesPeriod() const;
PathlinesCMFE GetPathlinesCMFE() const;
DisplayGeometry GetDisplayGeometry() const;
CoordinateSystem GetCoordinateSystem() const;
bool GetShowLines() const;
bool GetShowPoints() const;
bool GetCropBeginFlag() const;
......@@ -361,11 +353,6 @@ public:
static bool DisplayGeometry_FromString(const std::string &, DisplayGeometry &);
protected:
static std::string DisplayGeometry_ToString(int);
public:
static std::string CoordinateSystem_ToString(CoordinateSystem);
static bool CoordinateSystem_FromString(const std::string &, CoordinateSystem &);
protected:
static std::string CoordinateSystem_ToString(int);
public:
static std::string IntegrationDirection_ToString(IntegrationDirection);
static bool IntegrationDirection_FromString(const std::string &, IntegrationDirection &);
......@@ -453,7 +440,6 @@ public:
ID_pathlinesPeriod,
ID_pathlinesCMFE,
ID_displayGeometry,
ID_coordinateSystem,
ID_showLines,
ID_showPoints,
ID_cropBeginFlag,
......@@ -526,7 +512,6 @@ private:
double pathlinesPeriod;
int pathlinesCMFE;
int displayGeometry;
int coordinateSystem;
bool showLines;
bool showPoints;
bool cropBeginFlag;
......@@ -556,6 +541,6 @@ private:
static const char *TypeMapFormatString;
static const private_tmfs_t TmfsStruct;
};
#define INTEGRALCURVEATTRIBUTES_TMFS "iDDDDDDdDDbd*iiiisiibdbddbddiddidDiiiiibbddiiibbbdbdidddbbiibbbbddddis"
#define INTEGRALCURVEATTRIBUTES_TMFS "iDDDDDDdDDbd*iiiisiibdbddbddiddidDiiiiibbddiibbbdbdidddbbiibbbbddddis"
#endif
......@@ -61,7 +61,7 @@ import java.util.Vector;
public class IntegralCurveAttributes extends AttributeSubject implements Plugin
{
private static int IntegralCurveAttributes_numAdditionalAtts = 69;
private static int IntegralCurveAttributes_numAdditionalAtts = 68;
// Enum values
public final static int SOURCETYPE_POINT = 0;
......@@ -93,10 +93,6 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
public final static int DISPLAYGEOMETRY_TUBES = 1;
public final static int DISPLAYGEOMETRY_RIBBONS = 2;
public final static int COORDINATESYSTEM_ASIS = 0;
public final static int COORDINATESYSTEM_CYLINDRICALTOCARTESIAN = 1;
public final static int COORDINATESYSTEM_CARTESIANTOCYLINDRICAL = 2;
public final static int INTEGRATIONDIRECTION_FORWARD = 0;
public final static int INTEGRATIONDIRECTION_BACKWARD = 1;
public final static int INTEGRATIONDIRECTION_BOTH = 2;
......@@ -214,7 +210,6 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
pathlinesPeriod = 0;
pathlinesCMFE = PATHLINESCMFE_POS_CMFE;
displayGeometry = DISPLAYGEOMETRY_LINES;
coordinateSystem = COORDINATESYSTEM_ASIS;
showLines = true;
showPoints = false;
cropBeginFlag = false;
......@@ -328,7 +323,6 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
pathlinesPeriod = 0;
pathlinesCMFE = PATHLINESCMFE_POS_CMFE;
displayGeometry = DISPLAYGEOMETRY_LINES;
coordinateSystem = COORDINATESYSTEM_ASIS;
showLines = true;
showPoints = false;
cropBeginFlag = false;
......@@ -446,7 +440,6 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
pathlinesPeriod = obj.pathlinesPeriod;
pathlinesCMFE = obj.pathlinesCMFE;
displayGeometry = obj.displayGeometry;
coordinateSystem = obj.coordinateSystem;
showLines = obj.showLines;
showPoints = obj.showPoints;
cropBeginFlag = obj.cropBeginFlag;
......@@ -588,7 +581,6 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
(pathlinesPeriod == obj.pathlinesPeriod) &&
(pathlinesCMFE == obj.pathlinesCMFE) &&
(displayGeometry == obj.displayGeometry) &&
(coordinateSystem == obj.coordinateSystem) &&
(showLines == obj.showLines) &&
(showPoints == obj.showPoints) &&
(cropBeginFlag == obj.cropBeginFlag) &&
......@@ -964,154 +956,148 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
Select(43);
}
public void SetCoordinateSystem(int coordinateSystem_)
{
coordinateSystem = coordinateSystem_;
Select(44);
}
public void SetShowLines(boolean showLines_)
{
showLines = showLines_;
Select(45);
Select(44);
}
public void SetShowPoints(boolean showPoints_)
{
showPoints = showPoints_;
Select(46);
Select(45);
}
public void SetCropBeginFlag(boolean cropBeginFlag_)
{
cropBeginFlag = cropBeginFlag_;
Select(47);
Select(46);
}
public void SetCropBegin(double cropBegin_)
{
cropBegin = cropBegin_;
Select(48);
Select(47);
}
public void SetCropEndFlag(boolean cropEndFlag_)
{
cropEndFlag = cropEndFlag_;
Select(49);
Select(48);
}
public void SetCropEnd(double cropEnd_)
{
cropEnd = cropEnd_;
Select(50);
Select(49);
}
public void SetCropValue(int cropValue_)
{
cropValue = cropValue_;
Select(51);
Select(50);
}
public void SetSampleDistance0(double sampleDistance0_)
{
sampleDistance0 = sampleDistance0_;
Select(52);
Select(51);
}
public void SetSampleDistance1(double sampleDistance1_)
{
sampleDistance1 = sampleDistance1_;
Select(53);
Select(52);
}
public void SetSampleDistance2(double sampleDistance2_)
{
sampleDistance2 = sampleDistance2_;
Select(54);
Select(53);
}
public void SetFillInterior(boolean fillInterior_)
{
fillInterior = fillInterior_;
Select(55);
Select(54);
}
public void SetRandomSamples(boolean randomSamples_)
{
randomSamples = randomSamples_;
Select(56);
Select(55);
}
public void SetRandomSeed(int randomSeed_)
{
randomSeed = randomSeed_;
Select(57);
Select(56);
}
public void SetNumberOfRandomSamples(int numberOfRandomSamples_)
{
numberOfRandomSamples = numberOfRandomSamples_;
Select(58);
Select(57);
}
public void SetForceNodeCenteredData(boolean forceNodeCenteredData_)
{
forceNodeCenteredData = forceNodeCenteredData_;
Select(59);
Select(58);
}
public void SetIssueTerminationWarnings(boolean issueTerminationWarnings_)
{
issueTerminationWarnings = issueTerminationWarnings_;
Select(60);
Select(59);
}
public void SetIssueStiffnessWarnings(boolean issueStiffnessWarnings_)
{
issueStiffnessWarnings = issueStiffnessWarnings_;
Select(61);
Select(60);
}
public void SetIssueCriticalPointsWarnings(boolean issueCriticalPointsWarnings_)
{
issueCriticalPointsWarnings = issueCriticalPointsWarnings_;
Select(62);
Select(61);
}
public void SetCriticalPointThreshold(double criticalPointThreshold_)
{
criticalPointThreshold = criticalPointThreshold_;
Select(63);
Select(62);
}
public void SetCorrelationDistanceAngTol(double correlationDistanceAngTol_)
{
correlationDistanceAngTol = correlationDistanceAngTol_;
Select(64);
Select(63);
}
public void SetCorrelationDistanceMinDistAbsolute(double correlationDistanceMinDistAbsolute_)
{
correlationDistanceMinDistAbsolute = correlationDistanceMinDistAbsolute_;
Select(65);
Select(64);
}
public void SetCorrelationDistanceMinDistBBox(double correlationDistanceMinDistBBox_)
{
correlationDistanceMinDistBBox = correlationDistanceMinDistBBox_;
Select(66);
Select(65);
}
public void SetCorrelationDistanceMinDistType(int correlationDistanceMinDistType_)
{
correlationDistanceMinDistType = correlationDistanceMinDistType_;
Select(67);
Select(66);
}
public void SetSelection(String selection_)
{
selection = selection_;
Select(68);
Select(67);
}
// Property getting methods
......@@ -1159,7 +1145,6 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
public double GetPathlinesPeriod() { return pathlinesPeriod; }
public int GetPathlinesCMFE() { return pathlinesCMFE; }
public int GetDisplayGeometry() { return displayGeometry; }
public int GetCoordinateSystem() { return coordinateSystem; }
public boolean GetShowLines() { return showLines; }
public boolean GetShowPoints() { return showPoints; }
public boolean GetCropBeginFlag() { return cropBeginFlag; }
......@@ -1277,54 +1262,52 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
if(WriteSelect(43, buf))
buf.WriteInt(displayGeometry);
if(WriteSelect(44, buf))
buf.WriteInt(coordinateSystem);
if(WriteSelect(45, buf))
buf.WriteBool(showLines);
if(WriteSelect(46, buf))
if(WriteSelect(45, buf))
buf.WriteBool(showPoints);
if(WriteSelect(47, buf))
if(WriteSelect(46, buf))
buf.WriteBool(cropBeginFlag);
if(WriteSelect(48, buf))
if(WriteSelect(47, buf))
buf.WriteDouble(cropBegin);
if(WriteSelect(49, buf))
if(WriteSelect(48, buf))
buf.WriteBool(cropEndFlag);
if(WriteSelect(50, buf))
if(WriteSelect(49, buf))
buf.WriteDouble(cropEnd);
if(WriteSelect(51, buf))
if(WriteSelect(50, buf))
buf.WriteInt(cropValue);
if(WriteSelect(52, buf))
if(WriteSelect(51, buf))
buf.WriteDouble(sampleDistance0);
if(WriteSelect(53, buf))
if(WriteSelect(52, buf))
buf.WriteDouble(sampleDistance1);
if(WriteSelect(54, buf))
if(WriteSelect(53, buf))
buf.WriteDouble(sampleDistance2);
if(WriteSelect(55, buf))
if(WriteSelect(54, buf))
buf.WriteBool(fillInterior);
if(WriteSelect(56, buf))
if(WriteSelect(55, buf))
buf.WriteBool(randomSamples);
if(WriteSelect(57, buf))
if(WriteSelect(56, buf))
buf.WriteInt(randomSeed);
if(WriteSelect(58, buf))
if(WriteSelect(57, buf))
buf.WriteInt(numberOfRandomSamples);
if(WriteSelect(59, buf))
if(WriteSelect(58, buf))
buf.WriteBool(forceNodeCenteredData);
if(WriteSelect(60, buf))
if(WriteSelect(59, buf))
buf.WriteBool(issueTerminationWarnings);
if(WriteSelect(61, buf))
if(WriteSelect(60, buf))
buf.WriteBool(issueStiffnessWarnings);
if(WriteSelect(62, buf))
if(WriteSelect(61, buf))
buf.WriteBool(issueCriticalPointsWarnings);
if(WriteSelect(63, buf))
if(WriteSelect(62, buf))
buf.WriteDouble(criticalPointThreshold);
if(WriteSelect(64, buf))
if(WriteSelect(63, buf))
buf.WriteDouble(correlationDistanceAngTol);
if(WriteSelect(65, buf))
if(WriteSelect(64, buf))
buf.WriteDouble(correlationDistanceMinDistAbsolute);
if(WriteSelect(66, buf))
if(WriteSelect(65, buf))
buf.WriteDouble(correlationDistanceMinDistBBox);
if(WriteSelect(67, buf))
if(WriteSelect(66, buf))
buf.WriteInt(correlationDistanceMinDistType);
if(WriteSelect(68, buf))
if(WriteSelect(67, buf))
buf.WriteString(selection);
}
......@@ -1465,78 +1448,75 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
SetDisplayGeometry(buf.ReadInt());
break;
case 44:
SetCoordinateSystem(buf.ReadInt());
break;
case 45:
SetShowLines(buf.ReadBool());
break;
case 46:
case 45:
SetShowPoints(buf.ReadBool());
break;
case 47:
case 46:
SetCropBeginFlag(buf.ReadBool());
break;