diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C index 2fdcf6edd0e059d7a495307b96de06f3574c2ad0..4edabee83eca3c7ed08152e51fcc23ac92138c81 100644 --- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C +++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C @@ -53,8 +53,8 @@ Usage -rotate-angle (vector angle) Rotate angle degrees about vector axis. - or -yawPitchRoll (yawdegrees pitchdegrees rolldegrees) - or -rollPitchYaw (rolldegrees pitchdegrees yawdegrees) + or -yawPitchRoll : (yaw pitch roll) degrees + or -rollPitchYaw : (roll pitch yaw) degrees -scale scalar|vector Scale the points by the given scalar or vector on output. @@ -259,15 +259,18 @@ int main(int argc, char *argv[]) ); argList::addBoolOption ( - "auto-origin", - "Use bounding box centre as origin for rotations" + "auto-centre", + "Use bounding box centre as centre for rotations" ); argList::addOption ( - "origin", + "centre", "point", - "Use specified <point> as origin for rotations" + "Use specified <point> as centre for rotations" ); + argList::addOptionCompat("auto-centre", {"auto-origin", 2206}); + argList::addOptionCompat("centre", {"origin", 2206}); + argList::addOption ( "rotate", @@ -411,18 +414,18 @@ int main(int argc, char *argv[]) points += v; } - vector origin; - bool useOrigin = args.readIfPresent("origin", origin); - if (args.found("auto-origin") && !useOrigin) + vector rotationCentre; + bool useRotationCentre = args.readIfPresent("centre", rotationCentre); + if (args.found("auto-centre") && !useRotationCentre) { - useOrigin = true; - origin = boundBox(points).centre(); + useRotationCentre = true; + rotationCentre = boundBox(points).centre(); } - if (useOrigin) + if (useRotationCentre) { - Info<< "Set origin for rotations to " << origin << endl; - points -= origin; + Info<< "Set centre of rotation to " << rotationCentre << endl; + points -= rotationCentre; } if (args.found("rotate")) @@ -503,15 +506,15 @@ int main(int argc, char *argv[]) } } - // Output scaling - applyScaling(points, getScalingOpt("scale", args)); - - if (useOrigin) + if (useRotationCentre) { - Info<< "Unset origin for rotations from " << origin << endl; - points += origin; + Info<< "Unset centre of rotation from " << rotationCentre << endl; + points += rotationCentre; } + // Output scaling + applyScaling(points, getScalingOpt("scale", args)); + // Set the precision of the points data to 10 IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision())); diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C index 4322a0a530c92150bbd235af9066f440e5e0819a..26df0802ec3d1fed199830decc4c80c53f7198fb 100644 --- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C +++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C @@ -188,15 +188,18 @@ int main(int argc, char *argv[]) ); argList::addBoolOption ( - "auto-origin", - "Use bounding box centre as origin for rotations" + "auto-centre", + "Use bounding box centre as centre for rotations" ); argList::addOption ( - "origin", + "centre", "point", - "Use specified <point> as origin for rotations" + "Use specified <point> as centre for rotations" ); + argList::addOptionCompat("auto-centre", {"auto-origin", 2206}); + argList::addOptionCompat("centre", {"origin", 2206}); + argList::addOption ( "rotate", @@ -334,18 +337,18 @@ int main(int argc, char *argv[]) points += v; } - vector origin; - bool useOrigin = args.readIfPresent("origin", origin); - if (args.found("auto-origin") && !useOrigin) + vector rotationCentre; + bool useRotationCentre = args.readIfPresent("centre", rotationCentre); + if (args.found("auto-centre") && !useRotationCentre) { - useOrigin = true; - origin = boundBox(points).centre(); + useRotationCentre = true; + rotationCentre = boundBox(points).centre(); } - if (useOrigin) + if (useRotationCentre) { - Info<< "Set origin for rotations to " << origin << endl; - points -= origin; + Info<< "Set centre of rotation to " << rotationCentre << endl; + points -= rotationCentre; } if (args.found("rotate")) @@ -406,15 +409,15 @@ int main(int argc, char *argv[]) points = transform(rot, points); } - // Output scaling - applyScaling(points, getScalingOpt("write-scale", args)); - - if (useOrigin) + if (useRotationCentre) { - Info<< "Unset origin for rotations from " << origin << endl; - points += origin; + Info<< "Unset centre of rotation from " << rotationCentre << endl; + points += rotationCentre; } + // Output scaling + applyScaling(points, getScalingOpt("write-scale", args)); + surf1.movePoints(points); surf1.write(exportName, writeFileType);