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

Robot: modernize type checking

Browse Source
This commit is contained in:
Florian Foinant-Willig
2023-10-15 21:39:09 +02:00
parent 6fb3984322
commit a82a9482ce
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Robot/App/Edge2TracObject.cpp
View File

@@ -67,7 +67,7 @@ App::DocumentObjectExecReturn* Edge2TracObject::execute()
if (!link) {
return new App::DocumentObjectExecReturn("No object linked");
}
if (!link->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
if (!link->isDerivedFrom<Part::Feature>()) {
return new App::DocumentObjectExecReturn("Linked object is not a Part object");
}
Part::Feature* base = static_cast<Part::Feature*>(Source.getValue());

2
src/Mod/Robot/App/TrajectoryCompound.cpp
View File

@@ -44,7 +44,7 @@ App::DocumentObjectExecReturn* TrajectoryCompound::execute()
Robot::Trajectory result;
for (auto it : Tracs) {
if (it->getTypeId().isDerivedFrom(Robot::TrajectoryObject::getClassTypeId())) {
if (it->isDerivedFrom<Robot::TrajectoryObject>()) {
const std::vector<Waypoint*>& wps =
static_cast<Robot::TrajectoryObject*>(it)->Trajectory.getValue().getWaypoints();
for (auto wp : wps) {

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

@@ -81,7 +81,7 @@ App::DocumentObjectExecReturn* TrajectoryDressUpObject::execute()
if (!link) {
return new App::DocumentObjectExecReturn("No object linked");
}
if (!link->getTypeId().isDerivedFrom(Robot::TrajectoryObject::getClassTypeId())) {
if (!link->isDerivedFrom<Robot::TrajectoryObject>()) {
return new App::DocumentObjectExecReturn("Linked object is not a Trajectory object");
}

16
src/Mod/Robot/Gui/CommandExport.cpp
View File

@@ -68,19 +68,19 @@ void CmdRobotExportKukaCompact::activated(int)
Robot::RobotObject* pcRobotObject = nullptr;
if (Sel[0].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) {
if (Sel[0].pObject->is<Robot::RobotObject>()) {
pcRobotObject = static_cast<Robot::RobotObject*>(Sel[0].pObject);
}
else if (Sel[1].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) {
else if (Sel[1].pObject->is<Robot::RobotObject>()) {
pcRobotObject = static_cast<Robot::RobotObject*>(Sel[1].pObject);
}
std::string RoboName = pcRobotObject->getNameInDocument();
Robot::TrajectoryObject* pcTrajectoryObject = nullptr;
if (Sel[0].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) {
if (Sel[0].pObject->is<Robot::TrajectoryObject>()) {
pcTrajectoryObject = static_cast<Robot::TrajectoryObject*>(Sel[0].pObject);
}
else if (Sel[1].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) {
else if (Sel[1].pObject->is<Robot::TrajectoryObject>()) {
pcTrajectoryObject = static_cast<Robot::TrajectoryObject*>(Sel[1].pObject);
}
// std::string TrakName = pcTrajectoryObject->getNameInDocument();
@@ -143,19 +143,19 @@ void CmdRobotExportKukaFull::activated(int)
Robot::RobotObject* pcRobotObject = nullptr;
if (Sel[0].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) {
if (Sel[0].pObject->is<Robot::RobotObject>()) {
pcRobotObject = static_cast<Robot::RobotObject*>(Sel[0].pObject);
}
else if (Sel[1].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) {
else if (Sel[1].pObject->is<Robot::RobotObject>()) {
pcRobotObject = static_cast<Robot::RobotObject*>(Sel[1].pObject);
}
// std::string RoboName = pcRobotObject->getNameInDocument();
Robot::TrajectoryObject* pcTrajectoryObject = nullptr;
if (Sel[0].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) {
if (Sel[0].pObject->is<Robot::TrajectoryObject>()) {
pcTrajectoryObject = static_cast<Robot::TrajectoryObject*>(Sel[0].pObject);
}
else if (Sel[1].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) {
else if (Sel[1].pObject->is<Robot::TrajectoryObject>()) {
pcTrajectoryObject = static_cast<Robot::TrajectoryObject*>(Sel[1].pObject);
}
// std::string TrakName = pcTrajectoryObject->getNameInDocument();

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

@@ -111,19 +111,19 @@ void CmdRobotInsertWaypoint::activated(int)
std::vector<Gui::SelectionSingleton::SelObj> Sel = getSelection().getSelection();
Robot::RobotObject* pcRobotObject = nullptr;
if (Sel[0].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) {
if (Sel[0].pObject->is<Robot::RobotObject>()) {
pcRobotObject = static_cast<Robot::RobotObject*>(Sel[0].pObject);
}
else if (Sel[1].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) {
else if (Sel[1].pObject->is<Robot::RobotObject>()) {
pcRobotObject = static_cast<Robot::RobotObject*>(Sel[1].pObject);
}
std::string RoboName = pcRobotObject->getNameInDocument();
Robot::TrajectoryObject* pcTrajectoryObject = nullptr;
if (Sel[0].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) {
if (Sel[0].pObject->is<Robot::TrajectoryObject>()) {
pcTrajectoryObject = static_cast<Robot::TrajectoryObject*>(Sel[0].pObject);
}
else if (Sel[1].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) {
else if (Sel[1].pObject->is<Robot::TrajectoryObject>()) {
pcTrajectoryObject = static_cast<Robot::TrajectoryObject*>(Sel[1].pObject);
}
std::string TrakName = pcTrajectoryObject->getNameInDocument();
@@ -184,7 +184,7 @@ void CmdRobotInsertWaypointPreselect::activated(int)
Robot::TrajectoryObject* pcTrajectoryObject;
if (Sel[0].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) {
if (Sel[0].pObject->is<Robot::TrajectoryObject>()) {
pcTrajectoryObject = static_cast<Robot::TrajectoryObject*>(Sel[0].pObject);
}
else {