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

Merge pull request #19583 from hyarion/refactor/base-type

Browse Source 
Refactor Base::Type
This commit is contained in:
Chris Hennes
2025-03-17 00:03:22 -05:00
committed by GitHub
parent ca4f99103b a0a64c1fb8
commit 4fcdac28fb
23 changed files with 174 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Measure/App/MeasureDistance.cpp
View File

@@ -415,12 +415,12 @@ std::vector<App::DocumentObject*> MeasureDistanceDetached::getSubject() const
Base::Type MeasureDistanceType::getClassTypeId()
{
return Base::Type::badType();
return Base::Type::BadType;
}
Base::Type MeasureDistanceType::getTypeId() const
{
return Base::Type::badType();
return Base::Type::BadType;
}
void MeasureDistanceType::init()
@@ -436,7 +436,7 @@ void* MeasureDistanceType::create()
return new MeasureDistanceDetached();
}
Base::Type MeasureDistanceType::classTypeId = Base::Type::badType();
Base::Type MeasureDistanceType::classTypeId = Base::Type::BadType;
// Migrate old MeasureDistance Type

2
src/Mod/Part/App/GeometryDefaultExtension.h
View File

@@ -87,7 +87,7 @@ namespace Part {
// 6. Register your type and corresponding python type in AppPart.cpp
template <typename T>
Base::Type GeometryDefaultExtension<T>::classTypeId{Base::Type::badType()};
Base::Type GeometryDefaultExtension<T>::classTypeId{Base::Type::BadType};
// Must be explicitly declared here
template<> void * GeometryDefaultExtension<long>::create();

6
src/Mod/Part/App/GeometryPyImp.cpp
View File

@@ -242,7 +242,7 @@ PyObject* GeometryPy::getExtensionOfType(PyObject *args)
Base::Type type = Base::Type::fromName(o);
if(type != Base::Type::badType()) {
if(!type.isBad()) {
try {
std::shared_ptr<const GeometryExtension> ext(this->getGeometryPtr()->getExtension(type));
@@ -313,7 +313,7 @@ PyObject* GeometryPy::hasExtensionOfType(PyObject *args)
Base::Type type = Base::Type::fromName(o);
if(type != Base::Type::badType()) {
if(!type.isBad()) {
try {
return Py::new_reference_to(Py::Boolean(this->getGeometryPtr()->hasExtension(type)));
}
@@ -360,7 +360,7 @@ PyObject* GeometryPy::deleteExtensionOfType(PyObject *args)
Base::Type type = Base::Type::fromName(o);
if(type != Base::Type::badType()) {
if(!type.isBad()) {
try {
this->getGeometryPtr()->deleteExtension(type);
Py_Return;

6
src/Mod/Sketcher/App/ExternalGeometryFacadePyImp.cpp
View File

@@ -302,7 +302,7 @@ PyObject* ExternalGeometryFacadePy::getExtensionOfType(PyObject* args)
Base::Type type = Base::Type::fromName(o);
if (type != Base::Type::badType()) {
if (!type.isBad()) {
try {
std::shared_ptr<const Part::GeometryExtension> ext(
this->getExternalGeometryFacadePtr()->getExtension(type));
@@ -379,7 +379,7 @@ PyObject* ExternalGeometryFacadePy::hasExtensionOfType(PyObject* args)
Base::Type type = Base::Type::fromName(o);
if (type != Base::Type::badType()) {
if (!type.isBad()) {
try {
return Py::new_reference_to(
Py::Boolean(this->getExternalGeometryFacadePtr()->hasExtension(type)));
@@ -427,7 +427,7 @@ PyObject* ExternalGeometryFacadePy::deleteExtensionOfType(PyObject* args)
Base::Type type = Base::Type::fromName(o);
if (type != Base::Type::badType()) {
if (!type.isBad()) {
try {
this->getExternalGeometryFacadePtr()->deleteExtension(type);
Py_Return;

6
src/Mod/Sketcher/App/GeometryFacadePyImp.cpp
View File

@@ -278,7 +278,7 @@ PyObject* GeometryFacadePy::getExtensionOfType(PyObject* args)
Base::Type type = Base::Type::fromName(o);
if (type != Base::Type::badType()) {
if (!type.isBad()) {
try {
std::shared_ptr<const Part::GeometryExtension> ext(
this->getGeometryFacadePtr()->getExtension(type));
@@ -355,7 +355,7 @@ PyObject* GeometryFacadePy::hasExtensionOfType(PyObject* args)
Base::Type type = Base::Type::fromName(o);
if (type != Base::Type::badType()) {
if (!type.isBad()) {
try {
return Py::new_reference_to(
Py::Boolean(this->getGeometryFacadePtr()->hasExtension(type)));
@@ -403,7 +403,7 @@ PyObject* GeometryFacadePy::deleteExtensionOfType(PyObject* args)
Base::Type type = Base::Type::fromName(o);
if (type != Base::Type::badType()) {
if (!type.isBad()) {
try {
this->getGeometryFacadePtr()->deleteExtension(type);
Py_Return;

4
src/Mod/Sketcher/Gui/CommandConstraints.cpp
View File

@@ -1526,7 +1526,7 @@ public:
selIdPair.GeoId = GeoEnum::GeoUndef;
selIdPair.PosId = Sketcher::PointPos::none;
std::stringstream ss;
Base::Type newselGeoType = Base::Type::badType();
Base::Type newselGeoType = Base::Type::BadType;
int VtId = getPreselectPoint();
int CrvId = getPreselectCurve();
@@ -1662,7 +1662,7 @@ protected:
SelIdPair selIdPair;
getIdsFromName(selElement, Obj, selIdPair.GeoId, selIdPair.PosId);
Base::Type newselGeoType = Base::Type::badType();
Base::Type newselGeoType = Base::Type::BadType;
if (isEdge(selIdPair.GeoId, selIdPair.PosId)) {
const Part::Geometry* geo = Obj->getGeometry(selIdPair.GeoId);
newselGeoType = geo->getTypeId();

6
src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
View File

@@ -463,7 +463,7 @@ private:
icons.emplace(
std::piecewise_construct,
std::forward_as_tuple(Base::Type::badType()),
std::forward_as_tuple(Base::Type::BadType),
std::forward_as_tuple(
std::initializer_list<
std::pair<const Sketcher::PointPos, std::tuple<QIcon, QIcon, QIcon, QIcon>>> {
@@ -479,14 +479,14 @@ private:
auto typekey = icons.find(type);
if (typekey == icons.end()) {// Not supported Geometry Type - Defaults to invalid icon
typekey = icons.find(Base::Type::badType());
typekey = icons.find(Base::Type::BadType);
pos = Sketcher::PointPos::none;
}
auto poskey = typekey->second.find(pos);
if (poskey == typekey->second.end()) {// invalid PointPos for type - Provide Invalid icon
typekey = icons.find(Base::Type::badType());
typekey = icons.find(Base::Type::BadType);
pos = Sketcher::PointPos::none;
poskey = typekey->second.find(pos);
}