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

Fem: Removing "constraint" from the names

Browse Source 
Removing "constraint" from the names of most FEM workbench features.

https://github.com/FreeCAD/FreeCAD/discussions/10217
This commit is contained in:
kaktus Jacek
2023-09-03 16:06:19 +02:00
committed by Chris Hennes
parent 0e04d526ec
commit 1adfa88aee
26 changed files with 133 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/Mod/Fem/Gui/Command.cpp
View File

@@ -177,8 +177,8 @@ CmdFemConstraintBearing::CmdFemConstraintBearing()
{
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint bearing");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a bearing");
sMenuText = QT_TR_NOOP("Bearing constraint");
sToolTipText = QT_TR_NOOP("Creates a bearing constraint");
sWhatsThis = "FEM_ConstraintBearing";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintBearing";
@@ -193,7 +193,7 @@ void CmdFemConstraintBearing::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintBearing");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint for bearing"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make bearing constraint"));
doCommand(
Doc, "App.activeDocument().addObject(\"Fem::ConstraintBearing\",\"%s\")", FeatName.c_str());
doCommand(Doc,
@@ -222,8 +222,8 @@ CmdFemConstraintContact::CmdFemConstraintContact()
{
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint contact");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for contact between faces");
sMenuText = QT_TR_NOOP("Contact constraint");
sToolTipText = QT_TR_NOOP("Creates a contact constraint between faces");
sWhatsThis = "FEM_ConstraintContact";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintContact";
@@ -238,7 +238,7 @@ void CmdFemConstraintContact::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintContact");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint contact on face"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make contact constraint on a face"));
doCommand(
Doc, "App.activeDocument().addObject(\"Fem::ConstraintContact\",\"%s\")", FeatName.c_str());
doCommand(Doc,
@@ -277,7 +277,7 @@ CmdFemConstraintDisplacement::CmdFemConstraintDisplacement()
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint displacement");
sToolTipText =
QT_TR_NOOP("Creates a FEM constraint for a displacement acting on a geometric entity");
QT_TR_NOOP("Creates a displacement boundary condition for a geometric entity");
sWhatsThis = "FEM_ConstraintDisplacement";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintDisplacement";
@@ -292,7 +292,7 @@ void CmdFemConstraintDisplacement::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintDisplacement");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint displacement on face"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make displacement boundary condition on face"));
doCommand(Doc,
"App.activeDocument().addObject(\"Fem::ConstraintDisplacement\",\"%s\")",
FeatName.c_str());
@@ -325,7 +325,7 @@ CmdFemConstraintFixed::CmdFemConstraintFixed()
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint fixed");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a fixed geometric entity");
sToolTipText = QT_TR_NOOP("Creates a fixed boundary condition for a geometric entity");
sWhatsThis = "FEM_ConstraintFixed";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintFixed";
@@ -340,7 +340,7 @@ void CmdFemConstraintFixed::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintFixed");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint fixed geometry"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make fixed boundary condition for geometry"));
doCommand(
Doc, "App.activeDocument().addObject(\"Fem::ConstraintFixed\",\"%s\")", FeatName.c_str());
doCommand(
@@ -421,7 +421,7 @@ CmdFemConstraintForce::CmdFemConstraintForce()
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint force");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a force acting on a geometric entity");
sToolTipText = QT_TR_NOOP("Creates a force load applied to a geometric entity");
sWhatsThis = "FEM_ConstraintForce";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintForce";
@@ -436,7 +436,7 @@ void CmdFemConstraintForce::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintForce");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint force on geometry"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make force load on geometry"));
doCommand(
Doc, "App.activeDocument().addObject(\"Fem::ConstraintForce\",\"%s\")", FeatName.c_str());
doCommand(Doc,
@@ -473,8 +473,8 @@ CmdFemConstraintGear::CmdFemConstraintGear()
{
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint gear");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a gear");
sMenuText = QT_TR_NOOP("Gear constraint");
sToolTipText = QT_TR_NOOP("Creates a gear constraint");
sWhatsThis = "FEM_ConstraintGear";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintGear";
@@ -488,7 +488,7 @@ void CmdFemConstraintGear::activated(int)
return;
std::string FeatName = getUniqueObjectName("ConstraintGear");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint for gear"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make gear constraint"));
doCommand(
Doc, "App.activeDocument().addObject(\"Fem::ConstraintGear\",\"%s\")", FeatName.c_str());
doCommand(Doc, "App.activeDocument().%s.Diameter = 100.0", FeatName.c_str());
@@ -518,8 +518,8 @@ CmdFemConstraintHeatflux::CmdFemConstraintHeatflux()
{
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint heatflux");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a heatflux acting on a face");
sMenuText = QT_TR_NOOP("Heat flux load");
sToolTipText = QT_TR_NOOP("Creates a heat flux load acting on a face");
sWhatsThis = "FEM_ConstraintHeatflux";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintHeatflux";
@@ -534,7 +534,7 @@ void CmdFemConstraintHeatflux::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintHeatflux");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint heatflux on face"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make heat flux load on face"));
doCommand(Doc,
"App.activeDocument().addObject(\"Fem::ConstraintHeatflux\",\"%s\")",
FeatName.c_str());
@@ -572,8 +572,8 @@ CmdFemConstraintInitialTemperature::CmdFemConstraintInitialTemperature()
{
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint initial temperature");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for initial temperature acting on a body");
sMenuText = QT_TR_NOOP("Initial temperature");
sToolTipText = QT_TR_NOOP("Creates an initial temperature acting on a body");
sWhatsThis = "FEM_ConstraintInitialTemperature";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintInitialTemperature";
@@ -588,7 +588,7 @@ void CmdFemConstraintInitialTemperature::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintInitialTemperature");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint initial temperature on body"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make initial temperature condition on body"));
doCommand(Doc,
"App.activeDocument().addObject(\"Fem::ConstraintInitialTemperature\",\"%s\")",
FeatName.c_str());
@@ -620,8 +620,8 @@ CmdFemConstraintPlaneRotation::CmdFemConstraintPlaneRotation()
{
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint plane rotation");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for plane rotation face");
sMenuText = QT_TR_NOOP("Plane multi-point constraint");
sToolTipText = QT_TR_NOOP("Creates a plane multi-point constraint for a face");
sWhatsThis = "FEM_ConstraintPlaneRotation";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintPlaneRotation";
@@ -636,7 +636,7 @@ void CmdFemConstraintPlaneRotation::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintPlaneRotation");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint Plane Rotation face"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make plane multi-point constraint on face"));
doCommand(Doc,
"App.activeDocument().addObject(\"Fem::ConstraintPlaneRotation\",\"%s\")",
FeatName.c_str());
@@ -669,7 +669,7 @@ CmdFemConstraintPressure::CmdFemConstraintPressure()
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint pressure");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a pressure acting on a face");
sToolTipText = QT_TR_NOOP("Creates a pressure load acting on a face");
sWhatsThis = "FEM_ConstraintPressure";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintPressure";
@@ -684,7 +684,7 @@ void CmdFemConstraintPressure::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintPressure");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint pressure on face"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make pressure load on face"));
doCommand(Doc,
"App.activeDocument().addObject(\"Fem::ConstraintPressure\",\"%s\")",
FeatName.c_str());
@@ -722,8 +722,8 @@ CmdFemConstraintSpring::CmdFemConstraintSpring()
{
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint spring");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a spring acting on a face");
sMenuText = QT_TR_NOOP("Spring");
sToolTipText = QT_TR_NOOP("Creates a spring acting on a face");
sWhatsThis = "FEM_ConstraintSpring";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintSpring";
@@ -738,7 +738,7 @@ void CmdFemConstraintSpring::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintSpring");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint spring on face"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make spring on face"));
doCommand(
Doc, "App.activeDocument().addObject(\"Fem::ConstraintSpring\",\"%s\")", FeatName.c_str());
doCommand(Doc,
@@ -775,8 +775,8 @@ CmdFemConstraintPulley::CmdFemConstraintPulley()
{
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint pulley");
sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a pulley");
sMenuText = QT_TR_NOOP("Pulley constraint");
sToolTipText = QT_TR_NOOP("Creates a pulley constraint");
sWhatsThis = "FEM_ConstraintPulley";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintPulley";
@@ -791,7 +791,7 @@ void CmdFemConstraintPulley::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintPulley");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint for pulley"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make pulley constraint"));
doCommand(
Doc, "App.activeDocument().addObject(\"Fem::ConstraintPulley\",\"%s\")", FeatName.c_str());
doCommand(Doc, "App.activeDocument().%s.Diameter = 300.0", FeatName.c_str());
@@ -827,7 +827,7 @@ CmdFemConstraintTemperature::CmdFemConstraintTemperature()
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint temperature");
sToolTipText = QT_TR_NOOP(
"Creates a FEM constraint for a temperature/concentrated heat flux acting on a face");
"Creates a temperature/concentrated heat flux load acting on a face");
sWhatsThis = "FEM_ConstraintTemperature";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintTemperature";
@@ -842,7 +842,7 @@ void CmdFemConstraintTemperature::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintTemperature");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint temperature on face"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make temperature boundary condition on face"));
doCommand(Doc,
"App.activeDocument().addObject(\"Fem::ConstraintTemperature\",\"%s\")",
FeatName.c_str());
@@ -875,7 +875,7 @@ CmdFemConstraintTransform::CmdFemConstraintTransform()
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Constraint transform");
sToolTipText = QT_TR_NOOP("Create FEM constraint for transforming a face");
sToolTipText = QT_TR_NOOP("Create a local coordinate system on a face");
sWhatsThis = "FEM_ConstraintTransform";
sStatusTip = sToolTipText;
sPixmap = "FEM_ConstraintTransform";
@@ -890,7 +890,7 @@ void CmdFemConstraintTransform::activated(int)
std::string FeatName = getUniqueObjectName("ConstraintTransform");
openCommand(QT_TRANSLATE_NOOP("Command", "Make FEM constraint transform on face"));
openCommand(QT_TRANSLATE_NOOP("Command", "Make local coordinate system on face"));
doCommand(Doc,
"App.activeDocument().addObject(\"Fem::ConstraintTransform\",\"%s\")",
FeatName.c_str());
@@ -1136,8 +1136,8 @@ CmdFemCompEmConstraints::CmdFemCompEmConstraints()
{
sAppModule = "Fem";
sGroup = QT_TR_NOOP("Fem");
sMenuText = QT_TR_NOOP("Electromagnetic constraints");
sToolTipText = QT_TR_NOOP("Electromagnetic constraints");
sMenuText = QT_TR_NOOP("Electromagnetic boundary conditions");
sToolTipText = QT_TR_NOOP("Electromagnetic boundary conditions");
sWhatsThis = "";
sStatusTip = sToolTipText;
}

6
src/Mod/Fem/Gui/DlgSettingsFemExportAbaqus.ui
View File

@@ -80,9 +80,9 @@ not belonging to faces and faces not belonging to volumes.</string>
<widget class="Gui::PrefCheckBox" name="checkBoxWriteGroups">
<property name="toolTip">
<string>Mesh groups are exported too.
Every constraint and, if there are different materials, material
consists of two mesh groups, faces and nodes where the
constraint or material is applied.</string>
Every analysis feature and, if there are different materials,
material consists of two mesh groups, faces and nodes where
the constraint or material is applied.</string>
</property>
<property name="text">
<string/>

4
src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui
View File

@@ -351,11 +351,11 @@ with the last used dialog settings</string>
<bool>true</bool>
</property>
<property name="toolTip">
<string>All constraints are hidden in the model view
<string>All analysis features are hidden in the model view
when the results dialog is opened</string>
</property>
<property name="text">
<string>Hide constraints when open result dialog</string>
<string>Hide analysis features when open result dialog</string>
</property>
<property name="checkable">
<bool>true</bool>

2
src/Mod/Fem/Gui/Resources/ui/BodyHeatSource.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Constraint Properties</string>
<string>Analysis feature properties</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>

2
src/Mod/Fem/Gui/Resources/ui/CurrentDensity.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Constraint Properties</string>
<string>Analysis feature properties</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">

8
src/Mod/Fem/Gui/Resources/ui/ElectrostaticPotential.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Constraint Properties</string>
<string>Analysis feature properties</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@@ -528,7 +528,7 @@ Note: has no effect if a solid was selected</string>
<item row="3" column="0">
<widget class="QCheckBox" name="potentialConstantBox">
<property name="toolTip">
<string>Whether the constraint defines a constant potential</string>
<string>Whether the boundary condition defines a constant potential</string>
</property>
<property name="text">
<string>Potential Constant</string>
@@ -541,7 +541,7 @@ Note: has no effect if a solid was selected</string>
<bool>true</bool>
</property>
<property name="toolTip">
<string>Whether the constraint defines a farfield potential</string>
<string>Whether the boundary condition defines a farfield potential</string>
</property>
<property name="text">
<string>Farfield / Electric infinity</string>
@@ -551,7 +551,7 @@ Note: has no effect if a solid was selected</string>
<item row="5" column="0">
<widget class="QCheckBox" name="electricForcecalculationBox">
<property name="toolTip">
<string>Whether the constraint is for the electric force</string>
<string>Whether the boundary condition is for the electric force</string>
</property>
<property name="text">
<string>Calculate Electric Force</string>

2
src/Mod/Fem/Gui/Resources/ui/FlowVelocity.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Constraint Properties</string>
<string>Analysis feature properties</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

2
src/Mod/Fem/Gui/Resources/ui/InitialFlowVelocity.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Constraint Properties</string>
<string>Analysis feature properties</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>

2
src/Mod/Fem/Gui/Resources/ui/InitialPressure.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Constraint Properties</string>
<string>Analysis feature properties</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>

2
src/Mod/Fem/Gui/Resources/ui/Magnetization.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Constraint Properties</string>
<string>Analysis feature properties</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">

2
src/Mod/Fem/Gui/TaskAnalysisInfo.ui
View File

@@ -45,7 +45,7 @@
</font>
</property>
<property name="text">
<string>Constraints</string>
<string>Analysis features</string>
</property>
</widget>
</item>

2
src/Mod/Fem/Gui/TaskFemConstraint.cpp
View File

@@ -51,7 +51,7 @@ using namespace Gui;
/* TRANSLATOR FemGui::TaskFemConstraint */
TaskFemConstraint::TaskFemConstraint(ViewProviderFemConstraint *ConstraintView,QWidget *parent,const char* pixmapname)
: TaskBox(Gui::BitmapFactory().pixmap(pixmapname),tr("FEM constraint parameters"),true, parent)
: TaskBox(Gui::BitmapFactory().pixmap(pixmapname),tr("Analysis feature parameters"),true, parent)
, proxy(nullptr)
, deleteAction(nullptr)
, ConstraintView(ConstraintView)

2
src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
View File

@@ -454,7 +454,7 @@ void TaskDlgFemConstraintContact::open()
{
// a transaction is already open at creation time of the panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint Contact");
QString msg = QObject::tr("Contact constraint");
Gui::Command::openCommand((const char*)msg.toUtf8());
ConstraintView->setVisible(true);
Gui::Command::runCommand(

4
src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp
View File

@@ -343,7 +343,7 @@ void TaskFemConstraintDisplacement::addToSelection()
for (const auto & SubElement : SubElements) {
if (SubElement.find(searchStr) == std::string::npos) {
QString msg = tr(
"Only one type of selection (vertex,face or edge) per constraint allowed!");
"Only one type of selection (vertex,face or edge) per analysis feature allowed!");
QMessageBox::warning(this, tr("Selection error"), msg);
addMe = false;
break;
@@ -609,7 +609,7 @@ void TaskDlgFemConstraintDisplacement::open()
{
// a transaction is already open at creation time of the panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint displacement");
QString msg = QObject::tr("Displacement boundary condition");
Gui::Command::openCommand((const char*)msg.toUtf8());
ConstraintView->setVisible(true);
Gui::Command::doCommand(

4
src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp
View File

@@ -149,7 +149,7 @@ void TaskFemConstraintFixed::addToSelection()
for (const auto & SubElement : SubElements) {
if (SubElement.find(searchStr) == std::string::npos) {
QString msg = tr(
"Only one type of selection (vertex,face or edge) per constraint allowed!");
"Only one type of selection (vertex, face or edge) per analysis feature allowed!");
QMessageBox::warning(this, tr("Selection error"), msg);
addMe = false;
break;
@@ -275,7 +275,7 @@ void TaskDlgFemConstraintFixed::open()
{
// a transaction is already open at creation time of the panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint fixed");
QString msg = QObject::tr("Fixed boundary condition");
Gui::Command::openCommand((const char*)msg.toUtf8());
ConstraintView->setVisible(true);
Gui::Command::doCommand(

4
src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp
View File

@@ -826,7 +826,7 @@ void TaskFemConstraintFluidBoundary::addToSelection()
for (const auto & SubElement : SubElements) {
if (SubElement.find(searchStr) == std::string::npos) {
QString msg = tr(
"Only one type of selection (vertex,face or edge) per constraint allowed!");
"Only one type of selection (vertex, face or edge) per analysis feature allowed!");
QMessageBox::warning(this, tr("Selection error"), msg);
addMe = false;
break;
@@ -957,7 +957,7 @@ void TaskDlgFemConstraintFluidBoundary::open()
{
// a transaction is already open when creating this panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint fluid boundary");
QString msg = QObject::tr("Fluid boundary condition");
Gui::Command::openCommand((const char*)msg.toUtf8());
}
}

4
src/Mod/Fem/Gui/TaskFemConstraintForce.cpp
View File

@@ -173,7 +173,7 @@ void TaskFemConstraintForce::addToSelection()
for (const auto & SubElement : SubElements) {
if (SubElement.find(searchStr) == std::string::npos) {
QString msg = tr(
"Only one type of selection (vertex,face or edge) per constraint allowed!");
"Only one type of selection (vertex, face or edge) per analysis feature allowed!");
QMessageBox::warning(this, tr("Selection error"), msg);
addMe = false;
break;
@@ -434,7 +434,7 @@ void TaskDlgFemConstraintForce::open()
{
// a transaction is already open at creation time of the panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint force");
QString msg = QObject::tr("Force load");
Gui::Command::openCommand((const char*)msg.toUtf8());
ConstraintView->setVisible(true);
Gui::Command::doCommand(

2
src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp
View File

@@ -421,7 +421,7 @@ void TaskDlgFemConstraintHeatflux::open()
{
// a transaction is already open at creation time of the panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint heat flux");
QString msg = QObject::tr("Heat flux load");
Gui::Command::openCommand((const char*)msg.toUtf8());
ConstraintView->setVisible(true);
Gui::Command::doCommand(

2
src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>TaskFemConstraintHeatflux</string>
<string>Task Fem Heat flux Load</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>

6
src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp
View File

@@ -113,7 +113,7 @@ void TaskFemConstraintPlaneRotation::addToSelection()
if (rows == 1) {
QMessageBox::warning(this,
tr("Selection error"),
tr("Only one face can be selected for a plane rotation constraint!"));
tr("Only one face can be selected for a plane multi-point constraint!"));
Gui::Selection().clearSelection();
return;
}
@@ -182,7 +182,7 @@ void TaskFemConstraintPlaneRotation::addToSelection()
QMessageBox::warning(
this,
tr("Selection error"),
tr("Only one face can be selected for a plane rotation constraint!"));
tr("Only one face can be selected for a plane multi-point constraint!"));
Gui::Selection().clearSelection();
return;
}
@@ -293,7 +293,7 @@ void TaskDlgFemConstraintPlaneRotation::open()
{
// a transaction is already open at creation time of the panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint planerotation");
QString msg = QObject::tr("Plane multi-point constraint");
Gui::Command::openCommand((const char*)msg.toUtf8());
ConstraintView->setVisible(true);
Gui::Command::doCommand(

2
src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp
View File

@@ -292,7 +292,7 @@ void TaskDlgFemConstraintPressure::open()
{
// a transaction is already open at creation time of the panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint pressure");
QString msg = QObject::tr("Pressure load");
Gui::Command::openCommand((const char*)msg.toUtf8());
ConstraintView->setVisible(true);
Gui::Command::doCommand(

2
src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp
View File

@@ -330,7 +330,7 @@ void TaskDlgFemConstraintTemperature::open()
{
// a transaction is already open at creation time of the panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint temperature");
QString msg = QObject::tr("Temperature boundary condition");
Gui::Command::openCommand((const char*)msg.toUtf8());
ConstraintView->setVisible(true);
Gui::Command::doCommand(

14
src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp
View File

@@ -159,7 +159,7 @@ TaskFemConstraintTransform::TaskFemConstraintTransform(
if ((p == 0) && (!Objects.empty())) {
QMessageBox::warning(this,
tr("Constraint update error"),
tr("Analysis feature update error"),
tr("The transformable faces have changed. Please add only the "
"transformable faces and remove non-transformable faces!"));
return;
@@ -270,14 +270,14 @@ void TaskFemConstraintTransform::addToSelection()
if (rows == 1) {
QMessageBox::warning(
this, tr("Selection error"), tr("Only one face for rectangular transform constraint!"));
this, tr("Selection error"), tr("Only one face for rectangular local coordinate system!"));
Gui::Selection().clearSelection();
return;
}
if ((rows == 0) && (selection.size() >= 2)) {
QMessageBox::warning(
this, tr("Selection error"), tr("Only one face for rectangular transform constraint!"));
this, tr("Selection error"), tr("Only one face for rectangular local coordinate system!"));
Gui::Selection().clearSelection();
return;
}
@@ -298,7 +298,7 @@ void TaskFemConstraintTransform::addToSelection()
App::DocumentObject* obj = it.getObject();
if (subNames.size() != 1) {
QMessageBox::warning(
this, tr("Selection error"), tr("Only one face for transform constraint!"));
this, tr("Selection error"), tr("Only one face for local coordinate system!"));
Gui::Selection().clearSelection();
return;
}
@@ -357,8 +357,8 @@ void TaskFemConstraintTransform::addToSelection()
QMessageBox::warning(
this,
tr("Selection error"),
tr("Only transformable faces can be selected! Apply displacement "
"constraint to surface first then apply constraint to surface"));
tr("Only transformable faces can be selected! Apply displacement boundary "
"condition to surface first then apply local coordinate system to surface"));
Gui::Selection().clearSelection();
return;
}
@@ -560,7 +560,7 @@ void TaskDlgFemConstraintTransform::open()
{
// a transaction is already open at creation time of the panel
if (!Gui::Command::hasPendingCommand()) {
QString msg = QObject::tr("Constraint transform");
QString msg = QObject::tr("Local coordinate system");
Gui::Command::openCommand((const char*)msg.toUtf8());
ConstraintView->setVisible(true);
Gui::Command::doCommand(

2
src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp
View File

@@ -136,7 +136,7 @@ std::vector<App::DocumentObject*> ViewProviderFemConstraint::claimChildren()cons
void ViewProviderFemConstraint::setupContextMenu(QMenu *menu, QObject *receiver, const char *member)
{
QAction *act;
act = menu->addAction(QObject::tr("Edit constraint"), receiver, member);
act = menu->addAction(QObject::tr("Edit analysis feature"), receiver, member);
act->setData(QVariant((int)ViewProvider::Default));
ViewProviderDocumentObject::setupContextMenu(menu, receiver,
member);// clazy:exclude=skipped-base-method

52
src/Mod/Fem/Gui/Workbench.cpp
View File

@@ -46,22 +46,20 @@ using namespace FemGui;
qApp->translate("Workbench", "&Materials");
qApp->translate("Workbench", "Element Geometry");
qApp->translate("Workbench", "&Element Geometry");
qApp->translate("Workbench", "Electrostatic Constraints");
qApp->translate("Workbench", "&Electrostatic Constraints");
qApp->translate("Workbench", "Electromagnetic Constraints");
qApp->translate("Workbench", "&Electromagnetic Constraints");
qApp->translate("Workbench", "Fluid Constraints");
qApp->translate("Workbench", "&Fluid Constraints");
qApp->translate("Workbench", "Electromagnetic Constraints");
qApp->translate("Workbench", "&Electromagnetic Constraints");
qApp->translate("Workbench", "Geometrical Constraints");
qApp->translate("Workbench", "&Geometrical Constraints");
qApp->translate("Workbench", "Mechanical Constraints");
qApp->translate("Workbench", "&Mechanical Constraints");
qApp->translate("Workbench", "Thermal Constraints");
qApp->translate("Workbench", "&Thermal Constraints");
qApp->translate("Workbench", "Constraints without solver");
qApp->translate("Workbench", "&Constraints without solver");
qApp->translate("Workbench", "Electrostatic boundary conditions");
qApp->translate("Workbench", "&Electrostatic boundary conditions");
qApp->translate("Workbench", "Fluid boundary conditions");
qApp->translate("Workbench", "&Fluid boundary conditions");
qApp->translate("Workbench", "Electromagnetic boundary conditions");
qApp->translate("Workbench", "&Electromagnetic boundary conditions");
qApp->translate("Workbench", "Geometrical analysis features");
qApp->translate("Workbench", "&Geometrical analysis features");
qApp->translate("Workbench", "Mechanical boundary conditions and loads");
qApp->translate("Workbench", "&Mechanical boundary conditions and loads");
qApp->translate("Workbench", "Thermal boundary conditions and loads");
qApp->translate("Workbench", "&Thermal boundary conditions and loads");
qApp->translate("Workbench", "Analysis features without solver");
qApp->translate("Workbench", "&Analysis features without solver");
qApp->translate("Workbench", "Overwrite Constants");
qApp->translate("Workbench", "&Overwrite Constants");
//
@@ -117,12 +115,12 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "FEM_ElementFluid1D";
Gui::ToolBarItem* electromag = new Gui::ToolBarItem(root);
electromag->setCommand("Electromagnetic Constraints");
electromag->setCommand("Electromagnetic boundary conditions");
*electromag
<< "FEM_CompEmConstraints";
Gui::ToolBarItem* fluid = new Gui::ToolBarItem(root);
fluid->setCommand("Fluid Constraints");
fluid->setCommand("Fluid boundary conditions");
*fluid
<< "FEM_ConstraintInitialFlowVelocity"
<< "FEM_ConstraintInitialPressure"
@@ -130,14 +128,14 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "FEM_ConstraintFlowVelocity";
Gui::ToolBarItem* geom = new Gui::ToolBarItem(root);
geom->setCommand("Geometrical Constraints");
geom->setCommand("Geometrical analysis features");
*geom
<< "FEM_ConstraintPlaneRotation"
<< "FEM_ConstraintSectionPrint"
<< "FEM_ConstraintTransform";
Gui::ToolBarItem* mech = new Gui::ToolBarItem(root);
mech->setCommand("Mechanical Constraints");
mech->setCommand("Mechanical boundary conditions and loads");
*mech
<< "FEM_ConstraintFixed"
<< "FEM_ConstraintDisplacement"
@@ -151,7 +149,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "FEM_ConstraintSelfWeight";
Gui::ToolBarItem* thermal = new Gui::ToolBarItem(root);
thermal->setCommand("Thermal Constraints");
thermal->setCommand("Thermal boundary conditions and loads");
*thermal
<< "FEM_ConstraintInitialTemperature"
<< "Separator"
@@ -253,14 +251,14 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "FEM_ElementFluid1D";
Gui::MenuItem* elec = new Gui::MenuItem;
elec->setCommand("&Electromagnetic Constraints");
elec->setCommand("&Electromagnetic boundary conditions");
*elec
<< "FEM_ConstraintElectrostaticPotential"
<< "FEM_ConstraintCurrentDensity"
<< "FEM_ConstraintMagnetization";
Gui::MenuItem* fluid = new Gui::MenuItem;
fluid->setCommand("&Fluid Constraints");
fluid->setCommand("&Fluid boundary conditions");
*fluid
<< "FEM_ConstraintInitialFlowVelocity"
<< "FEM_ConstraintInitialPressure"
@@ -268,14 +266,14 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "FEM_ConstraintFlowVelocity";
Gui::MenuItem* geom = new Gui::MenuItem;
geom->setCommand("&Geometrical Constraints");
geom->setCommand("&Geometrical analysis features");
*geom
<< "FEM_ConstraintPlaneRotation"
<< "FEM_ConstraintSectionPrint"
<< "FEM_ConstraintTransform";
Gui::MenuItem* mech = new Gui::MenuItem;
mech->setCommand("&Mechanical Constraints");
mech->setCommand("&Mechanical boundary conditions and loads");
*mech
<< "FEM_ConstraintFixed"
<< "FEM_ConstraintDisplacement"
@@ -289,7 +287,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "FEM_ConstraintSelfWeight";
Gui::MenuItem* thermal = new Gui::MenuItem;
thermal->setCommand("&Thermal Constraints");
thermal->setCommand("&Thermal boundary conditions and loads");
*thermal
<< "FEM_ConstraintInitialTemperature"
<< "Separator"
@@ -298,7 +296,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "FEM_ConstraintBodyHeatSource";
// Gui::MenuItem* nosolver = new Gui::MenuItem;
// nosolver->setCommand("&Constraints without solver");
// nosolver->setCommand("&Analysis features without solver");
// *nosolver
// << "FEM_ConstraintFluidBoundary"
// << "Separator"

58
src/Mod/Fem/femcommands/commands.py
View File

@@ -152,7 +152,7 @@ class _ClippingPlaneRemoveAll(CommandManager):
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ClippingPlaneRemoveAll",
"Remove all clipping planes"
"Removes all clipping planes"
)
self.is_active = "with_document"
@@ -193,11 +193,11 @@ class _ConstraintBodyHeatSource(CommandManager):
self.pixmap = "FEM_ConstraintBodyHeatSource"
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintBodyHeatSource",
"Constraint body heat source"
"Body heat source"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintBodyHeatSource",
"Creates a FEM constraint body heat source"
"Creates a body heat source"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -210,11 +210,11 @@ class _ConstraintCentrif(CommandManager):
super(_ConstraintCentrif, self).__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintCentrif",
"Constraint centrif"
"Centrifigual load"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintCentrif",
"Creates a FEM constraint centrif"
"Creates a centrifugal load"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -228,11 +228,11 @@ class _ConstraintCurrentDensity(CommandManager):
self.pixmap = "FEM_ConstraintCurrentDensity"
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintCurrentDensity",
"Constraint current density"
"Current density boundary condition"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintCurrentDensity",
"Creates a FEM constraint current density"
"Creates a current density boundary condition"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -245,11 +245,11 @@ class _ConstraintElectrostaticPotential(CommandManager):
super(_ConstraintElectrostaticPotential, self).__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintElectrostaticPotential",
"Constraint electrostatic potential"
"Electrostatic potential boundary condition"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintElectrostaticPotential",
"Creates a FEM constraint electrostatic potential"
"Creates an electrostatic potential boundary condition"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -262,11 +262,11 @@ class _ConstraintFlowVelocity(CommandManager):
super(_ConstraintFlowVelocity, self).__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintFlowVelocity",
"Constraint flow velocity"
"Flow velocity boundary condition"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintFlowVelocity",
"Creates a FEM constraint flow velocity"
"Creates a flow velocity boundary condition"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -279,11 +279,11 @@ class _ConstraintInitialFlowVelocity(CommandManager):
super(_ConstraintInitialFlowVelocity, self).__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintInitialFlowVelocity",
"Constraint initial flow velocity"
"Initial flow velocity condition"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintInitialFlowVelocity",
"Creates a FEM constraint initial flow velocity"
"Creates initial flow velocity condition"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -296,11 +296,11 @@ class _ConstraintInitialPressure(CommandManager):
super(_ConstraintInitialPressure, self).__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintInitialPressure",
"Constraint initial pressure"
"Initial pressure condition"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintInitialPressure",
"Creates a FEM constraint initial pressure"
"Creates an initial pressure condition"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -313,11 +313,11 @@ class _ConstraintMagnetization(CommandManager):
super(_ConstraintMagnetization, self).__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintMagnetization",
"Constraint magnetization"
"Magnetization boundary condition"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintMagnetization",
"Creates a FEM constraint magnetization"
"Creates a magnetization boundary condition"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -330,11 +330,11 @@ class _ConstraintSectionPrint(CommandManager):
super(_ConstraintSectionPrint, self).__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintSectionPrint",
"Constraint sectionprint"
"Section print feature"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintSectionPrint",
"Creates a FEM constraint sectionprint"
"Creates a section print feature"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -347,11 +347,11 @@ class _ConstraintSelfWeight(CommandManager):
super(_ConstraintSelfWeight, self).__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintSelfWeight",
"Constraint self weight"
"Gravity load"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintSelfWeight",
"Creates a FEM constraint self weight"
"Creates a gravity load"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_noset_edit"
@@ -364,11 +364,11 @@ class _ConstraintTie(CommandManager):
super(_ConstraintTie, self).__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintTie",
"Constraint tie"
"Tie constraint"
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_ConstraintTie",
"Creates a FEM constraint tie"
"Creates a tie constraint"
)
self.is_active = "with_analysis"
self.do_activated = "add_obj_on_gui_set_edit"
@@ -607,7 +607,7 @@ class _Examples(CommandManager):
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_Examples",
"Open FEM examples"
"Opens the FEM examples"
)
self.is_active = "always"
@@ -771,7 +771,7 @@ class _FEMMesh2Mesh(CommandManager):
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_FEMMesh2Mesh",
"Convert the surface of a FEM mesh to a mesh"
"Converts the surface of a FEM mesh to a mesh"
)
self.is_active = "with_femmesh_andor_res"
@@ -836,7 +836,7 @@ class _MeshClear(CommandManager):
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_MeshClear",
"Clear the Mesh of a FEM mesh object"
"Clears the Mesh of a FEM mesh object"
)
self.is_active = "with_femmesh"
@@ -862,7 +862,7 @@ class _MeshDisplayInfo(CommandManager):
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_MeshDisplayInfo",
"Display FEM mesh info"
"Displays FEM mesh information"
)
self.is_active = "with_femmesh"
@@ -892,7 +892,7 @@ class _MeshGmshFromShape(CommandManager):
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_MeshGmshFromShape",
"Create a FEM mesh from a shape by Gmsh mesher"
"Creates a FEM mesh from a shape by Gmsh mesher"
)
self.is_active = "with_part_feature"
@@ -955,7 +955,7 @@ class _MeshNetgenFromShape(CommandManager):
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_MeshNetgenFromShape",
"Create a FEM mesh from a solid or face shape by Netgen internal mesher"
"Creates a FEM mesh from a solid or face shape by Netgen internal mesher"
)
self.is_active = "with_part_feature"