Skip to content

Commit 1956ba2

Browse files
marioalexis84marioalexis84
committed
Fem: Rename heat flux ui members
1 parent 0c4f4ec commit 1956ba2

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

‎src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp

+20-20
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ TaskFemConstraintHeatflux::TaskFemConstraintHeatflux(
6969
qOverload<double>(&InputField::valueChanged),
7070
this,
7171
&TaskFemConstraintHeatflux::onHeatFluxChanged);
72-
connect(ui->if_ambienttemp,
72+
connect(ui->if_ambienttemp_conv,
7373
qOverload<double>(&InputField::valueChanged),
7474
this,
7575
&TaskFemConstraintHeatflux::onAmbientTempChanged);
@@ -81,7 +81,7 @@ TaskFemConstraintHeatflux::TaskFemConstraintHeatflux(
8181
qOverload<double>(&InputField::valueChanged),
8282
this,
8383
&TaskFemConstraintHeatflux::onEmissivityChanged);
84-
connect(ui->if_ambienttemp2,
84+
connect(ui->if_ambienttemp_rad,
8585
qOverload<double>(&InputField::valueChanged),
8686
this,
8787
&TaskFemConstraintHeatflux::onAmbientTempChanged);
@@ -93,11 +93,11 @@ TaskFemConstraintHeatflux::TaskFemConstraintHeatflux(
9393
this->groupLayout()->addWidget(proxy);
9494

9595
// Temporarily prevent unnecessary feature recomputes
96-
ui->if_ambienttemp->blockSignals(true);
96+
ui->if_ambienttemp_conv->blockSignals(true);
9797
// ui->if_facetemp->blockSignals(true);
9898
ui->if_filmcoef->blockSignals(true);
9999
ui->if_emissivity->blockSignals(true);
100-
ui->if_ambienttemp2->blockSignals(true);
100+
ui->if_ambienttemp_rad->blockSignals(true);
101101
ui->lw_references->blockSignals(true);
102102
ui->btnAdd->blockSignals(true);
103103
ui->btnRemove->blockSignals(true);
@@ -109,25 +109,25 @@ TaskFemConstraintHeatflux::TaskFemConstraintHeatflux(
109109
std::vector<std::string> SubElements = pcConstraint->References.getSubValues();
110110

111111
// Fill data into dialog elements
112-
ui->if_ambienttemp->setMinimum(0);
113-
ui->if_ambienttemp->setMaximum(FLOAT_MAX);
112+
ui->if_ambienttemp_conv->setMinimum(0);
113+
ui->if_ambienttemp_conv->setMaximum(FLOAT_MAX);
114114

115115
ui->if_filmcoef->setMinimum(0);
116116
ui->if_filmcoef->setMaximum(FLOAT_MAX);
117117

118118
ui->if_emissivity->setMinimum(0);
119119
ui->if_emissivity->setMaximum(FLOAT_MAX);
120120

121-
ui->if_ambienttemp2->setMinimum(0);
122-
ui->if_ambienttemp2->setMaximum(FLOAT_MAX);
121+
ui->if_ambienttemp_rad->setMinimum(0);
122+
ui->if_ambienttemp_rad->setMaximum(FLOAT_MAX);
123123

124124
std::string constraint_type = pcConstraint->ConstraintType.getValueAsString();
125125
if (constraint_type == "Convection") {
126126
ui->rb_convection->setChecked(true);
127127
ui->sw_heatflux->setCurrentIndex(0);
128128
Base::Quantity t =
129129
Base::Quantity(pcConstraint->AmbientTemp.getValue(), Base::Unit::Temperature);
130-
ui->if_ambienttemp->setValue(t);
130+
ui->if_ambienttemp_conv->setValue(t);
131131
Base::Quantity f = Base::Quantity(pcConstraint->FilmCoef.getValue(),
132132
Base::Unit::ThermalTransferCoefficient);
133133
ui->if_filmcoef->setValue(f);
@@ -137,7 +137,7 @@ TaskFemConstraintHeatflux::TaskFemConstraintHeatflux(
137137
ui->sw_heatflux->setCurrentIndex(1);
138138
Base::Quantity t =
139139
Base::Quantity(pcConstraint->AmbientTemp.getValue(), Base::Unit::Temperature);
140-
ui->if_ambienttemp2->setValue(t);
140+
ui->if_ambienttemp_rad->setValue(t);
141141
Base::Quantity e = Base::Quantity(pcConstraint->Emissivity.getValue(), Base::Unit());
142142
ui->if_emissivity->setValue(e);
143143
}
@@ -160,11 +160,11 @@ TaskFemConstraintHeatflux::TaskFemConstraintHeatflux(
160160
buttonGroup->addButton(ui->btnAdd, (int)SelectionChangeModes::refAdd);
161161
buttonGroup->addButton(ui->btnRemove, (int)SelectionChangeModes::refRemove);
162162

163-
ui->if_ambienttemp->blockSignals(false);
163+
ui->if_ambienttemp_conv->blockSignals(false);
164164
// ui->if_facetemp->blockSignals(false);
165165
ui->if_filmcoef->blockSignals(false);
166166
ui->if_emissivity->blockSignals(false);
167-
ui->if_ambienttemp2->blockSignals(false);
167+
ui->if_ambienttemp_rad->blockSignals(false);
168168
ui->lw_references->blockSignals(false);
169169
ui->btnAdd->blockSignals(false);
170170
ui->btnRemove->blockSignals(false);
@@ -221,7 +221,7 @@ void TaskFemConstraintHeatflux::Conv()
221221
name.c_str(),
222222
get_constraint_type().c_str());
223223
Base::Quantity t = Base::Quantity(300, Base::Unit::Temperature);
224-
ui->if_ambienttemp->setValue(t);
224+
ui->if_ambienttemp_conv->setValue(t);
225225
pcConstraint->AmbientTemp.setValue(300);
226226
Base::Quantity f = Base::Quantity(10, Base::Unit::ThermalTransferCoefficient);
227227
ui->if_filmcoef->setValue(f);
@@ -239,7 +239,7 @@ void TaskFemConstraintHeatflux::Rad()
239239
name.c_str(),
240240
get_constraint_type().c_str());
241241
Base::Quantity t = Base::Quantity(300, Base::Unit::Temperature);
242-
ui->if_ambienttemp2->setValue(t);
242+
ui->if_ambienttemp_rad->setValue(t);
243243
pcConstraint->AmbientTemp.setValue(300);
244244
Base::Quantity e = Base::Quantity(1, Base::Unit());
245245
ui->if_emissivity->setValue(e);
@@ -418,10 +418,10 @@ double TaskFemConstraintHeatflux::getAmbientTemp() const
418418
{
419419
Base::Quantity temperature;
420420
if (ui->rb_convection->isChecked()) {
421-
temperature = ui->if_ambienttemp->getQuantity();
421+
temperature = ui->if_ambienttemp_conv->getQuantity();
422422
}
423423
else if (ui->rb_radiation->isChecked()) {
424-
temperature = ui->if_ambienttemp2->getQuantity();
424+
temperature = ui->if_ambienttemp_rad->getQuantity();
425425
}
426426
double temperature_in_kelvin = temperature.getValueAs(Base::Quantity::Kelvin);
427427
return temperature_in_kelvin;
@@ -466,15 +466,15 @@ void TaskFemConstraintHeatflux::changeEvent(QEvent* e)
466466
{
467467
TaskBox::changeEvent(e);
468468
if (e->type() == QEvent::LanguageChange) {
469-
ui->if_ambienttemp->blockSignals(true);
469+
ui->if_ambienttemp_conv->blockSignals(true);
470470
ui->if_filmcoef->blockSignals(true);
471471
ui->if_emissivity->blockSignals(true);
472-
ui->if_ambienttemp2->blockSignals(true);
472+
ui->if_ambienttemp_rad->blockSignals(true);
473473
ui->retranslateUi(proxy);
474-
ui->if_ambienttemp->blockSignals(false);
474+
ui->if_ambienttemp_conv->blockSignals(false);
475475
ui->if_filmcoef->blockSignals(false);
476476
ui->if_emissivity->blockSignals(true);
477-
ui->if_ambienttemp2->blockSignals(false);
477+
ui->if_ambienttemp_rad->blockSignals(false);
478478
}
479479
}
480480

‎src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui

+7-7
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,16 @@
119119
</layout>
120120
</item>
121121
<item>
122-
<layout class="QHBoxLayout" name="layoutAmbientTemp">
122+
<layout class="QHBoxLayout" name="layoutAmbientTempCov">
123123
<item>
124-
<widget class="QLabel" name="lbl_ambienttemp">
124+
<widget class="QLabel" name="lbl_ambienttemp_conv">
125125
<property name="text">
126126
<string>Ambient Temperature</string>
127127
</property>
128128
</widget>
129129
</item>
130130
<item>
131-
<widget class="Gui::InputField" name="if_ambienttemp">
131+
<widget class="Gui::InputField" name="if_ambienttemp_conv">
132132
<property name="text">
133133
<string>300 K</string>
134134
</property>
@@ -152,7 +152,7 @@
152152
<widget class="QWidget" name="page_1">
153153
<layout class="QVBoxLayout" name="verticalLayout_5">
154154
<item>
155-
<layout class="QVBoxLayout" name="verticalLayout">
155+
<layout class="QVBoxLayout" name="verticalLayout_6">
156156
<item>
157157
<layout class="QHBoxLayout" name="layoutEmissivity">
158158
<item>
@@ -175,16 +175,16 @@
175175
</layout>
176176
</item>
177177
<item>
178-
<layout class="QHBoxLayout" name="layoutAmbientTemp2">
178+
<layout class="QHBoxLayout" name="layoutAmbientTempRad">
179179
<item>
180-
<widget class="QLabel" name="lbl_ambienttemp2">
180+
<widget class="QLabel" name="lbl_ambienttemp_rad">
181181
<property name="text">
182182
<string>Ambient Temperature</string>
183183
</property>
184184
</widget>
185185
</item>
186186
<item>
187-
<widget class="Gui::InputField" name="if_ambienttemp2">
187+
<widget class="Gui::InputField" name="if_ambienttemp_rad">
188188
<property name="text">
189189
<string>300 K</string>
190190
</property>

0 commit comments

Comments
 (0)