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

Sketcher: fix -Wclazy-connect-by-name

Browse Source
This commit is contained in:
wmayer
2023-04-03 00:12:31 +02:00
committed by wwmayer
parent a59ea60c4a
commit 1fc3f52e73
8 changed files with 210 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
View File

@@ -735,7 +735,6 @@ TaskSketcherConstraints::TaskSketcherConstraints(ViewProviderSketch *sketchView)
ui->setupUi(proxy);
ui->listWidgetConstraints->setSelectionMode(QAbstractItemView::ExtendedSelection);
ui->listWidgetConstraints->setEditTriggers(QListWidget::EditKeyPressed);
//QMetaObject::connectSlotsByName(this);
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/General");
ui->filterBox->setChecked(hGrp->GetBool("ConstraintFilterEnabled", true));
@@ -785,39 +784,39 @@ TaskSketcherConstraints::TaskSketcherConstraints(ViewProviderSketch *sketchView)
QObject::connect(
ui->listWidgetConstraints, &ConstraintView::itemSelectionChanged,
this, &TaskSketcherConstraints::on_listWidgetConstraints_itemSelectionChanged
this, &TaskSketcherConstraints::onListWidgetConstraintsItemSelectionChanged
);
QObject::connect(
ui->listWidgetConstraints, &ConstraintView::itemActivated,
this, &TaskSketcherConstraints::on_listWidgetConstraints_itemActivated
this, &TaskSketcherConstraints::onListWidgetConstraintsItemActivated
);
QObject::connect(
ui->listWidgetConstraints, &ConstraintView::itemChanged,
this, &TaskSketcherConstraints::on_listWidgetConstraints_itemChanged
this, &TaskSketcherConstraints::onListWidgetConstraintsItemChanged
);
QObject::connect(
ui->listWidgetConstraints, &ConstraintView::emitCenterSelectedItems,
this, &TaskSketcherConstraints::on_listWidgetConstraints_emitCenterSelectedItems
this, &TaskSketcherConstraints::onListWidgetConstraintsEmitCenterSelectedItems
);
QObject::connect(
ui->listWidgetConstraints, &ConstraintView::onUpdateDrivingStatus,
this, &TaskSketcherConstraints::on_listWidgetConstraints_updateDrivingStatus
this, &TaskSketcherConstraints::onListWidgetConstraintsUpdateDrivingStatus
);
QObject::connect(
ui->listWidgetConstraints, &ConstraintView::onUpdateActiveStatus,
this, &TaskSketcherConstraints::on_listWidgetConstraints_updateActiveStatus
this, &TaskSketcherConstraints::onListWidgetConstraintsUpdateActiveStatus
);
QObject::connect(
ui->listWidgetConstraints, &ConstraintView::emitHideSelection3DVisibility,
this, &TaskSketcherConstraints::on_listWidgetConstraints_emitHideSelection3DVisibility
this, &TaskSketcherConstraints::onListWidgetConstraintsEmitHideSelection3DVisibility
);
QObject::connect(
ui->listWidgetConstraints, &ConstraintView::emitShowSelection3DVisibility,
this, &TaskSketcherConstraints::on_listWidgetConstraints_emitShowSelection3DVisibility
this, &TaskSketcherConstraints::onListWidgetConstraintsEmitShowSelection3DVisibility
);
QObject::connect(
ui->filterBox, &QCheckBox::stateChanged,
this, &TaskSketcherConstraints::on_filterBox_stateChanged
this, &TaskSketcherConstraints::onFilterBoxStateChanged
);
QObject::connect(
ui->filterButton, &QToolButton::clicked,
@@ -825,7 +824,7 @@ TaskSketcherConstraints::TaskSketcherConstraints(ViewProviderSketch *sketchView)
);
QObject::connect(
ui->showHideButton, &QToolButton::clicked,
this, &TaskSketcherConstraints::on_showHideButton_clicked
this, &TaskSketcherConstraints::onShowHideButtonClicked
);
QObject::connect(
ui->settingsButton, &QToolButton::clicked,
@@ -833,27 +832,27 @@ TaskSketcherConstraints::TaskSketcherConstraints(ViewProviderSketch *sketchView)
);
QObject::connect(
action1, &QAction::triggered, // 'triggered' is emitted only on user action. This is defensive. See if 'toggled' is needed
this, &TaskSketcherConstraints::on_settings_autoConstraints_changed
this, &TaskSketcherConstraints::onSettingsAutoConstraintsChanged
);
QObject::connect(
action2, &QAction::triggered,
this, &TaskSketcherConstraints::on_settings_autoRemoveRedundant_changed
this, &TaskSketcherConstraints::onSettingsAutoRemoveRedundantChanged
);
QObject::connect(
action3, &QAction::triggered,
this, &TaskSketcherConstraints::on_settings_restrictVisibility_changed
this, &TaskSketcherConstraints::onSettingsRestrictVisibilityChanged
);
QObject::connect(
action4, &QAction::triggered,
this, &TaskSketcherConstraints::on_settings_extendedInformation_changed
this, &TaskSketcherConstraints::onSettingsExtendedInformationChanged
);
QObject::connect(
action5, &QAction::triggered,
this, &TaskSketcherConstraints::on_settings_hideInternalAligment_changed
this, &TaskSketcherConstraints::onSettingsHideInternalAligmentChanged
);
QObject::connect(
filterList, &ConstraintFilterList::itemChanged,
this, &TaskSketcherConstraints::on_filterList_itemChanged
this, &TaskSketcherConstraints::onFilterListItemChanged
);
connectionConstraintsChanged = sketchView->signalConstraintsChanged.connect(
@@ -871,8 +870,9 @@ TaskSketcherConstraints::TaskSketcherConstraints(ViewProviderSketch *sketchView)
slotConstraintsChanged(); // Populate constraints list
// Initialize special filters
for (int i = filterList->normalFilterCount ; i < filterList->count() ; i++)
on_filterList_itemChanged(filterList->item(i));
for (int i = filterList->normalFilterCount ; i < filterList->count() ; i++) {
onFilterListItemChanged(filterList->item(i));
}
}
TaskSketcherConstraints::~TaskSketcherConstraints()
@@ -881,7 +881,7 @@ TaskSketcherConstraints::~TaskSketcherConstraints()
App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher")->Detach(this);
}
void TaskSketcherConstraints::on_settings_extendedInformation_changed(bool value)
void TaskSketcherConstraints::onSettingsExtendedInformationChanged(bool value)
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
@@ -892,7 +892,7 @@ void TaskSketcherConstraints::on_settings_extendedInformation_changed(bool value
slotConstraintsChanged();
}
void TaskSketcherConstraints::on_settings_hideInternalAligment_changed(bool value)
void TaskSketcherConstraints::onSettingsHideInternalAligmentChanged(bool value)
{
// synchronise parameter
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
@@ -904,7 +904,7 @@ void TaskSketcherConstraints::on_settings_hideInternalAligment_changed(bool valu
slotConstraintsChanged();
}
void TaskSketcherConstraints::on_settings_restrictVisibility_changed(bool value)
void TaskSketcherConstraints::onSettingsRestrictVisibilityChanged(bool value)
{
// synchronise VisualisationTrackingFilter parameter
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
@@ -918,7 +918,7 @@ void TaskSketcherConstraints::on_settings_restrictVisibility_changed(bool value)
change3DViewVisibilityToTrackFilter();
}
void TaskSketcherConstraints::on_settings_autoConstraints_changed(bool value)
void TaskSketcherConstraints::onSettingsAutoConstraintsChanged(bool value)
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
@@ -926,7 +926,7 @@ void TaskSketcherConstraints::on_settings_autoConstraints_changed(bool value)
sketchView->Autoconstraints.setValue(value);
}
void TaskSketcherConstraints::on_settings_autoRemoveRedundant_changed(bool value)
void TaskSketcherConstraints::onSettingsAutoRemoveRedundantChanged(bool value)
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
@@ -945,7 +945,7 @@ void TaskSketcherConstraints::onChangedSketchView(const Gui::ViewProvider& vp, c
}
}
void TaskSketcherConstraints::on_filterBox_stateChanged(int val)
void TaskSketcherConstraints::onFilterBoxStateChanged(int val)
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/General");
hGrp->SetBool("ConstraintFilterEnabled", val == Qt::Checked);
@@ -955,7 +955,7 @@ void TaskSketcherConstraints::on_filterBox_stateChanged(int val)
}
/*hide all show all button =====================================================*/
void TaskSketcherConstraints::on_showHideButton_clicked(bool val)
void TaskSketcherConstraints::onShowHideButtonClicked(bool val)
{
Q_UNUSED(val)
bool allSelected = true;
@@ -970,11 +970,11 @@ void TaskSketcherConstraints::on_showHideButton_clicked(bool val)
}
/* Right click functionalities for constraint list view =========================*/
void TaskSketcherConstraints::on_listWidgetConstraints_emitHideSelection3DVisibility()
void TaskSketcherConstraints::onListWidgetConstraintsEmitHideSelection3DVisibility()
{
changeFilteredVisibility(false, ActionTarget::Selected);
}
void TaskSketcherConstraints::on_listWidgetConstraints_emitShowSelection3DVisibility()
void TaskSketcherConstraints::onListWidgetConstraintsEmitShowSelection3DVisibility()
{
changeFilteredVisibility(true, ActionTarget::Selected);
}
@@ -1052,7 +1052,7 @@ void TaskSketcherConstraints::changeFilteredVisibility(bool show, ActionTarget t
}
void TaskSketcherConstraints::on_listWidgetConstraints_updateDrivingStatus(QListWidgetItem* item, bool status)
void TaskSketcherConstraints::onListWidgetConstraintsUpdateDrivingStatus(QListWidgetItem* item, bool status)
{
Q_UNUSED(status);
ConstraintItem* citem = dynamic_cast<ConstraintItem*>(item);
@@ -1063,7 +1063,7 @@ void TaskSketcherConstraints::on_listWidgetConstraints_updateDrivingStatus(QList
slotConstraintsChanged();
}
void TaskSketcherConstraints::on_listWidgetConstraints_updateActiveStatus(QListWidgetItem* item, bool status)
void TaskSketcherConstraints::onListWidgetConstraintsUpdateActiveStatus(QListWidgetItem* item, bool status)
{
Q_UNUSED(status);
ConstraintItem* citem = dynamic_cast<ConstraintItem*>(item);
@@ -1074,7 +1074,7 @@ void TaskSketcherConstraints::on_listWidgetConstraints_updateActiveStatus(QListW
slotConstraintsChanged();
}
void TaskSketcherConstraints::on_listWidgetConstraints_itemActivated(QListWidgetItem* item)
void TaskSketcherConstraints::onListWidgetConstraintsItemActivated(QListWidgetItem* item)
{
ConstraintItem* it = dynamic_cast<ConstraintItem*>(item);
if (!it)
@@ -1088,7 +1088,7 @@ void TaskSketcherConstraints::on_listWidgetConstraints_itemActivated(QListWidget
}
}
void TaskSketcherConstraints::on_listWidgetConstraints_itemChanged(QListWidgetItem* item)
void TaskSketcherConstraints::onListWidgetConstraintsItemChanged(QListWidgetItem* item)
{
const ConstraintItem* it = dynamic_cast<const ConstraintItem*>(item);
if (!it || inEditMode)
@@ -1342,12 +1342,12 @@ void TaskSketcherConstraints::getSelectionGeoId(QString expr, int & geoid, Sketc
}
}
void TaskSketcherConstraints::on_listWidgetConstraints_emitCenterSelectedItems()
void TaskSketcherConstraints::onListWidgetConstraintsEmitCenterSelectedItems()
{
sketchView->centerSelection();
}
void TaskSketcherConstraints::on_listWidgetConstraints_itemSelectionChanged()
void TaskSketcherConstraints::onListWidgetConstraintsItemSelectionChanged()
{
std::string doc_name = sketchView->getSketchObject()->getDocument()->getName();
std::string obj_name = sketchView->getSketchObject()->getNameInDocument();
@@ -1600,7 +1600,7 @@ void TaskSketcherConstraints::changeEvent(QEvent *e)
}
/* list for multi filter */
void TaskSketcherConstraints::on_filterList_itemChanged(QListWidgetItem* item)
void TaskSketcherConstraints::onFilterListItemChanged(QListWidgetItem* item)
{
int filterindex = filterList->row(item);

34
src/Mod/Sketcher/Gui/TaskSketcherConstraints.h
View File

@@ -170,23 +170,23 @@ private:
void getSelectionGeoId(QString expr, int & geoid, Sketcher::PointPos & pos);
public Q_SLOTS:
void on_listWidgetConstraints_itemSelectionChanged();
void on_listWidgetConstraints_itemActivated(QListWidgetItem *item);
void on_listWidgetConstraints_itemChanged(QListWidgetItem * item);
void on_listWidgetConstraints_updateDrivingStatus(QListWidgetItem *item, bool status);
void on_listWidgetConstraints_updateActiveStatus(QListWidgetItem *item, bool status);
void on_listWidgetConstraints_emitCenterSelectedItems();
void on_listWidgetConstraints_emitShowSelection3DVisibility();
void on_listWidgetConstraints_emitHideSelection3DVisibility();
void on_filterBox_stateChanged(int val);
void on_showHideButton_clicked(bool);
void on_settings_restrictVisibility_changed(bool value = false);
void on_settings_extendedInformation_changed(bool value = false);
void on_settings_hideInternalAligment_changed(bool value = false);
void on_settings_autoConstraints_changed(bool value = false);
void on_settings_autoRemoveRedundant_changed(bool value = false);
void on_filterList_itemChanged(QListWidgetItem* item);
public:
void onListWidgetConstraintsItemSelectionChanged();
void onListWidgetConstraintsItemActivated(QListWidgetItem *item);
void onListWidgetConstraintsItemChanged(QListWidgetItem * item);
void onListWidgetConstraintsUpdateDrivingStatus(QListWidgetItem *item, bool status);
void onListWidgetConstraintsUpdateActiveStatus(QListWidgetItem *item, bool status);
void onListWidgetConstraintsEmitCenterSelectedItems();
void onListWidgetConstraintsEmitShowSelection3DVisibility();
void onListWidgetConstraintsEmitHideSelection3DVisibility();
void onFilterBoxStateChanged(int val);
void onShowHideButtonClicked(bool);
void onSettingsRestrictVisibilityChanged(bool value = false);
void onSettingsExtendedInformationChanged(bool value = false);
void onSettingsHideInternalAligmentChanged(bool value = false);
void onSettingsAutoConstraintsChanged(bool value = false);
void onSettingsAutoRemoveRedundantChanged(bool value = false);
void onFilterListItemChanged(QListWidgetItem* item);
protected:
void changeEvent(QEvent *e) override;

27
src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp
View File

@@ -47,7 +47,7 @@ TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch *sketchView) :
// we need a separate container widget to add all controls to
proxy = new QWidget(this);
ui->setupUi(proxy);
QMetaObject::connectSlotsByName(this);
setupConnections();
this->groupLayout()->addWidget(proxy);
@@ -68,10 +68,6 @@ TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch *sketchView) :
ui->labelConstrainStatusLink->setLaunchExternal(false);
// Manually connect the link since it uses "clicked()", which labels don't have natively
connect(ui->labelConstrainStatusLink, &Gui::UrlLabel::linkClicked,
this, &TaskSketcherMessages::on_labelConstrainStatusLink_linkClicked);
//Set Auto Update in the 'Manual Update' button menu.
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher");
bool state = hGrp->GetBool("AutoRecompute", false);
@@ -88,15 +84,6 @@ TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch *sketchView) :
qAsConst(ui->manualUpdate)->actions()[0], &QAction::changed,
this, &TaskSketcherMessages::onAutoUpdateStateChanged
);
/*QObject::connect(
ui->labelConstrainStatus, SIGNAL(linkActivated(const QString &)),
this , SLOT (on_labelConstrainStatus_linkActivated(const QString &))
);
QObject::connect(
ui->manualUpdate, SIGNAL(clicked(bool)),
this , SLOT (on_manualUpdate_clicked(bool))
);*/
}
TaskSketcherMessages::~TaskSketcherMessages()
@@ -104,6 +91,14 @@ TaskSketcherMessages::~TaskSketcherMessages()
connectionSetUp.disconnect();
}
void TaskSketcherMessages::setupConnections()
{
connect(ui->labelConstrainStatusLink, &Gui::UrlLabel::linkClicked,
this, &TaskSketcherMessages::onLabelConstrainStatusLinkClicked);
connect(ui->manualUpdate, &QToolButton::clicked,
this, &TaskSketcherMessages::onManualUpdateClicked);
}
void TaskSketcherMessages::slotSetUp(const QString& state, const QString& msg, const QString& link, const QString& linkText)
{
ui->labelConstrainStatus->setState(state);
@@ -112,7 +107,7 @@ void TaskSketcherMessages::slotSetUp(const QString& state, const QString& msg, c
ui->labelConstrainStatusLink->setText(linkText);
}
void TaskSketcherMessages::on_labelConstrainStatusLink_linkClicked(const QString &str)
void TaskSketcherMessages::onLabelConstrainStatusLinkClicked(const QString &str)
{
if( str == QString::fromLatin1("#conflicting"))
Gui::Application::Instance->commandManager().runCommandByName("Sketcher_SelectConflictingConstraints");
@@ -140,7 +135,7 @@ void TaskSketcherMessages::onAutoUpdateStateChanged()
sketchView->getSketchObject()->noRecomputes = !state;
}
void TaskSketcherMessages::on_manualUpdate_clicked(bool checked)
void TaskSketcherMessages::onManualUpdateClicked(bool checked)
{
Q_UNUSED(checked);
Gui::Command::updateActive();

7
src/Mod/Sketcher/Gui/TaskSketcherMessages.h
View File

@@ -49,10 +49,11 @@ public:
void slotSetUp(const QString& state, const QString& msg, const QString& link, const QString& linkText);
private Q_SLOTS:
void on_labelConstrainStatusLink_linkClicked(const QString &);
private:
void setupConnections();
void onLabelConstrainStatusLinkClicked(const QString &);
void onAutoUpdateStateChanged();
void on_manualUpdate_clicked(bool checked);
void onManualUpdateClicked(bool checked);
protected:
ViewProviderSketch *sketchView;

86
src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.cpp
View File

@@ -61,7 +61,7 @@ TaskSketcherSolverAdvanced::TaskSketcherSolverAdvanced(ViewProviderSketch *sketc
// we need a separate container widget to add all controls to
proxy = new QWidget(this);
ui->setupUi(proxy);
QMetaObject::connectSlotsByName(this);
setupConnections();
this->groupLayout()->addWidget(proxy);
@@ -85,6 +85,50 @@ TaskSketcherSolverAdvanced::~TaskSketcherSolverAdvanced()
{
}
void TaskSketcherSolverAdvanced::setupConnections()
{
connect(ui->comboBoxDefaultSolver, qOverload<int>(&QComboBox::currentIndexChanged),
this, &TaskSketcherSolverAdvanced::onComboBoxDefaultSolverCurrentIndexChanged);
connect(ui->comboBoxDogLegGaussStep, qOverload<int>(&QComboBox::currentIndexChanged),
this, &TaskSketcherSolverAdvanced::onComboBoxDogLegGaussStepCurrentIndexChanged);
connect(ui->spinBoxMaxIter, qOverload<int>(&QSpinBox::valueChanged),
this, &TaskSketcherSolverAdvanced::onSpinBoxMaxIterValueChanged);
connect(ui->checkBoxSketchSizeMultiplier, &QCheckBox::stateChanged,
this, &TaskSketcherSolverAdvanced::onCheckBoxSketchSizeMultiplierStateChanged);
connect(ui->lineEditConvergence, &QLineEdit::editingFinished,
this, &TaskSketcherSolverAdvanced::onLineEditConvergenceEditingFinished);
connect(ui->comboBoxQRMethod, qOverload<int>(&QComboBox::currentIndexChanged),
this, &TaskSketcherSolverAdvanced::onComboBoxQRMethodCurrentIndexChanged);
connect(ui->lineEditQRPivotThreshold, &QLineEdit::editingFinished,
this, &TaskSketcherSolverAdvanced::onLineEditQRPivotThresholdEditingFinished);
connect(ui->comboBoxRedundantDefaultSolver, qOverload<int>(&QComboBox::currentIndexChanged),
this, &TaskSketcherSolverAdvanced::onComboBoxRedundantDefaultSolverCurrentIndexChanged);
connect(ui->lineEditRedundantConvergence, &QLineEdit::editingFinished,
this, &TaskSketcherSolverAdvanced::onLineEditRedundantConvergenceEditingFinished);
connect(ui->spinBoxRedundantSolverMaxIterations, qOverload<int>(&QSpinBox::valueChanged),
this, &TaskSketcherSolverAdvanced::onSpinBoxRedundantSolverMaxIterationsValueChanged);
connect(ui->checkBoxRedundantSketchSizeMultiplier, &QCheckBox::stateChanged,
this, &TaskSketcherSolverAdvanced::onCheckBoxRedundantSketchSizeMultiplierStateChanged);
connect(ui->comboBoxDebugMode, qOverload<int>(&QComboBox::currentIndexChanged),
this, &TaskSketcherSolverAdvanced::onComboBoxDebugModeCurrentIndexChanged);
connect(ui->lineEditSolverParam1, &QLineEdit::editingFinished,
this, &TaskSketcherSolverAdvanced::onLineEditSolverParam1EditingFinished);
connect(ui->lineEditRedundantSolverParam1, &QLineEdit::editingFinished,
this, &TaskSketcherSolverAdvanced::onLineEditRedundantSolverParam1EditingFinished);
connect(ui->lineEditSolverParam2, &QLineEdit::editingFinished,
this, &TaskSketcherSolverAdvanced::onLineEditSolverParam2EditingFinished);
connect(ui->lineEditRedundantSolverParam2, &Gui::PrefLineEdit::editingFinished,
this, &TaskSketcherSolverAdvanced::onLineEditRedundantSolverParam2EditingFinished);
connect(ui->lineEditSolverParam3, &QLineEdit::editingFinished,
this, &TaskSketcherSolverAdvanced::onLineEditSolverParam3EditingFinished);
connect(ui->lineEditRedundantSolverParam3, &Gui::PrefLineEdit::editingFinished,
this, &TaskSketcherSolverAdvanced::onLineEditRedundantSolverParam3EditingFinished);
connect(ui->pushButtonDefaults, &QPushButton::clicked,
this, &TaskSketcherSolverAdvanced::onPushButtonDefaultsClicked);
connect(ui->pushButtonSolve, &QPushButton::clicked,
this, &TaskSketcherSolverAdvanced::onPushButtonSolveClicked);
}
void TaskSketcherSolverAdvanced::updateDefaultMethodParameters()
{
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/SolverAdvanced");
@@ -220,7 +264,7 @@ void TaskSketcherSolverAdvanced::updateRedundantMethodParameters()
}
}
void TaskSketcherSolverAdvanced::on_lineEditSolverParam1_editingFinished()
void TaskSketcherSolverAdvanced::onLineEditSolverParam1EditingFinished()
{
QString text = ui->lineEditSolverParam1->text();
double val = text.toDouble();
@@ -248,7 +292,7 @@ void TaskSketcherSolverAdvanced::on_lineEditSolverParam1_editingFinished()
}
}
void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam1_editingFinished()
void TaskSketcherSolverAdvanced::onLineEditRedundantSolverParam1EditingFinished()
{
QString text = ui->lineEditRedundantSolverParam1->text();
double val = text.toDouble();
@@ -276,7 +320,7 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam1_editingFinishe
}
}
void TaskSketcherSolverAdvanced::on_lineEditSolverParam2_editingFinished()
void TaskSketcherSolverAdvanced::onLineEditSolverParam2EditingFinished()
{
QString text = ui->lineEditSolverParam2->text();
double val = text.toDouble();
@@ -304,7 +348,7 @@ void TaskSketcherSolverAdvanced::on_lineEditSolverParam2_editingFinished()
}
}
void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam2_editingFinished()
void TaskSketcherSolverAdvanced::onLineEditRedundantSolverParam2EditingFinished()
{
QString text = ui->lineEditRedundantSolverParam2->text();
double val = text.toDouble();
@@ -332,7 +376,7 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam2_editingFinishe
}
}
void TaskSketcherSolverAdvanced::on_lineEditSolverParam3_editingFinished()
void TaskSketcherSolverAdvanced::onLineEditSolverParam3EditingFinished()
{
QString text = ui->lineEditSolverParam3->text();
double val = text.toDouble();
@@ -360,7 +404,7 @@ void TaskSketcherSolverAdvanced::on_lineEditSolverParam3_editingFinished()
}
}
void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam3_editingFinished()
void TaskSketcherSolverAdvanced::onLineEditRedundantSolverParam3EditingFinished()
{
QString text = ui->lineEditRedundantSolverParam3->text();
double val = text.toDouble();
@@ -388,27 +432,27 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantSolverParam3_editingFinishe
}
}
void TaskSketcherSolverAdvanced::on_comboBoxDefaultSolver_currentIndexChanged(int index)
void TaskSketcherSolverAdvanced::onComboBoxDefaultSolverCurrentIndexChanged(int index)
{
ui->comboBoxDefaultSolver->onSave();
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).defaultSolver = static_cast<GCS::Algorithm>(index);
updateDefaultMethodParameters();
}
void TaskSketcherSolverAdvanced::on_comboBoxDogLegGaussStep_currentIndexChanged(int index)
void TaskSketcherSolverAdvanced::onComboBoxDogLegGaussStepCurrentIndexChanged(int index)
{
ui->comboBoxDogLegGaussStep->onSave();
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).setDogLegGaussStep((GCS::DogLegGaussStep) index);
updateDefaultMethodParameters();
}
void TaskSketcherSolverAdvanced::on_spinBoxMaxIter_valueChanged(int i)
void TaskSketcherSolverAdvanced::onSpinBoxMaxIterValueChanged(int i)
{
ui->spinBoxMaxIter->onSave();
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).setMaxIter(i);
}
void TaskSketcherSolverAdvanced::on_checkBoxSketchSizeMultiplier_stateChanged(int state)
void TaskSketcherSolverAdvanced::onCheckBoxSketchSizeMultiplierStateChanged(int state)
{
if(state==Qt::Checked) {
ui->checkBoxSketchSizeMultiplier->onSave();
@@ -420,7 +464,7 @@ void TaskSketcherSolverAdvanced::on_checkBoxSketchSizeMultiplier_stateChanged(in
}
}
void TaskSketcherSolverAdvanced::on_lineEditQRPivotThreshold_editingFinished()
void TaskSketcherSolverAdvanced::onLineEditQRPivotThresholdEditingFinished()
{
QString text = ui->lineEditQRPivotThreshold->text();
double val = text.toDouble();
@@ -434,7 +478,7 @@ void TaskSketcherSolverAdvanced::on_lineEditQRPivotThreshold_editingFinished()
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).setQRPivotThreshold(val);
}
void TaskSketcherSolverAdvanced::on_lineEditConvergence_editingFinished()
void TaskSketcherSolverAdvanced::onLineEditConvergenceEditingFinished()
{
QString text = ui->lineEditConvergence->text();
double val = text.toDouble();
@@ -448,7 +492,7 @@ void TaskSketcherSolverAdvanced::on_lineEditConvergence_editingFinished()
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).setConvergence(val);
}
void TaskSketcherSolverAdvanced::on_lineEditRedundantConvergence_editingFinished()
void TaskSketcherSolverAdvanced::onLineEditRedundantConvergenceEditingFinished()
{
QString text = ui->lineEditRedundantConvergence->text();
double val = text.toDouble();
@@ -462,26 +506,26 @@ void TaskSketcherSolverAdvanced::on_lineEditRedundantConvergence_editingFinished
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).setConvergenceRedundant(val);
}
void TaskSketcherSolverAdvanced::on_comboBoxQRMethod_currentIndexChanged(int index)
void TaskSketcherSolverAdvanced::onComboBoxQRMethodCurrentIndexChanged(int index)
{
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).setQRAlgorithm((GCS::QRAlgorithm) index);
ui->comboBoxQRMethod->onSave();
}
void TaskSketcherSolverAdvanced::on_comboBoxRedundantDefaultSolver_currentIndexChanged(int index)
void TaskSketcherSolverAdvanced::onComboBoxRedundantDefaultSolverCurrentIndexChanged(int index)
{
ui->comboBoxRedundantDefaultSolver->onSave();
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).defaultSolverRedundant = static_cast<GCS::Algorithm>(index);
updateRedundantMethodParameters();
}
void TaskSketcherSolverAdvanced::on_spinBoxRedundantSolverMaxIterations_valueChanged(int i)
void TaskSketcherSolverAdvanced::onSpinBoxRedundantSolverMaxIterationsValueChanged(int i)
{
ui->spinBoxRedundantSolverMaxIterations->onSave();
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).setMaxIterRedundant(i);
}
void TaskSketcherSolverAdvanced::on_checkBoxRedundantSketchSizeMultiplier_stateChanged(int state)
void TaskSketcherSolverAdvanced::onCheckBoxRedundantSketchSizeMultiplierStateChanged(int state)
{
if(state==Qt::Checked) {
ui->checkBoxRedundantSketchSizeMultiplier->onSave();
@@ -493,19 +537,19 @@ void TaskSketcherSolverAdvanced::on_checkBoxRedundantSketchSizeMultiplier_stateC
}
}
void TaskSketcherSolverAdvanced::on_comboBoxDebugMode_currentIndexChanged(int index)
void TaskSketcherSolverAdvanced::onComboBoxDebugModeCurrentIndexChanged(int index)
{
ui->comboBoxDebugMode->onSave();
const_cast<Sketcher::Sketch &>(sketchView->getSketchObject()->getSolvedSketch()).setDebugMode((GCS::DebugMode) index);
}
void TaskSketcherSolverAdvanced::on_pushButtonSolve_clicked(bool checked/* = false*/)
void TaskSketcherSolverAdvanced::onPushButtonSolveClicked(bool checked/* = false*/)
{
Q_UNUSED(checked);
sketchView->getSketchObject()->solve();
}
void TaskSketcherSolverAdvanced::on_pushButtonDefaults_clicked(bool checked/* = false*/)
void TaskSketcherSolverAdvanced::onPushButtonDefaultsClicked(bool checked/* = false*/)
{
Q_UNUSED(checked);
// Algorithm params for default solvers

43
src/Mod/Sketcher/Gui/TaskSketcherSolverAdvanced.h
View File

@@ -44,27 +44,28 @@ public:
explicit TaskSketcherSolverAdvanced(ViewProviderSketch *sketchView);
~TaskSketcherSolverAdvanced() override;
private Q_SLOTS:
void on_comboBoxDefaultSolver_currentIndexChanged(int index);
void on_comboBoxDogLegGaussStep_currentIndexChanged(int index);
void on_spinBoxMaxIter_valueChanged(int i);
void on_checkBoxSketchSizeMultiplier_stateChanged(int state);
void on_lineEditConvergence_editingFinished();
void on_comboBoxQRMethod_currentIndexChanged(int index);
void on_lineEditQRPivotThreshold_editingFinished();
void on_comboBoxRedundantDefaultSolver_currentIndexChanged(int index);
void on_lineEditRedundantConvergence_editingFinished();
void on_spinBoxRedundantSolverMaxIterations_valueChanged(int i);
void on_checkBoxRedundantSketchSizeMultiplier_stateChanged(int state);
void on_comboBoxDebugMode_currentIndexChanged(int index);
void on_lineEditSolverParam1_editingFinished();
void on_lineEditRedundantSolverParam1_editingFinished();
void on_lineEditSolverParam2_editingFinished();
void on_lineEditRedundantSolverParam2_editingFinished();
void on_lineEditSolverParam3_editingFinished();
void on_lineEditRedundantSolverParam3_editingFinished();
void on_pushButtonDefaults_clicked(bool checked = false);
void on_pushButtonSolve_clicked(bool checked = false);
private:
void setupConnections();
void onComboBoxDefaultSolverCurrentIndexChanged(int index);
void onComboBoxDogLegGaussStepCurrentIndexChanged(int index);
void onSpinBoxMaxIterValueChanged(int i);
void onCheckBoxSketchSizeMultiplierStateChanged(int state);
void onLineEditConvergenceEditingFinished();
void onComboBoxQRMethodCurrentIndexChanged(int index);
void onLineEditQRPivotThresholdEditingFinished();
void onComboBoxRedundantDefaultSolverCurrentIndexChanged(int index);
void onLineEditRedundantConvergenceEditingFinished();
void onSpinBoxRedundantSolverMaxIterationsValueChanged(int i);
void onCheckBoxRedundantSketchSizeMultiplierStateChanged(int state);
void onComboBoxDebugModeCurrentIndexChanged(int index);
void onLineEditSolverParam1EditingFinished();
void onLineEditRedundantSolverParam1EditingFinished();
void onLineEditSolverParam2EditingFinished();
void onLineEditRedundantSolverParam2EditingFinished();
void onLineEditSolverParam3EditingFinished();
void onLineEditRedundantSolverParam3EditingFinished();
void onPushButtonDefaultsClicked(bool checked = false);
void onPushButtonSolveClicked(bool checked = false);
protected:
void updateDefaultMethodParameters();

54
src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
View File

@@ -56,6 +56,8 @@ SketcherValidation::SketcherValidation(Sketcher::SketchObject* Obj, QWidget* par
: QWidget(parent), ui(new Ui_TaskSketcherValidation()), sketch(Obj), sketchAnalyser(Obj), coincidenceRoot(nullptr)
{
ui->setupUi(this);
setupConnections();
ui->fixButton->setEnabled(false);
ui->fixConstraint->setEnabled(false);
ui->swapReversed->setEnabled(false);
@@ -86,6 +88,34 @@ SketcherValidation::~SketcherValidation()
hidePoints();
}
void SketcherValidation::setupConnections()
{
connect(ui->findButton, &QPushButton::clicked,
this, &SketcherValidation::onFindButtonClicked);
connect(ui->fixButton, &QPushButton::clicked,
this, &SketcherValidation::onFixButtonClicked);
connect(ui->highlightButton, &QPushButton::clicked,
this, &SketcherValidation::onHighlightButtonClicked);
connect(ui->findConstraint, &QPushButton::clicked,
this, &SketcherValidation::onFindConstraintClicked);
connect(ui->fixConstraint, &QPushButton::clicked,
this, &SketcherValidation::onFixConstraintClicked);
connect(ui->findReversed, &QPushButton::clicked,
this, &SketcherValidation::onFindReversedClicked);
connect(ui->swapReversed, &QPushButton::clicked,
this, &SketcherValidation::onSwapReversedClicked);
connect(ui->orientLockEnable, &QPushButton::clicked,
this, &SketcherValidation::onOrientLockEnableClicked);
connect(ui->orientLockDisable, &QPushButton::clicked,
this, &SketcherValidation::onOrientLockDisableClicked);
connect(ui->delConstrExtr, &QPushButton::clicked,
this, &SketcherValidation::onDelConstrExtrClicked);
connect(ui->findDegenerated, &QPushButton::clicked,
this, &SketcherValidation::onFindDegeneratedClicked);
connect(ui->fixDegenerated, &QPushButton::clicked,
this, &SketcherValidation::onFixDegeneratedClicked);
}
void SketcherValidation::changeEvent(QEvent *e)
{
if (e->type() == QEvent::LanguageChange) {
@@ -94,7 +124,7 @@ void SketcherValidation::changeEvent(QEvent *e)
QWidget::changeEvent(e);
}
void SketcherValidation::on_findButton_clicked()
void SketcherValidation::onFindButtonClicked()
{
if (sketch.expired())
return;
@@ -140,7 +170,7 @@ void SketcherValidation::on_findButton_clicked()
}
}
void SketcherValidation::on_fixButton_clicked()
void SketcherValidation::onFixButtonClicked()
{
if (sketch.expired())
return;
@@ -160,7 +190,7 @@ void SketcherValidation::on_fixButton_clicked()
doc->recompute();
}
void SketcherValidation::on_highlightButton_clicked()
void SketcherValidation::onHighlightButtonClicked()
{
if (sketch.expired())
return;
@@ -174,7 +204,7 @@ void SketcherValidation::on_highlightButton_clicked()
showPoints(points);
}
void SketcherValidation::on_findConstraint_clicked()
void SketcherValidation::onFindConstraintClicked()
{
if (sketch.expired())
return;
@@ -191,7 +221,7 @@ void SketcherValidation::on_findConstraint_clicked()
}
}
void SketcherValidation::on_fixConstraint_clicked()
void SketcherValidation::onFixConstraintClicked()
{
if (sketch.expired())
return;
@@ -200,7 +230,7 @@ void SketcherValidation::on_fixConstraint_clicked()
ui->fixConstraint->setEnabled(false);
}
void SketcherValidation::on_findReversed_clicked()
void SketcherValidation::onFindReversedClicked()
{
if (sketch.expired())
return;
@@ -246,7 +276,7 @@ void SketcherValidation::on_findReversed_clicked()
}
}
void SketcherValidation::on_swapReversed_clicked()
void SketcherValidation::onSwapReversedClicked()
{
if (sketch.expired())
return;
@@ -263,7 +293,7 @@ void SketcherValidation::on_swapReversed_clicked()
doc->commitTransaction();
}
void SketcherValidation::on_orientLockEnable_clicked()
void SketcherValidation::onOrientLockEnableClicked()
{
if (sketch.expired())
return;
@@ -280,7 +310,7 @@ void SketcherValidation::on_orientLockEnable_clicked()
doc->commitTransaction();
}
void SketcherValidation::on_orientLockDisable_clicked()
void SketcherValidation::onOrientLockDisableClicked()
{
if (sketch.expired())
return;
@@ -298,7 +328,7 @@ void SketcherValidation::on_orientLockDisable_clicked()
doc->commitTransaction();
}
void SketcherValidation::on_delConstrExtr_clicked()
void SketcherValidation::onDelConstrExtrClicked()
{
if (sketch.expired())
return;
@@ -374,7 +404,7 @@ void SketcherValidation::hidePoints()
}
}
void SketcherValidation::on_findDegenerated_clicked()
void SketcherValidation::onFindDegeneratedClicked()
{
if (sketch.expired())
return;
@@ -394,7 +424,7 @@ void SketcherValidation::on_findDegenerated_clicked()
}
}
void SketcherValidation::on_fixDegenerated_clicked()
void SketcherValidation::onFixDegeneratedClicked()
{
if (sketch.expired())
return;

27
src/Mod/Sketcher/Gui/TaskSketcherValidation.h
View File

@@ -49,19 +49,20 @@ public:
protected:
void changeEvent(QEvent *e) override;
private Q_SLOTS:
void on_findButton_clicked();
void on_fixButton_clicked();
void on_highlightButton_clicked();
void on_findConstraint_clicked();
void on_fixConstraint_clicked();
void on_findReversed_clicked();
void on_swapReversed_clicked();
void on_orientLockEnable_clicked();
void on_orientLockDisable_clicked();
void on_delConstrExtr_clicked();
void on_findDegenerated_clicked();
void on_fixDegenerated_clicked();
private:
void setupConnections();
void onFindButtonClicked();
void onFixButtonClicked();
void onHighlightButtonClicked();
void onFindConstraintClicked();
void onFixConstraintClicked();
void onFindReversedClicked();
void onSwapReversedClicked();
void onOrientLockEnableClicked();
void onOrientLockDisableClicked();
void onDelConstrExtrClicked();
void onFindDegeneratedClicked();
void onFixDegeneratedClicked();
private:
void showPoints(const std::vector<Base::Vector3d>&);