suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wrong error text, fix activation of sub-widgets

Browse Source
This commit is contained in:
wmayer 2016-08-12 13:26:52 +02:00
parent 1c51a182f6
commit f1bfd5cee2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,7 @@ void TaskFemConstraintFluidBoundary::updateBoundaryTypeUI()
else if (boundaryType == "freestream") { else if (boundaryType == "freestream") {
ui->tabBasicBoundary->setEnabled(false); ui->tabBasicBoundary->setEnabled(false);
ui->labelBoundaryValue->setText(QString::fromUtf8("value not needed")); ui->labelBoundaryValue->setText(QString::fromUtf8("value not needed"));
ui->tabBasicBoundary->setVisible(false); ui->tabBasicBoundary->setEnabled(false);
pcConstraint->Subtype.setEnums(FreestreamSubtypes); pcConstraint->Subtype.setEnums(FreestreamSubtypes);
} }
else if (boundaryType == "inlet") { else if (boundaryType == "inlet") {
@ -310,22 +310,27 @@ void TaskFemConstraintFluidBoundary::updateSubtypeUI()
if (subtype == "totalPressure" || subtype == "staticPressure"){ if (subtype == "totalPressure" || subtype == "staticPressure"){
ui->labelBoundaryValue->setText(QString::fromUtf8("pressure [Pa]")); ui->labelBoundaryValue->setText(QString::fromUtf8("pressure [Pa]"));
ui->buttonDirection->setEnabled(false); ui->buttonDirection->setEnabled(false);
ui->lineDirection->setEnabled(false);
} }
else if (subtype == "uniformVelocity") { else if (subtype == "uniformVelocity") {
ui->labelBoundaryValue->setText(QString::fromUtf8("velocity [m/s]")); ui->labelBoundaryValue->setText(QString::fromUtf8("velocity [m/s]"));
ui->buttonDirection->setEnabled(true); ui->buttonDirection->setEnabled(true);
ui->lineDirection->setEnabled(true);
} }
else if (subtype == "massFlowrate") { else if (subtype == "massFlowrate") {
ui->labelBoundaryValue->setText(QString::fromUtf8("flowrate [kg/s]")); ui->labelBoundaryValue->setText(QString::fromUtf8("flowrate [kg/s]"));
ui->buttonDirection->setEnabled(false); ui->buttonDirection->setEnabled(false);
ui->lineDirection->setEnabled(false);
} }
else if (subtype == "volumetricFlowRate") { else if (subtype == "volumetricFlowRate") {
ui->labelBoundaryValue->setText(QString::fromUtf8("flowrate [m3/s]")); ui->labelBoundaryValue->setText(QString::fromUtf8("flowrate [m3/s]"));
ui->buttonDirection->setEnabled(false); ui->buttonDirection->setEnabled(false);
ui->lineDirection->setEnabled(false);
} }
else { else {
ui->labelBoundaryValue->setText(QString::fromUtf8("unspecific")); ui->labelBoundaryValue->setText(QString::fromUtf8("unspecific"));
ui->buttonDirection->setEnabled(false); ui->buttonDirection->setEnabled(false);
ui->lineDirection->setEnabled(false);
} }
} }
if (boundaryType == "wall") { if (boundaryType == "wall") {
@ -333,11 +338,13 @@ void TaskFemConstraintFluidBoundary::updateSubtypeUI()
ui->labelBoundaryValue->setText(QString::fromUtf8("moving speed (m/s)")); ui->labelBoundaryValue->setText(QString::fromUtf8("moving speed (m/s)"));
ui->tabBasicBoundary->setEnabled(true); ui->tabBasicBoundary->setEnabled(true);
ui->buttonDirection->setEnabled(false); // moving speed must be parallel to wall ui->buttonDirection->setEnabled(false); // moving speed must be parallel to wall
ui->lineDirection->setEnabled(false);
} }
else if (subtype == "slip") { else if (subtype == "slip") {
ui->labelBoundaryValue->setText(QString::fromUtf8("slip speed (m/s)")); ui->labelBoundaryValue->setText(QString::fromUtf8("slip speed (m/s)"));
ui->tabBasicBoundary->setEnabled(true); ui->tabBasicBoundary->setEnabled(true);
ui->buttonDirection->setEnabled(false); ui->buttonDirection->setEnabled(false);
ui->lineDirection->setEnabled(false);
} }
else { else {
ui->labelBoundaryValue->setText(QString::fromUtf8("unspecific")); ui->labelBoundaryValue->setText(QString::fromUtf8("unspecific"));
@ -452,7 +459,7 @@ void TaskFemConstraintFluidBoundary::onSelectionChanged(const Gui::SelectionChan
} }
} }
else { else {
QMessageBox::warning(this, tr("Selection error"), tr("Only faces and edges can be picked")); QMessageBox::warning(this, tr("Selection error"), tr("Only faces can be picked"));
return; return;
} }
pcConstraint->Direction.setValue(obj, references); pcConstraint->Direction.setValue(obj, references);