All: Reformat according to new standard

This commit is contained in:
pre-commit-ci[bot]
2025-11-11 13:49:01 +01:00
committed by Kacper Donat
parent eafd18dac0
commit 25c3ba7338
2390 changed files with 154630 additions and 115818 deletions

View File

@@ -21,7 +21,6 @@
******************************************************************************/
#include <QAction>
@@ -51,8 +50,10 @@ using namespace Gui;
/* TRANSLATOR PartDesignGui::TaskMultiTransformParameters */
TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransformed* TransformedView,
QWidget* parent)
TaskMultiTransformParameters::TaskMultiTransformParameters(
ViewProviderTransformed* TransformedView,
QWidget* parent
)
: TaskTransformedParameters(TransformedView, parent)
, ui(new Ui_TaskMultiTransformParameters)
{
@@ -66,40 +67,37 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget)
// Create a context menu for the listview of transformation features
auto action = new QAction(tr("Edit"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformEdit);
action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformEdit);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Delete"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformDelete);
action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformDelete);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Add Mirror Transformation"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddMirrored);
action->connect(
action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddMirrored
);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Add Linear Pattern"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddLinearPattern);
action->connect(
action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddLinearPattern
);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Add Polar Pattern"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddPolarPattern);
action->connect(
action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddPolarPattern
);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Add Scale Transformation"), ui->listTransformFeatures);
action->connect(action,
&QAction::triggered,
this,
&TaskMultiTransformParameters::onTransformAddScaled);
action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onTransformAddScaled);
ui->listTransformFeatures->addAction(action);
action = new QAction(tr("Move Up"), ui->listTransformFeatures);
action->connect(action, &QAction::triggered, this, &TaskMultiTransformParameters::onMoveUp);
@@ -109,21 +107,19 @@ void TaskMultiTransformParameters::setupParameterUI(QWidget* widget)
ui->listTransformFeatures->addAction(action);
ui->listTransformFeatures->setContextMenuPolicy(Qt::ActionsContextMenu);
connect(ui->listTransformFeatures,
&QListWidget::activated,
this,
&TaskMultiTransformParameters::onTransformActivated);
connect(
ui->listTransformFeatures,
&QListWidget::activated,
this,
&TaskMultiTransformParameters::onTransformActivated
);
connect(ui->buttonOK,
&QToolButton::pressed,
this,
&TaskMultiTransformParameters::onSubTaskButtonOK);
connect(ui->buttonOK, &QToolButton::pressed, this, &TaskMultiTransformParameters::onSubTaskButtonOK);
ui->buttonOK->hide();
// Get the transformFeatures data
auto pcMultiTransform = TransformedView->getObject<PartDesign::MultiTransform>();
std::vector<App::DocumentObject*> transformFeatures =
pcMultiTransform->Transformations.getValues();
std::vector<App::DocumentObject*> transformFeatures = pcMultiTransform->Transformations.getValues();
// Fill data into dialog elements
ui->listTransformFeatures->setEnabled(true);
@@ -173,10 +169,8 @@ void TaskMultiTransformParameters::closeSubTask()
// Remove all parameter ui widgets and layout
ui->subFeatureWidget->setUpdatesEnabled(false);
qDeleteAll(
ui->subFeatureWidget->findChildren<QWidget*>(QString(), Qt::FindDirectChildrenOnly));
qDeleteAll(
ui->subFeatureWidget->findChildren<QLayout*>(QString(), Qt::FindDirectChildrenOnly));
qDeleteAll(ui->subFeatureWidget->findChildren<QWidget*>(QString(), Qt::FindDirectChildrenOnly));
qDeleteAll(ui->subFeatureWidget->findChildren<QLayout*>(QString(), Qt::FindDirectChildrenOnly));
ui->subFeatureWidget->setUpdatesEnabled(true);
}
}
@@ -188,8 +182,7 @@ void TaskMultiTransformParameters::onTransformDelete()
}
int row = ui->listTransformFeatures->currentIndex().row();
auto pcMultiTransform = TransformedView->getObject<PartDesign::MultiTransform>();
std::vector<App::DocumentObject*> transformFeatures =
pcMultiTransform->Transformations.getValues();
std::vector<App::DocumentObject*> transformFeatures = pcMultiTransform->Transformations.getValues();
App::DocumentObject* feature = transformFeatures[row];
if (feature == this->subFeature) {
@@ -220,15 +213,14 @@ void TaskMultiTransformParameters::onTransformEdit()
ui->listTransformFeatures->currentItem()->setSelected(true);
int row = ui->listTransformFeatures->currentIndex().row();
auto pcMultiTransform = TransformedView->getObject<PartDesign::MultiTransform>();
std::vector<App::DocumentObject*> transformFeatures =
pcMultiTransform->Transformations.getValues();
std::vector<App::DocumentObject*> transformFeatures = pcMultiTransform->Transformations.getValues();
subFeature = static_cast<PartDesign::Transformed*>(transformFeatures[row]);
if (subFeature->is<PartDesign::Mirrored>()) {
subTask = new TaskMirroredParameters(this, ui->subFeatureWidget);
}
else if (subFeature->is<PartDesign::LinearPattern>()
|| subFeature->is<PartDesign::PolarPattern>()) {
|| subFeature->is<PartDesign::PolarPattern>()) {
subTask = new TaskPatternParameters(this, ui->subFeatureWidget);
}
else if (subFeature->is<PartDesign::Scaled>()) {
@@ -252,8 +244,12 @@ void TaskMultiTransformParameters::onTransformActivated(const QModelIndex& index
void TaskMultiTransformParameters::onTransformAddMirrored()
{
closeSubTask();
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Mirror");
auto pcBody = dynamic_cast<PartDesign::Body*>(Part::BodyBase::findBodyOf(getTopTransformedObject()));
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName(
"Mirror"
);
auto pcBody = dynamic_cast<PartDesign::Body*>(
Part::BodyBase::findBodyOf(getTopTransformedObject())
);
if (!pcBody) {
return;
}
@@ -262,7 +258,7 @@ void TaskMultiTransformParameters::onTransformAddMirrored()
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Mirror"));
}
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Mirrored','"<<newFeatName<<"')");
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Mirrored','" << newFeatName << "')");
auto Feat = pcBody->getDocument()->getObject(newFeatName.c_str());
if (!Feat) {
return;
@@ -270,12 +266,11 @@ void TaskMultiTransformParameters::onTransformAddMirrored()
// Gui::Command::updateActive();
App::DocumentObject* sketch = getSketchObject();
if (sketch) {
FCMD_OBJ_CMD(Feat,
"MirrorPlane = (" << Gui::Command::getObjectCmd(sketch) << ",['V_Axis'])");
FCMD_OBJ_CMD(Feat, "MirrorPlane = (" << Gui::Command::getObjectCmd(sketch) << ",['V_Axis'])");
}
else {
App::Origin* orig = pcBody->getOrigin();
FCMD_OBJ_CMD(Feat, "MirrorPlane = ("<<Gui::Command::getObjectCmd(orig->getXY())<<",[''])");
FCMD_OBJ_CMD(Feat, "MirrorPlane = (" << Gui::Command::getObjectCmd(orig->getXY()) << ",[''])");
}
finishAdd(newFeatName);
// show the new view when no error
@@ -289,8 +284,12 @@ void TaskMultiTransformParameters::onTransformAddLinearPattern()
// See CmdPartDesignLinearPattern
//
closeSubTask();
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Linear Pattern");
auto pcBody = dynamic_cast<PartDesign::Body*>(Part::BodyBase::findBodyOf(getTopTransformedObject()));
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName(
"Linear Pattern"
);
auto pcBody = dynamic_cast<PartDesign::Body*>(
Part::BodyBase::findBodyOf(getTopTransformedObject())
);
if (!pcBody) {
return;
}
@@ -299,7 +298,7 @@ void TaskMultiTransformParameters::onTransformAddLinearPattern()
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Linear Pattern"));
}
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::LinearPattern','"<<newFeatName<<"')");
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::LinearPattern','" << newFeatName << "')");
auto Feat = pcBody->getDocument()->getObject(newFeatName.c_str());
if (!Feat) {
return;
@@ -314,9 +313,10 @@ void TaskMultiTransformParameters::onTransformAddLinearPattern()
// inside updateUI()
auto body = dynamic_cast<PartDesign::Body*>(Part::BodyBase::findBodyOf(getObject()));
if (body) {
FCMD_OBJ_CMD(Feat,
"Direction = (" << Gui::Command::getObjectCmd(body->getOrigin()->getX())
<< ",[''])");
FCMD_OBJ_CMD(
Feat,
"Direction = (" << Gui::Command::getObjectCmd(body->getOrigin()->getX()) << ",[''])"
);
}
}
@@ -333,8 +333,12 @@ void TaskMultiTransformParameters::onTransformAddLinearPattern()
void TaskMultiTransformParameters::onTransformAddPolarPattern()
{
closeSubTask();
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Polar Pattern");
auto pcBody = dynamic_cast<PartDesign::Body*>(Part::BodyBase::findBodyOf(getTopTransformedObject()));
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName(
"Polar Pattern"
);
auto pcBody = dynamic_cast<PartDesign::Body*>(
Part::BodyBase::findBodyOf(getTopTransformedObject())
);
if (!pcBody) {
return;
}
@@ -343,7 +347,7 @@ void TaskMultiTransformParameters::onTransformAddPolarPattern()
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Polar Pattern"));
}
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::PolarPattern','"<<newFeatName<<"')");
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::PolarPattern','" << newFeatName << "')");
auto Feat = pcBody->getDocument()->getObject(newFeatName.c_str());
if (!Feat) {
return;
@@ -355,7 +359,7 @@ void TaskMultiTransformParameters::onTransformAddPolarPattern()
}
else {
App::Origin* orig = pcBody->getOrigin();
FCMD_OBJ_CMD(Feat, "Axis = ("<<Gui::Command::getObjectCmd(orig->getX())<<",[''])");
FCMD_OBJ_CMD(Feat, "Axis = (" << Gui::Command::getObjectCmd(orig->getX()) << ",[''])");
}
FCMD_OBJ_CMD(Feat, "Angle = 360");
FCMD_OBJ_CMD(Feat, "Occurrences = 2");
@@ -371,7 +375,9 @@ void TaskMultiTransformParameters::onTransformAddScaled()
{
closeSubTask();
std::string newFeatName = TransformedView->getObject()->getDocument()->getUniqueObjectName("Scale");
auto pcBody = dynamic_cast<PartDesign::Body*>(Part::BodyBase::findBodyOf(getTopTransformedObject()));
auto pcBody = dynamic_cast<PartDesign::Body*>(
Part::BodyBase::findBodyOf(getTopTransformedObject())
);
if (!pcBody) {
return;
}
@@ -380,7 +386,7 @@ void TaskMultiTransformParameters::onTransformAddScaled()
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Scale"));
}
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Scaled','"<<newFeatName<<"')");
FCMD_OBJ_CMD(pcBody, "newObject('PartDesign::Scaled','" << newFeatName << "')");
auto Feat = pcBody->getDocument()->getObject(newFeatName.c_str());
if (!Feat) {
return;
@@ -421,10 +427,8 @@ void TaskMultiTransformParameters::finishAdd(std::string& newFeatName)
// Insert new transformation after the selected row
// This means that in order to insert at the beginning, the user has to use "Move Up" in the
// menu
App::DocumentObject* newFeature =
pcMultiTransform->getDocument()->getObject(newFeatName.c_str());
std::vector<App::DocumentObject*> transformFeatures =
pcMultiTransform->Transformations.getValues();
App::DocumentObject* newFeature = pcMultiTransform->getDocument()->getObject(newFeatName.c_str());
std::vector<App::DocumentObject*> transformFeatures = pcMultiTransform->Transformations.getValues();
if (row == ui->listTransformFeatures->model()->rowCount() - 1) {
// Note: Inserts always happen before the specified iterator so in order to append at the
// end we need to use push_back() and append()
@@ -435,8 +439,10 @@ void TaskMultiTransformParameters::finishAdd(std::string& newFeatName)
else {
// Note: The feature tree always seems to append to the end, no matter what we say here
transformFeatures.insert(transformFeatures.begin() + row + 1, newFeature);
ui->listTransformFeatures->insertItem(row + 1,
QString::fromLatin1(newFeature->Label.getValue()));
ui->listTransformFeatures->insertItem(
row + 1,
QString::fromLatin1(newFeature->Label.getValue())
);
ui->listTransformFeatures->setCurrentRow(row + 1, QItemSelectionModel::ClearAndSelect);
}
pcMultiTransform->Transformations.setValues(transformFeatures);
@@ -455,8 +461,7 @@ void TaskMultiTransformParameters::moveTransformFeature(const int increment)
setupTransaction();
int row = ui->listTransformFeatures->currentIndex().row();
auto pcMultiTransform = TransformedView->getObject<PartDesign::MultiTransform>();
std::vector<App::DocumentObject*> transformFeatures =
pcMultiTransform->Transformations.getValues();
std::vector<App::DocumentObject*> transformFeatures = pcMultiTransform->Transformations.getValues();
if (transformFeatures.empty()) {
return;
@@ -517,8 +522,7 @@ void TaskMultiTransformParameters::onUpdateView(bool on)
void TaskMultiTransformParameters::apply()
{
auto pcMultiTransform = getObject<PartDesign::MultiTransform>();
std::vector<App::DocumentObject*> transformFeatures =
pcMultiTransform->Transformations.getValues();
std::vector<App::DocumentObject*> transformFeatures = pcMultiTransform->Transformations.getValues();
std::stringstream str;
str << Gui::Command::getObjectCmd(TransformedView->getObject()) << ".Transformations = [";
for (auto it : transformFeatures) {
@@ -547,7 +551,8 @@ TaskMultiTransformParameters::~TaskMultiTransformParameters()
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskDlgMultiTransformParameters::TaskDlgMultiTransformParameters(
ViewProviderMultiTransform* MultiTransformView)
ViewProviderMultiTransform* MultiTransformView
)
: TaskDlgTransformedParameters(MultiTransformView)
{
parameter = new TaskMultiTransformParameters(MultiTransformView);