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

Part: move ViewProviderPrimitive to its own source files

Browse Source
This commit is contained in:
wmayer
2020-11-15 18:44:27 +01:00
parent d3d34fc9d1
commit 8af45a1fe1
19 changed files with 179 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Part/Gui/AppPartGui.cpp
View File

@@ -38,6 +38,7 @@
#include "ViewProvider.h"
#include "ViewProviderExt.h"
#include "ViewProviderPython.h"
#include "ViewProviderPrimitive.h"
#include "ViewProviderBox.h"
#include "ViewProviderCurveNet.h"
#include "ViewProviderImport.h"

2
src/Mod/Part/Gui/CMakeLists.txt
View File

@@ -233,6 +233,8 @@ SET(PartGui_SRCS
ViewProviderBoolean.h
ViewProviderRuledSurface.cpp
ViewProviderRuledSurface.h
ViewProviderPrimitive.cpp
ViewProviderPrimitive.h
Workbench.cpp
Workbench.h
TaskFaceColors.cpp

66
src/Mod/Part/Gui/ViewProvider.cpp
View File

@@ -31,17 +31,11 @@
#include <Base/Console.h>
#include <Base/Exception.h>
#include <App/Document.h>
#include <Gui/ActionFunction.h>
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/Control.h>
#include <Gui/Document.h>
#include <Mod/Part/App/PartFeature.h>
#include <Mod/Part/App/PrimitiveFeature.h>
#include "ViewProvider.h"
#include "DlgPrimitives.h"
using namespace PartGui;
@@ -101,66 +95,6 @@ void ViewProviderPart::applyTransparency(const float& transparency,
// ----------------------------------------------------------------------------
PROPERTY_SOURCE(PartGui::ViewProviderPrimitive, PartGui::ViewProviderPart)
ViewProviderPrimitive::ViewProviderPrimitive()
{
}
ViewProviderPrimitive::~ViewProviderPrimitive()
{
}
void ViewProviderPrimitive::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
Gui::ActionFunction* func = new Gui::ActionFunction(menu);
QAction* act = menu->addAction(QObject::tr("Edit %1").arg(QString::fromUtf8(getObject()->Label.getValue())));
act->setData(QVariant((int)ViewProvider::Default));
func->trigger(act, boost::bind(&ViewProviderPrimitive::startDefaultEditMode, this));
ViewProviderPart::setupContextMenu(menu, receiver, member);
}
void ViewProviderPrimitive::startDefaultEditMode()
{
QString text = QObject::tr("Edit %1").arg(QString::fromUtf8(getObject()->Label.getValue()));
Gui::Command::openCommand(text.toUtf8());
Gui::Document* document = this->getDocument();
if (document) {
document->setEdit(this, ViewProvider::Default);
}
}
bool ViewProviderPrimitive::setEdit(int ModNum)
{
if (ModNum == ViewProvider::Default) {
if (Gui::Control().activeDialog())
return false;
PartGui::TaskPrimitivesEdit* dlg
= new PartGui::TaskPrimitivesEdit(dynamic_cast<Part::Primitive*>(getObject()));
Gui::Control().showDialog(dlg);
return true;
}
else {
ViewProviderPart::setEdit(ModNum);
return true;
}
}
void ViewProviderPrimitive::unsetEdit(int ModNum)
{
if (ModNum == ViewProvider::Default) {
Gui::Control().closeDialog();
}
else {
ViewProviderPart::unsetEdit(ModNum);
}
}
// ----------------------------------------------------------------------------
void ViewProviderShapeBuilder::buildNodes(const App::Property* , std::vector<SoNode*>& ) const
{
}

20
src/Mod/Part/Gui/ViewProvider.h
View File

@@ -61,26 +61,6 @@ protected:
std::vector<App::Color>& colors);
};
class PartGuiExport ViewProviderPrimitive : public ViewProviderPart
{
PROPERTY_HEADER(PartGui::ViewProviderPrimitive);
public:
/// constructor
ViewProviderPrimitive();
/// destructor
virtual ~ViewProviderPrimitive();
void setupContextMenu(QMenu*, QObject*, const char*);
protected:
bool setEdit(int ModNum);
void unsetEdit(int ModNum);
private:
void startDefaultEditMode();
};
} // namespace PartGui

2
src/Mod/Part/Gui/ViewProviderBox.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERBOX_H
#define PARTGUI_VIEWPROVIDERBOX_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
class TopoDS_Shape;

2
src/Mod/Part/Gui/ViewProviderCircleParametric.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERCIRCLEPARAMETRIC_H
#define PARTGUI_VIEWPROVIDERCIRCLEPARAMETRIC_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
class TopoDS_Shape;

2
src/Mod/Part/Gui/ViewProviderConeParametric.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERCONEPARAMETRIC_H
#define PARTGUI_VIEWPROVIDERCONEPARAMETRIC_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
class TopoDS_Shape;

2
src/Mod/Part/Gui/ViewProviderCylinderParametric.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERCYLINDERPARAMETRIC_H
#define PARTGUI_VIEWPROVIDERCYLINDERPARAMETRIC_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
class TopoDS_Shape;

2
src/Mod/Part/Gui/ViewProviderEllipseParametric.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERELLIPSEPARAMETRIC_H
#define PARTGUI_VIEWPROVIDERELLIPSEPARAMETRIC_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
class TopoDS_Shape;

