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

Robot: modernize C++: use override

Browse Source
This commit is contained in:
wmayer
2023-08-04 01:42:56 +02:00
committed by wwmayer
parent 4366128cc4
commit ccca592c04
14 changed files with 94 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Robot/App/Edge2TracObject.h
View File

@@ -33,12 +33,12 @@ namespace Robot
class RobotExport Edge2TracObject : public TrajectoryObject
{
PROPERTY_HEADER(Robot::TrajectoryObject);
PROPERTY_HEADER_WITH_OVERRIDE(Robot::TrajectoryObject);
public:
/// Constructor
Edge2TracObject(void);
virtual ~Edge2TracObject();
Edge2TracObject();
~Edge2TracObject() override;
App::PropertyLinkSub Source;
App::PropertyFloatConstraint SegValue;
@@ -50,14 +50,14 @@ public:
int NbrOfEdges;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
const char* getViewProviderName() const override {
return "RobotGui::ViewProviderEdge2TracObject";
}
virtual App::DocumentObjectExecReturn *execute(void);
App::DocumentObjectExecReturn *execute() override;
protected:
/// get called by the container when a property has changed
virtual void onChanged (const App::Property* prop);
void onChanged (const App::Property* prop) override;
};

20
src/Mod/Robot/App/PropertyTrajectory.h
View File

@@ -37,18 +37,18 @@ namespace Robot
*/
class RobotExport PropertyTrajectory : public App::Property
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
PropertyTrajectory();
~PropertyTrajectory();
~PropertyTrajectory() override;
/** @name Getter/setter */
//@{
/// set the part shape
void setValue(const Trajectory&);
/// get the part shape
const Trajectory &getValue(void) const;
const Trajectory &getValue() const;
//@}
@@ -60,18 +60,18 @@ public:
/** @name Python interface */
//@{
PyObject* getPyObject(void);
void setPyObject(PyObject *value);
PyObject* getPyObject() override;
void setPyObject(PyObject *value) override;
//@}
/** @name Save/restore */
//@{
void Save (Base::Writer &writer) const;
void Restore(Base::XMLReader &reader);
void Save (Base::Writer &writer) const override;
void Restore(Base::XMLReader &reader) override;
App::Property *Copy(void) const;
void Paste(const App::Property &from);
unsigned int getMemSize (void) const;
App::Property *Copy() const override;
void Paste(const App::Property &from) override;
unsigned int getMemSize () const override;
//@}
private:

16
src/Mod/Robot/App/Trajectory.h
View File

@@ -41,27 +41,27 @@ namespace Robot
*/
class RobotExport Trajectory : public Base::Persistence
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
Trajectory();
Trajectory(const Trajectory&);
~Trajectory();
~Trajectory() override;
Trajectory &operator=(const Trajectory&);
// from base class
virtual unsigned int getMemSize (void) const;
virtual void Save (Base::Writer &/*writer*/) const;
virtual void Restore(Base::XMLReader &/*reader*/);
unsigned int getMemSize () const override;
void Save (Base::Writer &/*writer*/) const override;
void Restore(Base::XMLReader &/*reader*/) override;
// interface
void generateTrajectory(void);
void generateTrajectory();
void addWaypoint(const Waypoint &WPnt);
unsigned int getSize(void) const{return vpcWaypoints.size();}
unsigned int getSize() const{return vpcWaypoints.size();}
const Waypoint &getWaypoint(unsigned int pos)const {return *vpcWaypoints[pos];}
std::string getUniqueWaypointName(const char *Name) const;
const std::vector<Waypoint*> &getWaypoints(void)const{return vpcWaypoints;}
const std::vector<Waypoint*> &getWaypoints()const{return vpcWaypoints;}
/// delete the last n waypoints
void deleteLast(unsigned int n=1);

10
src/Mod/Robot/App/TrajectoryCompound.h
View File

