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

make EdgeSelection an internal class

Browse Source
This commit is contained in:
wmayer
2017-04-21 22:36:17 +02:00
parent 0f1c66724b
commit 71de6009aa
2 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/Mod/Surface/Gui/TaskGeomFillSurface.cpp
View File

@@ -49,33 +49,6 @@ PROPERTY_SOURCE(SurfaceGui::ViewProviderGeomFillSurface, PartGui::ViewProviderSp
namespace SurfaceGui {
bool EdgeSelection::allow(App::Document* , App::DocumentObject* pObj, const char* sSubName)
{
// don't allow references to itself
if (pObj == editedObject)
return false;
if (!pObj->isDerivedFrom(Part::Feature::getClassTypeId()))
return false;
if (!sSubName || sSubName[0] == '\0')
return false;
std::string element(sSubName);
if (element.substr(0,4) != "Edge")
return false;
auto links = editedObject->BoundaryList.getSubListValues();
for (auto it : links) {
if (it.first == pObj) {
for (auto jt : it.second) {
if (jt == sSubName)
return !appendEdges;
}
}
}
return appendEdges;
}
// ----------------------------------------------------------------------------
void ViewProviderGeomFillSurface::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QAction* act;
@@ -162,6 +135,55 @@ void ViewProviderGeomFillSurface::highlightReferences(bool on)
// ----------------------------------------------------------------------------
class GeomFillSurface::EdgeSelection : public Gui::SelectionFilterGate
{
public:
EdgeSelection(bool appendEdges, Surface::GeomFillSurface* editedObject)
: Gui::SelectionFilterGate(static_cast<Gui::SelectionFilter*>(nullptr))
, appendEdges(appendEdges)
, editedObject(editedObject)
{
}
/**
* Allow the user to pick only edges.
*/
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName);
private:
bool appendEdges;
Surface::GeomFillSurface* editedObject;
};
bool GeomFillSurface::EdgeSelection::allow(App::Document* , App::DocumentObject* pObj, const char* sSubName)
{
// don't allow references to itself
if (pObj == editedObject)
return false;
if (!pObj->isDerivedFrom(Part::Feature::getClassTypeId()))
return false;
if (!sSubName || sSubName[0] == '\0')
return false;
std::string element(sSubName);
if (element.substr(0,4) != "Edge")
return false;
auto links = editedObject->BoundaryList.getSubListValues();
for (auto it : links) {
if (it.first == pObj) {
for (auto jt : it.second) {
if (jt == sSubName)
return !appendEdges;
}
}
}
return appendEdges;
}
// ----------------------------------------------------------------------------
GeomFillSurface::GeomFillSurface(ViewProviderGeomFillSurface* vp, Surface::GeomFillSurface* obj)
{
ui = new Ui_GeomFillSurface();

20
src/Mod/Surface/Gui/TaskGeomFillSurface.h
View File

@@ -35,25 +35,6 @@
namespace SurfaceGui
{
class EdgeSelection : public Gui::SelectionFilterGate
{
public:
EdgeSelection(bool appendEdges, Surface::GeomFillSurface* editedObject)
: Gui::SelectionFilterGate(static_cast<Gui::SelectionFilter*>(nullptr))
, appendEdges(appendEdges)
, editedObject(editedObject)
{
}
/**
* Allow the user to pick only edges.
*/
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName);
private:
bool appendEdges;
Surface::GeomFillSurface* editedObject;
};
class Ui_GeomFillSurface;
class ViewProviderGeomFillSurface : public PartGui::ViewProviderSpline
@@ -74,6 +55,7 @@ class GeomFillSurface : public QWidget,
Q_OBJECT
protected:
class EdgeSelection;
enum SelectionMode { None, Append, Remove };
SelectionMode selectionMode;
Surface::GeomFillSurface* editedObject;