kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Robot] fix typo reported by spellchecker CI

Browse Source 
- Accelaration -> Acceleration

- plus some style fixes done by MSVC
This commit is contained in:
Uwe
2022-02-21 14:19:53 +01:00
committed by wwmayer
parent 4adabe3de8
commit 181fc65d01
11 changed files with 328 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/Mod/Robot/App/TrajectoryDressUpObject.cpp
View File

@@ -69,7 +69,7 @@ TrajectoryDressUpObject::~TrajectoryDressUpObject()
{
}
App::DocumentObjectExecReturn *TrajectoryDressUpObject::execute(void)
App::DocumentObjectExecReturn* TrajectoryDressUpObject::execute(void)
{
Robot::Trajectory result;
@@ -79,39 +79,39 @@ App::DocumentObjectExecReturn *TrajectoryDressUpObject::execute(void)
if (!link->getTypeId().isDerivedFrom(Robot::TrajectoryObject::getClassTypeId()))
return new App::DocumentObjectExecReturn("Linked object is not a Trajectory object");
const std::vector<Waypoint*> &wps = static_cast<Robot::TrajectoryObject*>(link)->Trajectory.getValue().getWaypoints();
for (std::vector<Waypoint*>::const_iterator it= wps.begin();it!=wps.end();++it) {
const std::vector<Waypoint*>& wps = static_cast<Robot::TrajectoryObject*>(link)->Trajectory.getValue().getWaypoints();
for (std::vector<Waypoint*>::const_iterator it = wps.begin(); it != wps.end(); ++it) {
Waypoint wpt = **it;
if(UseSpeed.getValue())
if (UseSpeed.getValue())
wpt.Velocity = Speed.getValue();
if(UseAcceleration.getValue())
wpt.Accelaration = Acceleration.getValue();
switch(ContType.getValue()){
case 0: break;
case 1: wpt.Cont = true;break;
case 2: wpt.Cont = false;break;
default: assert(0); // must not happen!
if (UseAcceleration.getValue())
wpt.Acceleration = Acceleration.getValue();
switch (ContType.getValue()) {
case 0: break;
case 1: wpt.Cont = true; break;
case 2: wpt.Cont = false; break;
default: assert(0); // must not happen!
}
switch(AddType.getValue()){
switch (AddType.getValue()) {
// do nothing
case 0: break;
case 0: break;
// use orientation
case 1:
wpt.EndPos.setRotation(PosAdd.getValue().getRotation());
break;
case 1:
wpt.EndPos.setRotation(PosAdd.getValue().getRotation());
break;
// add position
case 2:
wpt.EndPos.setPosition(wpt.EndPos.getPosition() + PosAdd.getValue().getPosition());
break;
case 2:
wpt.EndPos.setPosition(wpt.EndPos.getPosition() + PosAdd.getValue().getPosition());
break;
// add orientation
case 3:
wpt.EndPos.setRotation(wpt.EndPos.getRotation() * PosAdd.getValue().getRotation());
break;
case 3:
wpt.EndPos.setRotation(wpt.EndPos.getRotation() * PosAdd.getValue().getRotation());
break;
// add orientation & position
case 4:
wpt.EndPos= wpt.EndPos * PosAdd.getValue();
break;
default: assert(0); // must not happen!
case 4:
wpt.EndPos = wpt.EndPos * PosAdd.getValue();
break;
default: assert(0); // must not happen!
}
result.addWaypoint(wpt);
@@ -119,12 +119,11 @@ App::DocumentObjectExecReturn *TrajectoryDressUpObject::execute(void)
// set the resulting Trajectory to the object
Trajectory.setValue(result);
return App::DocumentObject::StdReturn;
}
void TrajectoryDressUpObject::onChanged(const Property* prop)
{
App::GeoFeature::onChanged(prop);
}