From a82a9482ceb58b2bad909c9622082d8cb7d3d08d Mon Sep 17 00:00:00 2001 From: Florian Foinant-Willig Date: Sun, 15 Oct 2023 21:39:09 +0200 Subject: [PATCH] Robot: modernize type checking --- src/Mod/Robot/App/Edge2TracObject.cpp | 2 +- src/Mod/Robot/App/TrajectoryCompound.cpp | 2 +- src/Mod/Robot/App/TrajectoryDressUpObject.cpp | 2 +- src/Mod/Robot/Gui/CommandExport.cpp | 16 ++++++++-------- src/Mod/Robot/Gui/CommandTrajectory.cpp | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Mod/Robot/App/Edge2TracObject.cpp b/src/Mod/Robot/App/Edge2TracObject.cpp index 4c8543bbcf..24636dc027 100644 --- a/src/Mod/Robot/App/Edge2TracObject.cpp +++ b/src/Mod/Robot/App/Edge2TracObject.cpp @@ -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()) { return new App::DocumentObjectExecReturn("Linked object is not a Part object"); } Part::Feature* base = static_cast(Source.getValue()); diff --git a/src/Mod/Robot/App/TrajectoryCompound.cpp b/src/Mod/Robot/App/TrajectoryCompound.cpp index 7e4ce7b341..d6c6811582 100644 --- a/src/Mod/Robot/App/TrajectoryCompound.cpp +++ b/src/Mod/Robot/App/TrajectoryCompound.cpp @@ -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()) { const std::vector& wps = static_cast(it)->Trajectory.getValue().getWaypoints(); for (auto wp : wps) { diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp index 6961f4a36a..54d6a4906f 100644 --- a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp +++ b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp @@ -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()) { return new App::DocumentObjectExecReturn("Linked object is not a Trajectory object"); } diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp index bbd390529c..304d154f53 100644 --- a/src/Mod/Robot/Gui/CommandExport.cpp +++ b/src/Mod/Robot/Gui/CommandExport.cpp @@ -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()) { pcRobotObject = static_cast(Sel[0].pObject); } - else if (Sel[1].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) { + else if (Sel[1].pObject->is()) { pcRobotObject = static_cast(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()) { pcTrajectoryObject = static_cast(Sel[0].pObject); } - else if (Sel[1].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) { + else if (Sel[1].pObject->is()) { pcTrajectoryObject = static_cast(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()) { pcRobotObject = static_cast(Sel[0].pObject); } - else if (Sel[1].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) { + else if (Sel[1].pObject->is()) { pcRobotObject = static_cast(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()) { pcTrajectoryObject = static_cast(Sel[0].pObject); } - else if (Sel[1].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) { + else if (Sel[1].pObject->is()) { pcTrajectoryObject = static_cast(Sel[1].pObject); } // std::string TrakName = pcTrajectoryObject->getNameInDocument(); diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp index f87604e4fa..e55457e62a 100644 --- a/src/Mod/Robot/Gui/CommandTrajectory.cpp +++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp @@ -111,19 +111,19 @@ void CmdRobotInsertWaypoint::activated(int) std::vector Sel = getSelection().getSelection(); Robot::RobotObject* pcRobotObject = nullptr; - if (Sel[0].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) { + if (Sel[0].pObject->is()) { pcRobotObject = static_cast(Sel[0].pObject); } - else if (Sel[1].pObject->getTypeId() == Robot::RobotObject::getClassTypeId()) { + else if (Sel[1].pObject->is()) { pcRobotObject = static_cast(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()) { pcTrajectoryObject = static_cast(Sel[0].pObject); } - else if (Sel[1].pObject->getTypeId() == Robot::TrajectoryObject::getClassTypeId()) { + else if (Sel[1].pObject->is()) { pcTrajectoryObject = static_cast(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()) { pcTrajectoryObject = static_cast(Sel[0].pObject); } else {