2
src/Mod/Part/Gui/ViewProviderHelixParametric.h
View File

@@ -25,7 +25,7 @@
#define PARTGUI_VIEWPROVIDERHELIXPARAMETRIC_H
#include "ViewProviderSpline.h"
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
namespace PartGui {

2
src/Mod/Part/Gui/ViewProviderLineParametric.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERLINEPARAMETRIC_H
#define PARTGUI_VIEWPROVIDERLINEPARAMETRIC_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
class TopoDS_Shape;

2
src/Mod/Part/Gui/ViewProviderPlaneParametric.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERPLANEPARAMETRIC_H
#define PARTGUI_VIEWPROVIDERPLANEPARAMETRIC_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
class TopoDS_Shape;

2
src/Mod/Part/Gui/ViewProviderPointParametric.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERPOINTPARAMETRIC_H
#define PARTGUI_VIEWPROVIDERPOINTPARAMETRIC_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
class TopoDS_Shape;

107
src/Mod/Part/Gui/ViewProviderPrimitive.cpp Normal file
View File

@@ -0,0 +1,107 @@
/***************************************************************************
* Copyright (c) 2020 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QAction>
# include <QMenu>
#endif
#include <Base/Console.h>
#include <Base/Exception.h>
#include <App/Document.h>
#include <Gui/ActionFunction.h>
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/Control.h>
#include <Gui/Document.h>
#include <Mod/Part/App/PartFeature.h>
#include <Mod/Part/App/PrimitiveFeature.h>
#include "ViewProviderPrimitive.h"
#include "DlgPrimitives.h"
using namespace PartGui;
PROPERTY_SOURCE(PartGui::ViewProviderPrimitive, PartGui::ViewProviderPart)
ViewProviderPrimitive::ViewProviderPrimitive()
{
extension.initExtension(this);
}
ViewProviderPrimitive::~ViewProviderPrimitive()
{
}
void ViewProviderPrimitive::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
Gui::ActionFunction* func = new Gui::ActionFunction(menu);
QAction* act = menu->addAction(QObject::tr("Edit %1").arg(QString::fromUtf8(getObject()->Label.getValue())));
act->setData(QVariant((int)ViewProvider::Default));
func->trigger(act, boost::bind(&ViewProviderPrimitive::startDefaultEditMode, this));
ViewProviderPart::setupContextMenu(menu, receiver, member);
}
void ViewProviderPrimitive::startDefaultEditMode()
{
QString text = QObject::tr("Edit %1").arg(QString::fromUtf8(getObject()->Label.getValue()));
Gui::Command::openCommand(text.toUtf8());
Gui::Document* document = this->getDocument();
if (document) {
document->setEdit(this, ViewProvider::Default);
}
}
bool ViewProviderPrimitive::setEdit(int ModNum)
{
if (ModNum == ViewProvider::Default) {
if (Gui::Control().activeDialog())
return false;
PartGui::TaskPrimitivesEdit* dlg
= new PartGui::TaskPrimitivesEdit(dynamic_cast<Part::Primitive*>(getObject()));
Gui::Control().showDialog(dlg);
return true;
}
else {
ViewProviderPart::setEdit(ModNum);
return true;
}
}
void ViewProviderPrimitive::unsetEdit(int ModNum)
{
if (ModNum == ViewProvider::Default) {
Gui::Control().closeDialog();
}
else {
ViewProviderPart::unsetEdit(ModNum);
}
}

56
src/Mod/Part/Gui/ViewProviderPrimitive.h Normal file
View File

@@ -0,0 +1,56 @@
/***************************************************************************
* Copyright (c) 2020 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef PARTGUI_VIEWPROVIDERPRIMITIVE_H
#define PARTGUI_VIEWPROVIDERPRIMITIVE_H
#include <Mod/Part/Gui/ViewProvider.h>
namespace PartGui {
class PartGuiExport ViewProviderPrimitive : public ViewProviderPart
{
PROPERTY_HEADER(PartGui::ViewProviderPrimitive);
public:
/// constructor
ViewProviderPrimitive();
/// destructor
virtual ~ViewProviderPrimitive();
void setupContextMenu(QMenu*, QObject*, const char*);
protected:
bool setEdit(int ModNum);
void unsetEdit(int ModNum);
private:
void startDefaultEditMode();
};
} // namespace PartGui
#endif // PARTGUI_VIEWPROVIDERPRIMITIVE_H

2
src/Mod/Part/Gui/ViewProviderPrism.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERPRISM_H
#define PARTGUI_VIEWPROVIDERPRISM_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
namespace PartGui {

2
src/Mod/Part/Gui/ViewProviderRegularPolygon.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERREGULARPOLYGON_H
#define PARTGUI_VIEWPROVIDERREGULARPOLYGON_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
namespace PartGui {

2
src/Mod/Part/Gui/ViewProviderSphereParametric.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERSPHEREPARAMETRIC_H
#define PARTGUI_VIEWPROVIDERSPHEREPARAMETRIC_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
namespace PartGui {

2
src/Mod/Part/Gui/ViewProviderTorusParametric.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERTORUSPARAMETRIC_H
#define PARTGUI_VIEWPROVIDERTORUSPARAMETRIC_H
#include "ViewProvider.h"
#include "ViewProviderPrimitive.h"
class TopoDS_Shape;