kindred/create
1
1
Fork 0
Code Issues 30 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

171
src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp
View File

@@ -25,8 +25,8 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QAction>
# include <QMessageBox>
#include <QAction>
#include <QMessageBox>
#endif
#include <App/Document.h>
@@ -48,8 +48,11 @@ using namespace Gui;
/* TRANSLATOR PartDesignGui::TaskBooleanParameters */
TaskBooleanParameters::TaskBooleanParameters(ViewProviderBoolean *BooleanView,QWidget *parent)
: TaskBox(Gui::BitmapFactory().pixmap("PartDesign_Boolean"), tr("Boolean parameters"), true, parent)
TaskBooleanParameters::TaskBooleanParameters(ViewProviderBoolean* BooleanView, QWidget* parent)
: TaskBox(Gui::BitmapFactory().pixmap("PartDesign_Boolean"),
tr("Boolean parameters"),
true,
parent)
, ui(new Ui_TaskBooleanParameters)
, BooleanView(BooleanView)
{
@@ -60,12 +63,14 @@ TaskBooleanParameters::TaskBooleanParameters(ViewProviderBoolean *BooleanView,QW
ui->setupUi(proxy);
QMetaObject::connectSlotsByName(this);
// clang-format off
connect(ui->buttonBodyAdd, &QToolButton::toggled,
this, &TaskBooleanParameters::onButtonBodyAdd);
connect(ui->buttonBodyRemove, &QToolButton::toggled,
this, &TaskBooleanParameters::onButtonBodyRemove);
connect(ui->comboType, qOverload<int>(&QComboBox::currentIndexChanged),
this, &TaskBooleanParameters::onTypeChanged);
// clang-format on
this->groupLayout()->addWidget(proxy);
@@ -94,27 +99,33 @@ TaskBooleanParameters::TaskBooleanParameters(ViewProviderBoolean *BooleanView,QW
void TaskBooleanParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
{
if (selectionMode == none)
if (selectionMode == none) {
return;
}
if (msg.Type == Gui::SelectionChanges::AddSelection) {
if (strcmp(msg.pDocName, BooleanView->getObject()->getDocument()->getName()) != 0)
if (strcmp(msg.pDocName, BooleanView->getObject()->getDocument()->getName()) != 0) {
return;
}
// get the selected object
PartDesign::Boolean* pcBoolean = static_cast<PartDesign::Boolean*>(BooleanView->getObject());
PartDesign::Boolean* pcBoolean =
static_cast<PartDesign::Boolean*>(BooleanView->getObject());
std::string body(msg.pObjectName);
if (body.empty())
if (body.empty()) {
return;
}
App::DocumentObject* pcBody = pcBoolean->getDocument()->getObject(body.c_str());
if (!pcBody)
if (!pcBody) {
return;
}
// if the selected object is not a body then get the body it is part of
if (!pcBody->isDerivedFrom<PartDesign::Body>()) {
pcBody = PartDesign::Body::findBodyOf(pcBody);
if (!pcBody)
if (!pcBody) {
return;
}
body = pcBody->getNameInDocument();
}
@@ -137,26 +148,34 @@ void TaskBooleanParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
// Hide the bodies
if (bodies.size() == 1) {
// Hide base body and added body
Gui::ViewProviderDocumentObject* vp = dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(pcBoolean->BaseFeature.getValue()));
if (vp)
Gui::ViewProviderDocumentObject* vp =
dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(
pcBoolean->BaseFeature.getValue()));
if (vp) {
vp->hide();
}
vp = dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(bodies.front()));
if (vp)
Gui::Application::Instance->getViewProvider(bodies.front()));
if (vp) {
vp->hide();
}
BooleanView->show();
} else {
}
else {
// Hide newly added body
Gui::ViewProviderDocumentObject* vp = dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(bodies.back()));
if (vp)
Gui::ViewProviderDocumentObject* vp =
dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(bodies.back()));
if (vp) {
vp->hide();
}
}
}
}
else if (selectionMode == bodyRemove) {
std::vector<App::DocumentObject*>::iterator b = std::find(bodies.begin(), bodies.end(), pcBody);
std::vector<App::DocumentObject*>::iterator b =
std::find(bodies.begin(), bodies.end(), pcBody);
if (b != bodies.end()) {
bodies.erase(b);
pcBoolean->setObjects(bodies);
@@ -177,15 +196,20 @@ void TaskBooleanParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
exitSelectionMode();
// Make bodies visible again
Gui::ViewProviderDocumentObject* vp = dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(pcBody));
if (vp)
Gui::ViewProviderDocumentObject* vp =
dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(pcBody));
if (vp) {
vp->show();
}
if (bodies.empty()) {
Gui::ViewProviderDocumentObject* vp = dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(pcBoolean->BaseFeature.getValue()));
if (vp)
Gui::ViewProviderDocumentObject* vp =
dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(
pcBoolean->BaseFeature.getValue()));
if (vp) {
vp->show();
}
BooleanView->hide();
}
}
@@ -196,14 +220,17 @@ void TaskBooleanParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
void TaskBooleanParameters::onButtonBodyAdd(bool checked)
{
if (checked) {
PartDesign::Boolean* pcBoolean = static_cast<PartDesign::Boolean*>(BooleanView->getObject());
PartDesign::Boolean* pcBoolean =
static_cast<PartDesign::Boolean*>(BooleanView->getObject());
Gui::Document* doc = BooleanView->getDocument();
BooleanView->hide();
if (pcBoolean->Group.getValues().empty() && pcBoolean->BaseFeature.getValue())
if (pcBoolean->Group.getValues().empty() && pcBoolean->BaseFeature.getValue()) {
doc->setHide(pcBoolean->BaseFeature.getValue()->getNameInDocument());
}
selectionMode = bodyAdd;
Gui::Selection().clearSelection();
} else {
}
else {
exitSelectionMode();
}
}
@@ -212,11 +239,13 @@ void TaskBooleanParameters::onButtonBodyRemove(bool checked)
{
if (checked) {
Gui::Document* doc = Gui::Application::Instance->activeDocument();
if (doc)
if (doc) {
BooleanView->show();
}
selectionMode = bodyRemove;
Gui::Selection().clearSelection();
} else {
}
else {
exitSelectionMode();
}
}
@@ -226,10 +255,17 @@ void TaskBooleanParameters::onTypeChanged(int index)
PartDesign::Boolean* pcBoolean = static_cast<PartDesign::Boolean*>(BooleanView->getObject());
switch (index) {
case 0: pcBoolean->Type.setValue("Fuse"); break;
case 1: pcBoolean->Type.setValue("Cut"); break;
case 2: pcBoolean->Type.setValue("Common"); break;
default: pcBoolean->Type.setValue("Fuse");
case 0:
pcBoolean->Type.setValue("Fuse");
break;
case 1:
pcBoolean->Type.setValue("Cut");
break;
case 2:
pcBoolean->Type.setValue("Common");
break;
default:
pcBoolean->Type.setValue("Fuse");
}
pcBoolean->getDocument()->recomputeFeature(pcBoolean);
@@ -238,8 +274,10 @@ void TaskBooleanParameters::onTypeChanged(int index)
const std::vector<std::string> TaskBooleanParameters::getBodies() const
{
std::vector<std::string> result;
for (int i = 0; i < ui->listWidgetBodies->count(); i++)
result.push_back(ui->listWidgetBodies->item(i)->data(Qt::UserRole).toString().toStdString());
for (int i = 0; i < ui->listWidgetBodies->count(); i++) {
result.push_back(
ui->listWidgetBodies->item(i)->data(Qt::UserRole).toString().toStdString());
}
return result;
}
@@ -253,8 +291,9 @@ void TaskBooleanParameters::onBodyDeleted()
PartDesign::Boolean* pcBoolean = static_cast<PartDesign::Boolean*>(BooleanView->getObject());
std::vector<App::DocumentObject*> bodies = pcBoolean->Group.getValues();
int index = ui->listWidgetBodies->currentRow();
if (index < 0 && (size_t) index > bodies.size())
if (index < 0 && (size_t)index > bodies.size()) {
return;
}
App::DocumentObject* body = bodies[index];
QString internalName = ui->listWidgetBodies->item(index)->data(Qt::UserRole).toString();
@@ -272,21 +311,23 @@ void TaskBooleanParameters::onBodyDeleted()
// Make bodies visible again
Gui::ViewProviderDocumentObject* vp = dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(body));
if (vp)
Gui::Application::Instance->getViewProvider(body));
if (vp) {
vp->show();
}
if (bodies.empty()) {
Gui::ViewProviderDocumentObject* vp = dynamic_cast<Gui::ViewProviderDocumentObject*>(
Gui::Application::Instance->getViewProvider(pcBoolean->BaseFeature.getValue()));
if (vp)
Gui::Application::Instance->getViewProvider(pcBoolean->BaseFeature.getValue()));
if (vp) {
vp->show();
}
BooleanView->hide();
}
}
TaskBooleanParameters::~TaskBooleanParameters() = default;
void TaskBooleanParameters::changeEvent(QEvent *e)
void TaskBooleanParameters::changeEvent(QEvent* e)
{
TaskBox::changeEvent(e);
if (e->type() == QEvent::LanguageChange) {
@@ -301,8 +342,9 @@ void TaskBooleanParameters::exitSelectionMode()
{
selectionMode = none;
Gui::Document* doc = Gui::Application::Instance->activeDocument();
if (doc)
if (doc) {
doc->setShow(BooleanView->getObject()->getNameInDocument());
}
}
//**************************************************************************
@@ -310,11 +352,12 @@ void TaskBooleanParameters::exitSelectionMode()
// TaskDialog
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskDlgBooleanParameters::TaskDlgBooleanParameters(ViewProviderBoolean *BooleanView)
: TaskDialog(),BooleanView(BooleanView)
TaskDlgBooleanParameters::TaskDlgBooleanParameters(ViewProviderBoolean* BooleanView)
: TaskDialog()
, BooleanView(BooleanView)
{
assert(BooleanView);
parameter = new TaskBooleanParameters(BooleanView);
parameter = new TaskBooleanParameters(BooleanView);
Content.push_back(parameter);
}
@@ -325,45 +368,46 @@ TaskDlgBooleanParameters::~TaskDlgBooleanParameters() = default;
void TaskDlgBooleanParameters::open()
{
}
{}
void TaskDlgBooleanParameters::clicked(int)
{
}
{}
bool TaskDlgBooleanParameters::accept()
{
auto obj = BooleanView->getObject();
if(!obj || !obj->isAttachedToDocument())
if (!obj || !obj->isAttachedToDocument()) {
return false;
}
BooleanView->Visibility.setValue(true);
try {
std::vector<std::string> bodies = parameter->getBodies();
if (bodies.empty()) {
QMessageBox::warning(parameter, tr("Empty body list"),
QMessageBox::warning(parameter,
tr("Empty body list"),
tr("The body list cannot be empty"));
return false;
}
std::stringstream str;
str << Gui::Command::getObjectCmd(obj) << ".setObjects( [";
for (const auto & body : bodies) {
str << "App.getDocument('" << obj->getDocument()->getName() << "').getObject('" << body << "'),";
for (const auto& body : bodies) {
str << "App.getDocument('" << obj->getDocument()->getName() << "').getObject('" << body
<< "'),";
}
str << "])";
Gui::Command::runCommand(Gui::Command::Doc,str.str().c_str());
Gui::Command::runCommand(Gui::Command::Doc, str.str().c_str());
}
catch (const Base::Exception& e) {
QMessageBox::warning(parameter, tr("Boolean: Accept: Input error"), QCoreApplication::translate("Exception", e.what()));
QMessageBox::warning(parameter,
tr("Boolean: Accept: Input error"),
QCoreApplication::translate("Exception", e.what()));
return false;
}
FCMD_OBJ_CMD(obj,"Type = " << parameter->getType());
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.recompute()");
Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
FCMD_OBJ_CMD(obj, "Type = " << parameter->getType());
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
Gui::Command::commitCommand();
return true;
@@ -386,12 +430,11 @@ bool TaskDlgBooleanParameters::reject()
// roll back the done things
Gui::Command::abortCommand();
Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
return true;
}
#include "moc_TaskBooleanParameters.cpp"