Reformat files with clang-format

This commit is contained in:
André Althaus
2024-02-17 14:41:12 +01:00
parent cf627f5ce4
commit 30f5595e2a
12 changed files with 819 additions and 521 deletions

View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#include <QMessageBox>
#endif
#include <App/Document.h>
@@ -48,48 +48,55 @@ using namespace Gui;
/* TRANSLATOR PartDesignGui::TaskMirroredParameters */
TaskMirroredParameters::TaskMirroredParameters(ViewProviderTransformed *TransformedView, QWidget *parent)
TaskMirroredParameters::TaskMirroredParameters(ViewProviderTransformed* TransformedView,
QWidget* parent)
: TaskTransformedParameters(TransformedView, parent)
, ui(new Ui_TaskMirroredParameters)
{
setupUI();
}
TaskMirroredParameters::TaskMirroredParameters(TaskMultiTransformParameters *parentTask, QWidget* parameterWidget)
: TaskTransformedParameters(parentTask), ui(new Ui_TaskMirroredParameters)
TaskMirroredParameters::TaskMirroredParameters(TaskMultiTransformParameters* parentTask,
QWidget* parameterWidget)
: TaskTransformedParameters(parentTask)
, ui(new Ui_TaskMirroredParameters)
{
setupParameterUI(parameterWidget);
}
void TaskMirroredParameters::setupParameterUI(QWidget *widget)
void TaskMirroredParameters::setupParameterUI(QWidget* widget)
{
ui->setupUi(widget);
QMetaObject::connectSlotsByName(this);
connect(ui->comboPlane, qOverload<int>(&QComboBox::activated),
this, &TaskMirroredParameters::onPlaneChanged);
connect(ui->comboPlane,
qOverload<int>(&QComboBox::activated),
this,
&TaskMirroredParameters::onPlaneChanged);
this->planeLinks.setCombo(*(ui->comboPlane));
ui->comboPlane->setEnabled(true);
App::DocumentObject* sketch = getSketchObject();
if (sketch && sketch->isDerivedFrom(Part::Part2DObject::getClassTypeId())) {
this->fillPlanesCombo(planeLinks,static_cast<Part::Part2DObject*>(sketch));
this->fillPlanesCombo(planeLinks, static_cast<Part::Part2DObject*>(sketch));
}
else {
this->fillPlanesCombo(planeLinks, nullptr);
}
//show the parts coordinate system planes for selection
PartDesign::Body * body = PartDesign::Body::findBodyOf ( getObject() );
if(body) {
// show the parts coordinate system planes for selection
PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject());
if (body) {
try {
App::Origin *origin = body->getOrigin();
App::Origin* origin = body->getOrigin();
ViewProviderOrigin* vpOrigin;
vpOrigin = static_cast<ViewProviderOrigin*>(Gui::Application::Instance->getViewProvider(origin));
vpOrigin = static_cast<ViewProviderOrigin*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->setTemporaryVisibility(false, true);
} catch (const Base::Exception &ex) {
Base::Console().Error ("%s\n", ex.what () );
}
catch (const Base::Exception& ex) {
Base::Console().Error("%s\n", ex.what());
}
}
@@ -103,15 +110,18 @@ void TaskMirroredParameters::retranslateParameterUI(QWidget* widget)
void TaskMirroredParameters::updateUI()
{
if (blockUpdate)
if (blockUpdate) {
return;
}
blockUpdate = true;
PartDesign::Mirrored* pcMirrored = static_cast<PartDesign::Mirrored*>(getObject());
if (planeLinks.setCurrentLink(pcMirrored->MirrorPlane) == -1){
//failed to set current, because the link isn't in the list yet
planeLinks.addLink(pcMirrored->MirrorPlane, getRefStr(pcMirrored->MirrorPlane.getValue(),pcMirrored->MirrorPlane.getSubValues()));
if (planeLinks.setCurrentLink(pcMirrored->MirrorPlane) == -1) {
// failed to set current, because the link isn't in the list yet
planeLinks.addLink(
pcMirrored->MirrorPlane,
getRefStr(pcMirrored->MirrorPlane.getValue(), pcMirrored->MirrorPlane.getSubValues()));
planeLinks.setCurrentLink(pcMirrored->MirrorPlane);
}
@@ -124,15 +134,18 @@ void TaskMirroredParameters::onSelectionChanged(const Gui::SelectionChanges& msg
if (originalSelected(msg)) {
exitSelectionMode();
} else {
}
else {
std::vector<std::string> mirrorPlanes;
App::DocumentObject* selObj;
PartDesign::Mirrored* pcMirrored = static_cast<PartDesign::Mirrored*>(getObject());
getReferencedSelection(pcMirrored, msg, selObj, mirrorPlanes);
if (!selObj)
return;
if (!selObj) {
return;
}
if ( selectionMode == SelectionMode::Reference || selObj->isDerivedFrom ( App::Plane::getClassTypeId () ) ) {
if (selectionMode == SelectionMode::Reference
|| selObj->isDerivedFrom(App::Plane::getClassTypeId())) {
setupTransaction();
pcMirrored->MirrorPlane.setValue(selObj, mirrorPlanes);
recomputeFeature();
@@ -145,11 +158,12 @@ void TaskMirroredParameters::onSelectionChanged(const Gui::SelectionChanges& msg
void TaskMirroredParameters::onPlaneChanged(int /*num*/)
{
if (blockUpdate)
if (blockUpdate) {
return;
}
setupTransaction();
PartDesign::Mirrored* pcMirrored = static_cast<PartDesign::Mirrored*>(getObject());
try{
try {
if (!planeLinks.getCurrentLink().getValue()) {
// enter reference selection mode
hideObject();
@@ -157,12 +171,14 @@ void TaskMirroredParameters::onPlaneChanged(int /*num*/)
selectionMode = SelectionMode::Reference;
Gui::Selection().clearSelection();
addReferenceSelectionGate(AllowSelection::FACE | AllowSelection::PLANAR);
} else {
}
else {
exitSelectionMode();
pcMirrored->MirrorPlane.Paste(planeLinks.getCurrentLink());
}
} catch (Base::Exception &e) {
QMessageBox::warning(nullptr,tr("Error"),QApplication::translate("Exception", e.what()));
}
catch (Base::Exception& e) {
QMessageBox::warning(nullptr, tr("Error"), QApplication::translate("Exception", e.what()));
}
recomputeFeature();
@@ -179,15 +195,16 @@ void TaskMirroredParameters::onUpdateView(bool on)
App::DocumentObject* obj;
getMirrorPlane(obj, mirrorPlanes);
pcMirrored->MirrorPlane.setValue(obj,mirrorPlanes);
pcMirrored->MirrorPlane.setValue(obj, mirrorPlanes);
recomputeFeature();
}
}
void TaskMirroredParameters::getMirrorPlane(App::DocumentObject*& obj, std::vector<std::string> &sub) const
void TaskMirroredParameters::getMirrorPlane(App::DocumentObject*& obj,
std::vector<std::string>& sub) const
{
const App::PropertyLinkSub &lnk = planeLinks.getCurrentLink();
const App::PropertyLinkSub& lnk = planeLinks.getCurrentLink();
obj = lnk.getValue();
sub = lnk.getSubValues();
}
@@ -199,22 +216,24 @@ void TaskMirroredParameters::doApply()
getMirrorPlane(obj, mirrorPlanes);
std::string mirrorPlane = buildLinkSingleSubPythonStr(obj, mirrorPlanes);
FCMD_OBJ_CMD(getObject(),"MirrorPlane = " << mirrorPlane);
FCMD_OBJ_CMD(getObject(), "MirrorPlane = " << mirrorPlane);
}
TaskMirroredParameters::~TaskMirroredParameters()
{
//hide the parts coordinate system axis for selection
// hide the parts coordinate system axis for selection
try {
PartDesign::Body * body = PartDesign::Body::findBodyOf ( getObject() );
if ( body ) {
App::Origin *origin = body->getOrigin();
PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject());
if (body) {
App::Origin* origin = body->getOrigin();
ViewProviderOrigin* vpOrigin;
vpOrigin = static_cast<ViewProviderOrigin*>(Gui::Application::Instance->getViewProvider(origin));
vpOrigin = static_cast<ViewProviderOrigin*>(
Gui::Application::Instance->getViewProvider(origin));
vpOrigin->resetTemporaryVisibility();
}
} catch (const Base::Exception &ex) {
Base::Console().Error ("%s\n", ex.what () );
}
catch (const Base::Exception& ex) {
Base::Console().Error("%s\n", ex.what());
}
}
@@ -223,7 +242,7 @@ TaskMirroredParameters::~TaskMirroredParameters()
// TaskDialog
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskDlgMirroredParameters::TaskDlgMirroredParameters(ViewProviderMirrored *MirroredView)
TaskDlgMirroredParameters::TaskDlgMirroredParameters(ViewProviderMirrored* MirroredView)
: TaskDlgTransformedParameters(MirroredView)
{
parameter = new TaskMirroredParameters(MirroredView);