@@ -33,20 +33,20 @@ namespace Robot
class RobotExport TrajectoryCompound : public TrajectoryObject
{
PROPERTY_HEADER(Robot::TrajectoryObject);
PROPERTY_HEADER_WITH_OVERRIDE(Robot::TrajectoryObject);
public:
/// Constructor
TrajectoryCompound(void);
virtual ~TrajectoryCompound();
TrajectoryCompound();
~TrajectoryCompound() override;
App::PropertyLinkList Source;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
const char* getViewProviderName() const override {
return "RobotGui::ViewProviderTrajectoryCompound";
}
virtual App::DocumentObjectExecReturn *execute(void);
App::DocumentObjectExecReturn *execute() override;
protected:
/// get called by the container when a property has changed

12
src/Mod/Robot/App/TrajectoryDressUpObject.h
View File

@@ -34,12 +34,12 @@ namespace Robot
class RobotExport TrajectoryDressUpObject : public TrajectoryObject
{
PROPERTY_HEADER(Robot::TrajectoryObject);
PROPERTY_HEADER_WITH_OVERRIDE(Robot::TrajectoryObject);
public:
/// Constructor
TrajectoryDressUpObject(void);
virtual ~TrajectoryDressUpObject();
TrajectoryDressUpObject();
~TrajectoryDressUpObject() override;
App::PropertyLink Source;
App::PropertySpeed Speed;
@@ -52,17 +52,17 @@ public:
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
const char* getViewProviderName() const override {
return "RobotGui::ViewProviderTrajectoryDressUp";
}
virtual App::DocumentObjectExecReturn *execute(void);
App::DocumentObjectExecReturn *execute() override;
static const char* ContTypeEnums[];
static const char* AddTypeEnums[];
protected:
/// get called by the container when a property has changed
virtual void onChanged (const App::Property* prop);
void onChanged (const App::Property* prop) override;
};

20
src/Mod/Robot/App/TrajectoryObject.h
View File

@@ -35,30 +35,30 @@ namespace Robot
class RobotExport TrajectoryObject : public App::GeoFeature
{
PROPERTY_HEADER(Robot::TrajectoryObject);
PROPERTY_HEADER_WITH_OVERRIDE(Robot::TrajectoryObject);
public:
/// Constructor
TrajectoryObject(void);
virtual ~TrajectoryObject();
TrajectoryObject();
~TrajectoryObject() override;
/// returns the type name of the ViewProvider
virtual const char* getViewProviderName(void) const {
const char* getViewProviderName() const override {
return "RobotGui::ViewProviderTrajectory";
}
virtual App::DocumentObjectExecReturn *execute(void) {
App::DocumentObjectExecReturn *execute() override {
return App::DocumentObject::StdReturn;
}
virtual short mustExecute(void) const;
virtual PyObject *getPyObject(void);
short mustExecute() const override;
PyObject *getPyObject() override;
App::PropertyPlacement Base;
PropertyTrajectory Trajectory;
App::PropertyPlacement Base;
PropertyTrajectory Trajectory;
protected:
/// get called by the container when a property has changed
virtual void onChanged (const App::Property* prop);
void onChanged (const App::Property* prop) override;
};

11
src/Mod/Robot/App/Waypoint.h
View File

@@ -25,6 +25,7 @@
#include <Base/Persistence.h>
#include <Base/Placement.h>
#include <Mod/Robot/RobotGlobal.h>
namespace Robot
@@ -34,7 +35,7 @@ namespace Robot
*/
class RobotExport Waypoint : public Base::Persistence
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
enum WaypointType {
@@ -55,12 +56,12 @@ public:
unsigned int tool = 0,
unsigned int base = 0);
~Waypoint();
~Waypoint() override;
// from base class
virtual unsigned int getMemSize(void) const;
virtual void Save(Base::Writer& /*writer*/) const;
virtual void Restore(Base::XMLReader& /*reader*/);
unsigned int getMemSize() const override;
void Save(Base::Writer& /*writer*/) const override;
void Restore(Base::XMLReader& /*reader*/) override;
std::string Name;

12
src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h
View File

@@ -39,20 +39,20 @@ class RobotGuiExport TaskDlgTrajectoryCompound : public Gui::TaskView::TaskDialo
public:
TaskDlgTrajectoryCompound(Robot::TrajectoryCompound *);
~TaskDlgTrajectoryCompound();
~TaskDlgTrajectoryCompound() override;
public:
/// is called the TaskView when the dialog is opened
virtual void open();
void open() override;
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
bool accept() override;
/// is called by the framework if the dialog is rejected (Cancel)
virtual bool reject();
bool reject() override;
/// is called by the framework if the user press the help button
virtual void helpRequested();
void helpRequested() override;
/// returns for Close and Help button
virtual QDialogButtonBox::StandardButtons getStandardButtons(void) const
QDialogButtonBox::StandardButtons getStandardButtons() const override
{ return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; }
protected:

8
src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h
View File

@@ -31,13 +31,13 @@ namespace RobotGui
class RobotGuiExport ViewProviderEdge2TracObject : public ViewProviderTrajectory
{
PROPERTY_HEADER(RobotGui::ViewProviderEdge2TracObject);
PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderEdge2TracObject);
public:
virtual bool doubleClicked(void);
bool doubleClicked() override;
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
};

19
src/Mod/Robot/Gui/ViewProviderRobotObject.h
View File

@@ -27,6 +27,7 @@
#include <Gui/SoFCSelection.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Inventor/VRMLnodes/SoVRMLTransform.h>
#include <Mod/Robot/RobotGlobal.h>
class SoDragger;
@@ -38,23 +39,23 @@ namespace RobotGui
class RobotGuiExport ViewProviderRobotObject : public Gui::ViewProviderGeometryObject
{
PROPERTY_HEADER(RobotGui::ViewProviderRobotObject);
PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderRobotObject);
public:
/// constructor.
ViewProviderRobotObject();
/// destructor.
~ViewProviderRobotObject();
~ViewProviderRobotObject() override;
App::PropertyBool Manipulator;
void attach(App::DocumentObject *pcObject);
void setDisplayMode(const char* ModeName);
std::vector<std::string> getDisplayModes() const;
void updateData(const App::Property*);
void attach(App::DocumentObject *pcObject) override;
void setDisplayMode(const char* ModeName) override;
std::vector<std::string> getDisplayModes() const override;
void updateData(const App::Property*) override;
virtual void onChanged(const App::Property* prop);
void onChanged(const App::Property* prop) override;
/// for simulation without changing the document:
void setAxisTo(float A1,float A2,float A3,float A4,float A5,float A6,const Base::Placement &Tcp);
@@ -63,8 +64,8 @@ protected:
static void sDraggerMotionCallback(void *data, SoDragger *dragger);
void DraggerMotionCallback(SoDragger *dragger);
void setDragger(void);
void resetDragger(void);
void setDragger();
void resetDragger();
Gui::SoFCSelection * pcRobotRoot;
Gui::SoFCSelection * pcSimpleRoot;

15
src/Mod/Robot/Gui/ViewProviderTrajectory.h
View File

@@ -25,6 +25,7 @@
#include <Gui/SoFCSelection.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Mod/Robot/RobotGlobal.h>
class SoCoordinate3;
@@ -38,20 +39,20 @@ namespace RobotGui
class RobotGuiExport ViewProviderTrajectory : public Gui::ViewProviderGeometryObject
{
PROPERTY_HEADER(RobotGui::ViewProviderTrajectory);
PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderTrajectory);
public:
/// constructor.
ViewProviderTrajectory();
/// destructor.
~ViewProviderTrajectory();
~ViewProviderTrajectory() override;
void attach(App::DocumentObject *pcObject);
void setDisplayMode(const char* ModeName);
std::vector<std::string> getDisplayModes() const;
void updateData(const App::Property*);
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member);
void attach(App::DocumentObject *pcObject) override;
void setDisplayMode(const char* ModeName) override;
std::vector<std::string> getDisplayModes() const override;
void updateData(const App::Property*) override;
void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override;
protected:

9
src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h
View File

@@ -31,16 +31,15 @@ namespace RobotGui
class RobotGuiExport ViewProviderTrajectoryCompound: public ViewProviderTrajectory
{
PROPERTY_HEADER(RobotGui::ViewProviderTrajectoryCompound);
PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderTrajectoryCompound);
public:
/// grouping handling
std::vector<App::DocumentObject*> claimChildren(void)const;
std::vector<App::DocumentObject*> claimChildren() const override;
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
};

