Skip to content

Commit

Permalink
Add UNITS to Part Primitive Gui
Browse files Browse the repository at this point in the history
  • Loading branch information
@WandererFan @wwmayer
WandererFan authored and wwmayer committed May 19, 2014
1 parent d95068a commit 5d2c285
Show file tree
Hide file tree
Showing 2 changed files with 424 additions and 595 deletions.
122 changes: 61 additions & 61 deletions src/Mod/Part/Gui/DlgPrimitives.cpp
View file
Expand Up @@ -360,8 +360,8 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%4\n"
"App.ActiveDocument.%1.Label='%5'\n")
.arg(name)
.arg(ui.planeLength->value(),0,'f',2)
.arg(ui.planeWidth->value(),0,'f',2)
.arg(ui.planeLength->getQuantity().getValue(),0,'f',2)
.arg(ui.planeWidth->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Plane"));
}
Expand All @@ -375,9 +375,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%5\n"
"App.ActiveDocument.%1.Label='%6'\n")
.arg(name)
.arg(ui.boxLength->value(),0,'f',2)
.arg(ui.boxWidth->value(),0,'f',2)
.arg(ui.boxHeight->value(),0,'f',2)
.arg(ui.boxLength->getQuantity().getValue(),0,'f',2)
.arg(ui.boxWidth->getQuantity().getValue(),0,'f',2)
.arg(ui.boxHeight->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Box"));
}
Expand All @@ -391,9 +391,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%5\n"
"App.ActiveDocument.%1.Label='%6'\n")
.arg(name)
.arg(ui.cylinderRadius->value(),0,'f',2)
.arg(ui.cylinderHeight->value(),0,'f',2)
.arg(ui.cylinderAngle->value(),0,'f',2)
.arg(ui.cylinderRadius->getQuantity().getValue(),0,'f',2)
.arg(ui.cylinderHeight->getQuantity().getValue(),0,'f',2)
.arg(ui.cylinderAngle->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Cylinder"));
}
Expand All @@ -408,10 +408,10 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%6\n"
"App.ActiveDocument.%1.Label='%7'\n")
.arg(name)
.arg(ui.coneRadius1->value(),0,'f',2)
.arg(ui.coneRadius2->value(),0,'f',2)
.arg(ui.coneHeight->value(),0,'f',2)
.arg(ui.coneAngle->value(),0,'f',2)
.arg(ui.coneRadius1->getQuantity().getValue(),0,'f',2)
.arg(ui.coneRadius2->getQuantity().getValue(),0,'f',2)
.arg(ui.coneHeight->getQuantity().getValue(),0,'f',2)
.arg(ui.coneAngle->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Cone"));
}
Expand All @@ -426,10 +426,10 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%6\n"
"App.ActiveDocument.%1.Label='%7'\n")
.arg(name)
.arg(ui.sphereRadius->value(),0,'f',2)
.arg(ui.sphereAngle1->value(),0,'f',2)
.arg(ui.sphereAngle2->value(),0,'f',2)
.arg(ui.sphereAngle3->value(),0,'f',2)
.arg(ui.sphereRadius->getQuantity().getValue(),0,'f',2)
.arg(ui.sphereAngle1->getQuantity().getValue(),0,'f',2)
.arg(ui.sphereAngle2->getQuantity().getValue(),0,'f',2)
.arg(ui.sphereAngle3->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Sphere"));
}
Expand All @@ -445,11 +445,11 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%7\n"
"App.ActiveDocument.%1.Label='%8'\n")
.arg(name)
.arg(ui.ellipsoidRadius1->value(),0,'f',2)
.arg(ui.ellipsoidRadius2->value(),0,'f',2)
.arg(ui.ellipsoidAngle1->value(),0,'f',2)
.arg(ui.ellipsoidAngle2->value(),0,'f',2)
.arg(ui.ellipsoidAngle3->value(),0,'f',2)
.arg(ui.ellipsoidRadius1->getQuantity().getValue(),0,'f',2)
.arg(ui.ellipsoidRadius2->getQuantity().getValue(),0,'f',2)
.arg(ui.ellipsoidAngle1->getQuantity().getValue(),0,'f',2)
.arg(ui.ellipsoidAngle2->getQuantity().getValue(),0,'f',2)
.arg(ui.ellipsoidAngle3->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Ellipsoid"));
}
Expand All @@ -465,11 +465,11 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%7\n"
"App.ActiveDocument.%1.Label='%8'\n")
.arg(name)
.arg(ui.torusRadius1->value(),0,'f',2)
.arg(ui.torusRadius2->value(),0,'f',2)
.arg(ui.torusAngle1->value(),0,'f',2)
.arg(ui.torusAngle2->value(),0,'f',2)
.arg(ui.torusAngle3->value(),0,'f',2)
.arg(ui.torusRadius1->getQuantity().getValue(),0,'f',2)
.arg(ui.torusRadius2->getQuantity().getValue(),0,'f',2)
.arg(ui.torusAngle1->getQuantity().getValue(),0,'f',2)
.arg(ui.torusAngle2->getQuantity().getValue(),0,'f',2)
.arg(ui.torusAngle3->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Torus"));
}
Expand All @@ -484,8 +484,8 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Label='%6'\n")
.arg(name)
.arg(ui.prismPolygon->value())
.arg(ui.prismCircumradius->value(),0,'f',2)
.arg(ui.prismHeight->value(),0,'f',2)
.arg(ui.prismCircumradius->getQuantity().getValue(),0,'f',2)
.arg(ui.prismHeight->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Prism"));
}
Expand All @@ -506,16 +506,16 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%12\n"
"App.ActiveDocument.%1.Label='%13'\n")
.arg(name)
.arg(ui.wedgeXmin->value(),0,'f',2)
.arg(ui.wedgeYmin->value(),0,'f',2)
.arg(ui.wedgeZmin->value(),0,'f',2)
.arg(ui.wedgeX2min->value(),0,'f',2)
.arg(ui.wedgeZ2min->value(),0,'f',2)
.arg(ui.wedgeXmax->value(),0,'f',2)
.arg(ui.wedgeYmax->value(),0,'f',2)
.arg(ui.wedgeZmax->value(),0,'f',2)
.arg(ui.wedgeX2max->value(),0,'f',2)
.arg(ui.wedgeZ2max->value(),0,'f',2)
.arg(ui.wedgeXmin->getQuantity().getValue(),0,'f',2)
.arg(ui.wedgeYmin->getQuantity().getValue(),0,'f',2)
.arg(ui.wedgeZmin->getQuantity().getValue(),0,'f',2)
.arg(ui.wedgeX2min->getQuantity().getValue(),0,'f',2)
.arg(ui.wedgeZ2min->getQuantity().getValue(),0,'f',2)
.arg(ui.wedgeXmax->getQuantity().getValue(),0,'f',2)
.arg(ui.wedgeYmax->getQuantity().getValue(),0,'f',2)
.arg(ui.wedgeZmax->getQuantity().getValue(),0,'f',2)
.arg(ui.wedgeX2max->getQuantity().getValue(),0,'f',2)
.arg(ui.wedgeZ2max->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Wedge"));
}
Expand All @@ -532,10 +532,10 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%7\n"
"App.ActiveDocument.%1.Label='%8'\n")
.arg(name)
.arg(ui.helixPitch->value(),0,'f',2)
.arg(ui.helixHeight->value(),0,'f',2)
.arg(ui.helixRadius->value(),0,'f',2)
.arg(ui.helixAngle->value(),0,'f',2)
.arg(ui.helixPitch->getQuantity().getValue(),0,'f',2)
.arg(ui.helixHeight->getQuantity().getValue(),0,'f',2)
.arg(ui.helixRadius->getQuantity().getValue(),0,'f',2)
.arg(ui.helixAngle->getQuantity().getValue(),0,'f',2)
.arg(ui.helixLocalCS->currentIndex())
.arg(placement)
.arg(tr("Helix"));
Expand All @@ -550,9 +550,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%5\n"
"App.ActiveDocument.%1.Label='%6'\n")
.arg(name)
.arg(ui.spiralGrowth->value(),0,'f',2)
.arg(ui.spiralGrowth->getQuantity().getValue(),0,'f',2)
.arg(ui.spiralRotation->value(),0,'f',2)
.arg(ui.spiralRadius->value(),0,'f',2)
.arg(ui.spiralRadius->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Spiral"));
}
Expand All @@ -566,9 +566,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%5\n"
"App.ActiveDocument.%1.Label='%6'\n")
.arg(name)
.arg(ui.circleRadius->value(),0,'f',2)
.arg(ui.circleAngle0->value(),0,'f',2)
.arg(ui.circleAngle1->value(),0,'f',2)
.arg(ui.circleRadius->getQuantity().getValue(),0,'f',2)
.arg(ui.circleAngle0->getQuantity().getValue(),0,'f',2)
.arg(ui.circleAngle1->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Circle"));
}
Expand All @@ -583,10 +583,10 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%6\n"
"App.ActiveDocument.%1.Label='%7'\n")
.arg(name)
.arg(ui.ellipseMajorRadius->value(),0,'f',2)
.arg(ui.ellipseMinorRadius->value(),0,'f',2)
.arg(ui.ellipseAngle0->value(),0,'f',2)
.arg(ui.ellipseAngle1->value(),0,'f',2)
.arg(ui.ellipseMajorRadius->getQuantity().getValue(),0,'f',2)
.arg(ui.ellipseMinorRadius->getQuantity().getValue(),0,'f',2)
.arg(ui.ellipseAngle0->getQuantity().getValue(),0,'f',2)
.arg(ui.ellipseAngle1->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Ellipse"));
}
Expand All @@ -600,9 +600,9 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%5\n"
"App.ActiveDocument.%1.Label='%6'\n")
.arg(name)
.arg(ui.vertexX->value(),0,'f',2)
.arg(ui.vertexY->value(),0,'f',2)
.arg(ui.vertexZ->value(),0,'f',2)
.arg(ui.vertexX->getQuantity().getValue(),0,'f',2)
.arg(ui.vertexY->getQuantity().getValue(),0,'f',2)
.arg(ui.vertexZ->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Vertex"));
}
Expand All @@ -619,12 +619,12 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Placement=%8\n"
"App.ActiveDocument.%1.Label='%9'\n")
.arg(name)
.arg(ui.edgeX1->value(),0,'f',2)
.arg(ui.edgeY1->value(),0,'f',2)
.arg(ui.edgeZ1->value(),0,'f',2)
.arg(ui.edgeX2->value(),0,'f',2)
.arg(ui.edgeY2->value(),0,'f',2)
.arg(ui.edgeZ2->value(),0,'f',2)
.arg(ui.edgeX1->getQuantity().getValue(),0,'f',2)
.arg(ui.edgeY1->getQuantity().getValue(),0,'f',2)
.arg(ui.edgeZ1->getQuantity().getValue(),0,'f',2)
.arg(ui.edgeX2->getQuantity().getValue(),0,'f',2)
.arg(ui.edgeY2->getQuantity().getValue(),0,'f',2)
.arg(ui.edgeZ2->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Line"));
}
Expand All @@ -638,7 +638,7 @@ void DlgPrimitives::createPrimitive(const QString& placement)
"App.ActiveDocument.%1.Label='%5'\n")
.arg(name)
.arg(ui.regularPolygonPolygon->value())
.arg(ui.regularPolygonCircumradius->value(),0,'f',2)
.arg(ui.regularPolygonCircumradius->getQuantity().getValue(),0,'f',2)
.arg(placement)
.arg(tr("Regular polygon"));
}
Expand Down

0 comments on commit 5d2c285

Please sign in to comment.