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

PartDesign: better quantity values handling for primitives

Browse Source
This commit is contained in:
0penBrain
2022-07-30 14:00:52 +02:00
parent 31ecac57af
commit 257629f9c7
1 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
View File

@@ -730,28 +730,28 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
switch(ui->widgetStack->currentIndex()) {
case 1: // box
cmd = QString::fromLatin1(
"%1.Length=%2\n"
"%1.Width=%3\n"
"%1.Height=%4\n")
"%1.Length='%2'\n"
"%1.Width='%3'\n"
"%1.Height='%4'\n")
.arg(name,
Base::UnitsApi::toNumber(ui->boxLength->value(), format),
Base::UnitsApi::toNumber(ui->boxWidth->value(), format),
Base::UnitsApi::toNumber(ui->boxHeight->value(), format));
ui->boxLength->value().getUserString(),
ui->boxWidth->value().getUserString(),
ui->boxHeight->value().getUserString());
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")
"%1.Radius='%2'\n"
"%1.Height='%3'\n"
"%1.Angle='%4'\n"
"%1.FirstAngle='%5'\n"
"%1.SecondAngle='%6'\n")
.arg(name,
Base::UnitsApi::toNumber(ui->cylinderRadius->value(), format),
Base::UnitsApi::toNumber(ui->cylinderHeight->value(), format),
Base::UnitsApi::toNumber(ui->cylinderAngle->value(), format),
Base::UnitsApi::toNumber(ui->cylinderXSkew->value(), format),
Base::UnitsApi::toNumber(ui->cylinderYSkew->value(), format));
ui->cylinderRadius->value().getUserString(),
ui->cylinderHeight->value().getUserString(),
ui->cylinderAngle->value().getUserString(),
ui->cylinderXSkew->value().getUserString(),
ui->cylinderYSkew->value().getUserString());
break;
case 3: // cone
@@ -762,73 +762,73 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
return false;
}
cmd = QString::fromLatin1(
"%1.Radius1=%2\n"
"%1.Radius2=%3\n"
"%1.Height=%4\n"
"%1.Angle=%5\n")
"%1.Radius1='%2'\n"
"%1.Radius2='%3'\n"
"%1.Height='%4'\n"
"%1.Angle='%5'\n")
.arg(name,
Base::UnitsApi::toNumber(ui->coneRadius1->value(), format),
Base::UnitsApi::toNumber(ui->coneRadius2->value(), format),
Base::UnitsApi::toNumber(ui->coneHeight->value(), format),
Base::UnitsApi::toNumber(ui->coneAngle->value(), format));
ui->coneRadius1->value().getUserString(),
ui->coneRadius2->value().getUserString(),
ui->coneHeight->value().getUserString(),
ui->coneAngle->value().getUserString());
break;
case 4: // sphere
cmd = QString::fromLatin1(
"%1.Radius=%2\n"
"%1.Angle1=%3\n"
"%1.Angle2=%4\n"
"%1.Angle3=%5\n")
"%1.Radius='%2'\n"
"%1.Angle1='%3'\n"
"%1.Angle2='%4'\n"
"%1.Angle3='%5'\n")
.arg(name,
Base::UnitsApi::toNumber(ui->sphereRadius->value(), format),
Base::UnitsApi::toNumber(ui->sphereAngle1->value(), format),
Base::UnitsApi::toNumber(ui->sphereAngle2->value(), format),
Base::UnitsApi::toNumber(ui->sphereAngle3->value(), format));
ui->sphereRadius->value().getUserString(),
ui->sphereAngle1->value().getUserString(),
ui->sphereAngle2->value().getUserString(),
ui->sphereAngle3->value().getUserString());
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")
"%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,
Base::UnitsApi::toNumber(ui->ellipsoidRadius1->value(), format),
Base::UnitsApi::toNumber(ui->ellipsoidRadius2->value(), format),
Base::UnitsApi::toNumber(ui->ellipsoidRadius3->value(), format),
Base::UnitsApi::toNumber(ui->ellipsoidAngle1->value(), format),
Base::UnitsApi::toNumber(ui->ellipsoidAngle2->value(), format),
Base::UnitsApi::toNumber(ui->ellipsoidAngle3->value(), format));
ui->ellipsoidRadius1->value().getUserString(),
ui->ellipsoidRadius2->value().getUserString(),
ui->ellipsoidRadius3->value().getUserString(),
ui->ellipsoidAngle1->value().getUserString(),
ui->ellipsoidAngle2->value().getUserString(),
ui->ellipsoidAngle3->value().getUserString());
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")
"%1.Radius1='%2'\n"
"%1.Radius2='%3'\n"
"%1.Angle1='%4'\n"
"%1.Angle2='%5'\n"
"%1.Angle3='%6'\n")
.arg(name,
Base::UnitsApi::toNumber(ui->torusRadius1->value(), format),
Base::UnitsApi::toNumber(ui->torusRadius2->value(), format),
Base::UnitsApi::toNumber(ui->torusAngle1->value(), format),
Base::UnitsApi::toNumber(ui->torusAngle2->value(), format),
Base::UnitsApi::toNumber(ui->torusAngle3->value(), format));
ui->torusRadius1->value().getUserString(),
ui->torusRadius2->value().getUserString(),
ui->torusAngle1->value().getUserString(),
ui->torusAngle2->value().getUserString(),
ui->torusAngle3->value().getUserString());
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")
"%1.Circumradius='%3'\n"
"%1.Height='%4'\n"
"%1.FirstAngle='%5'\n"
"%1.SecondAngle='%6'\n")
.arg(name,
QString::number(ui->prismPolygon->value()),
Base::UnitsApi::toNumber(ui->prismCircumradius->value(), format),
Base::UnitsApi::toNumber(ui->prismHeight->value(), format),
Base::UnitsApi::toNumber(ui->prismXSkew->value(), format),
Base::UnitsApi::toNumber(ui->prismYSkew->value(), format));
ui->prismCircumradius->value().getUserString(),
ui->prismHeight->value().getUserString(),
ui->prismXSkew->value().getUserString(),
ui->prismYSkew->value().getUserString());
break;
case 8: // wedge
// Xmin/max, Ymin/max and Zmin/max must each not be equal
@@ -848,27 +848,27 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
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")
"%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,
Base::UnitsApi::toNumber(ui->wedgeXmin->value(), format),
Base::UnitsApi::toNumber(ui->wedgeYmin->value(), format),
Base::UnitsApi::toNumber(ui->wedgeZmin->value(), format),
Base::UnitsApi::toNumber(ui->wedgeX2min->value(), format),
Base::UnitsApi::toNumber(ui->wedgeZ2min->value(), format),
Base::UnitsApi::toNumber(ui->wedgeXmax->value(), format),
Base::UnitsApi::toNumber(ui->wedgeYmax->value(), format),
Base::UnitsApi::toNumber(ui->wedgeZmax->value(), format))
.arg(Base::UnitsApi::toNumber(ui->wedgeX2max->value(), format),
Base::UnitsApi::toNumber(ui->wedgeZ2max->value(), format));
ui->wedgeXmin->value().getUserString(),
ui->wedgeYmin->value().getUserString(),
ui->wedgeZmin->value().getUserString(),
ui->wedgeX2min->value().getUserString(),
ui->wedgeZ2min->value().getUserString(),
ui->wedgeXmax->value().getUserString(),
ui->wedgeYmax->value().getUserString(),
ui->wedgeZmax->value().getUserString())
.arg(ui->wedgeX2max->value().getUserString(),
ui->wedgeZ2max->value().getUserString());
break;
default: