PartDesign: Prepare for clang-format (#16048)
* 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
@@ -24,7 +24,7 @@
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
# include <QMessageBox>
|
||||
#include <QMessageBox>
|
||||
#endif
|
||||
|
||||
#include <App/Document.h>
|
||||
@@ -45,6 +45,7 @@
|
||||
|
||||
using namespace PartDesignGui;
|
||||
|
||||
// clang-format off
|
||||
TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
|
||||
: TaskBox(QPixmap(),tr("Primitive parameters"), true, parent)
|
||||
, ui(new Ui_DlgPrimitives)
|
||||
@@ -367,24 +368,26 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent)
|
||||
connect(ui->wedgeZ2min, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
|
||||
this, &TaskBoxPrimitives::onWedgeZ2minChanged);
|
||||
}
|
||||
// clang-format on
|
||||
|
||||
/*
|
||||
* Destroys the object and frees any allocated resources
|
||||
*/
|
||||
TaskBoxPrimitives::~TaskBoxPrimitives()
|
||||
{
|
||||
//hide the parts coordinate system axis for selection
|
||||
// hide the parts coordinate system axis for selection
|
||||
try {
|
||||
auto obj = getObject();
|
||||
if (PartDesign::Body * body = obj ? PartDesign::Body::findBodyOf(obj) : nullptr) {
|
||||
App::Origin *origin = body->getOrigin();
|
||||
if (PartDesign::Body* body = obj ? PartDesign::Body::findBodyOf(obj) : nullptr) {
|
||||
App::Origin* origin = body->getOrigin();
|
||||
Gui::ViewProviderOrigin* vpOrigin;
|
||||
vpOrigin = static_cast<Gui::ViewProviderOrigin*>(Gui::Application::Instance->getViewProvider(origin));
|
||||
vpOrigin = static_cast<Gui::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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -452,10 +455,12 @@ void TaskBoxPrimitives::onCylinderXSkewChanged(double v)
|
||||
cyl->FirstAngle.setValue(v);
|
||||
}
|
||||
else {
|
||||
if (v == 90.0)
|
||||
if (v == 90.0) {
|
||||
cyl->FirstAngle.setValue(cyl->FirstAngle.getMaximum());
|
||||
else if (v == -90.0)
|
||||
}
|
||||
else if (v == -90.0) {
|
||||
cyl->FirstAngle.setValue(cyl->FirstAngle.getMinimum());
|
||||
}
|
||||
ui->cylinderXSkew->setValue(cyl->FirstAngle.getQuantityValue());
|
||||
}
|
||||
cyl->recomputeFeature();
|
||||
@@ -471,10 +476,12 @@ void TaskBoxPrimitives::onCylinderYSkewChanged(double v)
|
||||
cyl->SecondAngle.setValue(v);
|
||||
}
|
||||
else {
|
||||
if (v == 90.0)
|
||||
if (v == 90.0) {
|
||||
cyl->SecondAngle.setValue(cyl->SecondAngle.getMaximum());
|
||||
else if (v == -90.0)
|
||||
}
|
||||
else if (v == -90.0) {
|
||||
cyl->SecondAngle.setValue(cyl->SecondAngle.getMinimum());
|
||||
}
|
||||
ui->cylinderYSkew->setValue(cyl->SecondAngle.getQuantityValue());
|
||||
}
|
||||
cyl->recomputeFeature();
|
||||
@@ -484,7 +491,7 @@ void TaskBoxPrimitives::onCylinderYSkewChanged(double v)
|
||||
void TaskBoxPrimitives::onSphereAngle1Changed(double v)
|
||||
{
|
||||
if (auto sph = getObject<PartDesign::Sphere>()) {
|
||||
ui->sphereAngle2->setMinimum(v); // Angle1 must geometrically be <= than Angle2
|
||||
ui->sphereAngle2->setMinimum(v); // Angle1 must geometrically be <= than Angle2
|
||||
sph->Angle1.setValue(v);
|
||||
sph->recomputeFeature();
|
||||
}
|
||||
@@ -493,7 +500,7 @@ void TaskBoxPrimitives::onSphereAngle1Changed(double v)
|
||||
void TaskBoxPrimitives::onSphereAngle2Changed(double v)
|
||||
{
|
||||
if (auto sph = getObject<PartDesign::Sphere>()) {
|
||||
ui->sphereAngle1->setMaximum(v); // Angle1 must geometrically be <= than Angle2
|
||||
ui->sphereAngle1->setMaximum(v); // Angle1 must geometrically be <= than Angle2
|
||||
sph->Angle2.setValue(v);
|
||||
sph->recomputeFeature();
|
||||
}
|
||||
@@ -507,7 +514,7 @@ void TaskBoxPrimitives::onSphereAngle3Changed(double v)
|
||||
}
|
||||
}
|
||||
|
||||
void TaskBoxPrimitives::onSphereRadiusChanged(double v)
|
||||
void TaskBoxPrimitives::onSphereRadiusChanged(double v)
|
||||
{
|
||||
if (auto sph = getObject<PartDesign::Sphere>()) {
|
||||
sph->Radius.setValue(v);
|
||||
@@ -550,7 +557,7 @@ void TaskBoxPrimitives::onConeRadius2Changed(double v)
|
||||
void TaskBoxPrimitives::onEllipsoidAngle1Changed(double v)
|
||||
{
|
||||
if (auto ell = getObject<PartDesign::Ellipsoid>()) {
|
||||
ui->ellipsoidAngle2->setMinimum(v); // Angle1 must geometrically be <= than Angle2
|
||||
ui->ellipsoidAngle2->setMinimum(v); // Angle1 must geometrically be <= than Angle2
|
||||
ell->Angle1.setValue(v);
|
||||
ell->recomputeFeature();
|
||||
}
|
||||
@@ -559,7 +566,7 @@ void TaskBoxPrimitives::onEllipsoidAngle1Changed(double v)
|
||||
void TaskBoxPrimitives::onEllipsoidAngle2Changed(double v)
|
||||
{
|
||||
if (auto ell = getObject<PartDesign::Ellipsoid>()) {
|
||||
ui->ellipsoidAngle1->setMaximum(v); // Angle1 must geometrically be <= than Angle22
|
||||
ui->ellipsoidAngle1->setMaximum(v); // Angle1 must geometrically be <= than Angle22
|
||||
ell->Angle2.setValue(v);
|
||||
ell->recomputeFeature();
|
||||
}
|
||||
@@ -600,7 +607,7 @@ void TaskBoxPrimitives::onEllipsoidRadius3Changed(double v)
|
||||
void TaskBoxPrimitives::onTorusAngle1Changed(double v)
|
||||
{
|
||||
if (auto tor = getObject<PartDesign::Torus>()) {
|
||||
ui->torusAngle2->setMinimum(v); // Angle1 must geometrically be <= than Angle2
|
||||
ui->torusAngle2->setMinimum(v); // Angle1 must geometrically be <= than Angle2
|
||||
tor->Angle1.setValue(v);
|
||||
tor->recomputeFeature();
|
||||
}
|
||||
@@ -609,7 +616,7 @@ void TaskBoxPrimitives::onTorusAngle1Changed(double v)
|
||||
void TaskBoxPrimitives::onTorusAngle2Changed(double v)
|
||||
{
|
||||
if (auto tor = getObject<PartDesign::Torus>()) {
|
||||
ui->torusAngle1->setMaximum(v); // Angle1 must geometrically be <= than Angle2
|
||||
ui->torusAngle1->setMaximum(v); // Angle1 must geometrically be <= than Angle2
|
||||
tor->Angle2.setValue(v);
|
||||
tor->recomputeFeature();
|
||||
}
|
||||
@@ -669,10 +676,12 @@ void TaskBoxPrimitives::onPrismXSkewChanged(double v)
|
||||
prim->FirstAngle.setValue(v);
|
||||
}
|
||||
else {
|
||||
if (v == 90.0)
|
||||
if (v == 90.0) {
|
||||
prim->FirstAngle.setValue(89.99999);
|
||||
else if (v == -90.0)
|
||||
}
|
||||
else if (v == -90.0) {
|
||||
prim->FirstAngle.setValue(-89.99999);
|
||||
}
|
||||
ui->prismXSkew->setValue(prim->FirstAngle.getQuantityValue());
|
||||
}
|
||||
prim->recomputeFeature();
|
||||
@@ -688,10 +697,12 @@ void TaskBoxPrimitives::onPrismYSkewChanged(double v)
|
||||
prim->SecondAngle.setValue(v);
|
||||
}
|
||||
else {
|
||||
if (v == 90.0)
|
||||
if (v == 90.0) {
|
||||
prim->SecondAngle.setValue(89.99999);
|
||||
else if (v == -90.0)
|
||||
}
|
||||
else if (v == -90.0) {
|
||||
prim->SecondAngle.setValue(-89.99999);
|
||||
}
|
||||
ui->prismYSkew->setValue(prim->SecondAngle.getQuantityValue());
|
||||
}
|
||||
prim->recomputeFeature();
|
||||
@@ -709,7 +720,7 @@ void TaskBoxPrimitives::onPrismPolygonChanged(int v)
|
||||
void TaskBoxPrimitives::onWedgeX2minChanged(double v)
|
||||
{
|
||||
if (auto wedge = getObject<PartDesign::Wedge>()) {
|
||||
ui->wedgeX2max->setMinimum(v); // wedgeX2min must be <= than wedgeX2max
|
||||
ui->wedgeX2max->setMinimum(v); // wedgeX2min must be <= than wedgeX2max
|
||||
wedge->X2min.setValue(v);
|
||||
wedge->recomputeFeature();
|
||||
}
|
||||
@@ -718,7 +729,7 @@ void TaskBoxPrimitives::onWedgeX2minChanged(double v)
|
||||
void TaskBoxPrimitives::onWedgeX2maxChanged(double v)
|
||||
{
|
||||
if (auto wedge = getObject<PartDesign::Wedge>()) {
|
||||
ui->wedgeX2min->setMaximum(v); // wedgeX2min must be <= than wedgeX2max
|
||||
ui->wedgeX2min->setMaximum(v); // wedgeX2min must be <= than wedgeX2max
|
||||
wedge->X2max.setValue(v);
|
||||
wedge->recomputeFeature();
|
||||
}
|
||||
@@ -736,7 +747,7 @@ void TaskBoxPrimitives::onWedgeXminChanged(double v)
|
||||
void TaskBoxPrimitives::onWedgeXmaxChanged(double v)
|
||||
{
|
||||
if (auto wedge = getObject<PartDesign::Wedge>()) {
|
||||
ui->wedgeXmin->setMaximum(v); // must be < than wedgeXmax
|
||||
ui->wedgeXmin->setMaximum(v); // must be < than wedgeXmax
|
||||
wedge->Xmax.setValue(v);
|
||||
wedge->recomputeFeature();
|
||||
}
|
||||
@@ -745,7 +756,7 @@ void TaskBoxPrimitives::onWedgeXmaxChanged(double v)
|
||||
void TaskBoxPrimitives::onWedgeYminChanged(double v)
|
||||
{
|
||||
if (auto wedge = getObject<PartDesign::Wedge>()) {
|
||||
ui->wedgeYmax->setMinimum(v); // must be > than wedgeYmin
|
||||
ui->wedgeYmax->setMinimum(v); // must be > than wedgeYmin
|
||||
wedge->Ymin.setValue(v);
|
||||
wedge->recomputeFeature();
|
||||
}
|
||||
@@ -754,7 +765,7 @@ void TaskBoxPrimitives::onWedgeYminChanged(double v)
|
||||
void TaskBoxPrimitives::onWedgeYmaxChanged(double v)
|
||||
{
|
||||
if (auto wedge = getObject<PartDesign::Wedge>()) {
|
||||
ui->wedgeYmin->setMaximum(v); // must be < than wedgeYmax
|
||||
ui->wedgeYmin->setMaximum(v); // must be < than wedgeYmax
|
||||
wedge->Ymax.setValue(v);
|
||||
wedge->recomputeFeature();
|
||||
}
|
||||
@@ -763,7 +774,7 @@ void TaskBoxPrimitives::onWedgeYmaxChanged(double v)
|
||||
void TaskBoxPrimitives::onWedgeZ2minChanged(double v)
|
||||
{
|
||||
if (auto wedge = getObject<PartDesign::Wedge>()) {
|
||||
ui->wedgeZ2max->setMinimum(v); // must be >= than wedgeZ2min
|
||||
ui->wedgeZ2max->setMinimum(v); // must be >= than wedgeZ2min
|
||||
wedge->Z2min.setValue(v);
|
||||
wedge->recomputeFeature();
|
||||
}
|
||||
@@ -772,7 +783,7 @@ void TaskBoxPrimitives::onWedgeZ2minChanged(double v)
|
||||
void TaskBoxPrimitives::onWedgeZ2maxChanged(double v)
|
||||
{
|
||||
if (auto wedge = getObject<PartDesign::Wedge>()) {
|
||||
ui->wedgeZ2min->setMaximum(v); // must be <= than wedgeZ2max
|
||||
ui->wedgeZ2min->setMaximum(v); // must be <= than wedgeZ2max
|
||||
wedge->Z2max.setValue(v);
|
||||
wedge->recomputeFeature();
|
||||
}
|
||||
@@ -781,7 +792,7 @@ void TaskBoxPrimitives::onWedgeZ2maxChanged(double v)
|
||||
void TaskBoxPrimitives::onWedgeZminChanged(double v)
|
||||
{
|
||||
if (auto wedge = getObject<PartDesign::Wedge>()) {
|
||||
ui->wedgeZmax->setMinimum(v); // must be > than wedgeZmin
|
||||
ui->wedgeZmax->setMinimum(v); // must be > than wedgeZmin
|
||||
wedge->Zmin.setValue(v);
|
||||
wedge->recomputeFeature();
|
||||
}
|
||||
@@ -790,14 +801,14 @@ void TaskBoxPrimitives::onWedgeZminChanged(double v)
|
||||
void TaskBoxPrimitives::onWedgeZmaxChanged(double v)
|
||||
{
|
||||
if (auto wedge = getObject<PartDesign::Wedge>()) {
|
||||
ui->wedgeZmin->setMaximum(v); // must be < than wedgeZmax
|
||||
ui->wedgeZmin->setMaximum(v); // must be < than wedgeZmax
|
||||
wedge->Zmax.setValue(v);
|
||||
wedge->recomputeFeature();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
bool TaskBoxPrimitives::setPrimitive(App::DocumentObject* obj)
|
||||
{
|
||||
try {
|
||||
QString name(QString::fromLatin1(Gui::Command::getObjectCmd(obj).c_str()));
|
||||
@@ -808,142 +819,137 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
}
|
||||
|
||||
Base::QuantityFormat format(Base::QuantityFormat::Fixed, Base::UnitsApi::getDecimals());
|
||||
switch(ui->widgetStack->currentIndex()) {
|
||||
case 1: // box
|
||||
cmd = QString::fromLatin1(
|
||||
"%1.Length='%2'\n"
|
||||
"%1.Width='%3'\n"
|
||||
"%1.Height='%4'\n")
|
||||
.arg(name,
|
||||
ui->boxLength->value().getSafeUserString(),
|
||||
ui->boxWidth->value().getSafeUserString(),
|
||||
ui->boxHeight->value().getSafeUserString());
|
||||
switch (ui->widgetStack->currentIndex()) {
|
||||
case 1: // box
|
||||
cmd = QString::fromLatin1("%1.Length='%2'\n"
|
||||
"%1.Width='%3'\n"
|
||||
"%1.Height='%4'\n")
|
||||
.arg(name,
|
||||
ui->boxLength->value().getSafeUserString(),
|
||||
ui->boxWidth->value().getSafeUserString(),
|
||||
ui->boxHeight->value().getSafeUserString());
|
||||
break;
|
||||
|
||||
case 2: // cylinder
|
||||
cmd = QString::fromLatin1(
|
||||
"%1.Radius='%2'\n"
|
||||
"%1.Height='%3'\n"
|
||||
"%1.Angle='%4'\n"
|
||||
"%1.FirstAngle='%5'\n"
|
||||
"%1.SecondAngle='%6'\n")
|
||||
.arg(name,
|
||||
ui->cylinderRadius->value().getSafeUserString(),
|
||||
ui->cylinderHeight->value().getSafeUserString(),
|
||||
ui->cylinderAngle->value().getSafeUserString(),
|
||||
ui->cylinderXSkew->value().getSafeUserString(),
|
||||
ui->cylinderYSkew->value().getSafeUserString());
|
||||
cmd = QString::fromLatin1("%1.Radius='%2'\n"
|
||||
"%1.Height='%3'\n"
|
||||
"%1.Angle='%4'\n"
|
||||
"%1.FirstAngle='%5'\n"
|
||||
"%1.SecondAngle='%6'\n")
|
||||
.arg(name,
|
||||
ui->cylinderRadius->value().getSafeUserString(),
|
||||
ui->cylinderHeight->value().getSafeUserString(),
|
||||
ui->cylinderAngle->value().getSafeUserString(),
|
||||
ui->cylinderXSkew->value().getSafeUserString(),
|
||||
ui->cylinderYSkew->value().getSafeUserString());
|
||||
break;
|
||||
|
||||
case 3: // cone
|
||||
cmd = QString::fromLatin1(
|
||||
"%1.Radius1='%2'\n"
|
||||
"%1.Radius2='%3'\n"
|
||||
"%1.Height='%4'\n"
|
||||
"%1.Angle='%5'\n")
|
||||
.arg(name,
|
||||
ui->coneRadius1->value().getSafeUserString(),
|
||||
ui->coneRadius2->value().getSafeUserString(),
|
||||
ui->coneHeight->value().getSafeUserString(),
|
||||
ui->coneAngle->value().getSafeUserString());
|
||||
break;
|
||||
cmd = QString::fromLatin1("%1.Radius1='%2'\n"
|
||||
"%1.Radius2='%3'\n"
|
||||
"%1.Height='%4'\n"
|
||||
"%1.Angle='%5'\n")
|
||||
.arg(name,
|
||||
ui->coneRadius1->value().getSafeUserString(),
|
||||
ui->coneRadius2->value().getSafeUserString(),
|
||||
ui->coneHeight->value().getSafeUserString(),
|
||||
ui->coneAngle->value().getSafeUserString());
|
||||
break;
|
||||
|
||||
case 4: // sphere
|
||||
cmd = QString::fromLatin1(
|
||||
"%1.Radius='%2'\n"
|
||||
"%1.Angle1='%3'\n"
|
||||
"%1.Angle2='%4'\n"
|
||||
"%1.Angle3='%5'\n")
|
||||
.arg(name,
|
||||
ui->sphereRadius->value().getSafeUserString(),
|
||||
ui->sphereAngle1->value().getSafeUserString(),
|
||||
ui->sphereAngle2->value().getSafeUserString(),
|
||||
ui->sphereAngle3->value().getSafeUserString());
|
||||
cmd = QString::fromLatin1("%1.Radius='%2'\n"
|
||||
"%1.Angle1='%3'\n"
|
||||
"%1.Angle2='%4'\n"
|
||||
"%1.Angle3='%5'\n")
|
||||
.arg(name,
|
||||
ui->sphereRadius->value().getSafeUserString(),
|
||||
ui->sphereAngle1->value().getSafeUserString(),
|
||||
ui->sphereAngle2->value().getSafeUserString(),
|
||||
ui->sphereAngle3->value().getSafeUserString());
|
||||
break;
|
||||
case 5: // ellipsoid
|
||||
cmd = QString::fromLatin1(
|
||||
"%1.Radius1='%2'\n"
|
||||
"%1.Radius2='%3'\n"
|
||||
"%1.Radius3='%4'\n"
|
||||
"%1.Angle1='%5'\n"
|
||||
"%1.Angle2='%6'\n"
|
||||
"%1.Angle3='%7'\n")
|
||||
.arg(name,
|
||||
ui->ellipsoidRadius1->value().getSafeUserString(),
|
||||
ui->ellipsoidRadius2->value().getSafeUserString(),
|
||||
ui->ellipsoidRadius3->value().getSafeUserString(),
|
||||
ui->ellipsoidAngle1->value().getSafeUserString(),
|
||||
ui->ellipsoidAngle2->value().getSafeUserString(),
|
||||
ui->ellipsoidAngle3->value().getSafeUserString());
|
||||
cmd = QString::fromLatin1("%1.Radius1='%2'\n"
|
||||
"%1.Radius2='%3'\n"
|
||||
"%1.Radius3='%4'\n"
|
||||
"%1.Angle1='%5'\n"
|
||||
"%1.Angle2='%6'\n"
|
||||
"%1.Angle3='%7'\n")
|
||||
.arg(name,
|
||||
ui->ellipsoidRadius1->value().getSafeUserString(),
|
||||
ui->ellipsoidRadius2->value().getSafeUserString(),
|
||||
ui->ellipsoidRadius3->value().getSafeUserString(),
|
||||
ui->ellipsoidAngle1->value().getSafeUserString(),
|
||||
ui->ellipsoidAngle2->value().getSafeUserString(),
|
||||
ui->ellipsoidAngle3->value().getSafeUserString());
|
||||
break;
|
||||
|
||||
case 6: // torus
|
||||
cmd = QString::fromLatin1(
|
||||
"%1.Radius1='%2'\n"
|
||||
"%1.Radius2='%3'\n"
|
||||
"%1.Angle1='%4'\n"
|
||||
"%1.Angle2='%5'\n"
|
||||
"%1.Angle3='%6'\n")
|
||||
.arg(name,
|
||||
ui->torusRadius1->value().getSafeUserString(),
|
||||
ui->torusRadius2->value().getSafeUserString(),
|
||||
ui->torusAngle1->value().getSafeUserString(),
|
||||
ui->torusAngle2->value().getSafeUserString(),
|
||||
ui->torusAngle3->value().getSafeUserString());
|
||||
cmd = QString::fromLatin1("%1.Radius1='%2'\n"
|
||||
"%1.Radius2='%3'\n"
|
||||
"%1.Angle1='%4'\n"
|
||||
"%1.Angle2='%5'\n"
|
||||
"%1.Angle3='%6'\n")
|
||||
.arg(name,
|
||||
ui->torusRadius1->value().getSafeUserString(),
|
||||
ui->torusRadius2->value().getSafeUserString(),
|
||||
ui->torusAngle1->value().getSafeUserString(),
|
||||
ui->torusAngle2->value().getSafeUserString(),
|
||||
ui->torusAngle3->value().getSafeUserString());
|
||||
break;
|
||||
case 7: // prism
|
||||
cmd = QString::fromLatin1(
|
||||
"%1.Polygon=%2\n"
|
||||
"%1.Circumradius='%3'\n"
|
||||
"%1.Height='%4'\n"
|
||||
"%1.FirstAngle='%5'\n"
|
||||
"%1.SecondAngle='%6'\n")
|
||||
.arg(name,
|
||||
QString::number(ui->prismPolygon->value()),
|
||||
ui->prismCircumradius->value().getSafeUserString(),
|
||||
ui->prismHeight->value().getSafeUserString(),
|
||||
ui->prismXSkew->value().getSafeUserString(),
|
||||
ui->prismYSkew->value().getSafeUserString());
|
||||
cmd = QString::fromLatin1("%1.Polygon=%2\n"
|
||||
"%1.Circumradius='%3'\n"
|
||||
"%1.Height='%4'\n"
|
||||
"%1.FirstAngle='%5'\n"
|
||||
"%1.SecondAngle='%6'\n")
|
||||
.arg(name,
|
||||
QString::number(ui->prismPolygon->value()),
|
||||
ui->prismCircumradius->value().getSafeUserString(),
|
||||
ui->prismHeight->value().getSafeUserString(),
|
||||
ui->prismXSkew->value().getSafeUserString(),
|
||||
ui->prismYSkew->value().getSafeUserString());
|
||||
break;
|
||||
case 8: // wedge
|
||||
// Xmin/max, Ymin/max and Zmin/max must each not be equal
|
||||
if (ui->wedgeXmin->value().getValue() == ui->wedgeXmax->value().getValue()) {
|
||||
QMessageBox::warning(Gui::getMainWindow(), tr("Invalid wedge parameters"),
|
||||
tr("X min must not be equal to X max!"));
|
||||
QMessageBox::warning(Gui::getMainWindow(),
|
||||
tr("Invalid wedge parameters"),
|
||||
tr("X min must not be equal to X max!"));
|
||||
return false;
|
||||
}
|
||||
else if (ui->wedgeYmin->value().getValue() == ui->wedgeYmax->value().getValue()) {
|
||||
QMessageBox::warning(Gui::getMainWindow(), tr("Invalid wedge parameters"),
|
||||
tr("Y min must not be equal to Y max!"));
|
||||
QMessageBox::warning(Gui::getMainWindow(),
|
||||
tr("Invalid wedge parameters"),
|
||||
tr("Y min must not be equal to Y max!"));
|
||||
return false;
|
||||
}
|
||||
else if (ui->wedgeZmin->value().getValue() == ui->wedgeZmax->value().getValue()) {
|
||||
QMessageBox::warning(Gui::getMainWindow(), tr("Invalid wedge parameters"),
|
||||
tr("Z min must not be equal to Z max!"));
|
||||
QMessageBox::warning(Gui::getMainWindow(),
|
||||
tr("Invalid wedge parameters"),
|
||||
tr("Z min must not be equal to Z max!"));
|
||||
return false;
|
||||
}
|
||||
cmd = QString::fromLatin1(
|
||||
"%1.Xmin='%2'\n"
|
||||
"%1.Ymin='%3'\n"
|
||||
"%1.Zmin='%4'\n"
|
||||
"%1.X2min='%5'\n"
|
||||
"%1.Z2min='%6'\n"
|
||||
"%1.Xmax='%7'\n"
|
||||
"%1.Ymax='%8'\n"
|
||||
"%1.Zmax='%9'\n"
|
||||
"%1.X2max='%10'\n"
|
||||
"%1.Z2max='%11'\n")
|
||||
.arg(name,
|
||||
ui->wedgeXmin->value().getSafeUserString(),
|
||||
ui->wedgeYmin->value().getSafeUserString(),
|
||||
ui->wedgeZmin->value().getSafeUserString(),
|
||||
ui->wedgeX2min->value().getSafeUserString(),
|
||||
ui->wedgeZ2min->value().getSafeUserString(),
|
||||
ui->wedgeXmax->value().getSafeUserString(),
|
||||
ui->wedgeYmax->value().getSafeUserString(),
|
||||
ui->wedgeZmax->value().getSafeUserString())
|
||||
.arg(ui->wedgeX2max->value().getSafeUserString(),
|
||||
ui->wedgeZ2max->value().getSafeUserString());
|
||||
cmd = QString::fromLatin1("%1.Xmin='%2'\n"
|
||||
"%1.Ymin='%3'\n"
|
||||
"%1.Zmin='%4'\n"
|
||||
"%1.X2min='%5'\n"
|
||||
"%1.Z2min='%6'\n"
|
||||
"%1.Xmax='%7'\n"
|
||||
"%1.Ymax='%8'\n"
|
||||
"%1.Zmax='%9'\n"
|
||||
"%1.X2max='%10'\n"
|
||||
"%1.Z2max='%11'\n")
|
||||
.arg(name,
|
||||
ui->wedgeXmin->value().getSafeUserString(),
|
||||
ui->wedgeYmin->value().getSafeUserString(),
|
||||
ui->wedgeZmin->value().getSafeUserString(),
|
||||
ui->wedgeX2min->value().getSafeUserString(),
|
||||
ui->wedgeZ2min->value().getSafeUserString(),
|
||||
ui->wedgeXmax->value().getSafeUserString(),
|
||||
ui->wedgeYmax->value().getSafeUserString(),
|
||||
ui->wedgeZmax->value().getSafeUserString())
|
||||
.arg(ui->wedgeX2max->value().getSafeUserString(),
|
||||
ui->wedgeZ2max->value().getSafeUserString());
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -957,13 +963,16 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
|
||||
Gui::Command::runCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
|
||||
}
|
||||
catch (const Base::PyException& e) {
|
||||
QMessageBox::warning(this, tr("Create primitive"), QApplication::translate("Exception", e.what()));
|
||||
QMessageBox::warning(this,
|
||||
tr("Create primitive"),
|
||||
QApplication::translate("Exception", e.what()));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
TaskPrimitiveParameters::TaskPrimitiveParameters(ViewProviderPrimitive* PrimitiveView) : vp_prm(PrimitiveView)
|
||||
TaskPrimitiveParameters::TaskPrimitiveParameters(ViewProviderPrimitive* PrimitiveView)
|
||||
: vp_prm(PrimitiveView)
|
||||
{
|
||||
assert(PrimitiveView);
|
||||
|
||||
@@ -978,10 +987,11 @@ TaskPrimitiveParameters::~TaskPrimitiveParameters() = default;
|
||||
bool TaskPrimitiveParameters::accept()
|
||||
{
|
||||
bool primitiveOK = primitive->setPrimitive(vp_prm->getObject());
|
||||
if (!primitiveOK)
|
||||
if (!primitiveOK) {
|
||||
return primitiveOK;
|
||||
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.recompute()");
|
||||
Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
|
||||
}
|
||||
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
|
||||
Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -990,7 +1000,7 @@ bool TaskPrimitiveParameters::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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user