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

[FEM] Temperature constraints overhaul

Browse Source 
- fix bug that changing constraint type in dialog lost flux value
- accept and not immediately save any changed value
- make the temperatures a PropertyTemperature to get rid of hacks
- also fix some too long code lines
This commit is contained in:
Uwe
2023-03-27 20:13:42 +02:00
parent 468a54cb6d
commit cc6c98c1d4
18 changed files with 176 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Mod/Fem/App/FemConstraintTemperature.cpp
View File

@@ -36,16 +36,19 @@ static const char* ConstraintTypes[] = {"CFlux","Temperature", nullptr};
ConstraintTemperature::ConstraintTemperature()
{
ADD_PROPERTY(Temperature,(300.0));
ADD_PROPERTY(CFlux,(0.0));
ADD_PROPERTY_TYPE(ConstraintType,(1),"ConstraintTemperature",(App::PropertyType)(App::Prop_None),
ADD_PROPERTY(Temperature, (300.0));
ADD_PROPERTY(CFlux, (0.0));
ADD_PROPERTY_TYPE(ConstraintType, (1), "ConstraintTemperature",
(App::PropertyType)(App::Prop_None),
"Type of constraint, temperature or concentrated heat flux");
ConstraintType.setEnums(ConstraintTypes);
ADD_PROPERTY_TYPE(Points,(Base::Vector3d()),"ConstraintTemperature",App::PropertyType(App::Prop_ReadOnly|App::Prop_Output),
ADD_PROPERTY_TYPE(Points, (Base::Vector3d()), "ConstraintTemperature",
App::PropertyType(App::Prop_ReadOnly | App::Prop_Output),
"Points where symbols are drawn");
ADD_PROPERTY_TYPE(Normals,(Base::Vector3d()),"ConstraintTemperature",App::PropertyType(App::Prop_ReadOnly|App::Prop_Output),
"Normals where symbols are drawn");
ADD_PROPERTY_TYPE(Normals, (Base::Vector3d()), "ConstraintTemperature",
App::PropertyType(App::Prop_ReadOnly | App::Prop_Output),
"Normals where symbols are drawn");
Points.setValues(std::vector<Base::Vector3d>());
Normals.setValues(std::vector<Base::Vector3d>());
}
@@ -60,6 +63,24 @@ const char* ConstraintTemperature::getViewProviderName() const
return "FemGui::ViewProviderFemConstraintTemperature";
}
void ConstraintTemperature::handleChangedPropertyType(Base::XMLReader& reader, const char* TypeName,
App::Property* prop)
{
// property Temperature had App::PropertyFloat and was changed to App::PropertyTemperature
if (prop == &Temperature && strcmp(TypeName, "App::PropertyFloat") == 0) {
App::PropertyFloat TemperatureProperty;
// restore the PropertyFloat to be able to set its value
TemperatureProperty.Restore(reader);
Temperature.setValue(TemperatureProperty.getValue());
}
// property CFlux had App::PropertyFloat and was changed to App::PropertyPower
else if (prop == &CFlux && strcmp(TypeName, "App::PropertyFloat") == 0) {
App::PropertyFloat CFluxProperty;
CFluxProperty.Restore(reader);
CFlux.setValue(CFluxProperty.getValue());
}
}
void ConstraintTemperature::onChanged(const App::Property* prop)
{
// Note: If we call this at the end, then the arrows are not oriented correctly initially