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

Fem: Change TaskPostBoxes constructors to specific view providers

Browse Source
This commit is contained in:
marioalexis
2023-10-13 02:32:26 -03:00
committed by wwmayer
parent 259a9dba37
commit 3f1ecf9141
4 changed files with 56 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Mod/Fem/Gui/TaskPostBoxes.cpp
View File

@@ -135,7 +135,7 @@ std::string PointMarker::ObjectInvisible()
}
PROPERTY_SOURCE(FemGui::ViewProviderPointMarker, Gui::ViewProviderDocumentObject)
PROPERTY_SOURCE(FemGui::ViewProviderPointMarker, Gui::ViewProvider)
ViewProviderPointMarker::ViewProviderPointMarker()
{
@@ -280,7 +280,6 @@ TaskDlgPost::~TaskDlgPost() = default;
QDialogButtonBox::StandardButtons TaskDlgPost::getStandardButtons() const
{
// check if we only have gui task boxes
bool guionly = true;
for (auto it : m_boxes) {
@@ -333,7 +332,7 @@ void TaskDlgPost::open()
{
// a transaction is already open at creation time of the pad
QString msg = QObject::tr("Edit post processing object");
Gui::Command::openCommand((const char*)msg.toUtf8());
Gui::Command::openCommand(msg.toUtf8().constData());
}
void TaskDlgPost::clicked(int button)
@@ -379,7 +378,6 @@ void TaskDlgPost::recompute()
void TaskDlgPost::modifyStandardButtons(QDialogButtonBox* box)
{
if (box->button(QDialogButtonBox::Apply)) {
box->button(QDialogButtonBox::Apply)->setDefault(true);
}
@@ -388,7 +386,7 @@ void TaskDlgPost::modifyStandardButtons(QDialogButtonBox* box)
// ***************************************************************************
// box to set the coloring
TaskPostDisplay::TaskPostDisplay(Gui::ViewProviderDocumentObject* view, QWidget* parent)
TaskPostDisplay::TaskPostDisplay(ViewProviderFemPostObject* view, QWidget* parent)
: TaskPostBox(view,
Gui::BitmapFactory().pixmap("FEM_ResultShow"),
tr("Result display options"),
@@ -410,7 +408,6 @@ TaskPostDisplay::TaskPostDisplay(Gui::ViewProviderDocumentObject* view, QWidget*
// get Transparency from ViewProvider
int trans = getTypedView<ViewProviderFemPostObject>()->Transparency.getValue();
Base::Console().Log("Transparency %i: \n", trans);
// sync the trancparency slider
ui->Transparency->setValue(trans);
ui->Transparency->setToolTip(QString::number(trans) + QString::fromLatin1(" %"));
@@ -463,7 +460,6 @@ void TaskPostDisplay::onVectorModeActivated(int i)
void TaskPostDisplay::onTransparencyValueChanged(int i)
{
getTypedView<ViewProviderFemPostObject>()->Transparency.setValue(i);
ui->Transparency->setToolTip(QString::number(i) + QString::fromLatin1(" %"));
// highlight the tooltip
@@ -476,14 +472,12 @@ void TaskPostDisplay::applyPythonCode()
// ***************************************************************************
// functions
TaskPostFunction::TaskPostFunction(ViewProviderDocumentObject* view, QWidget* parent)
TaskPostFunction::TaskPostFunction(ViewProviderFemPostFunction* view, QWidget* parent)
: TaskPostBox(view,
Gui::BitmapFactory().pixmap("fem-post-geo-plane"),
tr("Implicit function"),
parent)
{
assert(view->isDerivedFrom(ViewProviderFemPostFunction::getClassTypeId()));
// we load the views widget
FunctionWidget* w = getTypedView<ViewProviderFemPostFunction>()->createControlWidget();
w->setParent(this);
@@ -506,7 +500,8 @@ void TaskPostFunction::applyPythonCode()
// ***************************************************************************
// data along line filter
TaskPostDataAlongLine::TaskPostDataAlongLine(ViewProviderDocumentObject* view, QWidget* parent)
TaskPostDataAlongLine::TaskPostDataAlongLine(ViewProviderFemPostDataAlongLine* view,
QWidget* parent)
: TaskPostBox(view,
Gui::BitmapFactory().pixmap("FEM_PostFilterDataAlongLine"),
tr("Data along a line options"),
@@ -514,8 +509,6 @@ TaskPostDataAlongLine::TaskPostDataAlongLine(ViewProviderDocumentObject* view, Q
, ui(new Ui_TaskPostDataAlongLine)
, marker(nullptr)
{
assert(view->isDerivedFrom(ViewProviderFemPostDataAlongLine::getClassTypeId()));
// we load the views widget
proxy = new QWidget(this);
ui->setupUi(proxy);
@@ -933,7 +926,7 @@ plt.show()\n";
// ***************************************************************************
// data at point filter
TaskPostDataAtPoint::TaskPostDataAtPoint(ViewProviderDocumentObject* view, QWidget* parent)
TaskPostDataAtPoint::TaskPostDataAtPoint(ViewProviderFemPostDataAtPoint* view, QWidget* parent)
: TaskPostBox(view,
Gui::BitmapFactory().pixmap("FEM_PostFilterDataAtPoint"),
tr("Data at point options"),
@@ -941,8 +934,6 @@ TaskPostDataAtPoint::TaskPostDataAtPoint(ViewProviderDocumentObject* view, QWidg
, ui(new Ui_TaskPostDataAtPoint)
, marker(nullptr)
{
assert(view->isDerivedFrom(ViewProviderFemPostDataAtPoint::getClassTypeId()));
// we load the views widget
proxy = new QWidget(this);
ui->setupUi(proxy);
@@ -1311,7 +1302,7 @@ std::string TaskPostDataAtPoint::toString(double val) const
// ***************************************************************************
// clip filter
TaskPostClip::TaskPostClip(ViewProviderDocumentObject* view,
TaskPostClip::TaskPostClip(ViewProviderFemPostClip* view,
App::PropertyLink* function,
QWidget* parent)
: TaskPostBox(view,
@@ -1320,7 +1311,6 @@ TaskPostClip::TaskPostClip(ViewProviderDocumentObject* view,
parent)
, ui(new Ui_TaskPostClip)
{
assert(view->isDerivedFrom(ViewProviderFemPostClip::getClassTypeId()));
assert(function);
Q_UNUSED(function);
@@ -1482,15 +1472,13 @@ void TaskPostClip::onInsideOutToggled(bool val)
// ***************************************************************************
// contours filter
TaskPostContours::TaskPostContours(ViewProviderDocumentObject* view, QWidget* parent)
TaskPostContours::TaskPostContours(ViewProviderFemPostContours* view, QWidget* parent)
: TaskPostBox(view,
Gui::BitmapFactory().pixmap("FEM_PostFilterContours"),
tr("Contours filter options"),
parent)
, ui(new Ui_TaskPostContours)
{
assert(view->isDerivedFrom(ViewProviderFemPostContours::getClassTypeId()));
// load the views widget
proxy = new QWidget(this);
ui->setupUi(proxy);
@@ -1612,16 +1600,13 @@ void TaskPostContours::onNoColorChanged(bool state)
// ***************************************************************************
// cut filter
TaskPostCut::TaskPostCut(ViewProviderDocumentObject* view,
App::PropertyLink* function,
QWidget* parent)
TaskPostCut::TaskPostCut(ViewProviderFemPostCut* view, App::PropertyLink* function, QWidget* parent)
: TaskPostBox(view,
Gui::BitmapFactory().pixmap("FEM_PostFilterCutFunction"),
tr("Function cut, choose implicit function"),
parent)
, ui(new Ui_TaskPostCut)
{
assert(view->isDerivedFrom(ViewProviderFemPostCut::getClassTypeId()));
assert(function);
Q_UNUSED(function)
@@ -1760,15 +1745,13 @@ void TaskPostCut::onFunctionBoxCurrentIndexChanged(int idx)
// ***************************************************************************
// scalar clip filter
TaskPostScalarClip::TaskPostScalarClip(ViewProviderDocumentObject* view, QWidget* parent)
TaskPostScalarClip::TaskPostScalarClip(ViewProviderFemPostScalarClip* view, QWidget* parent)
: TaskPostBox(view,
Gui::BitmapFactory().pixmap("FEM_PostFilterClipScalar"),
tr("Scalar clip options"),
parent)
, ui(new Ui_TaskPostScalarClip)
{
assert(view->isDerivedFrom(ViewProviderFemPostScalarClip::getClassTypeId()));
// we load the views widget
proxy = new QWidget(this);
ui->setupUi(proxy);
@@ -1892,15 +1875,13 @@ void TaskPostScalarClip::onInsideOutToggled(bool val)
// ***************************************************************************
// warp vector filter
TaskPostWarpVector::TaskPostWarpVector(ViewProviderDocumentObject* view, QWidget* parent)
TaskPostWarpVector::TaskPostWarpVector(ViewProviderFemPostWarpVector* view, QWidget* parent)
: TaskPostBox(view,
Gui::BitmapFactory().pixmap("FEM_PostFilterWarp"),
tr("Warp options"),
parent)
, ui(new Ui_TaskPostWarpVector)
{
assert(view->isDerivedFrom(ViewProviderFemPostWarpVector::getClassTypeId()));
// we load the views widget
proxy = new QWidget(this);
ui->setupUi(proxy);
@@ -1971,7 +1952,6 @@ void TaskPostWarpVector::applyPythonCode()
void TaskPostWarpVector::onVectorCurrentIndexChanged(int idx)
{
// combobox to choose the result to warp
static_cast<Fem::FemPostWarpVectorFilter*>(getObject())->Vector.setValue(idx);
recompute();
}
@@ -2003,7 +1983,6 @@ void TaskPostWarpVector::onValueValueChanged(double warp_factor)
// TODO warp factor should not be smaller than min and greater than max,
// but problems on automate change of warp_factor, see on_Max_valueChanged
static_cast<Fem::FemPostWarpVectorFilter*>(getObject())->Factor.setValue(warp_factor);
recompute();

39
src/Mod/Fem/Gui/TaskPostBoxes.h
View File

@@ -62,6 +62,7 @@ namespace FemGui
// ***************************************************************************
// point marker
class ViewProviderPointMarker;
class PointMarker: public QObject
{
Q_OBJECT
@@ -89,7 +90,7 @@ private:
};
class FemGuiExport ViewProviderPointMarker: public Gui::ViewProviderDocumentObject
class FemGuiExport ViewProviderPointMarker: public Gui::ViewProvider
{
PROPERTY_HEADER_WITH_OVERRIDE(FemGui::ViewProviderPointMarker);
@@ -237,12 +238,14 @@ protected:
// ***************************************************************************
// box to set the coloring
class ViewProviderFemPostObject;
class TaskPostDisplay: public TaskPostBox
{
Q_OBJECT
public:
explicit TaskPostDisplay(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
explicit TaskPostDisplay(ViewProviderFemPostObject* view, QWidget* parent = nullptr);
~TaskPostDisplay() override;
void applyPythonCode() override;
@@ -267,12 +270,14 @@ private:
// ***************************************************************************
// functions
class ViewProviderFemPostFunction;
class TaskPostFunction: public TaskPostBox
{
Q_OBJECT
public:
explicit TaskPostFunction(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
explicit TaskPostFunction(ViewProviderFemPostFunction* view, QWidget* parent = nullptr);
~TaskPostFunction() override;
void applyPythonCode() override;
@@ -286,12 +291,14 @@ public:
// ***************************************************************************
// data along line filter
class ViewProviderFemPostDataAlongLine;
class TaskPostDataAlongLine: public TaskPostBox
{
Q_OBJECT
public:
explicit TaskPostDataAlongLine(Gui::ViewProviderDocumentObject* view,
explicit TaskPostDataAlongLine(ViewProviderFemPostDataAlongLine* view,
QWidget* parent = nullptr);
~TaskPostDataAlongLine() override;
@@ -322,12 +329,14 @@ private:
// ***************************************************************************
// data at point filter
class ViewProviderFemPostDataAtPoint;
class TaskPostDataAtPoint: public TaskPostBox
{
Q_OBJECT
public:
explicit TaskPostDataAtPoint(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
explicit TaskPostDataAtPoint(ViewProviderFemPostDataAtPoint* view, QWidget* parent = nullptr);
~TaskPostDataAtPoint() override;
void applyPythonCode() override;
@@ -352,12 +361,14 @@ private:
// ***************************************************************************
// clip filter
class ViewProviderFemPostClip;
class TaskPostClip: public TaskPostBox
{
Q_OBJECT
public:
TaskPostClip(Gui::ViewProviderDocumentObject* view,
TaskPostClip(ViewProviderFemPostClip* view,
App::PropertyLink* function,
QWidget* parent = nullptr);
~TaskPostClip() override;
@@ -386,12 +397,14 @@ private:
// ***************************************************************************
// contours filter
class ViewProviderFemPostContours;
class TaskPostContours: public TaskPostBox
{
Q_OBJECT
public:
explicit TaskPostContours(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
explicit TaskPostContours(ViewProviderFemPostContours* view, QWidget* parent = nullptr);
~TaskPostContours() override;
void applyPythonCode() override;
@@ -412,12 +425,14 @@ private:
// ***************************************************************************
// cut filter
class ViewProviderFemPostCut;
class TaskPostCut: public TaskPostBox
{
Q_OBJECT
public:
TaskPostCut(Gui::ViewProviderDocumentObject* view,
TaskPostCut(ViewProviderFemPostCut* view,
App::PropertyLink* function,
QWidget* parent = nullptr);
~TaskPostCut() override;
@@ -444,12 +459,14 @@ private:
// ***************************************************************************
// scalar clip filter
class ViewProviderFemPostScalarClip;
class TaskPostScalarClip: public TaskPostBox
{
Q_OBJECT
public:
explicit TaskPostScalarClip(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
explicit TaskPostScalarClip(ViewProviderFemPostScalarClip* view, QWidget* parent = nullptr);
~TaskPostScalarClip() override;
void applyPythonCode() override;
@@ -469,12 +486,14 @@ private:
// ***************************************************************************
// warp vector filter
class ViewProviderFemPostWarpVector;
class TaskPostWarpVector: public TaskPostBox
{
Q_OBJECT
public:
explicit TaskPostWarpVector(Gui::ViewProviderDocumentObject* view, QWidget* parent = nullptr);
explicit TaskPostWarpVector(ViewProviderFemPostWarpVector* view, QWidget* parent = nullptr);
~TaskPostWarpVector() override;
void applyPythonCode() override;

21
src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp
View File

@@ -49,7 +49,8 @@ ViewProviderFemPostDataAlongLine::~ViewProviderFemPostDataAlongLine() = default;
void ViewProviderFemPostDataAlongLine::setupTaskDialog(TaskDlgPost* dlg)
{
// add the function box
dlg->appendBox(new TaskPostDataAlongLine(dlg->getView()));
assert(dlg->getView() == this);
dlg->appendBox(new TaskPostDataAlongLine(this));
}
@@ -79,7 +80,8 @@ ViewProviderFemPostDataAtPoint::~ViewProviderFemPostDataAtPoint() = default;
void ViewProviderFemPostDataAtPoint::setupTaskDialog(TaskDlgPost* dlg)
{
// add the function box
dlg->appendBox(new TaskPostDataAtPoint(dlg->getView()));
assert(dlg->getView() == this);
dlg->appendBox(new TaskPostDataAtPoint(this));
}
@@ -99,8 +101,9 @@ void ViewProviderFemPostClip::setupTaskDialog(TaskDlgPost* dlg)
{
// add the function box
assert(dlg->getView() == this);
dlg->appendBox(new TaskPostClip(
dlg->getView(),
this,
&static_cast<Fem::FemPostClipFilter*>(dlg->getView()->getObject())->Function));
// add the display options
@@ -122,7 +125,8 @@ ViewProviderFemPostContours::~ViewProviderFemPostContours() = default;
void ViewProviderFemPostContours::setupTaskDialog(TaskDlgPost* dlg)
{
// the filter-specific task panel
dlg->appendBox(new TaskPostContours(dlg->getView()));
assert(dlg->getView() == this);
dlg->appendBox(new TaskPostContours(this));
}
@@ -140,8 +144,9 @@ ViewProviderFemPostCut::~ViewProviderFemPostCut() = default;
void ViewProviderFemPostCut::setupTaskDialog(TaskDlgPost* dlg)
{
// add the function box
assert(dlg->getView() == this);
dlg->appendBox(new TaskPostCut(
dlg->getView(),
this,
&static_cast<Fem::FemPostCutFilter*>(dlg->getView()->getObject())->Function));
// add the display options
@@ -163,7 +168,8 @@ ViewProviderFemPostScalarClip::~ViewProviderFemPostScalarClip() = default;
void ViewProviderFemPostScalarClip::setupTaskDialog(TaskDlgPost* dlg)
{
// add the function box
dlg->appendBox(new TaskPostScalarClip(dlg->getView()));
assert(dlg->getView() == this);
dlg->appendBox(new TaskPostScalarClip(this));
// add the display options
FemGui::ViewProviderFemPostObject::setupTaskDialog(dlg);
@@ -184,7 +190,8 @@ ViewProviderFemPostWarpVector::~ViewProviderFemPostWarpVector() = default;
void ViewProviderFemPostWarpVector::setupTaskDialog(TaskDlgPost* dlg)
{
// add the function box
dlg->appendBox(new TaskPostWarpVector(dlg->getView()));
assert(dlg->getView() == this);
dlg->appendBox(new TaskPostWarpVector(this));
// add the display options
FemGui::ViewProviderFemPostObject::setupTaskDialog(dlg);

1
src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
View File

@@ -892,6 +892,7 @@ bool ViewProviderFemPostObject::setEdit(int ModNum)
void ViewProviderFemPostObject::setupTaskDialog(TaskDlgPost* dlg)
{
assert(dlg->getView() == this);
dlg->appendBox(new TaskPostDisplay(this));
}