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

[TD]Ensure changed expression value is processed

Browse Source
This commit is contained in:
wandererfan
2025-07-31 16:27:07 -04:00
committed by Chris Hennes
parent 131737a4fc
commit d0faf2a6b4
6 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/TechDraw/App/DrawProjGroup.cpp
View File

@@ -150,16 +150,9 @@ void DrawProjGroup::onChanged(const App::Property* prop)
}
}
// if ( ScaleType.isValue("Automatic") ||
// ScaleType.isValue("Custom") ){
// //just documenting that nothing is required here
// //DrawView::onChanged will sort out Scale hidden/readonly/etc
// }
if (prop == &Rotation) {
if (!DrawUtil::fpCompare(Rotation.getValue(), 0.0)) {
Rotation.setValue(0.0);
purgeTouched();
}
return;
}
@@ -169,8 +162,6 @@ void DrawProjGroup::onChanged(const App::Property* prop)
App::DocumentObjectExecReturn* DrawProjGroup::execute()
{
// Base::Console().message("DPG::execute() - %s - waitingForChildren: %d\n",
// getNameInDocument(), waitingForChildren());
if (!keepUpdated())
return App::DocumentObject::StdReturn;
@@ -490,13 +481,11 @@ App::DocumentObject* DrawProjGroup::addProjection(const char* viewProjType)
}
else {//Front
Anchor.setValue(view);
Anchor.purgeTouched();
requestPaint();//make sure the group object is on the Gui page
view->LockPosition.setValue(
true);//lock "Front" position within DPG (note not Page!).
view->LockPosition.setStatus(App::Property::ReadOnly,
true);//Front should stay locked.
view->LockPosition.purgeTouched();
}
}
return view;
@@ -984,8 +973,6 @@ void DrawProjGroup::updateChildrenScale()
}
view->Scale.setValue(getScale());
view->Scale.purgeTouched();
view->purgeTouched();
}
}
@@ -1128,9 +1115,7 @@ void DrawProjGroup::updateSecondaryDirs()
ProjDirection type = static_cast<ProjDirection>(v->Type.getValue());
data = saveVals[type];
v->Direction.setValue(data.first);
v->Direction.purgeTouched();
v->XDirection.setValue(data.second);
v->XDirection.purgeTouched();
}
recomputeChildren();
}

18
src/Mod/TechDraw/App/DrawView.cpp
View File

@@ -94,8 +94,8 @@ DrawView::DrawView():
m_overrideKeepUpdated(false)
{
static const char *group = "Base";
ADD_PROPERTY_TYPE(X, (0.0), group, (App::PropertyType)(App::Prop_None), "X position");
ADD_PROPERTY_TYPE(Y, (0.0), group, (App::PropertyType)(App::Prop_None), "Y position");
ADD_PROPERTY_TYPE(X, (0.0), group, App::Prop_None, "X position");
ADD_PROPERTY_TYPE(Y, (0.0), group, App::Prop_None, "Y position");
ADD_PROPERTY_TYPE(LockPosition, (false), group, App::Prop_Output, "Lock View position to parent Page or Group");
ADD_PROPERTY_TYPE(Rotation, (0.0), group, App::Prop_Output, "Rotation in degrees counterclockwise");
@@ -109,9 +109,6 @@ DrawView::DrawView():
setScaleAttribute();
}
DrawView::~DrawView()
{
}
App::DocumentObjectExecReturn *DrawView::execute()
{
@@ -120,8 +117,7 @@ App::DocumentObjectExecReturn *DrawView::execute()
return App::DocumentObject::execute();
}
handleXYLock();
//should not be necessary to purgeTouched here, but it prevents a superfluous feature recompute
purgeTouched(); //this should not be necessary!
requestPaint();
return App::DocumentObject::execute();
}
@@ -133,7 +129,6 @@ void DrawView::checkScale()
if (ScaleType.isValue("Page")) {
if(std::abs(page->Scale.getValue() - Scale.getValue()) > std::numeric_limits<float>::epsilon()) {
Scale.setValue(page->Scale.getValue());
Scale.purgeTouched();
}
}
}
@@ -209,15 +204,12 @@ void DrawView::onChanged(const App::Property* prop)
} else if (prop == &LockPosition) {
handleXYLock();
requestPaint(); //change lock icon
LockPosition.purgeTouched();
} else if ((prop == &Caption) ||
(prop == &Label)) {
requestPaint();
} else if ( prop == &X ||
prop == &Y ) {
//X,Y changes are only interesting to DPGI and Gui side
X.purgeTouched();
Y.purgeTouched();
}
App::PropertyLink *ownerProp = getOwnerProperty();
@@ -244,20 +236,16 @@ void DrawView::handleXYLock()
if (isLocked()) {
if (!X.testStatus(App::Property::ReadOnly)) {
X.setStatus(App::Property::ReadOnly, true);
X.purgeTouched();
}
if (!Y.testStatus(App::Property::ReadOnly)) {
Y.setStatus(App::Property::ReadOnly, true);
Y.purgeTouched();
}
} else {
if (X.testStatus(App::Property::ReadOnly)) {
X.setStatus(App::Property::ReadOnly, false);
X.purgeTouched();
}
if (Y.testStatus(App::Property::ReadOnly)) {
Y.setStatus(App::Property::ReadOnly, false);
Y.purgeTouched();
}
}
}

2
src/Mod/TechDraw/App/DrawView.h
View File

@@ -52,7 +52,7 @@ class TechDrawExport DrawView : public App::DocumentObject
public:
/// Constructor
DrawView();
~DrawView() override;
~DrawView() override = default;
App::PropertyDistance X;
App::PropertyDistance Y;

1
src/Mod/TechDraw/App/DrawViewDetail.cpp
View File

@@ -397,7 +397,6 @@ void DrawViewDetail::postHlrTasks(void)
if (ScaleType.isValue("Automatic") && !checkFit()) {
double newScale = autoScale();
Scale.setValue(newScale);
Scale.purgeTouched();
detailExec(m_saveShape, m_saveDvp, m_saveDvs);
}

1
src/Mod/TechDraw/App/DrawViewPart.cpp
View File

@@ -471,7 +471,6 @@ void DrawViewPart::postHlrTasks()
if (ScaleType.isValue("Automatic") && !checkFit()) {
double newScale = autoScale();
Scale.setValue(newScale);
Scale.purgeTouched();
partExec(m_saveShape);
}

1
src/Mod/TechDraw/App/DrawViewSection.cpp
View File

@@ -652,7 +652,6 @@ void DrawViewSection::postHlrTasks()
if (ScaleType.isValue("Automatic") && !checkFit()) {
double newScale = autoScale();
Scale.setValue(newScale);
Scale.purgeTouched();
sectionExec(m_saveShape);
}
overrideKeepUpdated(false);