Reformat files with clang-format
This commit is contained in:
@@ -24,8 +24,8 @@
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
# include <QMessageBox>
|
||||
# include <QTimer>
|
||||
#include <QMessageBox>
|
||||
#include <QTimer>
|
||||
#endif
|
||||
|
||||
#include <Base/UnitsApi.h>
|
||||
@@ -59,20 +59,23 @@ using namespace Gui;
|
||||
|
||||
/* TRANSLATOR PartDesignGui::TaskPolarPatternParameters */
|
||||
|
||||
TaskPolarPatternParameters::TaskPolarPatternParameters(ViewProviderTransformed *TransformedView,QWidget *parent)
|
||||
TaskPolarPatternParameters::TaskPolarPatternParameters(ViewProviderTransformed* TransformedView,
|
||||
QWidget* parent)
|
||||
: TaskTransformedParameters(TransformedView, parent)
|
||||
, ui(new Ui_TaskPolarPatternParameters)
|
||||
{
|
||||
setupUI();
|
||||
}
|
||||
|
||||
TaskPolarPatternParameters::TaskPolarPatternParameters(TaskMultiTransformParameters *parentTask, QWidget* parameterWidget)
|
||||
: TaskTransformedParameters(parentTask), ui(new Ui_TaskPolarPatternParameters)
|
||||
TaskPolarPatternParameters::TaskPolarPatternParameters(TaskMultiTransformParameters* parentTask,
|
||||
QWidget* parameterWidget)
|
||||
: TaskTransformedParameters(parentTask)
|
||||
, ui(new Ui_TaskPolarPatternParameters)
|
||||
{
|
||||
setupParameterUI(parameterWidget);
|
||||
}
|
||||
|
||||
void TaskPolarPatternParameters::setupParameterUI(QWidget *widget)
|
||||
void TaskPolarPatternParameters::setupParameterUI(QWidget* widget)
|
||||
{
|
||||
ui->setupUi(widget);
|
||||
QMetaObject::connectSlotsByName(this);
|
||||
@@ -102,17 +105,19 @@ void TaskPolarPatternParameters::setupParameterUI(QWidget *widget)
|
||||
this->fillAxisCombo(axesLinks, nullptr);
|
||||
}
|
||||
|
||||
//show the parts coordinate system axis for selection
|
||||
PartDesign::Body * body = PartDesign::Body::findBodyOf ( getObject() );
|
||||
// show the parts coordinate system axis for selection
|
||||
PartDesign::Body* body = PartDesign::Body::findBodyOf(getObject());
|
||||
|
||||
if(body) {
|
||||
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(true, false);
|
||||
} catch (const Base::Exception &ex) {
|
||||
Base::Console().Error ("%s\n", ex.what () );
|
||||
}
|
||||
catch (const Base::Exception& ex) {
|
||||
Base::Console().Error("%s\n", ex.what());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -122,20 +127,34 @@ void TaskPolarPatternParameters::setupParameterUI(QWidget *widget)
|
||||
updateViewTimer = new QTimer(this);
|
||||
updateViewTimer->setSingleShot(true);
|
||||
updateViewTimer->setInterval(getUpdateViewTimeout());
|
||||
connect(updateViewTimer, &QTimer::timeout,
|
||||
this, &TaskPolarPatternParameters::onUpdateViewTimer);
|
||||
connect(ui->comboAxis, qOverload<int>(&QComboBox::activated),
|
||||
this, &TaskPolarPatternParameters::onAxisChanged);
|
||||
connect(ui->comboMode, qOverload<int>(&QComboBox::activated),
|
||||
this, &TaskPolarPatternParameters::onModeChanged);
|
||||
connect(ui->checkReverse, &QCheckBox::toggled,
|
||||
this, &TaskPolarPatternParameters::onCheckReverse);
|
||||
connect(ui->polarAngle, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
|
||||
this, &TaskPolarPatternParameters::onAngle);
|
||||
connect(ui->angleOffset, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
|
||||
this, &TaskPolarPatternParameters::onOffset);
|
||||
connect(ui->spinOccurrences, &Gui::UIntSpinBox::unsignedChanged,
|
||||
this, &TaskPolarPatternParameters::onOccurrences);
|
||||
connect(updateViewTimer,
|
||||
&QTimer::timeout,
|
||||
this,
|
||||
&TaskPolarPatternParameters::onUpdateViewTimer);
|
||||
connect(ui->comboAxis,
|
||||
qOverload<int>(&QComboBox::activated),
|
||||
this,
|
||||
&TaskPolarPatternParameters::onAxisChanged);
|
||||
connect(ui->comboMode,
|
||||
qOverload<int>(&QComboBox::activated),
|
||||
this,
|
||||
&TaskPolarPatternParameters::onModeChanged);
|
||||
connect(ui->checkReverse,
|
||||
&QCheckBox::toggled,
|
||||
this,
|
||||
&TaskPolarPatternParameters::onCheckReverse);
|
||||
connect(ui->polarAngle,
|
||||
qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
|
||||
this,
|
||||
&TaskPolarPatternParameters::onAngle);
|
||||
connect(ui->angleOffset,
|
||||
qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
|
||||
this,
|
||||
&TaskPolarPatternParameters::onOffset);
|
||||
connect(ui->spinOccurrences,
|
||||
&Gui::UIntSpinBox::unsignedChanged,
|
||||
this,
|
||||
&TaskPolarPatternParameters::onOccurrences);
|
||||
}
|
||||
|
||||
void TaskPolarPatternParameters::retranslateParameterUI(QWidget* widget)
|
||||
@@ -145,21 +164,25 @@ void TaskPolarPatternParameters::retranslateParameterUI(QWidget* widget)
|
||||
|
||||
void TaskPolarPatternParameters::updateUI()
|
||||
{
|
||||
if (blockUpdate)
|
||||
if (blockUpdate) {
|
||||
return;
|
||||
}
|
||||
blockUpdate = true;
|
||||
|
||||
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
|
||||
PartDesign::PolarPatternMode mode = static_cast<PartDesign::PolarPatternMode>(pcPolarPattern->Mode.getValue());
|
||||
PartDesign::PolarPatternMode mode =
|
||||
static_cast<PartDesign::PolarPatternMode>(pcPolarPattern->Mode.getValue());
|
||||
bool reverse = pcPolarPattern->Reversed.getValue();
|
||||
double angle = pcPolarPattern->Angle.getValue();
|
||||
double offset = pcPolarPattern->Offset.getValue();
|
||||
unsigned occurrences = pcPolarPattern->Occurrences.getValue();
|
||||
|
||||
if (axesLinks.setCurrentLink(pcPolarPattern->Axis) == -1) {
|
||||
//failed to set current, because the link isn't in the list yet
|
||||
axesLinks.addLink(pcPolarPattern->Axis, getRefStr(pcPolarPattern->Axis.getValue(),pcPolarPattern->Axis.getSubValues()));
|
||||
// failed to set current, because the link isn't in the list yet
|
||||
axesLinks.addLink(
|
||||
pcPolarPattern->Axis,
|
||||
getRefStr(pcPolarPattern->Axis.getValue(), pcPolarPattern->Axis.getSubValues()));
|
||||
axesLinks.setCurrentLink(pcPolarPattern->Axis);
|
||||
}
|
||||
|
||||
@@ -204,12 +227,15 @@ void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges&
|
||||
else {
|
||||
std::vector<std::string> axes;
|
||||
App::DocumentObject* selObj;
|
||||
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
PartDesign::PolarPattern* pcPolarPattern =
|
||||
static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
getReferencedSelection(pcPolarPattern, msg, selObj, axes);
|
||||
if(!selObj)
|
||||
return;
|
||||
if (!selObj) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (selectionMode == SelectionMode::Reference || selObj->isDerivedFrom ( App::Line::getClassTypeId () ) ) {
|
||||
if (selectionMode == SelectionMode::Reference
|
||||
|| selObj->isDerivedFrom(App::Line::getClassTypeId())) {
|
||||
setupTransaction();
|
||||
pcPolarPattern->Axis.setValue(selObj, axes);
|
||||
recomputeFeature();
|
||||
@@ -220,9 +246,11 @@ void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges&
|
||||
}
|
||||
}
|
||||
|
||||
void TaskPolarPatternParameters::onCheckReverse(const bool on) {
|
||||
if (blockUpdate)
|
||||
void TaskPolarPatternParameters::onCheckReverse(const bool on)
|
||||
{
|
||||
if (blockUpdate) {
|
||||
return;
|
||||
}
|
||||
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
pcPolarPattern->Reversed.setValue(on);
|
||||
|
||||
@@ -230,9 +258,11 @@ void TaskPolarPatternParameters::onCheckReverse(const bool on) {
|
||||
kickUpdateViewTimer();
|
||||
}
|
||||
|
||||
void TaskPolarPatternParameters::onModeChanged(const int mode) {
|
||||
if (blockUpdate)
|
||||
void TaskPolarPatternParameters::onModeChanged(const int mode)
|
||||
{
|
||||
if (blockUpdate) {
|
||||
return;
|
||||
}
|
||||
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
pcPolarPattern->Mode.setValue(mode);
|
||||
|
||||
@@ -242,9 +272,11 @@ void TaskPolarPatternParameters::onModeChanged(const int mode) {
|
||||
kickUpdateViewTimer();
|
||||
}
|
||||
|
||||
void TaskPolarPatternParameters::onAngle(const double a) {
|
||||
if (blockUpdate)
|
||||
void TaskPolarPatternParameters::onAngle(const double a)
|
||||
{
|
||||
if (blockUpdate) {
|
||||
return;
|
||||
}
|
||||
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
pcPolarPattern->Angle.setValue(a);
|
||||
|
||||
@@ -252,9 +284,11 @@ void TaskPolarPatternParameters::onAngle(const double a) {
|
||||
kickUpdateViewTimer();
|
||||
}
|
||||
|
||||
void TaskPolarPatternParameters::onOffset(const double a) {
|
||||
if (blockUpdate)
|
||||
void TaskPolarPatternParameters::onOffset(const double a)
|
||||
{
|
||||
if (blockUpdate) {
|
||||
return;
|
||||
}
|
||||
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
pcPolarPattern->Offset.setValue(a);
|
||||
|
||||
@@ -262,9 +296,11 @@ void TaskPolarPatternParameters::onOffset(const double a) {
|
||||
kickUpdateViewTimer();
|
||||
}
|
||||
|
||||
void TaskPolarPatternParameters::onOccurrences(const uint n) {
|
||||
if (blockUpdate)
|
||||
void TaskPolarPatternParameters::onOccurrences(const uint n)
|
||||
{
|
||||
if (blockUpdate) {
|
||||
return;
|
||||
}
|
||||
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
pcPolarPattern->Occurrences.setValue(n);
|
||||
|
||||
@@ -274,11 +310,12 @@ void TaskPolarPatternParameters::onOccurrences(const uint n) {
|
||||
|
||||
void TaskPolarPatternParameters::onAxisChanged(int /*num*/)
|
||||
{
|
||||
if (blockUpdate)
|
||||
if (blockUpdate) {
|
||||
return;
|
||||
}
|
||||
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
|
||||
try{
|
||||
try {
|
||||
if (!axesLinks.getCurrentLink().getValue()) {
|
||||
// enter reference selection mode
|
||||
hideObject();
|
||||
@@ -286,12 +323,14 @@ void TaskPolarPatternParameters::onAxisChanged(int /*num*/)
|
||||
selectionMode = SelectionMode::Reference;
|
||||
Gui::Selection().clearSelection();
|
||||
addReferenceSelectionGate(AllowSelection::EDGE | AllowSelection::CIRCLE);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
exitSelectionMode();
|
||||
pcPolarPattern->Axis.Paste(axesLinks.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()));
|
||||
}
|
||||
|
||||
kickUpdateViewTimer();
|
||||
@@ -302,13 +341,14 @@ void TaskPolarPatternParameters::onUpdateView(bool on)
|
||||
blockUpdate = !on;
|
||||
if (on) {
|
||||
// Do the same like in TaskDlgPolarPatternParameters::accept() but without doCommand
|
||||
PartDesign::PolarPattern* pcPolarPattern = static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
PartDesign::PolarPattern* pcPolarPattern =
|
||||
static_cast<PartDesign::PolarPattern*>(getObject());
|
||||
std::vector<std::string> axes;
|
||||
App::DocumentObject* obj;
|
||||
|
||||
setupTransaction();
|
||||
getAxis(obj, axes);
|
||||
pcPolarPattern->Axis.setValue(obj,axes);
|
||||
pcPolarPattern->Axis.setValue(obj, axes);
|
||||
pcPolarPattern->Reversed.setValue(getReverse());
|
||||
pcPolarPattern->Angle.setValue(getAngle());
|
||||
pcPolarPattern->Occurrences.setValue(getOccurrences());
|
||||
@@ -317,9 +357,10 @@ void TaskPolarPatternParameters::onUpdateView(bool on)
|
||||
}
|
||||
}
|
||||
|
||||
void TaskPolarPatternParameters::getAxis(App::DocumentObject*& obj, std::vector<std::string>& sub) const
|
||||
void TaskPolarPatternParameters::getAxis(App::DocumentObject*& obj,
|
||||
std::vector<std::string>& sub) const
|
||||
{
|
||||
const App::PropertyLinkSub &lnk = axesLinks.getCurrentLink();
|
||||
const App::PropertyLinkSub& lnk = axesLinks.getCurrentLink();
|
||||
obj = lnk.getValue();
|
||||
sub = lnk.getSubValues();
|
||||
}
|
||||
@@ -347,17 +388,19 @@ unsigned TaskPolarPatternParameters::getOccurrences() const
|
||||
|
||||
TaskPolarPatternParameters::~TaskPolarPatternParameters()
|
||||
{
|
||||
//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->resetTemporaryVisibility ();
|
||||
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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -369,9 +412,9 @@ void TaskPolarPatternParameters::doApply()
|
||||
std::string axis = buildLinkSingleSubPythonStr(obj, axes);
|
||||
|
||||
auto tobj = getObject();
|
||||
FCMD_OBJ_CMD(tobj,"Axis = " << axis.c_str());
|
||||
FCMD_OBJ_CMD(tobj,"Reversed = " << getReverse());
|
||||
FCMD_OBJ_CMD(tobj,"Mode = " << getMode());
|
||||
FCMD_OBJ_CMD(tobj, "Axis = " << axis.c_str());
|
||||
FCMD_OBJ_CMD(tobj, "Reversed = " << getReverse());
|
||||
FCMD_OBJ_CMD(tobj, "Mode = " << getMode());
|
||||
ui->polarAngle->apply();
|
||||
ui->angleOffset->apply();
|
||||
ui->spinOccurrences->apply();
|
||||
@@ -382,7 +425,8 @@ void TaskPolarPatternParameters::doApply()
|
||||
// TaskDialog
|
||||
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
TaskDlgPolarPatternParameters::TaskDlgPolarPatternParameters(ViewProviderPolarPattern *PolarPatternView)
|
||||
TaskDlgPolarPatternParameters::TaskDlgPolarPatternParameters(
|
||||
ViewProviderPolarPattern* PolarPatternView)
|
||||
: TaskDlgTransformedParameters(PolarPatternView)
|
||||
{
|
||||
parameter = new TaskPolarPatternParameters(PolarPatternView);
|
||||
|
||||
Reference in New Issue
Block a user