From 9d4b58ae85bfbac752b439b4146f8a0c119fd436 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Thu, 26 Dec 2019 08:10:23 -0500 Subject: [PATCH] Robot: [skip ci] fix header uniformity + trailing whitespace This PR fixes header uniformity across all Robot files --- src/Mod/Robot/App/AppRobot.cpp | 2 +- src/Mod/Robot/App/Edge2TracObject.cpp | 2 +- src/Mod/Robot/App/Edge2TracObject.h | 2 +- src/Mod/Robot/App/PreCompiled.cpp | 2 +- src/Mod/Robot/App/PreCompiled.h | 2 +- src/Mod/Robot/App/PropertyTrajectory.cpp | 2 +- src/Mod/Robot/App/PropertyTrajectory.h | 2 +- src/Mod/Robot/App/Robot6Axis.cpp | 2 +- src/Mod/Robot/App/Robot6Axis.h | 2 +- src/Mod/Robot/App/Robot6AxisPyImp.cpp | 2 +- src/Mod/Robot/App/RobotAlgos.cpp | 2 +- src/Mod/Robot/App/RobotAlgos.h | 2 +- src/Mod/Robot/App/RobotObject.cpp | 5 ++-- src/Mod/Robot/App/RobotObject.h | 2 +- src/Mod/Robot/App/RobotObjectPyImp.cpp | 2 +- src/Mod/Robot/App/Simulation.cpp | 2 +- src/Mod/Robot/App/Simulation.h | 4 +-- src/Mod/Robot/App/Trajectory.cpp | 2 +- src/Mod/Robot/App/Trajectory.h | 10 +++---- src/Mod/Robot/App/TrajectoryCompound.cpp | 2 +- src/Mod/Robot/App/TrajectoryCompound.h | 2 +- src/Mod/Robot/App/TrajectoryDressUpObject.cpp | 2 +- src/Mod/Robot/App/TrajectoryDressUpObject.h | 2 +- src/Mod/Robot/App/TrajectoryObject.cpp | 2 +- src/Mod/Robot/App/TrajectoryObject.h | 2 +- src/Mod/Robot/App/TrajectoryPyImp.cpp | 2 +- src/Mod/Robot/App/Waypoint.cpp | 2 +- src/Mod/Robot/App/Waypoint.h | 2 +- src/Mod/Robot/App/WaypointPyImp.cpp | 2 +- src/Mod/Robot/Gui/AppRobotGui.cpp | 2 +- src/Mod/Robot/Gui/Command.cpp | 26 ++++++++-------- src/Mod/Robot/Gui/CommandExport.cpp | 6 ++-- src/Mod/Robot/Gui/CommandInsertRobot.cpp | 12 ++++---- src/Mod/Robot/Gui/CommandTrajectory.cpp | 30 +++++++++---------- src/Mod/Robot/Gui/PreCompiled.cpp | 4 +-- src/Mod/Robot/Gui/PreCompiled.h | 8 ++--- .../Robot/Gui/ViewProviderEdge2TracObject.cpp | 2 +- .../Robot/Gui/ViewProviderEdge2TracObject.h | 2 +- src/Mod/Robot/Gui/ViewProviderRobotObject.cpp | 4 +-- src/Mod/Robot/Gui/ViewProviderRobotObject.h | 2 +- src/Mod/Robot/Gui/ViewProviderTrajectory.cpp | 4 +-- src/Mod/Robot/Gui/ViewProviderTrajectory.h | 8 ++--- .../Gui/ViewProviderTrajectoryCompound.cpp | 2 +- .../Gui/ViewProviderTrajectoryCompound.h | 2 +- .../Gui/ViewProviderTrajectoryDressUp.cpp | 4 +-- .../Robot/Gui/ViewProviderTrajectoryDressUp.h | 4 +-- src/Mod/Robot/Init.py | 11 ++++--- src/Mod/Robot/InitGui.py | 10 +++---- src/Mod/Robot/KukaExporter.py | 4 +-- 49 files changed, 106 insertions(+), 112 deletions(-) diff --git a/src/Mod/Robot/App/AppRobot.cpp b/src/Mod/Robot/App/AppRobot.cpp index da7f36af22..383277235f 100644 --- a/src/Mod/Robot/App/AppRobot.cpp +++ b/src/Mod/Robot/App/AppRobot.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Edge2TracObject.cpp b/src/Mod/Robot/App/Edge2TracObject.cpp index 41220964e5..cc90008abc 100644 --- a/src/Mod/Robot/App/Edge2TracObject.cpp +++ b/src/Mod/Robot/App/Edge2TracObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Edge2TracObject.h b/src/Mod/Robot/App/Edge2TracObject.h index 9224eb68f0..4881350e7b 100644 --- a/src/Mod/Robot/App/Edge2TracObject.h +++ b/src/Mod/Robot/App/Edge2TracObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/PreCompiled.cpp b/src/Mod/Robot/App/PreCompiled.cpp index 46269e9671..1e5d389dd2 100644 --- a/src/Mod/Robot/App/PreCompiled.cpp +++ b/src/Mod/Robot/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/PreCompiled.h b/src/Mod/Robot/App/PreCompiled.h index 1a09057c1f..30daa1dc9e 100644 --- a/src/Mod/Robot/App/PreCompiled.h +++ b/src/Mod/Robot/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/PropertyTrajectory.cpp b/src/Mod/Robot/App/PropertyTrajectory.cpp index 9576b8b59e..458e1177d7 100644 --- a/src/Mod/Robot/App/PropertyTrajectory.cpp +++ b/src/Mod/Robot/App/PropertyTrajectory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/PropertyTrajectory.h b/src/Mod/Robot/App/PropertyTrajectory.h index b76b299bf1..53e01d5e39 100644 --- a/src/Mod/Robot/App/PropertyTrajectory.h +++ b/src/Mod/Robot/App/PropertyTrajectory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Robot6Axis.cpp b/src/Mod/Robot/App/Robot6Axis.cpp index cff847f592..d63b302850 100644 --- a/src/Mod/Robot/App/Robot6Axis.cpp +++ b/src/Mod/Robot/App/Robot6Axis.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Robot6Axis.h b/src/Mod/Robot/App/Robot6Axis.h index 6663756f44..a1cb2703b8 100644 --- a/src/Mod/Robot/App/Robot6Axis.h +++ b/src/Mod/Robot/App/Robot6Axis.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Robot6AxisPyImp.cpp b/src/Mod/Robot/App/Robot6AxisPyImp.cpp index 029cff2966..9d19127dd5 100644 --- a/src/Mod/Robot/App/Robot6AxisPyImp.cpp +++ b/src/Mod/Robot/App/Robot6AxisPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/RobotAlgos.cpp b/src/Mod/Robot/App/RobotAlgos.cpp index cabcc4bbbc..c784a544a8 100644 --- a/src/Mod/Robot/App/RobotAlgos.cpp +++ b/src/Mod/Robot/App/RobotAlgos.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/RobotAlgos.h b/src/Mod/Robot/App/RobotAlgos.h index 5dc89c9486..fc5ec10c54 100644 --- a/src/Mod/Robot/App/RobotAlgos.h +++ b/src/Mod/Robot/App/RobotAlgos.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/RobotObject.cpp b/src/Mod/Robot/App/RobotObject.cpp index 81c54d05d8..8f0bcaa3ba 100644 --- a/src/Mod/Robot/App/RobotObject.cpp +++ b/src/Mod/Robot/App/RobotObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -162,5 +162,4 @@ void RobotObject::Restore(Base::XMLReader &reader) robot.setTo(Tcp.getValue()); Tcp.setValue(robot.getTcp()); block = false; -} - +} diff --git a/src/Mod/Robot/App/RobotObject.h b/src/Mod/Robot/App/RobotObject.h index 934f0e1b22..2bb2c572fe 100644 --- a/src/Mod/Robot/App/RobotObject.h +++ b/src/Mod/Robot/App/RobotObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/RobotObjectPyImp.cpp b/src/Mod/Robot/App/RobotObjectPyImp.cpp index 677ec8065e..8c6a6a14fc 100644 --- a/src/Mod/Robot/App/RobotObjectPyImp.cpp +++ b/src/Mod/Robot/App/RobotObjectPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Simulation.cpp b/src/Mod/Robot/App/Simulation.cpp index 0a74fef99e..362530688c 100644 --- a/src/Mod/Robot/App/Simulation.cpp +++ b/src/Mod/Robot/App/Simulation.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Simulation.h b/src/Mod/Robot/App/Simulation.h index 5456afafe1..f33c84a637 100644 --- a/src/Mod/Robot/App/Simulation.h +++ b/src/Mod/Robot/App/Simulation.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -21,8 +21,6 @@ ***************************************************************************/ - - #ifndef _Simulation_h_ #define _Simulation_h_ diff --git a/src/Mod/Robot/App/Trajectory.cpp b/src/Mod/Robot/App/Trajectory.cpp index ad24b00171..fb799b94f7 100644 --- a/src/Mod/Robot/App/Trajectory.cpp +++ b/src/Mod/Robot/App/Trajectory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Trajectory.h b/src/Mod/Robot/App/Trajectory.h index fd7dfe63b7..67fc28c3a4 100644 --- a/src/Mod/Robot/App/Trajectory.h +++ b/src/Mod/Robot/App/Trajectory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -23,11 +23,11 @@ #ifndef ROBOT_Trajectory_H #define ROBOT_Trajectory_H - + #include "kdl_cp/trajectory.hpp" - -#include "Waypoint.h" - + +#include "Waypoint.h" + #include #include diff --git a/src/Mod/Robot/App/TrajectoryCompound.cpp b/src/Mod/Robot/App/TrajectoryCompound.cpp index 5908ce1cee..5eff4f9ffa 100644 --- a/src/Mod/Robot/App/TrajectoryCompound.cpp +++ b/src/Mod/Robot/App/TrajectoryCompound.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryCompound.h b/src/Mod/Robot/App/TrajectoryCompound.h index d4a1b7d100..2f997fc1cd 100644 --- a/src/Mod/Robot/App/TrajectoryCompound.h +++ b/src/Mod/Robot/App/TrajectoryCompound.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp index 5915472a4c..23cf4eca25 100644 --- a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp +++ b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.h b/src/Mod/Robot/App/TrajectoryDressUpObject.h index 41d16f6584..e02caf8b99 100644 --- a/src/Mod/Robot/App/TrajectoryDressUpObject.h +++ b/src/Mod/Robot/App/TrajectoryDressUpObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryObject.cpp b/src/Mod/Robot/App/TrajectoryObject.cpp index 2583f2c813..bc2efe5b5b 100644 --- a/src/Mod/Robot/App/TrajectoryObject.cpp +++ b/src/Mod/Robot/App/TrajectoryObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryObject.h b/src/Mod/Robot/App/TrajectoryObject.h index 299e14da01..ffd8b0463c 100644 --- a/src/Mod/Robot/App/TrajectoryObject.h +++ b/src/Mod/Robot/App/TrajectoryObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryPyImp.cpp b/src/Mod/Robot/App/TrajectoryPyImp.cpp index 3300a26840..ac075fbc15 100644 --- a/src/Mod/Robot/App/TrajectoryPyImp.cpp +++ b/src/Mod/Robot/App/TrajectoryPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Waypoint.cpp b/src/Mod/Robot/App/Waypoint.cpp index f69e45578c..452c7ec3aa 100644 --- a/src/Mod/Robot/App/Waypoint.cpp +++ b/src/Mod/Robot/App/Waypoint.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Waypoint.h b/src/Mod/Robot/App/Waypoint.h index 8dc8710be4..33bc000645 100644 --- a/src/Mod/Robot/App/Waypoint.h +++ b/src/Mod/Robot/App/Waypoint.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/WaypointPyImp.cpp b/src/Mod/Robot/App/WaypointPyImp.cpp index f697fc1a43..cfb17f8a79 100644 --- a/src/Mod/Robot/App/WaypointPyImp.cpp +++ b/src/Mod/Robot/App/WaypointPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/AppRobotGui.cpp b/src/Mod/Robot/Gui/AppRobotGui.cpp index cc5b55207e..a9e815f754 100644 --- a/src/Mod/Robot/Gui/AppRobotGui.cpp +++ b/src/Mod/Robot/Gui/AppRobotGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp index 7baee270c1..4b3219f939 100644 --- a/src/Mod/Robot/Gui/Command.cpp +++ b/src/Mod/Robot/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -63,7 +63,7 @@ CmdRobotSetHomePos::CmdRobotSetHomePos() void CmdRobotSetHomePos::activated(int) { - const char * SelFilter = + const char * SelFilter = "SELECT Robot::RobotObject COUNT 1 "; Gui::SelectionFilter filter(SelFilter); @@ -79,13 +79,13 @@ void CmdRobotSetHomePos::activated(int) std::string FeatName = pcRobotObject->getNameInDocument(); - + const char* n = FeatName.c_str(); openCommand("Set home"); doCommand(Doc,"App.activeDocument().%s.Home = [App.activeDocument().%s.Axis1,App.activeDocument().%s.Axis2,App.activeDocument().%s.Axis3,App.activeDocument().%s.Axis4,App.activeDocument().%s.Axis5,App.activeDocument().%s.Axis6]",n,n,n,n,n,n,n); updateActive(); commitCommand(); - + } bool CmdRobotSetHomePos::isActive(void) @@ -112,7 +112,7 @@ CmdRobotRestoreHomePos::CmdRobotRestoreHomePos() void CmdRobotRestoreHomePos::activated(int) { - const char * SelFilter = + const char * SelFilter = "SELECT Robot::RobotObject COUNT 1 "; Gui::SelectionFilter filter(SelFilter); @@ -128,7 +128,7 @@ void CmdRobotRestoreHomePos::activated(int) std::string FeatName = pcRobotObject->getNameInDocument(); - + const char* n = FeatName.c_str(); openCommand("Move to home"); doCommand(Doc,"App.activeDocument().%s.Axis1 = App.activeDocument().%s.Home[0]",n,n); @@ -139,7 +139,7 @@ void CmdRobotRestoreHomePos::activated(int) doCommand(Doc,"App.activeDocument().%s.Axis6 = App.activeDocument().%s.Home[5]",n,n); updateActive(); commitCommand(); - + } bool CmdRobotRestoreHomePos::isActive(void) @@ -179,7 +179,7 @@ void CmdRobotConstraintAxle::activated(int) doCommand(Doc,"App.activeDocument().%s.Axis5 = 45",FeatName.c_str()); updateActive(); commitCommand(); - + } bool CmdRobotConstraintAxle::isActive(void) @@ -208,7 +208,7 @@ CmdRobotSimulate::CmdRobotSimulate() void CmdRobotSimulate::activated(int) { #if 1 - const char * SelFilter = + const char * SelFilter = "SELECT Robot::RobotObject \n" "SELECT Robot::TrajectoryObject "; @@ -234,11 +234,11 @@ void CmdRobotSimulate::activated(int) Gui::TaskView::TaskDialog* dlg = new TaskDlgSimulate(pcRobotObject,pcTrajectoryObject); Gui::Control().showDialog(dlg); - + #else - - const char * SelFilter = + + const char * SelFilter = "SELECT Robot::RobotObject \n" "SELECT Robot::TrajectoryObject "; @@ -256,7 +256,7 @@ void CmdRobotSimulate::activated(int) RobotGui::TrajectorySimulate dlg(pcRobotObject,pcTrajectoryObject,Gui::getMainWindow()); dlg.exec(); -#endif +#endif } bool CmdRobotSimulate::isActive(void) diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp index a132db9aa1..3e0d2ec8f1 100644 --- a/src/Mod/Robot/Gui/CommandExport.cpp +++ b/src/Mod/Robot/Gui/CommandExport.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -60,7 +60,7 @@ void CmdRobotExportKukaCompact::activated(int) { unsigned int n1 = getSelection().countObjectsOfType(Robot::RobotObject::getClassTypeId()); unsigned int n2 = getSelection().countObjectsOfType(Robot::TrajectoryObject::getClassTypeId()); - + if (n1 != 1 || n2 != 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), QObject::tr("Select one Robot and one Trajectory object.")); @@ -122,7 +122,7 @@ void CmdRobotExportKukaFull::activated(int) { unsigned int n1 = getSelection().countObjectsOfType(Robot::RobotObject::getClassTypeId()); unsigned int n2 = getSelection().countObjectsOfType(Robot::TrajectoryObject::getClassTypeId()); - + if (n1 != 1 || n2 != 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), QObject::tr("Select one Robot and one Trajectory object.")); diff --git a/src/Mod/Robot/Gui/CommandInsertRobot.cpp b/src/Mod/Robot/Gui/CommandInsertRobot.cpp index 683b8bbd6f..98d9b3745e 100644 --- a/src/Mod/Robot/Gui/CommandInsertRobot.cpp +++ b/src/Mod/Robot/Gui/CommandInsertRobot.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -73,7 +73,7 @@ void CmdRobotInsertKukaIR500::activated(int) doCommand(Doc,"App.activeDocument().%s.Home = [0.0,-90.0,90.0,0.0,45.0,0.0]",FeatName.c_str()); updateActive(); commitCommand(); - + } bool CmdRobotInsertKukaIR500::isActive(void) @@ -114,7 +114,7 @@ void CmdRobotInsertKukaIR16::activated(int) doCommand(Doc,"App.activeDocument().%s.Axis5 = 45",FeatName.c_str()); updateActive(); commitCommand(); - + } bool CmdRobotInsertKukaIR16::isActive(void) @@ -155,7 +155,7 @@ void CmdRobotInsertKukaIR210::activated(int) doCommand(Doc,"App.activeDocument().%s.Axis5 = 45",FeatName.c_str()); updateActive(); commitCommand(); - + } bool CmdRobotInsertKukaIR210::isActive(void) @@ -195,7 +195,7 @@ void CmdRobotInsertKukaIR125::activated(int) doCommand(Doc,"App.activeDocument().%s.Axis5 = 45",FeatName.c_str()); updateActive(); commitCommand(); - + } bool CmdRobotInsertKukaIR125::isActive(void) @@ -229,7 +229,7 @@ void CmdRobotAddToolShape::activated(int) .getObjectsOfType(Base::Type::fromName("Part::Feature")); std::vector VRMLs = getSelection() .getObjectsOfType(Base::Type::fromName("App::VRMLObject")); - + if (robots.size() != 1 || (shapes.size() != 1 && VRMLs.size() != 1)) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), QObject::tr("Select one robot and one shape or VRML object.")); diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp index 7a73a29db7..ef15ca005f 100644 --- a/src/Mod/Robot/Gui/CommandTrajectory.cpp +++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -71,12 +71,12 @@ CmdRobotCreateTrajectory::CmdRobotCreateTrajectory() void CmdRobotCreateTrajectory::activated(int) { std::string FeatName = getUniqueObjectName("Trajectory"); - + openCommand("Create trajectory"); doCommand(Doc,"App.activeDocument().addObject(\"Robot::TrajectoryObject\",\"%s\")",FeatName.c_str()); updateActive(); commitCommand(); - + } bool CmdRobotCreateTrajectory::isActive(void) @@ -106,7 +106,7 @@ void CmdRobotInsertWaypoint::activated(int) { unsigned int n1 = getSelection().countObjectsOfType(Robot::RobotObject::getClassTypeId()); unsigned int n2 = getSelection().countObjectsOfType(Robot::TrajectoryObject::getClassTypeId()); - + if (n1 != 1 || n2 != 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), QObject::tr("Select one Robot and one Trajectory object.")); @@ -133,7 +133,7 @@ void CmdRobotInsertWaypoint::activated(int) 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()); updateActive(); commitCommand(); - + } bool CmdRobotInsertWaypoint::isActive(void) @@ -162,7 +162,7 @@ CmdRobotInsertWaypointPreselect::CmdRobotInsertWaypointPreselect() void CmdRobotInsertWaypointPreselect::activated(int) { - + if (getSelection().size() != 1 ) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), QObject::tr("Select one Trajectory object.")); @@ -197,7 +197,7 @@ void CmdRobotInsertWaypointPreselect::activated(int) 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); updateActive(); commitCommand(); - + } bool CmdRobotInsertWaypointPreselect::isActive(void) @@ -225,7 +225,7 @@ CmdRobotSetDefaultOrientation::CmdRobotSetDefaultOrientation() void CmdRobotSetDefaultOrientation::activated(int) { - // create placement dialog + // create placement dialog Gui::Dialog::Placement Dlg; Base::Placement place; Dlg.setPlacement(place); @@ -270,7 +270,7 @@ void CmdRobotSetDefaultValues::activated(int) QString::fromLatin1("1 m/s"), &ok); if ( ok && !text.isEmpty() ) { doCommand(Doc,"_DefSpeed = '%s'",text.toLatin1().constData()); - } + } QStringList items; items << QString::fromLatin1("False") << QString::fromLatin1("True"); @@ -287,10 +287,10 @@ void CmdRobotSetDefaultValues::activated(int) QString::fromLatin1("1 m/s^2"), &ok); if ( ok && !text.isEmpty() ) { doCommand(Doc,"_DefAccelaration = '%s'",text.toLatin1().constData()); - } + } - // create placement dialog + // create placement dialog //Gui::Dialog::Placement *Dlg = new Gui::Dialog::Placement(); //Base::Placement place; //Dlg->setPlacement(place); @@ -301,7 +301,7 @@ void CmdRobotSetDefaultValues::activated(int) // doCommand(Doc,"_DefOrientation = FreeCAD.Rotation(%f,%f,%f,%f)",rot[0],rot[1],rot[2],rot[3]); // doCommand(Doc,"_DefDisplacement = FreeCAD.Vector(%f,%f,%f)",disp[0],disp[1],disp[2]); //} - + } bool CmdRobotSetDefaultValues::isActive(void) @@ -329,9 +329,9 @@ CmdRobotEdge2Trac::CmdRobotEdge2Trac() void CmdRobotEdge2Trac::activated(int) { - + /* App::DocumentObject *obj = this->getDocument()->getObject(FeatName.c_str()); - App::Property *prop = &(dynamic_cast(obj)->Source); + App::Property *prop = &(dynamic_cast(obj)->Source); Gui::TaskView::TaskDialog* dlg = new TaskDlgEdge2Trac(dynamic_cast(obj)); Gui::Control().showDialog(dlg);*/ @@ -363,7 +363,7 @@ void CmdRobotEdge2Trac::activated(int) doCommand(Doc,"App.activeDocument().addObject('Robot::Edge2TracObject','%s')",FeatName.c_str()); doCommand(Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); } - + } diff --git a/src/Mod/Robot/Gui/PreCompiled.cpp b/src/Mod/Robot/Gui/PreCompiled.cpp index 46269e9671..7cd1cae80f 100644 --- a/src/Mod/Robot/Gui/PreCompiled.cpp +++ b/src/Mod/Robot/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -21,4 +21,4 @@ ***************************************************************************/ -#include "PreCompiled.h" +#include "PreCompiled.h" diff --git a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h index 629d926985..afb562ca76 100644 --- a/src/Mod/Robot/Gui/PreCompiled.h +++ b/src/Mod/Robot/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -47,8 +47,8 @@ #endif #ifdef _PreComp_ - -// Python + +// Python #include // standard @@ -76,7 +76,7 @@ #ifndef __Qt4All__ # include #endif - + #endif //_PreComp_ #endif // ROBOTGUI_PRECOMPILED_H diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp index bba0f5ce1e..a772c57bc7 100644 --- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp +++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h index 066b2851df..b16dfe988f 100644 --- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h +++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp index 0174566812..e0c771d733 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -58,7 +58,7 @@ PROPERTY_SOURCE(RobotGui::ViewProviderRobotObject, Gui::ViewProviderGeometryObje ViewProviderRobotObject::ViewProviderRobotObject() : pcDragger(0),toolShape(0) { - ADD_PROPERTY(Manipulator,(0)); + ADD_PROPERTY(Manipulator,(0)); pcRobotRoot = new Gui::SoFCSelection(); pcRobotRoot->highlightMode = Gui::SoFCSelection::OFF; diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.h b/src/Mod/Robot/Gui/ViewProviderRobotObject.h index 80c1a31de5..1c27b1f15c 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.h +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp index 59134a26df..bf1d90f4ac 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -65,7 +65,7 @@ PROPERTY_SOURCE(RobotGui::ViewProviderTrajectory, Gui::ViewProviderGeometryObjec ViewProviderTrajectory::ViewProviderTrajectory() { - + pcTrajectoryRoot = new Gui::SoFCSelection(); pcTrajectoryRoot->highlightMode = Gui::SoFCSelection::OFF; pcTrajectoryRoot->selectionMode = Gui::SoFCSelection::SEL_OFF; diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.h b/src/Mod/Robot/Gui/ViewProviderTrajectory.h index fbc517e349..7344a24745 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -31,8 +31,8 @@ class SoDragger; class SoJackDragger; class SoCoordinate3; -class SoDrawStyle; -class SoLineSet; +class SoDrawStyle; +class SoLineSet; namespace RobotGui { @@ -55,7 +55,7 @@ public: void setupContextMenu(QMenu* menu, QObject* receiver, const char* member); protected: - + Gui::SoFCSelection * pcTrajectoryRoot; SoCoordinate3 * pcCoords; SoDrawStyle * pcDrawStyle; diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp index ba16ea5d82..94a17da9ba 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h index a6f80434fe..0bff0a50be 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp index 639c5e41d7..1fdee009a5 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -62,6 +62,6 @@ std::vector ViewProviderTrajectoryDressUp::claimChildren(v { std::vector temp; temp.push_back(static_cast(getObject())->Source.getValue()); - + return temp; } diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h index dbcca93785..824e8b488e 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -36,7 +36,7 @@ class RobotGuiExport ViewProviderTrajectoryDressUp : public ViewProviderTrajecto public: //virtual bool doubleClicked(void); - /// grouping handling + /// grouping handling std::vector claimChildren(void)const; protected: diff --git a/src/Mod/Robot/Init.py b/src/Mod/Robot/Init.py index 0e979aa313..6b33c22f6e 100644 --- a/src/Mod/Robot/Init.py +++ b/src/Mod/Robot/Init.py @@ -1,8 +1,8 @@ -# FreeCAD init script of the Robot module -# (c) 2001 Juergen Riegel +# FreeCAD init script of the Robot module +# (c) 2001 Jürgen Riegel #*************************************************************************** -#* (c) Juergen Riegel (juergen.riegel@web.de) 2002 * +#* Copyright (c) 2002 Jürgen Riegel * #* * #* This file is part of the FreeCAD CAx development system. * #* * @@ -13,14 +13,13 @@ #* for detail see the LICENCE text file. * #* * #* FreeCAD is distributed in the hope that it will be useful, * -#* but WITHOUT ANY WARRANTY; without even the implied warranty of * +#* but WITHOUT ANY WARRANTY; without even the implied warranty of * #* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * #* GNU Lesser General Public License for more details. * #* * #* You should have received a copy of the GNU Library General Public * -#* License along with FreeCAD; if not, write to the Free Software * +#* License along with FreeCAD; if not, write to the Free Software * #* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * #* USA * #* * -#* Juergen Riegel 2002 * #***************************************************************************/ diff --git a/src/Mod/Robot/InitGui.py b/src/Mod/Robot/InitGui.py index 912b362213..882430e8f6 100644 --- a/src/Mod/Robot/InitGui.py +++ b/src/Mod/Robot/InitGui.py @@ -1,12 +1,12 @@ # Robot gui init module -# (c) 2009 Juergen Riegel +# (c) 2009 Jürgen Riegel # # Gathering all the information to start FreeCAD # This is the second one of three init scripts, the third one # runs when the gui is up #*************************************************************************** -#* (c) Juergen Riegel (juergen.riegel@web.de) 2009 * +#* Copyright (c) 2009 Jürgen Riegel * #* * #* This file is part of the FreeCAD CAx development system. * #* * @@ -17,20 +17,18 @@ #* for detail see the LICENCE text file. * #* * #* FreeCAD is distributed in the hope that it will be useful, * -#* but WITHOUT ANY WARRANTY; without even the implied warranty of * +#* but WITHOUT ANY WARRANTY; without even the implied warranty of * #* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * #* GNU Lesser General Public License for more details. * #* * #* You should have received a copy of the GNU Library General Public * -#* License along with FreeCAD; if not, write to the Free Software * +#* License along with FreeCAD; if not, write to the Free Software * #* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * #* USA * #* * -#* Juergen Riegel 2009 * #***************************************************************************/ - class RobotWorkbench ( Workbench ): "Robot workbench object" def __init__(self): diff --git a/src/Mod/Robot/KukaExporter.py b/src/Mod/Robot/KukaExporter.py index 340d9655ba..2f697c4595 100644 --- a/src/Mod/Robot/KukaExporter.py +++ b/src/Mod/Robot/KukaExporter.py @@ -1,4 +1,4 @@ -# Kuka export lib (c) Juergen Riegel 2009 LGPL 2.1 or higher +# Kuka export lib (c) Jürgen Riegel 2009 LGPL 2.1 or higher import time @@ -34,7 +34,7 @@ def ExportCompactSub(Rob,Trak,FileName): SrcFile.write(HeaderSrc) # subroutine definition SrcFile.write("DEF "+Trak.Name+"( )\n\n") - SrcFile.write(";- Kuka src file, generated by FreeCAD (http://www.freecadweb.org)\n") + SrcFile.write(";- Kuka src file, generated by FreeCAD (https://www.freecadweb.org)\n") SrcFile.write(";- "+ time.asctime()+"\n\n") # defining world and base SrcFile.write(";------------- definitions ------------\n")