kindred/create
1
1
Fork 0
Code Issues 37 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

2
src/Mod/Robot/Gui/AppRobotGui.cpp
View File

@@ -92,7 +92,7 @@ PyMOD_INIT_FUNC(RobotGui)
// default Cintinuity is off
Base::Interpreter().runString("_DefCont = False");
// default Cintinuity is off
Base::Interpreter().runString("_DefAccelaration = '1 m/s^2'");
Base::Interpreter().runString("_DefAcceleration = '1 m/s^2'");
// default orientation of a waypoint if no other constraint
Base::Interpreter().runString("_DefOrientation = FreeCAD.Rotation()");
// default displacement while e.g. picking

6
src/Mod/Robot/Gui/CommandTrajectory.cpp
View File

@@ -130,7 +130,7 @@ void CmdRobotInsertWaypoint::activated(int)
std::string TrakName = pcTrajectoryObject->getNameInDocument();
openCommand("Insert waypoint");
doCommand(Doc,"App.activeDocument().%s.Trajectory = App.activeDocument().%s.Trajectory.insertWaypoints(Robot.Waypoint(App.activeDocument().%s.Tcp.multiply(App.activeDocument().%s.Tool),type='LIN',name='Pt',vel=_DefSpeed,cont=_DefCont,acc=_DefAccelaration,tool=1))",TrakName.c_str(),TrakName.c_str(),RoboName.c_str(),RoboName.c_str());
doCommand(Doc,"App.activeDocument().%s.Trajectory = App.activeDocument().%s.Trajectory.insertWaypoints(Robot.Waypoint(App.activeDocument().%s.Tcp.multiply(App.activeDocument().%s.Tool),type='LIN',name='Pt',vel=_DefSpeed,cont=_DefCont,acc=_DefAcceleration,tool=1))",TrakName.c_str(),TrakName.c_str(),RoboName.c_str(),RoboName.c_str());
updateActive();
commitCommand();
@@ -194,7 +194,7 @@ void CmdRobotInsertWaypointPreselect::activated(int)
}
openCommand("Insert waypoint");
doCommand(Doc,"App.activeDocument().%s.Trajectory = App.activeDocument().%s.Trajectory.insertWaypoints(Robot.Waypoint(FreeCAD.Placement(FreeCAD.Vector(%f,%f,%f)+_DefDisplacement,_DefOrientation),type='LIN',name='Pt',vel=_DefSpeed,cont=_DefCont,acc=_DefAccelaration,tool=1))",TrakName.c_str(),TrakName.c_str(),x,y,z);
doCommand(Doc,"App.activeDocument().%s.Trajectory = App.activeDocument().%s.Trajectory.insertWaypoints(Robot.Waypoint(FreeCAD.Placement(FreeCAD.Vector(%f,%f,%f)+_DefDisplacement,_DefOrientation),type='LIN',name='Pt',vel=_DefSpeed,cont=_DefCont,acc=_DefAcceleration,tool=1))",TrakName.c_str(),TrakName.c_str(),x,y,z);
updateActive();
commitCommand();
@@ -286,7 +286,7 @@ void CmdRobotSetDefaultValues::activated(int)
QObject::tr("acceleration: (e.g. 1 m/s^2 or 3 cm/s^2)"), QLineEdit::Normal,
QString::fromLatin1("1 m/s^2"), &ok, Qt::MSWindowsFixedSizeDialogHint);
if ( ok && !text.isEmpty() ) {
doCommand(Doc,"_DefAccelaration = '%s'",text.toLatin1().constData());
doCommand(Doc,"_DefAcceleration = '%s'",text.toLatin1().constData());
}

2
src/Mod/Robot/Gui/TaskTrajectory.cpp
View File

@@ -81,7 +81,7 @@ TaskTrajectory::TaskTrajectory(Robot::RobotObject *pcRobotObject,Robot::Trajecto
else
ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QString::fromLatin1("-")));
ui->trajectoryTable->setItem(i, 3, new QTableWidgetItem(QString::number(pt.Velocity)));
ui->trajectoryTable->setItem(i, 4, new QTableWidgetItem(QString::number(pt.Accelaration)));
ui->trajectoryTable->setItem(i, 4, new QTableWidgetItem(QString::number(pt.Acceleration)));
}

2
src/Mod/Robot/Gui/TrajectorySimulate.cpp
View File

@@ -79,7 +79,7 @@ TrajectorySimulate::TrajectorySimulate(Robot::RobotObject *pcRobotObject,Robot::
else
ui->trajectoryTable->setItem(i, 2, new QTableWidgetItem(QString::fromLatin1("-")));
ui->trajectoryTable->setItem(i, 3, new QTableWidgetItem(QString::number(pt.Velocity)));
ui->trajectoryTable->setItem(i, 4, new QTableWidgetItem(QString::number(pt.Accelaration)));
ui->trajectoryTable->setItem(i, 4, new QTableWidgetItem(QString::number(pt.Acceleration)));
}