From ad29f1628a3cee51c10cc52928901fa614ef6a6b Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 3 Apr 2023 10:53:30 +0200 Subject: [PATCH] Part: fix -Wclazy-connect-by-name --- src/Mod/Part/Gui/CrossSections.cpp | 40 ++++++++--- src/Mod/Part/Gui/CrossSections.h | 19 +++--- src/Mod/Part/Gui/DlgBooleanOperation.cpp | 4 +- src/Mod/Part/Gui/DlgBooleanOperation.h | 6 +- src/Mod/Part/Gui/DlgExtrusion.cpp | 58 +++++++++++----- src/Mod/Part/Gui/DlgExtrusion.h | 23 +++---- src/Mod/Part/Gui/DlgFilletEdges.cpp | 56 +++++++++++----- src/Mod/Part/Gui/DlgFilletEdges.h | 19 +++--- src/Mod/Part/Gui/DlgProjectionOnSurface.cpp | 66 ++++++++++++++----- src/Mod/Part/Gui/DlgProjectionOnSurface.h | 30 ++++----- src/Mod/Part/Gui/DlgRevolution.cpp | 27 ++++++-- src/Mod/Part/Gui/DlgRevolution.h | 13 ++-- src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp | 4 +- src/Mod/Part/Gui/DlgSettings3DViewPartImp.h | 4 +- src/Mod/Part/Gui/TaskCheckGeometry.cpp | 64 +++++++++--------- src/Mod/Part/Gui/TaskCheckGeometry.h | 34 +++++----- src/Mod/Part/Gui/TaskFaceColors.cpp | 18 ++++- src/Mod/Part/Gui/TaskFaceColors.h | 9 +-- src/Mod/Part/Gui/TaskOffset.cpp | 34 ++++++++-- src/Mod/Part/Gui/TaskOffset.h | 17 ++--- src/Mod/Part/Gui/TaskShapeBuilder.cpp | 8 ++- src/Mod/Part/Gui/TaskShapeBuilder.h | 6 +- src/Mod/Part/Gui/TaskSweep.cpp | 4 +- src/Mod/Part/Gui/TaskSweep.h | 4 +- src/Mod/Part/Gui/TaskThickness.cpp | 34 ++++++++-- src/Mod/Part/Gui/TaskThickness.h | 17 ++--- 26 files changed, 401 insertions(+), 217 deletions(-) diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp index 8642006038..1f42410aaf 100644 --- a/src/Mod/Part/Gui/CrossSections.cpp +++ b/src/Mod/Part/Gui/CrossSections.cpp @@ -125,6 +125,8 @@ CrossSections::CrossSections(const Base::BoundBox3d& bb, QWidget* parent, Qt::Wi , bbox(bb) { ui->setupUi(this); + setupConnections(); + ui->position->setRange(-DBL_MAX, DBL_MAX); ui->position->setUnit(Base::Unit::Length); ui->distance->setRange(0, DBL_MAX); @@ -154,6 +156,26 @@ CrossSections::~CrossSections() delete vp; } +void CrossSections::setupConnections() +{ + connect(ui->xyPlane, &QRadioButton::clicked, + this, &CrossSections::xyPlaneClicked); + connect(ui->xzPlane, &QRadioButton::clicked, + this, &CrossSections::xzPlaneClicked); + connect(ui->yzPlane, &QRadioButton::clicked, + this, &CrossSections::yzPlaneClicked); + connect(ui->position, qOverload(&Gui::QuantitySpinBox::valueChanged), + this, &CrossSections::positionValueChanged); + connect(ui->distance, qOverload(&Gui::QuantitySpinBox::valueChanged), + this, &CrossSections::distanceValueChanged); + connect(ui->countSections, qOverload(&QSpinBox::valueChanged), + this, &CrossSections::countSectionsValueChanged); + connect(ui->checkBothSides, &QCheckBox::toggled, + this, &CrossSections::checkBothSidesToggled); + connect(ui->sectionsBox, &QGroupBox::toggled, + this, &CrossSections::sectionsBoxToggled); +} + CrossSections::Plane CrossSections::plane() const { if (ui->xyPlane->isChecked()) @@ -280,7 +302,7 @@ void CrossSections::apply() #endif } -void CrossSections::on_xyPlane_clicked() +void CrossSections::xyPlaneClicked() { Base::Vector3d c = bbox.GetCenter(); ui->position->setValue(c.z); @@ -296,7 +318,7 @@ void CrossSections::on_xyPlane_clicked() } } -void CrossSections::on_xzPlane_clicked() +void CrossSections::xzPlaneClicked() { Base::Vector3d c = bbox.GetCenter(); ui->position->setValue(c.y); @@ -312,7 +334,7 @@ void CrossSections::on_xzPlane_clicked() } } -void CrossSections::on_yzPlane_clicked() +void CrossSections::yzPlaneClicked() { Base::Vector3d c = bbox.GetCenter(); ui->position->setValue(c.x); @@ -328,7 +350,7 @@ void CrossSections::on_yzPlane_clicked() } } -void CrossSections::on_position_valueChanged(double v) +void CrossSections::positionValueChanged(double v) { if (!ui->sectionsBox->isChecked()) { calcPlane(plane(), v); @@ -338,10 +360,10 @@ void CrossSections::on_position_valueChanged(double v) } } -void CrossSections::on_sectionsBox_toggled(bool b) +void CrossSections::sectionsBoxToggled(bool b) { if (b) { - on_countSections_valueChanged(ui->countSections->value()); + countSectionsValueChanged(ui->countSections->value()); } else { CrossSections::Plane type = plane(); @@ -364,7 +386,7 @@ void CrossSections::on_sectionsBox_toggled(bool b) } } -void CrossSections::on_checkBothSides_toggled(bool b) +void CrossSections::checkBothSidesToggled(bool b) { double d = ui->distance->value().getValue(); d = b ? 2.0 * d : 0.5 * d; @@ -372,7 +394,7 @@ void CrossSections::on_checkBothSides_toggled(bool b) calcPlanes(plane()); } -void CrossSections::on_countSections_valueChanged(int v) +void CrossSections::countSectionsValueChanged(int v) { CrossSections::Plane type = plane(); double dist = 0; @@ -393,7 +415,7 @@ void CrossSections::on_countSections_valueChanged(int v) calcPlanes(type); } -void CrossSections::on_distance_valueChanged(double) +void CrossSections::distanceValueChanged(double) { calcPlanes(plane()); } diff --git a/src/Mod/Part/Gui/CrossSections.h b/src/Mod/Part/Gui/CrossSections.h index 104e591c99..d7de574578 100644 --- a/src/Mod/Part/Gui/CrossSections.h +++ b/src/Mod/Part/Gui/CrossSections.h @@ -55,15 +55,16 @@ protected: void changeEvent(QEvent *e) override; void keyPressEvent(QKeyEvent*) override; -private Q_SLOTS: - void on_xyPlane_clicked(); - void on_xzPlane_clicked(); - void on_yzPlane_clicked(); - void on_position_valueChanged(double); - void on_distance_valueChanged(double); - void on_countSections_valueChanged(int); - void on_checkBothSides_toggled(bool); - void on_sectionsBox_toggled(bool); +private: + void setupConnections(); + void xyPlaneClicked(); + void xzPlaneClicked(); + void yzPlaneClicked(); + void positionValueChanged(double); + void distanceValueChanged(double); + void countSectionsValueChanged(int); + void checkBothSidesToggled(bool); + void sectionsBoxToggled(bool); private: std::vector getPlanes() const; diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.cpp b/src/Mod/Part/Gui/DlgBooleanOperation.cpp index 9c73222a01..d84e08bf7c 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.cpp +++ b/src/Mod/Part/Gui/DlgBooleanOperation.cpp @@ -86,6 +86,8 @@ DlgBooleanOperation::DlgBooleanOperation(QWidget* parent) : QWidget(parent), ui(new Ui_DlgBooleanOperation) { ui->setupUi(this); + connect(ui->swapButton, &QPushButton::clicked, + this, &DlgBooleanOperation::onSwapButtonClicked); connect(ui->firstShape, &QTreeWidget::currentItemChanged, this, &DlgBooleanOperation::currentItemChanged); connect(ui->secondShape, &QTreeWidget::currentItemChanged, @@ -316,7 +318,7 @@ void DlgBooleanOperation::currentItemChanged(QTreeWidgetItem* current, QTreeWidg // previous->setCheckState(0, Qt::Unchecked); } -void DlgBooleanOperation::on_swapButton_clicked() +void DlgBooleanOperation::onSwapButtonClicked() { QTreeWidgetItem* lChild = ui->firstShape->currentItem(); bool lsel = (lChild && (lChild->checkState(0) & Qt::Checked)); diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.h b/src/Mod/Part/Gui/DlgBooleanOperation.h index 839cf1f062..ef28764ede 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.h +++ b/src/Mod/Part/Gui/DlgBooleanOperation.h @@ -56,10 +56,8 @@ private: protected: void changeEvent(QEvent *e) override; -public Q_SLOTS: - void on_swapButton_clicked(); - -private Q_SLOTS: +private: + void onSwapButtonClicked(); void currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*); private: diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp index e7534bbe24..64e9d31d74 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.cpp +++ b/src/Mod/Part/Gui/DlgExtrusion.cpp @@ -100,6 +100,8 @@ DlgExtrusion::DlgExtrusion(QWidget* parent, Qt::WindowFlags fl) : QDialog(parent, fl), ui(new Ui_DlgExtrusion), filter(nullptr) { ui->setupUi(this); + setupConnections(); + ui->statusLabel->clear(); ui->dirX->setDecimals(Base::UnitsApi::getDecimals()); ui->dirY->setDecimals(Base::UnitsApi::getDecimals()); @@ -116,7 +118,7 @@ DlgExtrusion::DlgExtrusion(QWidget* parent, Qt::WindowFlags fl) sel.applyFrom(Gui::Selection().getObjectsOfType(App::Link::getClassTypeId())); sel.applyFrom(Gui::Selection().getObjectsOfType(App::Part::getClassTypeId())); - this->on_DirMode_changed(); + this->onDirModeChanged(); ui->spinLenFwd->selectAll(); // Make sure that the spin box has the focus to get key events // Calling setFocus() directly doesn't work because the spin box is not @@ -139,6 +141,28 @@ DlgExtrusion::~DlgExtrusion() // no need to delete child widgets, Qt does it all for us } +void DlgExtrusion::setupConnections() +{ + connect(ui->rbDirModeCustom, &QRadioButton::toggled, + this, &DlgExtrusion::onDirModeCustomToggled); + connect(ui->rbDirModeEdge, &QRadioButton::toggled, + this, &DlgExtrusion::onDirModeEdgeToggled); + connect(ui->rbDirModeNormal, &QRadioButton::toggled, + this, &DlgExtrusion::onDirModeNormalToggled); + connect(ui->btnSelectEdge, &QPushButton::clicked, + this, &DlgExtrusion::onSelectEdgeClicked); + connect(ui->btnX, &QPushButton::clicked, + this, &DlgExtrusion::onButtnoXClicked); + connect(ui->btnY, &QPushButton::clicked, + this, &DlgExtrusion::onButtonYClicked); + connect(ui->btnZ, &QPushButton::clicked, + this, &DlgExtrusion::onButtonZClicked); + connect(ui->chkSymmetric, &QCheckBox::toggled, + this, &DlgExtrusion::onCheckSymmetricToggled); + connect(ui->txtLink, &QLineEdit::textChanged, + this, &DlgExtrusion::onTextLinkTextChanged); +} + void DlgExtrusion::changeEvent(QEvent *e) { if (e->type() == QEvent::LanguageChange) { @@ -154,25 +178,25 @@ void DlgExtrusion::keyPressEvent(QKeyEvent* ke) ke->ignore(); } -void DlgExtrusion::on_rbDirModeCustom_toggled(bool on) +void DlgExtrusion::onDirModeCustomToggled(bool on) { if(on) //this check prevents dual fire of dirmode changed - on radio buttons, one will come on, and other will come off, causing two events. - this->on_DirMode_changed(); + this->onDirModeChanged(); } -void DlgExtrusion::on_rbDirModeEdge_toggled(bool on) +void DlgExtrusion::onDirModeEdgeToggled(bool on) { if(on) - this->on_DirMode_changed(); + this->onDirModeChanged(); } -void DlgExtrusion::on_rbDirModeNormal_toggled(bool on) +void DlgExtrusion::onDirModeNormalToggled(bool on) { if(on) - this->on_DirMode_changed(); + this->onDirModeChanged(); } -void DlgExtrusion::on_btnSelectEdge_clicked() +void DlgExtrusion::onSelectEdgeClicked() { if (!filter) { filter = new EdgeSelection(); @@ -214,7 +238,7 @@ void DlgExtrusion::on_btnSelectEdge_clicked() } } -void DlgExtrusion::on_btnX_clicked() +void DlgExtrusion::onButtnoXClicked() { Base::Vector3d axis(1.0, 0.0, 0.0); if ((getDir() - axis).Length() < 1e-7) @@ -223,7 +247,7 @@ void DlgExtrusion::on_btnX_clicked() setDir(axis); } -void DlgExtrusion::on_btnY_clicked() +void DlgExtrusion::onButtonYClicked() { Base::Vector3d axis(0.0, 1.0, 0.0); if ((getDir() - axis).Length() < 1e-7) @@ -232,7 +256,7 @@ void DlgExtrusion::on_btnY_clicked() setDir(axis); } -void DlgExtrusion::on_btnZ_clicked() +void DlgExtrusion::onButtonZClicked() { Base::Vector3d axis(0.0, 0.0, 1.0); if ((getDir() - axis).Length() < 1e-7) @@ -241,17 +265,17 @@ void DlgExtrusion::on_btnZ_clicked() setDir(axis); } -void DlgExtrusion::on_chkSymmetric_toggled(bool on) +void DlgExtrusion::onCheckSymmetricToggled(bool on) { ui->spinLenRev->setEnabled(!on); } -void DlgExtrusion::on_txtLink_textChanged(QString) +void DlgExtrusion::onTextLinkTextChanged(QString) { this->fetchDir(); } -void DlgExtrusion::on_DirMode_changed() +void DlgExtrusion::onDirModeChanged() { Part::Extrusion::eDirMode dirMode = this->getDirMode(); ui->dirX->setEnabled(dirMode == Part::Extrusion::dmCustom); @@ -419,7 +443,7 @@ void DlgExtrusion::apply() throw Base::AbortException(); if (filter) //if still selecting edge - stop. This is important for visibility automation. - this->on_btnSelectEdge_clicked(); + this->onSelectEdgeClicked(); Gui::WaitCursor wc; App::Document* activeDoc = App::GetApplication().getDocument(this->document.c_str()); @@ -485,7 +509,7 @@ void DlgExtrusion::apply() void DlgExtrusion::reject() { if (filter) //if still selecting edge - stop. - this->on_btnSelectEdge_clicked(); + this->onSelectEdgeClicked(); QDialog::reject(); } @@ -531,7 +555,7 @@ void DlgExtrusion::setDirMode(Part::Extrusion::eDirMode newMode) ui->rbDirModeCustom->blockSignals(false); ui->rbDirModeEdge->blockSignals(false); ui->rbDirModeNormal->blockSignals(false); - this->on_DirMode_changed(); + this->onDirModeChanged(); } void DlgExtrusion::getAxisLink(App::PropertyLinkSub& lnk) const diff --git a/src/Mod/Part/Gui/DlgExtrusion.h b/src/Mod/Part/Gui/DlgExtrusion.h index c8a1e258c5..0deef402ce 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.h +++ b/src/Mod/Part/Gui/DlgExtrusion.h @@ -69,20 +69,21 @@ protected: void changeEvent(QEvent *e) override; void keyPressEvent(QKeyEvent*) override; -private Q_SLOTS: - void on_rbDirModeCustom_toggled(bool on); - void on_rbDirModeEdge_toggled(bool on); - void on_rbDirModeNormal_toggled(bool on); - void on_btnSelectEdge_clicked(); - void on_btnX_clicked(); - void on_btnY_clicked(); - void on_btnZ_clicked(); - void on_chkSymmetric_toggled(bool on); - void on_txtLink_textChanged(QString); +private: + void setupConnections(); + void onDirModeCustomToggled(bool on); + void onDirModeEdgeToggled(bool on); + void onDirModeNormalToggled(bool on); + void onSelectEdgeClicked(); + void onButtnoXClicked(); + void onButtonYClicked(); + void onButtonZClicked(); + void onCheckSymmetricToggled(bool on); + void onTextLinkTextChanged(QString); private: ///updates enabling of controls - void on_DirMode_changed(); + void onDirModeChanged(); void onSelectionChanged(const Gui::SelectionChanges& msg) override; ///returns link to any of selected source shapes. Throws if nothing is selected for extrusion. App::DocumentObject& getShapeToExtrude() const; diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 11c7137cfe..6ddf486d9e 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -229,6 +229,8 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge : QWidget(parent, fl), ui(new Ui_DlgFilletEdges()), d(new Private()) { ui->setupUi(this); + setupConnections(); + ui->filletStartRadius->setMaximum(INT_MAX); ui->filletStartRadius->setMinimum(0); ui->filletStartRadius->setUnit(Base::Unit::Length); @@ -285,7 +287,7 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge header->setSectionResizeMode(0, QHeaderView::Stretch); header->setDefaultAlignment(Qt::AlignLeft); header->setSectionsMovable(false); - on_filletType_activated(0); + onFilletTypeActivated(0); findShapes(); } @@ -300,6 +302,28 @@ DlgFilletEdges::~DlgFilletEdges() Gui::Selection().rmvSelectionGate(); } +void DlgFilletEdges::setupConnections() +{ + connect(ui->shapeObject, qOverload(&QComboBox::activated), + this, &DlgFilletEdges::onShapeObjectActivated); + connect(ui->selectEdges, &QRadioButton::toggled, + this, &DlgFilletEdges::onSelectEdgesToggled); + connect(ui->selectFaces, &QRadioButton::toggled, + this, &DlgFilletEdges::onSelectFacesToggled); + connect(ui->selectAllButton, &QPushButton::clicked, + this, &DlgFilletEdges::onSelectAllButtonClicked); + connect(ui->selectNoneButton, &QPushButton::clicked, + this, &DlgFilletEdges::onSelectNoneButtonClicked); + connect(ui->filletType, qOverload(&QComboBox::activated), + this, &DlgFilletEdges::onFilletTypeActivated); + connect(ui->filletStartRadius, + qOverload(&Gui::QuantitySpinBox::valueChanged), + this, &DlgFilletEdges::onFilletStartRadiusValueChanged); + connect(ui->filletEndRadius, + qOverload(&Gui::QuantitySpinBox::valueChanged), + this, &DlgFilletEdges::onFilletEndRadiusValueChanged); +} + void DlgFilletEdges::onSelectionChanged(const Gui::SelectionChanges& msg) { // no object selected in the combobox or no sub-element was selected @@ -462,13 +486,13 @@ void DlgFilletEdges::onDeleteObject(const App::DocumentObject& obj) d->fillet = nullptr; d->object = nullptr; ui->shapeObject->setCurrentIndex(0); - on_shapeObject_activated(0); + onShapeObjectActivated(0); } else if (d->object == &obj) { d->object = nullptr; ui->shapeObject->removeItem(ui->shapeObject->currentIndex()); ui->shapeObject->setCurrentIndex(0); - on_shapeObject_activated(0); + onShapeObjectActivated(0); } else { QString shape = QString::fromLatin1(obj.getNameInDocument()); @@ -487,13 +511,13 @@ void DlgFilletEdges::onDeleteDocument(const App::Document& doc) if (d->object) { if (d->object->getDocument() == &doc) { ui->shapeObject->setCurrentIndex(0); - on_shapeObject_activated(0); + onShapeObjectActivated(0); setEnabled(false); } } else if (App::GetApplication().getActiveDocument() == &doc) { ui->shapeObject->setCurrentIndex(0); - on_shapeObject_activated(0); + onShapeObjectActivated(0); setEnabled(false); } } @@ -552,7 +576,7 @@ void DlgFilletEdges::findShapes() if (current_index > 0) { ui->shapeObject->setCurrentIndex(current_index); - on_shapeObject_activated(current_index); + onShapeObjectActivated(current_index); } // if an existing fillet object is given start the edit mode @@ -576,7 +600,7 @@ void DlgFilletEdges::setupFillet(const std::vector& objs) int current_index = (it - objs.begin()) + 1; ui->shapeObject->setCurrentIndex(current_index); - on_shapeObject_activated(current_index); + onShapeObjectActivated(current_index); ui->shapeObject->setEnabled(false); double startRadius = 1; @@ -612,7 +636,7 @@ void DlgFilletEdges::setupFillet(const std::vector& objs) // #0002273 if (twoRadii) { ui->filletType->setCurrentIndex(1); - on_filletType_activated(1); + onFilletTypeActivated(1); } // #0001746 @@ -694,7 +718,7 @@ void DlgFilletEdges::changeEvent(QEvent *e) } } -void DlgFilletEdges::on_shapeObject_activated(int itemPos) +void DlgFilletEdges::onShapeObjectActivated(int itemPos) { d->object = nullptr; QStandardItemModel *model = qobject_cast(ui->treeView->model()); @@ -763,17 +787,17 @@ void DlgFilletEdges::on_shapeObject_activated(int itemPos) } } -void DlgFilletEdges::on_selectEdges_toggled(bool on) +void DlgFilletEdges::onSelectEdgesToggled(bool on) { if (on) d->selection->selectEdges(); } -void DlgFilletEdges::on_selectFaces_toggled(bool on) +void DlgFilletEdges::onSelectFacesToggled(bool on) { if (on) d->selection->selectFaces(); } -void DlgFilletEdges::on_selectAllButton_clicked() +void DlgFilletEdges::onSelectAllButtonClicked() { std::vector subElements; FilletRadiusModel* model = static_cast(ui->treeView->model()); @@ -806,7 +830,7 @@ void DlgFilletEdges::on_selectAllButton_clicked() } } -void DlgFilletEdges::on_selectNoneButton_clicked() +void DlgFilletEdges::onSelectNoneButtonClicked() { FilletRadiusModel* model = static_cast(ui->treeView->model()); bool block = model->blockSignals(true); // do not call toggleCheckState @@ -824,7 +848,7 @@ void DlgFilletEdges::on_selectNoneButton_clicked() } } -void DlgFilletEdges::on_filletType_activated(int index) +void DlgFilletEdges::onFilletTypeActivated(int index) { QStandardItemModel *model = qobject_cast(ui->treeView->model()); if (index == 0) { @@ -849,7 +873,7 @@ void DlgFilletEdges::on_filletType_activated(int index) ui->treeView->resizeColumnToContents(2); } -void DlgFilletEdges::on_filletStartRadius_valueChanged(const Base::Quantity& radius) +void DlgFilletEdges::onFilletStartRadiusValueChanged(const Base::Quantity& radius) { QAbstractItemModel* model = ui->treeView->model(); for (int i=0; irowCount(); ++i) { @@ -863,7 +887,7 @@ void DlgFilletEdges::on_filletStartRadius_valueChanged(const Base::Quantity& rad } } -void DlgFilletEdges::on_filletEndRadius_valueChanged(const Base::Quantity& radius) +void DlgFilletEdges::onFilletEndRadiusValueChanged(const Base::Quantity& radius) { QAbstractItemModel* model = ui->treeView->model(); for (int i=0; irowCount(); ++i) { diff --git a/src/Mod/Part/Gui/DlgFilletEdges.h b/src/Mod/Part/Gui/DlgFilletEdges.h index e886eacf67..765c659aec 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.h +++ b/src/Mod/Part/Gui/DlgFilletEdges.h @@ -103,15 +103,16 @@ private: void onSelectEdge(const QString& subelement, int type); void onSelectEdgesOfFace(const QString& subelement, int type); -private Q_SLOTS: - void on_shapeObject_activated(int); - void on_selectEdges_toggled(bool); - void on_selectFaces_toggled(bool); - void on_selectAllButton_clicked(); - void on_selectNoneButton_clicked(); - void on_filletType_activated(int); - void on_filletStartRadius_valueChanged(const Base::Quantity&); - void on_filletEndRadius_valueChanged(const Base::Quantity&); +private: + void setupConnections(); + void onShapeObjectActivated(int); + void onSelectEdgesToggled(bool); + void onSelectFacesToggled(bool); + void onSelectAllButtonClicked(); + void onSelectNoneButtonClicked(); + void onFilletTypeActivated(int); + void onFilletStartRadiusValueChanged(const Base::Quantity&); + void onFilletEndRadiusValueChanged(const Base::Quantity&); void toggleCheckState(const QModelIndex&); void onHighlightEdges(); diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp index 7d80357690..deae279067 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.cpp @@ -137,6 +137,8 @@ DlgProjectionOnSurface::DlgProjectionOnSurface(QWidget *parent) , filterFace(nullptr) { ui->setupUi(this); + setupConnections(); + ui->pushButtonAddEdge->setCheckable(true); ui->pushButtonAddFace->setCheckable(true); ui->pushButtonAddProjFace->setCheckable(true); @@ -170,7 +172,7 @@ DlgProjectionOnSurface::DlgProjectionOnSurface(QWidget *parent) throw Base::ValueError(QString(tr("Can not create a projection object!!!")).toUtf8()); } m_projectionObject->Label.setValue(std::string(m_projectionObjectName.toUtf8()).c_str()); - on_radioButtonShowAll_clicked(); + onRadioButtonShowAllClicked(); m_lastDepthVal = ui->doubleSpinBoxSolidDepth->value(); } @@ -204,6 +206,36 @@ DlgProjectionOnSurface::~DlgProjectionOnSurface() Gui::Selection().rmvSelectionGate(); } +void PartGui::DlgProjectionOnSurface::setupConnections() +{ + connect(ui->pushButtonAddFace, &QPushButton::clicked, + this, &DlgProjectionOnSurface::onPushButtonAddFaceClicked); + connect(ui->pushButtonAddEdge, &QPushButton::clicked, + this, &DlgProjectionOnSurface::onPushButtonAddEdgeClicked); + connect(ui->pushButtonGetCurrentCamDir, &QPushButton::clicked, + this, &DlgProjectionOnSurface::onPushButtonGetCurrentCamDirClicked); + connect(ui->pushButtonDirX, &QPushButton::clicked, + this, &DlgProjectionOnSurface::onPushButtonDirXClicked); + connect(ui->pushButtonDirY, &QPushButton::clicked, + this, &DlgProjectionOnSurface::onPushButtonDirYClicked); + connect(ui->pushButtonDirZ, &QPushButton::clicked, + this, &DlgProjectionOnSurface::onPushButtonDirZClicked); + connect(ui->pushButtonAddProjFace, &QPushButton::clicked, + this, &DlgProjectionOnSurface::onPushButtonAddProjFaceClicked); + connect(ui->radioButtonShowAll, &QRadioButton::clicked, + this, &DlgProjectionOnSurface::onRadioButtonShowAllClicked); + connect(ui->radioButtonFaces, &QRadioButton::clicked, + this, &DlgProjectionOnSurface::onRadioButtonFacesClicked); + connect(ui->radioButtonEdges, &QRadioButton::clicked, + this, &DlgProjectionOnSurface::onRadioButtonEdgesClicked); + connect(ui->doubleSpinBoxExtrudeHeight, qOverload(&QDoubleSpinBox::valueChanged), + this, &DlgProjectionOnSurface::onDoubleSpinBoxExtrudeHeightValueChanged); + connect(ui->pushButtonAddWire, &QPushButton::clicked, + this, &DlgProjectionOnSurface::onPushButtonAddWireClicked); + connect(ui->doubleSpinBoxSolidDepth, qOverload(&QDoubleSpinBox::valueChanged), + this, &DlgProjectionOnSurface::onDoubleSpinBoxSolidDepthValueChanged); +} + void PartGui::DlgProjectionOnSurface::slotDeletedDocument(const App::Document& Doc) { if (m_partDocument == &Doc) { @@ -231,7 +263,7 @@ void PartGui::DlgProjectionOnSurface::reject() m_partDocument->abortTransaction(); } -void PartGui::DlgProjectionOnSurface::on_pushButtonAddFace_clicked() +void PartGui::DlgProjectionOnSurface::onPushButtonAddFaceClicked() { if ( ui->pushButtonAddFace->isChecked() ) { @@ -252,7 +284,7 @@ void PartGui::DlgProjectionOnSurface::on_pushButtonAddFace_clicked() } } -void PartGui::DlgProjectionOnSurface::on_pushButtonAddEdge_clicked() +void PartGui::DlgProjectionOnSurface::onPushButtonAddEdgeClicked() { if (ui->pushButtonAddEdge->isChecked()) { @@ -264,7 +296,7 @@ void PartGui::DlgProjectionOnSurface::on_pushButtonAddEdge_clicked() Gui::Selection().addSelectionGate(filterEdge); } ui->radioButtonEdges->setChecked(true); - on_radioButtonEdges_clicked(); + onRadioButtonEdgesClicked(); } else { @@ -275,22 +307,22 @@ void PartGui::DlgProjectionOnSurface::on_pushButtonAddEdge_clicked() } } -void PartGui::DlgProjectionOnSurface::on_pushButtonGetCurrentCamDir_clicked() +void PartGui::DlgProjectionOnSurface::onPushButtonGetCurrentCamDirClicked() { get_camera_direction(); } -void PartGui::DlgProjectionOnSurface::on_pushButtonDirX_clicked() +void PartGui::DlgProjectionOnSurface::onPushButtonDirXClicked() { set_xyz_dir_spinbox(ui->doubleSpinBoxDirX); } -void PartGui::DlgProjectionOnSurface::on_pushButtonDirY_clicked() +void PartGui::DlgProjectionOnSurface::onPushButtonDirYClicked() { set_xyz_dir_spinbox(ui->doubleSpinBoxDirY); } -void PartGui::DlgProjectionOnSurface::on_pushButtonDirZ_clicked() +void PartGui::DlgProjectionOnSurface::onPushButtonDirZClicked() { set_xyz_dir_spinbox(ui->doubleSpinBoxDirZ); } @@ -322,7 +354,7 @@ void PartGui::DlgProjectionOnSurface::onSelectionChanged(const Gui::SelectionCha } ui->pushButtonAddProjFace->setChecked(false); - on_pushButtonAddProjFace_clicked(); + onPushButtonAddProjFaceClicked(); } } } @@ -978,7 +1010,7 @@ void PartGui::DlgProjectionOnSurface::transform_shape_to_global_position(TopoDS_ } } -void PartGui::DlgProjectionOnSurface::on_pushButtonAddProjFace_clicked() +void PartGui::DlgProjectionOnSurface::onPushButtonAddProjFaceClicked() { if (ui->pushButtonAddProjFace->isChecked()) { @@ -998,32 +1030,32 @@ void PartGui::DlgProjectionOnSurface::on_pushButtonAddProjFace_clicked() filterFace = nullptr; } } -void PartGui::DlgProjectionOnSurface::on_radioButtonShowAll_clicked() +void PartGui::DlgProjectionOnSurface::onRadioButtonShowAllClicked() { m_currentShowType = "all"; show_projected_shapes(m_shapeVec); } -void PartGui::DlgProjectionOnSurface::on_radioButtonFaces_clicked() +void PartGui::DlgProjectionOnSurface::onRadioButtonFacesClicked() { m_currentShowType = "faces"; show_projected_shapes(m_shapeVec); } -void PartGui::DlgProjectionOnSurface::on_radioButtonEdges_clicked() +void PartGui::DlgProjectionOnSurface::onRadioButtonEdgesClicked() { m_currentShowType = "edges"; show_projected_shapes(m_shapeVec); } -void PartGui::DlgProjectionOnSurface::on_doubleSpinBoxExtrudeHeight_valueChanged(double arg1) +void PartGui::DlgProjectionOnSurface::onDoubleSpinBoxExtrudeHeightValueChanged(double arg1) { Q_UNUSED(arg1); create_face_extrude(m_shapeVec); show_projected_shapes(m_shapeVec); } -void PartGui::DlgProjectionOnSurface::on_pushButtonAddWire_clicked() +void PartGui::DlgProjectionOnSurface::onPushButtonAddWireClicked() { if (ui->pushButtonAddWire->isChecked()) { @@ -1035,7 +1067,7 @@ void PartGui::DlgProjectionOnSurface::on_pushButtonAddWire_clicked() Gui::Selection().addSelectionGate(filterEdge); } ui->radioButtonEdges->setChecked(true); - on_radioButtonEdges_clicked(); + onRadioButtonEdgesClicked(); } else { @@ -1046,7 +1078,7 @@ void PartGui::DlgProjectionOnSurface::on_pushButtonAddWire_clicked() } } -void PartGui::DlgProjectionOnSurface::on_doubleSpinBoxSolidDepth_valueChanged(double arg1) +void PartGui::DlgProjectionOnSurface::onDoubleSpinBoxSolidDepthValueChanged(double arg1) { auto valX = ui->doubleSpinBoxDirX->value(); auto valY = ui->doubleSpinBoxDirY->value(); diff --git a/src/Mod/Part/Gui/DlgProjectionOnSurface.h b/src/Mod/Part/Gui/DlgProjectionOnSurface.h index 739049fc20..4fd5bcb3d5 100644 --- a/src/Mod/Part/Gui/DlgProjectionOnSurface.h +++ b/src/Mod/Part/Gui/DlgProjectionOnSurface.h @@ -57,21 +57,21 @@ public: void apply(); void reject(); -private Q_SLOTS: - - void on_pushButtonAddFace_clicked(); - void on_pushButtonAddEdge_clicked(); - void on_pushButtonGetCurrentCamDir_clicked(); - void on_pushButtonDirX_clicked(); - void on_pushButtonDirY_clicked(); - void on_pushButtonDirZ_clicked(); - void on_pushButtonAddProjFace_clicked(); - void on_radioButtonShowAll_clicked(); - void on_radioButtonFaces_clicked(); - void on_radioButtonEdges_clicked(); - void on_doubleSpinBoxExtrudeHeight_valueChanged(double arg1); - void on_pushButtonAddWire_clicked(); - void on_doubleSpinBoxSolidDepth_valueChanged(double arg1); +private: + void setupConnections(); + void onPushButtonAddFaceClicked(); + void onPushButtonAddEdgeClicked(); + void onPushButtonGetCurrentCamDirClicked(); + void onPushButtonDirXClicked(); + void onPushButtonDirYClicked(); + void onPushButtonDirZClicked(); + void onPushButtonAddProjFaceClicked(); + void onRadioButtonShowAllClicked(); + void onRadioButtonFacesClicked(); + void onRadioButtonEdgesClicked(); + void onDoubleSpinBoxExtrudeHeightValueChanged(double arg1); + void onPushButtonAddWireClicked(); + void onDoubleSpinBoxSolidDepthValueChanged(double arg1); private: diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp index 9977bfbe2e..359f5c5ab8 100644 --- a/src/Mod/Part/Gui/DlgRevolution.cpp +++ b/src/Mod/Part/Gui/DlgRevolution.cpp @@ -100,6 +100,7 @@ DlgRevolution::DlgRevolution(QWidget* parent, Qt::WindowFlags fl) , filter(nullptr) { ui->setupUi(this); + setupConnections(); ui->xPos->setRange(-DBL_MAX,DBL_MAX); ui->yPos->setRange(-DBL_MAX,DBL_MAX); @@ -125,7 +126,7 @@ DlgRevolution::DlgRevolution(QWidget* parent, Qt::WindowFlags fl) sel.applyFrom(Gui::Selection().getObjectsOfType(App::Link::getClassTypeId())); sel.applyFrom(Gui::Selection().getObjectsOfType(App::Part::getClassTypeId())); - connect(ui->txtAxisLink, &QLineEdit::textChanged, this, &DlgRevolution::on_txtAxisLink_textChanged); + connect(ui->txtAxisLink, &QLineEdit::textChanged, this, &DlgRevolution::onAxisLinkTextChanged); autoSolid(); } @@ -139,6 +140,20 @@ DlgRevolution::~DlgRevolution() Gui::Selection().rmvSelectionGate(); } +void DlgRevolution::setupConnections() +{ + connect(ui->selectLine, &QPushButton::clicked, + this, &DlgRevolution::onSelectLineClicked); + connect(ui->btnX, &QPushButton::clicked, + this, &DlgRevolution::onButtonXClicked); + connect(ui->btnY, &QPushButton::clicked, + this, &DlgRevolution::onButtonYClicked); + connect(ui->btnZ, &QPushButton::clicked, + this, &DlgRevolution::onButtonZClicked); + connect(ui->txtAxisLink, &QLineEdit::textChanged, + this, &DlgRevolution::onAxisLinkTextChanged); +} + Base::Vector3d DlgRevolution::getDirection() const { return Base::Vector3d( @@ -436,7 +451,7 @@ void DlgRevolution::accept() QDialog::accept(); } -void DlgRevolution::on_selectLine_clicked() +void DlgRevolution::onSelectLineClicked() { if (!filter) { filter = new EdgeSelection(); @@ -449,28 +464,28 @@ void DlgRevolution::on_selectLine_clicked() } } -void DlgRevolution::on_btnX_clicked() +void DlgRevolution::onButtonXClicked() { setDirection(Base::Vector3d(1,0,0)); if (!ui->xDir->isEnabled()) ui->txtAxisLink->clear(); } -void DlgRevolution::on_btnY_clicked() +void DlgRevolution::onButtonYClicked() { setDirection(Base::Vector3d(0,1,0)); if (!ui->xDir->isEnabled()) ui->txtAxisLink->clear(); } -void DlgRevolution::on_btnZ_clicked() +void DlgRevolution::onButtonZClicked() { setDirection(Base::Vector3d(0,0,1)); if (!ui->xDir->isEnabled()) ui->txtAxisLink->clear(); } -void DlgRevolution::on_txtAxisLink_textChanged(QString) +void DlgRevolution::onAxisLinkTextChanged(QString) { bool en = true; try{ diff --git a/src/Mod/Part/Gui/DlgRevolution.h b/src/Mod/Part/Gui/DlgRevolution.h index a26a1b6c5d..0232053952 100644 --- a/src/Mod/Part/Gui/DlgRevolution.h +++ b/src/Mod/Part/Gui/DlgRevolution.h @@ -59,12 +59,13 @@ protected: void changeEvent(QEvent *e) override; void keyPressEvent(QKeyEvent*) override; -private Q_SLOTS: - void on_selectLine_clicked(); - void on_btnX_clicked(); - void on_btnY_clicked(); - void on_btnZ_clicked(); - void on_txtAxisLink_textChanged(QString); +private: + void setupConnections(); + void onSelectLineClicked(); + void onButtonXClicked(); + void onButtonYClicked(); + void onButtonZClicked(); + void onAxisLinkTextChanged(QString); private: void findShapes(); diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp index c3d619326d..f35e5a4a84 100644 --- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp +++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp @@ -45,6 +45,8 @@ DlgSettings3DViewPart::DlgSettings3DViewPart(QWidget* parent) : PreferencePage(parent), ui(new Ui_DlgSettings3DViewPart), checkValue(false) { ui->setupUi(this); + connect(ui->maxDeviation, qOverload(&QDoubleSpinBox::valueChanged), + this, &DlgSettings3DViewPart::onMaxDeviationValueChanged); ParameterGrp::handle hPart = App::GetApplication().GetParameterGroupByPath ("User parameter:BaseApp/Preferences/Mod/Part"); double lowerLimit = hPart->GetFloat("MinimumDeviation", ui->maxDeviation->minimum()); @@ -59,7 +61,7 @@ DlgSettings3DViewPart::~DlgSettings3DViewPart() // no need to delete child widgets, Qt does it all for us } -void DlgSettings3DViewPart::on_maxDeviation_valueChanged(double v) +void DlgSettings3DViewPart::onMaxDeviationValueChanged(double v) { if (!this->isVisible()) return; diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h index 3d7defed66..3e62ee18f6 100644 --- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h +++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h @@ -47,8 +47,8 @@ protected: void loadSettings() override; void changeEvent(QEvent *e) override; -private Q_SLOTS: - void on_maxDeviation_valueChanged(double); +private: + void onMaxDeviationValueChanged(double); private: std::unique_ptr ui; diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp index af5ed1d8bd..0074e77757 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp +++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp @@ -1013,7 +1013,7 @@ Skip this settings page and run the geometry check automatically.\n\ Default: false")); autoRunCheckBox->setChecked(group->GetBool("AutoRun", false)); connect(autoRunCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_autoRunCheckBox_toggled); + this, &TaskCheckGeometryDialog::onAutoRunCheckBoxToggled); settingsBox->groupLayout()->addWidget(autoRunCheckBox); runBOPCheckBox = new QCheckBox(); @@ -1024,7 +1024,7 @@ the standard BRep geometry check misses. These errors do not always \n\ mean the checked object is unusable. Default: false")); runBOPCheckBox->setChecked(group->GetBool("RunBOPCheck", false)); connect(runBOPCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_runBOPCheckBox_toggled); + this, &TaskCheckGeometryDialog::onRunBOPCheckBoxToggled); settingsBox->groupLayout()->addWidget(runBOPCheckBox); runSingleThreadedCheckBox = new QCheckBox(); @@ -1034,7 +1034,7 @@ Run the geometry check in a single thread. This is slower,\n\ but more stable. Default: false")); runSingleThreadedCheckBox->setChecked(group->GetBool("RunSingleThreaded", false)); connect(runSingleThreadedCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_runSingleThreadedCheckBox_toggled); + this, &TaskCheckGeometryDialog::onRunSingleThreadedCheckBoxToggled); settingsBox->groupLayout()->addWidget(runSingleThreadedCheckBox); logErrorsCheckBox = new QCheckBox(); @@ -1042,7 +1042,7 @@ but more stable. Default: false")); logErrorsCheckBox->setToolTip(tr("Log errors to report view. Default: true")); logErrorsCheckBox->setChecked(group->GetBool("LogErrors", true)); connect(logErrorsCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_logErrorsCheckBox_toggled); + this, &TaskCheckGeometryDialog::onLogErrorsCheckBoxToggled); settingsBox->groupLayout()->addWidget(logErrorsCheckBox); expandShapeContentCheckBox = new QCheckBox(); @@ -1052,7 +1052,7 @@ Expand shape content. Changes will take effect next time you use \n\ the check geometry tool. Default: false")); expandShapeContentCheckBox->setChecked(group->GetBool("ExpandShapeContent", false)); connect(expandShapeContentCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_expandShapeContentCheckBox_toggled); + this, &TaskCheckGeometryDialog::onExpandShapeContentCheckBoxToggled); settingsBox->groupLayout()->addWidget(expandShapeContentCheckBox); advancedShapeContentCheckBox = new QCheckBox(); @@ -1062,7 +1062,7 @@ Show advanced shape content. Changes will take effect next time you use \n\ the check geometry tool. Default: false")); advancedShapeContentCheckBox->setChecked(group->GetBool("AdvancedShapeContent", true)); connect(advancedShapeContentCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_advancedShapeContentCheckBox_toggled); + this, &TaskCheckGeometryDialog::onAdvancedShapeContentCheckBoxToggled); settingsBox->groupLayout()->addWidget(advancedShapeContentCheckBox); settingsBox->groupLayout()->addWidget(new QLabel(tr("\nIndividual BOP Checks:"))); @@ -1072,7 +1072,7 @@ the check geometry tool. Default: false")); argumentTypeModeCheckBox->setToolTip(tr("Check for bad argument types. Default: true")); argumentTypeModeCheckBox->setChecked(group->GetBool("ArgumentTypeMode", true)); connect(argumentTypeModeCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_argumentTypeModeCheckBox_toggled); + this, &TaskCheckGeometryDialog::onArgumentTypeModeCheckBoxToggled); settingsBox->groupLayout()->addWidget(argumentTypeModeCheckBox); selfInterModeCheckBox = new QCheckBox(); @@ -1080,7 +1080,7 @@ the check geometry tool. Default: false")); selfInterModeCheckBox->setToolTip(tr("Check for self-intersections. Default: true")); selfInterModeCheckBox->setChecked(group->GetBool("SelfInterMode", true)); connect(selfInterModeCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_selfInterModeCheckBox_toggled); + this, &TaskCheckGeometryDialog::onSelfInterModeCheckBoxToggled); settingsBox->groupLayout()->addWidget(selfInterModeCheckBox); smallEdgeModeCheckBox = new QCheckBox(); @@ -1088,7 +1088,7 @@ the check geometry tool. Default: false")); smallEdgeModeCheckBox->setToolTip(tr("Check for edges that are too small. Default: true")); smallEdgeModeCheckBox->setChecked(group->GetBool("SmallEdgeMode", true)); connect(smallEdgeModeCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_smallEdgeModeCheckBox_toggled); + this, &TaskCheckGeometryDialog::onSmallEdgeModeCheckBoxToggled); settingsBox->groupLayout()->addWidget(smallEdgeModeCheckBox); rebuildFaceModeCheckBox = new QCheckBox(); @@ -1096,7 +1096,7 @@ the check geometry tool. Default: false")); rebuildFaceModeCheckBox->setToolTip(tr("Check for nonrecoverable faces. Default: true")); rebuildFaceModeCheckBox->setChecked(group->GetBool("RebuildFaceMode", true)); connect(rebuildFaceModeCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_rebuildFaceModeCheckBox_toggled); + this, &TaskCheckGeometryDialog::onRebuildFaceModeCheckBoxToggled); settingsBox->groupLayout()->addWidget(rebuildFaceModeCheckBox); continuityModeCheckBox = new QCheckBox(); @@ -1104,7 +1104,7 @@ the check geometry tool. Default: false")); continuityModeCheckBox->setToolTip(tr("Check for continuity. Default: true")); continuityModeCheckBox->setChecked(group->GetBool("ContinuityMode", true)); connect(continuityModeCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_continuityModeCheckBox_toggled); + this, &TaskCheckGeometryDialog::onContinuityModeCheckBoxToggled); settingsBox->groupLayout()->addWidget(continuityModeCheckBox); tangentModeCheckBox = new QCheckBox(); @@ -1112,7 +1112,7 @@ the check geometry tool. Default: false")); tangentModeCheckBox->setToolTip(tr("Check for incompatible faces. Default: true")); tangentModeCheckBox->setChecked(group->GetBool("TangentMode", true)); connect(tangentModeCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_tangentModeCheckBox_toggled); + this, &TaskCheckGeometryDialog::onTangentModeCheckBoxToggled); settingsBox->groupLayout()->addWidget(tangentModeCheckBox); mergeVertexModeCheckBox = new QCheckBox(); @@ -1120,7 +1120,7 @@ the check geometry tool. Default: false")); mergeVertexModeCheckBox->setToolTip(tr("Check for incompatible vertices. Default: true")); mergeVertexModeCheckBox->setChecked(group->GetBool("MergeVertexMode", true)); connect(mergeVertexModeCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_mergeVertexModeCheckBox_toggled); + this, &TaskCheckGeometryDialog::onMergeVertexModeCheckBoxToggled); settingsBox->groupLayout()->addWidget(mergeVertexModeCheckBox); mergeEdgeModeCheckBox = new QCheckBox(); @@ -1128,7 +1128,7 @@ the check geometry tool. Default: false")); mergeEdgeModeCheckBox->setToolTip(tr("Check for incompatible edges. Default: true")); mergeEdgeModeCheckBox->setChecked(group->GetBool("MergeEdgeMode", true)); connect(mergeEdgeModeCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_mergeEdgeModeCheckBox_toggled); + this, &TaskCheckGeometryDialog::onMergeEdgeModeCheckBoxToggled); settingsBox->groupLayout()->addWidget(mergeEdgeModeCheckBox); curveOnSurfaceModeCheckBox = new QCheckBox(); @@ -1136,7 +1136,7 @@ the check geometry tool. Default: false")); curveOnSurfaceModeCheckBox->setToolTip(tr("Check for invalid curves on surfaces. Default: true")); curveOnSurfaceModeCheckBox->setChecked(group->GetBool("CurveOnSurfaceMode", true)); connect(curveOnSurfaceModeCheckBox, &QCheckBox::toggled, - this, &TaskCheckGeometryDialog::on_curveOnSurfaceModeCheckBox_toggled); + this, &TaskCheckGeometryDialog::onCurveOnSurfaceModeCheckBoxToggled); settingsBox->groupLayout()->addWidget(curveOnSurfaceModeCheckBox); if (group->GetBool("AutoRun",false)){ settingsBox->hide(); @@ -1168,7 +1168,7 @@ bool TaskCheckGeometryDialog::reject() return true; } -void TaskCheckGeometryDialog::on_clicked(QAbstractButton *btn) +void TaskCheckGeometryDialog::onClicked(QAbstractButton *btn) { /** when ok (run check) is clicked or when close is clicked * the appropriate accept() or reject() is called already @@ -1204,108 +1204,108 @@ void TaskCheckGeometryDialog::modifyStandardButtons(QDialogButtonBox* box) settingsBtn->setEnabled(false); resultsBtn = box->addButton(tr("Results"),QDialogButtonBox::ActionRole); resultsBtn->setEnabled(false); - connect(box, &QDialogButtonBox::clicked, this, &TaskCheckGeometryDialog::on_clicked); + connect(box, &QDialogButtonBox::clicked, this, &TaskCheckGeometryDialog::onClicked); } -void TaskCheckGeometryDialog::on_autoRunCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onAutoRunCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("AutoRun", isOn); } -void TaskCheckGeometryDialog::on_runBOPCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onRunBOPCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("RunBOPCheck", isOn); } -void TaskCheckGeometryDialog::on_runSingleThreadedCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onRunSingleThreadedCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("RunSingleThreaded", isOn); } -void TaskCheckGeometryDialog::on_logErrorsCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onLogErrorsCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("LogErrors", isOn); } -void TaskCheckGeometryDialog::on_argumentTypeModeCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onArgumentTypeModeCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("ArgumentTypeMode", isOn); } -void TaskCheckGeometryDialog::on_expandShapeContentCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onExpandShapeContentCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("ExpandShapeContent", isOn); } -void TaskCheckGeometryDialog::on_advancedShapeContentCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onAdvancedShapeContentCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("AdvancedShapeContent", isOn); } -void TaskCheckGeometryDialog::on_selfInterModeCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onSelfInterModeCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("SelfInterMode", isOn); } -void TaskCheckGeometryDialog::on_smallEdgeModeCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onSmallEdgeModeCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("SmallEdgeMode", isOn); } -void TaskCheckGeometryDialog::on_rebuildFaceModeCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onRebuildFaceModeCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("RebuildFaceMode", isOn); } -void TaskCheckGeometryDialog::on_continuityModeCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onContinuityModeCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("ContinuityMode", isOn); } -void TaskCheckGeometryDialog::on_tangentModeCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onTangentModeCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("TangentMode", isOn); } -void TaskCheckGeometryDialog::on_mergeVertexModeCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onMergeVertexModeCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("MergeVertexMode", isOn); } -void TaskCheckGeometryDialog::on_mergeEdgeModeCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onMergeEdgeModeCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); group->SetBool("MergeEdgeMode", isOn); } -void TaskCheckGeometryDialog::on_curveOnSurfaceModeCheckBox_toggled(bool isOn) +void TaskCheckGeometryDialog::onCurveOnSurfaceModeCheckBoxToggled(bool isOn) { ParameterGrp::handle group = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod")->GetGroup("Part")->GetGroup("CheckGeometry"); diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h index bfd6ff8855..562dfafd5f 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.h +++ b/src/Mod/Part/Gui/TaskCheckGeometry.h @@ -152,23 +152,23 @@ public: {return false;} bool needsFullSpace() const override {return true;} -private Q_SLOTS: - void on_runBOPCheckBox_toggled(bool isOn); - void on_runSingleThreadedCheckBox_toggled(bool isOn); - void on_logErrorsCheckBox_toggled(bool isOn); - void on_expandShapeContentCheckBox_toggled(bool isOn); - void on_advancedShapeContentCheckBox_toggled(bool isOn); - void on_autoRunCheckBox_toggled(bool isOn); - void on_argumentTypeModeCheckBox_toggled(bool isOn); - void on_selfInterModeCheckBox_toggled(bool isOn); - void on_smallEdgeModeCheckBox_toggled(bool isOn); - void on_rebuildFaceModeCheckBox_toggled(bool isOn); - void on_continuityModeCheckBox_toggled(bool isOn); - void on_tangentModeCheckBox_toggled(bool isOn); - void on_mergeVertexModeCheckBox_toggled(bool isOn); - void on_mergeEdgeModeCheckBox_toggled(bool isOn); - void on_curveOnSurfaceModeCheckBox_toggled(bool isOn); - void on_clicked(QAbstractButton* btn); +private: + void onRunBOPCheckBoxToggled(bool isOn); + void onRunSingleThreadedCheckBoxToggled(bool isOn); + void onLogErrorsCheckBoxToggled(bool isOn); + void onExpandShapeContentCheckBoxToggled(bool isOn); + void onAdvancedShapeContentCheckBoxToggled(bool isOn); + void onAutoRunCheckBoxToggled(bool isOn); + void onArgumentTypeModeCheckBoxToggled(bool isOn); + void onSelfInterModeCheckBoxToggled(bool isOn); + void onSmallEdgeModeCheckBoxToggled(bool isOn); + void onRebuildFaceModeCheckBoxToggled(bool isOn); + void onContinuityModeCheckBoxToggled(bool isOn); + void onTangentModeCheckBoxToggled(bool isOn); + void onMergeVertexModeCheckBoxToggled(bool isOn); + void onMergeEdgeModeCheckBoxToggled(bool isOn); + void onCurveOnSurfaceModeCheckBoxToggled(bool isOn); + void onClicked(QAbstractButton* btn); private: TaskCheckGeometryResults* widget; diff --git a/src/Mod/Part/Gui/TaskFaceColors.cpp b/src/Mod/Part/Gui/TaskFaceColors.cpp index e5315c2901..96cc34aaa6 100644 --- a/src/Mod/Part/Gui/TaskFaceColors.cpp +++ b/src/Mod/Part/Gui/TaskFaceColors.cpp @@ -244,6 +244,8 @@ FaceColors::FaceColors(ViewProviderPartExt* vp, QWidget* parent) { Q_UNUSED(parent); d->ui->setupUi(this); + setupConnections(); + d->ui->groupBox->setTitle(QString::fromUtf8(vp->getObject()->Label.getValue())); d->ui->colorButton->setDisabled(true); d->ui->colorButton->setAllowTransparency(true); @@ -275,6 +277,16 @@ FaceColors::~FaceColors() delete d; } +void FaceColors::setupConnections() +{ + connect(d->ui->colorButton, &Gui::ColorButton::changed, + this, &FaceColors::onColorButtonChanged); + connect(d->ui->defaultButton, &QPushButton::clicked, + this, &FaceColors::onDefaultButtonClicked); + connect(d->ui->boxSelection, &QPushButton::toggled, + this, &FaceColors::onBoxSelectionToggled); +} + void FaceColors::slotUndoDocument(const Gui::Document& Doc) { if (d->doc == &Doc) { @@ -295,7 +307,7 @@ void FaceColors::slotDeleteObject(const Gui::ViewProvider& obj) Gui::Control().closeDialog(); } -void FaceColors::on_boxSelection_toggled(bool checked) +void FaceColors::onBoxSelectionToggled(bool checked) { Gui::View3DInventor* view = qobject_cast(Gui::getMainWindow()->activeWindow()); // toggle the button state and feature @@ -320,13 +332,13 @@ void FaceColors::on_boxSelection_toggled(bool checked) } } -void FaceColors::on_defaultButton_clicked() +void FaceColors::onDefaultButtonClicked() { std::fill(d->perface.begin(), d->perface.end(), d->vp->ShapeColor.getValue()); d->vp->DiffuseColor.setValues(d->perface); } -void FaceColors::on_colorButton_changed() +void FaceColors::onColorButtonChanged() { if (!d->index.isEmpty()) { QColor color = d->ui->colorButton->color(); diff --git a/src/Mod/Part/Gui/TaskFaceColors.h b/src/Mod/Part/Gui/TaskFaceColors.h index 76eddbcf7e..63e9131ca8 100644 --- a/src/Mod/Part/Gui/TaskFaceColors.h +++ b/src/Mod/Part/Gui/TaskFaceColors.h @@ -47,10 +47,11 @@ public: bool accept(); bool reject(); -private Q_SLOTS: - void on_colorButton_changed(); - void on_defaultButton_clicked(); - void on_boxSelection_toggled(bool checked); +private: + void setupConnections(); + void onColorButtonChanged(); + void onDefaultButtonClicked(); + void onBoxSelectionToggled(bool checked); protected: void onSelectionChanged(const Gui::SelectionChanges& msg) override; diff --git a/src/Mod/Part/Gui/TaskOffset.cpp b/src/Mod/Part/Gui/TaskOffset.cpp index 9d33745d6e..6e9c0c339e 100644 --- a/src/Mod/Part/Gui/TaskOffset.cpp +++ b/src/Mod/Part/Gui/TaskOffset.cpp @@ -66,6 +66,8 @@ OffsetWidget::OffsetWidget(Part::Offset* offset, QWidget* parent) d->offset = offset; d->ui.setupUi(this); + setupConnections(); + d->ui.spinOffset->setUnit(Base::Unit::Length); d->ui.spinOffset->setRange(-INT_MAX, INT_MAX); d->ui.spinOffset->setSingleStep(0.1); @@ -114,54 +116,72 @@ OffsetWidget::~OffsetWidget() delete d; } +void OffsetWidget::setupConnections() +{ + connect(d->ui.spinOffset, qOverload(&Gui::QuantitySpinBox::valueChanged), + this, &OffsetWidget::onSpinOffsetValueChanged); + connect(d->ui.modeType, qOverload(&QComboBox::activated), + this, &OffsetWidget::onModeTypeActivated); + connect(d->ui.joinType, qOverload(&QComboBox::activated), + this, &OffsetWidget::onJoinTypeActivated); + connect(d->ui.intersection, &QCheckBox::toggled, + this, &OffsetWidget::onIntersectionToggled); + connect(d->ui.selfIntersection, &QCheckBox::toggled, + this, &OffsetWidget::onSelfIntersectionToggled); + connect(d->ui.fillOffset, &QCheckBox::toggled, + this, &OffsetWidget::onFillOffsetToggled); + connect(d->ui.updateView, &QCheckBox::toggled, + this, &OffsetWidget::onUpdateViewToggled); +} + Part::Offset* OffsetWidget::getObject() const { return d->offset; } -void OffsetWidget::on_spinOffset_valueChanged(double val) +void OffsetWidget::onSpinOffsetValueChanged(double val) { d->offset->Value.setValue(val); if (d->ui.updateView->isChecked()) d->offset->getDocument()->recomputeFeature(d->offset); } -void OffsetWidget::on_modeType_activated(int val) +void OffsetWidget::onModeTypeActivated(int val) { d->offset->Mode.setValue(val); if (d->ui.updateView->isChecked()) d->offset->getDocument()->recomputeFeature(d->offset); } -void OffsetWidget::on_joinType_activated(int val) +void OffsetWidget::onJoinTypeActivated(int val) { d->offset->Join.setValue((long)val); if (d->ui.updateView->isChecked()) d->offset->getDocument()->recomputeFeature(d->offset); } -void OffsetWidget::on_intersection_toggled(bool on) +void OffsetWidget::onIntersectionToggled(bool on) { d->offset->Intersection.setValue(on); if (d->ui.updateView->isChecked()) d->offset->getDocument()->recomputeFeature(d->offset); } -void OffsetWidget::on_selfIntersection_toggled(bool on) +void OffsetWidget::onSelfIntersectionToggled(bool on) { d->offset->SelfIntersection.setValue(on); if (d->ui.updateView->isChecked()) d->offset->getDocument()->recomputeFeature(d->offset); } -void OffsetWidget::on_fillOffset_toggled(bool on) +void OffsetWidget::onFillOffsetToggled(bool on) { d->offset->Fill.setValue(on); if (d->ui.updateView->isChecked()) d->offset->getDocument()->recomputeFeature(d->offset); } -void OffsetWidget::on_updateView_toggled(bool on) +void OffsetWidget::onUpdateViewToggled(bool on) { if (on) { d->offset->getDocument()->recomputeFeature(d->offset); diff --git a/src/Mod/Part/Gui/TaskOffset.h b/src/Mod/Part/Gui/TaskOffset.h index 8ff7b52235..7f58f7df25 100644 --- a/src/Mod/Part/Gui/TaskOffset.h +++ b/src/Mod/Part/Gui/TaskOffset.h @@ -42,14 +42,15 @@ public: bool reject(); Part::Offset* getObject() const; -private Q_SLOTS: - void on_spinOffset_valueChanged(double); - void on_modeType_activated(int); - void on_joinType_activated(int); - void on_intersection_toggled(bool); - void on_selfIntersection_toggled(bool); - void on_fillOffset_toggled(bool); - void on_updateView_toggled(bool); +private: + void setupConnections(); + void onSpinOffsetValueChanged(double); + void onModeTypeActivated(int); + void onJoinTypeActivated(int); + void onIntersectionToggled(bool); + void onSelfIntersectionToggled(bool); + void onFillOffsetToggled(bool); + void onUpdateViewToggled(bool); private: void changeEvent(QEvent *e) override; diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp index 71c2e4bbd6..6cec236405 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp +++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp @@ -119,6 +119,10 @@ ShapeBuilderWidget::ShapeBuilderWidget(QWidget* parent) d->bg.addButton(d->ui.radioButtonSolidFromShell, 5); d->bg.setExclusive(true); + connect(d->ui.selectButton, &QPushButton::clicked, + this, &ShapeBuilderWidget::onSelectButtonClicked); + connect(d->ui.createButton, &QPushButton::clicked, + this, &ShapeBuilderWidget::onCreateButtonClicked); #if QT_VERSION < QT_VERSION_CHECK(5,15,0) connect(&d->bg, qOverload(&QButtonGroup::buttonClicked), this, &ShapeBuilderWidget::switchMode); @@ -170,7 +174,7 @@ void ShapeBuilderWidget::onSelectionChanged(const Gui::SelectionChanges& msg) } } -void ShapeBuilderWidget::on_createButton_clicked() +void ShapeBuilderWidget::onCreateButtonClicked() { int mode = d->bg.checkedId(); Gui::Document* doc = Gui::Application::Instance->activeDocument(); @@ -204,7 +208,7 @@ void ShapeBuilderWidget::on_createButton_clicked() } } -void ShapeBuilderWidget::on_selectButton_clicked() +void ShapeBuilderWidget::onSelectButtonClicked() { int id = d->bg.checkedId(); if (id == 0 || id == 2) { diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.h b/src/Mod/Part/Gui/TaskShapeBuilder.h index e0c4429272..2ba399138a 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.h +++ b/src/Mod/Part/Gui/TaskShapeBuilder.h @@ -42,9 +42,9 @@ public: bool accept(); bool reject(); -private Q_SLOTS: - void on_createButton_clicked(); - void on_selectButton_clicked(); +private: + void onCreateButtonClicked(); + void onSelectButtonClicked(); void switchMode(int); private: diff --git a/src/Mod/Part/Gui/TaskSweep.cpp b/src/Mod/Part/Gui/TaskSweep.cpp index 8c83251308..fb886e7071 100644 --- a/src/Mod/Part/Gui/TaskSweep.cpp +++ b/src/Mod/Part/Gui/TaskSweep.cpp @@ -136,6 +136,8 @@ SweepWidget::SweepWidget(QWidget* parent) d->ui.selector->setSelectedLabel(tr("Selected profiles")); d->ui.labelPath->clear(); + connect(d->ui.buttonPath, &QPushButton::toggled, + this, &SweepWidget::onButtonPathToggled); connect(d->ui.selector->availableTreeWidget(), &QTreeWidget::currentItemChanged, this, &SweepWidget::onCurrentItemChanged); connect(d->ui.selector->selectedTreeWidget(), &QTreeWidget::currentItemChanged, @@ -402,7 +404,7 @@ void SweepWidget::onCurrentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem } } -void SweepWidget::on_buttonPath_toggled(bool on) +void SweepWidget::onButtonPathToggled(bool on) { if (on) { QList c = this->findChildren(); diff --git a/src/Mod/Part/Gui/TaskSweep.h b/src/Mod/Part/Gui/TaskSweep.h index b4423686a0..0c50375861 100644 --- a/src/Mod/Part/Gui/TaskSweep.h +++ b/src/Mod/Part/Gui/TaskSweep.h @@ -46,9 +46,9 @@ public: bool accept(); bool reject(); -private Q_SLOTS: +private: void onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*); - void on_buttonPath_toggled(bool); + void onButtonPathToggled(bool); private: void changeEvent(QEvent *e) override; diff --git a/src/Mod/Part/Gui/TaskThickness.cpp b/src/Mod/Part/Gui/TaskThickness.cpp index 0f38d380e9..097647f91b 100644 --- a/src/Mod/Part/Gui/TaskThickness.cpp +++ b/src/Mod/Part/Gui/TaskThickness.cpp @@ -90,6 +90,8 @@ ThicknessWidget::ThicknessWidget(Part::Thickness* thickness, QWidget* parent) d->thickness = thickness; d->ui.setupUi(this); + setupConnections(); + d->ui.labelOffset->setText(tr("Thickness")); d->ui.fillOffset->hide(); @@ -121,47 +123,65 @@ ThicknessWidget::~ThicknessWidget() Gui::Selection().rmvSelectionGate(); } +void ThicknessWidget::setupConnections() +{ + connect(d->ui.spinOffset, qOverload(&Gui::QuantitySpinBox::valueChanged), + this, &ThicknessWidget::onSpinOffsetValueChanged); + connect(d->ui.modeType, qOverload(&QComboBox::activated), + this, &ThicknessWidget::onModeTypeActivated); + connect(d->ui.joinType, qOverload(&QComboBox::activated), + this, &ThicknessWidget::onJoinTypeActivated); + connect(d->ui.intersection, &QCheckBox::toggled, + this, &ThicknessWidget::onIntersectionToggled); + connect(d->ui.selfIntersection, &QCheckBox::toggled, + this, &ThicknessWidget::onSelfIntersectionToggled); + connect(d->ui.facesButton, &QPushButton::toggled, + this, &ThicknessWidget::onFacesButtonToggled); + connect(d->ui.updateView, &QCheckBox::toggled, + this, &ThicknessWidget::onUpdateViewToggled); +} + Part::Thickness* ThicknessWidget::getObject() const { return d->thickness; } -void ThicknessWidget::on_spinOffset_valueChanged(double val) +void ThicknessWidget::onSpinOffsetValueChanged(double val) { d->thickness->Value.setValue(val); if (d->ui.updateView->isChecked()) d->thickness->getDocument()->recomputeFeature(d->thickness); } -void ThicknessWidget::on_modeType_activated(int val) +void ThicknessWidget::onModeTypeActivated(int val) { d->thickness->Mode.setValue(val); if (d->ui.updateView->isChecked()) d->thickness->getDocument()->recomputeFeature(d->thickness); } -void ThicknessWidget::on_joinType_activated(int val) +void ThicknessWidget::onJoinTypeActivated(int val) { d->thickness->Join.setValue((long)val); if (d->ui.updateView->isChecked()) d->thickness->getDocument()->recomputeFeature(d->thickness); } -void ThicknessWidget::on_intersection_toggled(bool on) +void ThicknessWidget::onIntersectionToggled(bool on) { d->thickness->Intersection.setValue(on); if (d->ui.updateView->isChecked()) d->thickness->getDocument()->recomputeFeature(d->thickness); } -void ThicknessWidget::on_selfIntersection_toggled(bool on) +void ThicknessWidget::onSelfIntersectionToggled(bool on) { d->thickness->SelfIntersection.setValue(on); if (d->ui.updateView->isChecked()) d->thickness->getDocument()->recomputeFeature(d->thickness); } -void ThicknessWidget::on_facesButton_toggled(bool on) +void ThicknessWidget::onFacesButtonToggled(bool on) { if (on) { QList c = this->findChildren(); @@ -204,7 +224,7 @@ void ThicknessWidget::on_facesButton_toggled(bool on) } } -void ThicknessWidget::on_updateView_toggled(bool on) +void ThicknessWidget::onUpdateViewToggled(bool on) { if (on) { d->thickness->getDocument()->recomputeFeature(d->thickness); diff --git a/src/Mod/Part/Gui/TaskThickness.h b/src/Mod/Part/Gui/TaskThickness.h index 515dca7b44..934bea337e 100644 --- a/src/Mod/Part/Gui/TaskThickness.h +++ b/src/Mod/Part/Gui/TaskThickness.h @@ -42,14 +42,15 @@ public: bool reject(); Part::Thickness* getObject() const; -private Q_SLOTS: - void on_spinOffset_valueChanged(double); - void on_modeType_activated(int); - void on_joinType_activated(int); - void on_intersection_toggled(bool); - void on_selfIntersection_toggled(bool); - void on_facesButton_toggled(bool); - void on_updateView_toggled(bool); +private: + void setupConnections(); + void onSpinOffsetValueChanged(double); + void onModeTypeActivated(int); + void onJoinTypeActivated(int); + void onIntersectionToggled(bool); + void onSelfIntersectionToggled(bool); + void onFacesButtonToggled(bool); + void onUpdateViewToggled(bool); private: void changeEvent(QEvent *e) override;