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

Surface: in Extend::onChanged call the function of its direct parent class Part::Spline

Browse Source
This commit is contained in:
wmayer
2020-07-03 15:25:21 +02:00
parent 711d473a6d
commit 9dd57ddee9
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/Mod/Surface/App/FeatureExtend.cpp
View File

@@ -46,42 +46,6 @@ const App::PropertyFloatConstraint::Constraints ToleranceRange = {0.0,10.0,0.01}
const App::PropertyFloatConstraint::Constraints ExtendRange = {-0.5,10.0,0.01};
PROPERTY_SOURCE(Surface::Extend, Part::Spline)
void Surface::Extend::onChanged(const App::Property* prop)
{
// using a mutex and lock to protect a recursive calling when setting the new values
if (!lockOnChangeMutex.try_lock()) return;
lockOnChangeMutex.unlock();
std::lock_guard<std::mutex> lock(lockOnChangeMutex);
if ( ExtendUSymetric.getValue() )
{
if (prop->getName() == ExtendUNeg.getName()
|| prop->getName() == ExtendUPos.getName())
{
auto changedValue = dynamic_cast<const App::PropertyFloat*>(prop);
if (changedValue)
{
ExtendUNeg.setValue(changedValue->getValue());
ExtendUPos.setValue(changedValue->getValue());
}
}
}
if (ExtendVSymetric.getValue())
{
if (prop->getName() == ExtendVNeg.getName()
|| prop->getName() == ExtendVPos.getName())
{
auto changedValue = dynamic_cast<const App::PropertyFloat*>(prop);
if (changedValue)
{
ExtendVNeg.setValue(changedValue->getValue());
ExtendVPos.setValue(changedValue->getValue());
}
}
}
Part::Feature::onChanged(prop);
}
Extend::Extend()
{
ADD_PROPERTY(Face,(0));
@@ -190,6 +154,42 @@ App::DocumentObjectExecReturn *Extend::execute(void)
return StdReturn;
}
void Extend::onChanged(const App::Property* prop)
{
// using a mutex and lock to protect a recursive calling when setting the new values
if (!lockOnChangeMutex.try_lock()) return;
lockOnChangeMutex.unlock();
std::lock_guard<std::mutex> lock(lockOnChangeMutex);
if ( ExtendUSymetric.getValue() )
{
if (prop->getName() == ExtendUNeg.getName()
|| prop->getName() == ExtendUPos.getName())
{
auto changedValue = dynamic_cast<const App::PropertyFloat*>(prop);
if (changedValue)
{
ExtendUNeg.setValue(changedValue->getValue());
ExtendUPos.setValue(changedValue->getValue());
}
}
}
if (ExtendVSymetric.getValue())
{
if (prop->getName() == ExtendVNeg.getName()
|| prop->getName() == ExtendVPos.getName())
{
auto changedValue = dynamic_cast<const App::PropertyFloat*>(prop);
if (changedValue)
{
ExtendVNeg.setValue(changedValue->getValue());
ExtendVPos.setValue(changedValue->getValue());
}
}
}
Part::Spline::onChanged(prop);
}
void Extend::handleChangedPropertyName(Base::XMLReader &reader,
const char * TypeName,
const char *PropName)