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

PartDesign: Prepare for clang-format (#16048)

Browse Source 
* PartDesign: Prepare for clang-format

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
wwmayer
2024-09-02 17:48:26 +02:00
committed by GitHub
parent e88b1b49c9
commit e98ffc3060
13 changed files with 1286 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
View File

@@ -25,10 +25,10 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QAction>
# include <QKeyEvent>
# include <QListWidget>
# include <QMessageBox>
#include <QAction>
#include <QKeyEvent>
#include <QListWidget>
#include <QMessageBox>
#endif
#include <Base/Interpreter.h>
@@ -48,7 +48,7 @@ using namespace Gui;
/* TRANSLATOR PartDesignGui::TaskDraftParameters */
TaskDraftParameters::TaskDraftParameters(ViewProviderDressUp *DressUpView, QWidget *parent)
TaskDraftParameters::TaskDraftParameters(ViewProviderDressUp* DressUpView, QWidget* parent)
: TaskDressUpParameters(DressUpView, false, true, parent)
, ui(new Ui_TaskDraftParameters)
{
@@ -74,33 +74,35 @@ TaskDraftParameters::TaskDraftParameters(ViewProviderDressUp *DressUpView, QWidg
ui->checkReverse->setChecked(r);
std::vector<std::string> strings = pcDraft->Base.getSubValues();
for (const auto & string : strings) {
for (const auto& string : strings) {
ui->listWidgetReferences->addItem(QString::fromStdString(string));
}
QMetaObject::connectSlotsByName(this);
// clang-format off
connect(ui->draftAngle, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
this, &TaskDraftParameters::onAngleChanged);
this, &TaskDraftParameters::onAngleChanged);
connect(ui->checkReverse, &QCheckBox::toggled,
this, &TaskDraftParameters::onReversedChanged);
this, &TaskDraftParameters::onReversedChanged);
connect(ui->buttonRefSel, &QToolButton::toggled,
this, &TaskDraftParameters::onButtonRefSel);
this, &TaskDraftParameters::onButtonRefSel);
connect(ui->buttonPlane, &QToolButton::toggled,
this, &TaskDraftParameters::onButtonPlane);
this, &TaskDraftParameters::onButtonPlane);
connect(ui->buttonLine, &QToolButton::toggled,
this, &TaskDraftParameters::onButtonLine);
this, &TaskDraftParameters::onButtonLine);
// Create context menu
createDeleteAction(ui->listWidgetReferences);
connect(deleteAction, &QAction::triggered, this, &TaskDraftParameters::onRefDeleted);
connect(ui->listWidgetReferences, &QListWidget::currentItemChanged,
this, &TaskDraftParameters::setSelection);
this, &TaskDraftParameters::setSelection);
connect(ui->listWidgetReferences, &QListWidget::itemClicked,
this, &TaskDraftParameters::setSelection);
this, &TaskDraftParameters::setSelection);
connect(ui->listWidgetReferences, &QListWidget::itemDoubleClicked,
this, &TaskDraftParameters::doubleClicked);
this, &TaskDraftParameters::doubleClicked);
// clang-format on
App::DocumentObject* ref = pcDraft->NeutralPlane.getValue();
strings = pcDraft->NeutralPlane.getSubValues();
@@ -110,10 +112,12 @@ TaskDraftParameters::TaskDraftParameters(ViewProviderDressUp *DressUpView, QWidg
strings = pcDraft->PullDirection.getSubValues();
ui->lineLine->setText(getRefStr(ref, strings));
if (strings.size() == 0)
if (strings.size() == 0) {
setSelectionMode(refSel);
else
}
else {
hideOnError();
}
}
void TaskDraftParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
@@ -130,8 +134,9 @@ void TaskDraftParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
std::vector<std::string> planes;
App::DocumentObject* selObj {};
getReferencedSelection(pcDraft, msg, selObj, planes);
if(!selObj)
if (!selObj) {
return;
}
setupTransaction();
pcDraft->NeutralPlane.setValue(selObj, planes);
ui->linePlane->setText(getRefStr(selObj, planes));
@@ -141,14 +146,15 @@ void TaskDraftParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
getDressUpView()->highlightReferences(true);
// hide the draft if there was a computation error
hideOnError();
}
}
else if (selectionMode == line) {
auto pcDraft = getObject<PartDesign::Draft>();
std::vector<std::string> edges;
App::DocumentObject* selObj;
getReferencedSelection(pcDraft, msg, selObj, edges);
if(!selObj)
if (!selObj) {
return;
}
setupTransaction();
pcDraft->PullDirection.setValue(selObj, edges);
ui->lineLine->setText(getRefStr(selObj, edges));
@@ -177,9 +183,9 @@ void TaskDraftParameters::onButtonPlane(bool checked)
hideObject();
selectionMode = plane;
Gui::Selection().clearSelection();
Gui::Selection().addSelectionGate(new ReferenceSelection(this->getBase(), AllowSelection::EDGE |
AllowSelection::FACE |
AllowSelection::PLANAR));
Gui::Selection().addSelectionGate(new ReferenceSelection(
this->getBase(),
AllowSelection::EDGE | AllowSelection::FACE | AllowSelection::PLANAR));
}
}
@@ -190,8 +196,8 @@ void TaskDraftParameters::onButtonLine(bool checked)
hideObject();
selectionMode = line;
Gui::Selection().clearSelection();
Gui::Selection().addSelectionGate(new ReferenceSelection(this->getBase(), AllowSelection::EDGE |
AllowSelection::PLANAR));
Gui::Selection().addSelectionGate(
new ReferenceSelection(this->getBase(), AllowSelection::EDGE | AllowSelection::PLANAR));
}
}
@@ -202,20 +208,22 @@ void TaskDraftParameters::onRefDeleted()
void TaskDraftParameters::getPlane(App::DocumentObject*& obj, std::vector<std::string>& sub) const
{
sub = std::vector<std::string>(1,"");
sub = std::vector<std::string>(1, "");
QStringList parts = ui->linePlane->text().split(QChar::fromLatin1(':'));
obj = getObject()->getDocument()->getObject(parts[0].toStdString().c_str());
if (parts.size() > 1)
if (parts.size() > 1) {
sub[0] = parts[1].toStdString();
}
}
void TaskDraftParameters::getLine(App::DocumentObject*& obj, std::vector<std::string>& sub) const
{
sub = std::vector<std::string>(1,"");
sub = std::vector<std::string>(1, "");
QStringList parts = ui->lineLine->text().split(QChar::fromLatin1(':'));
obj = getObject()->getDocument()->getObject(parts[0].toStdString().c_str());
if (parts.size() > 1)
if (parts.size() > 1) {
sub[0] = parts[1].toStdString();
}
}
void TaskDraftParameters::onAngleChanged(double angle)
@@ -259,17 +267,17 @@ TaskDraftParameters::~TaskDraftParameters()
Gui::Selection().rmvSelectionGate();
}
catch (const Py::Exception&) {
Base::PyException e; // extract the Python error text
Base::PyException e; // extract the Python error text
e.ReportException();
}
}
bool TaskDraftParameters::event(QEvent *e)
bool TaskDraftParameters::event(QEvent* e)
{
return TaskDressUpParameters::KeyEvent(e);
}
void TaskDraftParameters::changeEvent(QEvent *e)
void TaskDraftParameters::changeEvent(QEvent* e)
{
TaskBox::changeEvent(e);
if (e->type() == QEvent::LanguageChange) {
@@ -279,9 +287,10 @@ void TaskDraftParameters::changeEvent(QEvent *e)
void TaskDraftParameters::apply()
{
//Alert user if he created an empty feature
if (ui->listWidgetReferences->count() == 0)
// Alert user if he created an empty feature
if (ui->listWidgetReferences->count() == 0) {
Base::Console().Warning(tr("Empty draft created !\n").toStdString().c_str());
}
TaskDressUpParameters::apply();
}
@@ -291,10 +300,10 @@ void TaskDraftParameters::apply()
// TaskDialog
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskDlgDraftParameters::TaskDlgDraftParameters(ViewProviderDraft *DressUpView)
TaskDlgDraftParameters::TaskDlgDraftParameters(ViewProviderDraft* DressUpView)
: TaskDlgDressUpParameters(DressUpView)
{
parameter = new TaskDraftParameters(DressUpView);
parameter = new TaskDraftParameters(DressUpView);
Content.push_back(parameter);
}
@@ -322,14 +331,16 @@ bool TaskDlgDraftParameters::accept()
draftparameter->getLine(obj, strings);
std::string pullDirection = buildLinkSingleSubPythonStr(obj, strings);
FCMD_OBJ_CMD(tobj,"Angle = " << draftparameter->getAngle());
FCMD_OBJ_CMD(tobj,"Reversed = " << draftparameter->getReversed());
if(neutralPlane.empty())
FCMD_OBJ_CMD(tobj, "Angle = " << draftparameter->getAngle());
FCMD_OBJ_CMD(tobj, "Reversed = " << draftparameter->getReversed());
if (neutralPlane.empty()) {
neutralPlane = "None";
FCMD_OBJ_CMD(tobj,"NeutralPlane = " << neutralPlane);
if(pullDirection.empty())
}
FCMD_OBJ_CMD(tobj, "NeutralPlane = " << neutralPlane);
if (pullDirection.empty()) {
pullDirection = "None";
FCMD_OBJ_CMD(tobj,"PullDirection = " << pullDirection);
}
FCMD_OBJ_CMD(tobj, "PullDirection = " << pullDirection);
return TaskDlgDressUpParameters::accept();
}