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

Sketcher: GeometryFacade inheritance correctness

Browse Source 
- Make explicit private inheritance of the interface
- Correct inheritance of ExternalGeometryFacade
- Correct inheritance of ExternalGeometryExtension
- Better document the inheritance choice
This commit is contained in:
Abdullah Tahiri
2020-11-07 08:36:24 +01:00
committed by abdullahtahiriyo
parent 645535234a
commit 485b0b58a0
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,12 +87,12 @@ PyObject* ExternalGeometryFacadePy::testFlag(PyObject *args)
char* flag;
if (PyArg_ParseTuple(args, "s",&flag)) {
auto pos = std::find_if(getExternalGeometryFacadePtr()->flag2str.begin(),
getExternalGeometryFacadePtr()->flag2str.end(),
auto pos = std::find_if(ExternalGeometryExtension::flag2str.begin(),
ExternalGeometryExtension::flag2str.end(),
[flag](const char * val) { return strcmp(val,flag) == 0;});
if( pos != getExternalGeometryFacadePtr()->flag2str.end()) {
int index = std::distance( getExternalGeometryFacadePtr()->flag2str.begin(), pos );
if( pos != ExternalGeometryExtension::flag2str.end()) {
int index = std::distance( ExternalGeometryExtension::flag2str.begin(), pos );
return new_reference_to(Py::Boolean(this->getExternalGeometryFacadePtr()->testFlag(index)));
}
@@ -112,14 +112,14 @@ PyObject* ExternalGeometryFacadePy::setFlag(PyObject *args)
PyObject * bflag = Py_True;
if (PyArg_ParseTuple(args, "s|O!", &flag, &PyBool_Type, &bflag)) {
auto pos = std::find_if(getExternalGeometryFacadePtr()->flag2str.begin(),
getExternalGeometryFacadePtr()->flag2str.end(),
auto pos = std::find_if(ExternalGeometryExtension::flag2str.begin(),
ExternalGeometryExtension::flag2str.end(),
[flag](const char * val) {
return strcmp(val,flag)==0;}
);
if( pos != getExternalGeometryFacadePtr()->flag2str.end()) {
int index = std::distance( getExternalGeometryFacadePtr()->flag2str.begin(), pos );
if( pos != ExternalGeometryExtension::flag2str.end()) {
int index = std::distance( ExternalGeometryExtension::flag2str.begin(), pos );
this->getExternalGeometryFacadePtr()->setFlag(index,PyObject_IsTrue(bflag) ? true : false);
Py_Return;