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

[PD] Hole: don't call onChanged on restoration

Browse Source 
fixes the issue reported here: https://forum.freecadweb.org/viewtopic.php?f=10&t=65035
This commit is contained in:
Uwe
2022-01-06 02:41:20 +01:00
committed by wwmayer
parent 8df64b7426
commit d232f17e23
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Mod/PartDesign/App/FeatureHole.cpp
View File

@@ -1435,8 +1435,10 @@ void Hole::onChanged(const App::Property* prop)
}
else if (prop == &ThreadSize) {
updateDiameterParam();
updateThreadDepthParam();
// updateHoleCutParams() will later automatically be called because updateDiameterParam() changes &Diameter
if (!isRestoring())
updateThreadDepthParam();
// updateHoleCutParams() will later automatically be called because
// updateDiameterParam() changes &Diameter
}
else if (prop == &ThreadFit) {
updateDiameterParam();
@@ -1466,27 +1468,32 @@ void Hole::onChanged(const App::Property* prop)
DrillPoint.setReadOnly(DepthMode != "Dimension");
DrillPointAngle.setReadOnly(DepthMode != "Dimension");
DrillForDepth.setReadOnly(DepthMode != "Dimension");
if (DepthMode != "Dimension") {
// if through all, set the depth accordingly
Depth.setValue(getThroughAllLength());
// the thread depth is not dimension, it is the same as the hole depth
ThreadDepth.setValue(getThroughAllLength());
if (!isRestoring()) {
if (DepthMode != "Dimension") {
// if through all, set the depth accordingly
Depth.setValue(getThroughAllLength());
// the thread depth is not dimension, it is the same as the hole depth
ThreadDepth.setValue(getThroughAllLength());
}
updateThreadDepthParam();
}
updateThreadDepthParam();
}
else if (prop == &Depth) {
// the depth cannot be greater than the through-all length
if (Depth.getValue() > getThroughAllLength())
Depth.setValue(getThroughAllLength());
if (!isRestoring()) {
// the depth cannot be greater than the through-all length
if (Depth.getValue() > getThroughAllLength())
Depth.setValue(getThroughAllLength());
}
if (std::string(ThreadDepthType.getValueAsString()) != "Dimension")
updateDiameterParam(); // make sure diameter and pitch are updated.
// update the thread in every case
updateThreadDepthParam();
if (!isRestoring())
updateThreadDepthParam();
}
else if (prop == &ThreadDepthType) {
updateThreadDepthParam();
if (!isRestoring())
updateThreadDepthParam();
ThreadDepth.setReadOnly(Threaded.getValue()
&& std::string(ThreadDepthType.getValueAsString()) != "Dimension");
}
@@ -1590,7 +1597,6 @@ short Hole::mustExecute() const
void Hole::Restore(Base::XMLReader& reader)
{
ProfileBased::Restore(reader);
updateProps();
}