Skip to content

Commit

Permalink
Stop IDE from removing trailing whitespaces...
Browse files Browse the repository at this point in the history
  • Loading branch information
nickbianco committed Aug 29, 2023
1 parent 5a74515 commit ce3b0c4
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Bindings/Java/OpenSimJNI/OpenSimContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const Array<AbstractPathPoint*>& OpenSimContext::getCurrentPath(Muscle& m) {
void OpenSimContext::copyMuscle(Muscle& from, Muscle& to) {
to = from;
recreateSystemKeepStage();
to.updPath<GeometryPath>().updateGeometry(*_configState);
to.updGeometryPath().updateGeometry(*_configState);
}

// Muscle Points
Expand Down
2 changes: 1 addition & 1 deletion Bindings/Java/OpenSimJNI/Test/testContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ int main()
AbstractPathPoint* clonedPoint = savePoint.clone();

// Test delete second PathPoint from TRIlong muscle
context->deletePathPoint(dTRIlong->updGeometryPath(), 2);
context->deletePathPoint(dTRIlong->updGeometryPath(), 2);
assert(pathPoints.getSize() == origSize - 1);
std::string pathAfterDeletionInXML = dTRIlong->updGeometryPath().dump();
std::cout << pathAfterDeletionInXML << endl;
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Actuators/Test/testMuscles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ void testThelen2003Muscle()
Thelen2003Muscle* myMcl = new Thelen2003Muscle("myMuscle",
MaxIsometricForce0, OptimalFiberLength0, TendonSlackLength0,
PennationAngle0);

myMcl->addNewPathPoint("p1", myModel.getGround(), SimTK::Vec3(0.0));
myMcl->addNewPathPoint("p2", myModel.getGround(), SimTK::Vec3(1.0));
myModel.addForce(myMcl);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,6 @@ void createLuxoJr(OpenSim::Model& model){
"back_extensor_right",
back_extensor_F0, back_extensor_lm0,
back_extensor_lts, pennationAngle);

backExtensorRight->addNewPathPoint("back_extensor_right_origin", *chest,
back_extensor_origin);
backExtensorRight->addNewPathPoint("back_extensor_right_insertion", *back,
Expand Down
8 changes: 4 additions & 4 deletions OpenSim/Examples/MuscleExample/mainFatigue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ int main()
pennationAngle);

// Define the path of the muscles
fatigable->addNewPathPoint("fatigable-point1", ground,
fatigable->addNewPathPoint("fatigable-point1", ground,
Vec3(0.0, halfLength, -0.35));
fatigable->addNewPathPoint("fatigable-point2", *block,
fatigable->addNewPathPoint("fatigable-point2", *block,
Vec3(0.0, halfLength, -halfLength));

original->addNewPathPoint("original-point1", ground,
original->addNewPathPoint("original-point1", ground,
Vec3(0.0, halfLength, 0.35));
original->addNewPathPoint("original-point2", *block,
original->addNewPathPoint("original-point2", *block,
Vec3(0.0, halfLength, halfLength));

// Define the default states for the two muscles
Expand Down
6 changes: 3 additions & 3 deletions OpenSim/Simulation/Model/Blankevoort1991Ligament.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Blankevoort1991Ligament::Blankevoort1991Ligament() : Force() {
}

Blankevoort1991Ligament::Blankevoort1991Ligament(std::string name,
const PhysicalFrame& frame1, SimTK::Vec3 point1,
const PhysicalFrame& frame1, SimTK::Vec3 point1,
const PhysicalFrame& frame2, SimTK::Vec3 point2)
: Blankevoort1991Ligament() {
setName(name);
Expand All @@ -45,8 +45,8 @@ Blankevoort1991Ligament::Blankevoort1991Ligament(std::string name,
}

Blankevoort1991Ligament::Blankevoort1991Ligament(std::string name,
const PhysicalFrame& frame1, SimTK::Vec3 point1,
const PhysicalFrame& frame2, SimTK::Vec3 point2,
const PhysicalFrame& frame1, SimTK::Vec3 point1,
const PhysicalFrame& frame2, SimTK::Vec3 point2,
double linear_stiffness, double slack_length)
: Blankevoort1991Ligament(name, frame1, point1, frame2, point2) {
set_linear_stiffness(linear_stiffness);
Expand Down
4 changes: 2 additions & 2 deletions OpenSim/Simulation/Model/Blankevoort1991Ligament.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@ OpenSim_DECLARE_CONCRETE_OBJECT(Blankevoort1991Ligament, Force)
// Constructors
Blankevoort1991Ligament();

Blankevoort1991Ligament(std::string name,
Blankevoort1991Ligament(std::string name,
const PhysicalFrame& frame1, SimTK::Vec3 point1,
const PhysicalFrame& frame2, SimTK::Vec3 point2);

Blankevoort1991Ligament(std::string name,
Blankevoort1991Ligament(std::string name,
const PhysicalFrame& frame1, SimTK::Vec3 point1,
const PhysicalFrame& frame2, SimTK::Vec3 point2,
double linear_stiffness, double slack_length);
Expand Down
2 changes: 1 addition & 1 deletion OpenSim/Simulation/Model/Muscle.h
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ OpenSim_DECLARE_ABSTRACT_OBJECT(Muscle, PathActuator);

/** Potential energy stored by the muscle */
double computePotentialEnergy(const SimTK::State& state) const override;

/** Override PathActuator virtual to calculate a preferred color for the
muscle path based on activation. **/
SimTK::Vec3 computePathColor(const SimTK::State& state) const override;
Expand Down
1 change: 0 additions & 1 deletion OpenSim/Simulation/MomentArmSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "MomentArmSolver.h"
#include "Model/PointForceDirection.h"
#include "Model/Model.h"
#include "Model/GeometryPath.h"

using namespace std;
using namespace SimTK;
Expand Down
1 change: 0 additions & 1 deletion OpenSim/Simulation/RegisterTypes_osimSimulation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
#include "Model/PathPointSet.h"
#include "Model/ConditionalPathPoint.h"
#include "Model/MovingPathPoint.h"
#include "Model/AbstractPath.h"
#include "Model/GeometryPath.h"
#include "Model/PrescribedForce.h"
#include "Model/ExternalForce.h"
Expand Down
4 changes: 2 additions & 2 deletions OpenSim/Tests/Wrapping/testWrappingAlgorithm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void testSingleWrapObjectPerpendicular(WrapObject* wrapObject, Vec3 axisRotation
new PathSpring("spring1", 1.0, 0.1, 0.01);
//offset in X direction to avoid ambiguous scenario where path passes through center
spring1->updGeometryPath().
appendNewPathPoint("origin", ground, Vec3(r-.1, r, 0));
appendNewPathPoint("origin", ground, Vec3(r-.1, r, 0));
spring1->updGeometryPath().
appendNewPathPoint("insert", *body, Vec3(-r, r, 0));
spring1->updGeometryPath().addPathWrap(*wObj);
Expand Down Expand Up @@ -211,7 +211,7 @@ void testEllipsoidWrapLength(OpenSim::WrapEllipsoid* wrapObject)
new PathSpring("spring1", 1.0, 0.1, 0.01);
//offset in X direction to avoid ambiguous scenario where path passes through center
spring1->updGeometryPath().
appendNewPathPoint("origin", ground, Vec3(r - .1, r, 0));
appendNewPathPoint("origin", ground, Vec3(r - .1, r, 0));
// insertion point is -r down from the tip of the long axis of the ellipsoid
spring1->updGeometryPath().
appendNewPathPoint("insert", *body, Vec3(-wrapObject->get_dimensions()[0], -r, 0));
Expand Down
1 change: 0 additions & 1 deletion OpenSim/Tests/testIterators/testIterators.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
* -------------------------------------------------------------------------- */
#include <iostream>
#include <OpenSim/Simulation/Model/Model.h>
#include <OpenSim/Simulation/Model/GeometryPath.h>
#include "OpenSim/Simulation/SimbodyEngine/PinJoint.h"
#include <OpenSim/Common/LoadOpenSimLibrary.h>
#include <OpenSim/Auxiliary/auxiliaryTestFunctions.h>
Expand Down

0 comments on commit ce3b0c4

Please sign in to comment.