8
src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h
View File

@@ -31,17 +31,17 @@ namespace RobotGui
class RobotGuiExport ViewProviderTrajectoryDressUp : public ViewProviderTrajectory
{
PROPERTY_HEADER(RobotGui::ViewProviderTrajectoryDressUp);
PROPERTY_HEADER_WITH_OVERRIDE(RobotGui::ViewProviderTrajectoryDressUp);
public:
//virtual bool doubleClicked(void);
/// grouping handling
std::vector<App::DocumentObject*> claimChildren(void)const;
std::vector<App::DocumentObject*> claimChildren() const override;
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
bool setEdit(int ModNum) override;
void unsetEdit(int ModNum) override;
};

13
src/Mod/Robot/Gui/Workbench.h
View File

@@ -25,6 +25,7 @@
#include <Gui/Workbench.h>
#include <Gui/TaskView/TaskWatcher.h>
#include <Mod/Robot/RobotGlobal.h>
namespace RobotGui {
@@ -34,21 +35,21 @@ namespace RobotGui {
*/
class RobotGuiExport Workbench : public Gui::StdWorkbench
{
TYPESYSTEM_HEADER();
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
Workbench();
virtual ~Workbench();
~Workbench() override;
/** Run some actions when the workbench gets activated. */
virtual void activated();
void activated() override;
/** Run some actions when the workbench gets deactivated. */
virtual void deactivated();
void deactivated() override;
protected:
Gui::ToolBarItem* setupToolBars() const;
Gui::MenuItem* setupMenuBar() const;
Gui::ToolBarItem* setupToolBars() const override;
Gui::MenuItem* setupMenuBar() const override;
std::vector<Gui::TaskView::TaskWatcher*> Watcher;
};