Skip to content

Commit

Permalink
Draft: add onChanged method in the derived annotation classes
Browse files Browse the repository at this point in the history
The classes `ViewProviderDimensionBase`, `ViewProviderLinearDimension`,
`ViewProviderAngularDimension`, `ViewProviderText`, and
`ViewProviderLabel` use `super()` to call the `onChanged` method
of the parent class `ViewProviderDraftAnnotation`.

In this way the `AnnotationStyle` property correctly modifies
the properties of every annotation object.
  • Loading branch information
vocx-fc authored and yorikvanhavre committed Jun 19, 2020
1 parent b9d4e68 commit 4e10690
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
11 changes: 8 additions & 3 deletions src/Mod/Draft/draftviewproviders/view_dimension.py
Expand Up @@ -265,8 +265,8 @@ def updateData(self, obj, prop):
return

def onChanged(self, vobj, prop):
"""called when a view property has changed"""
return
"""Execute when a view property is changed."""
super(ViewProviderDimensionBase, self).onChanged(vobj, prop)

def doubleClicked(self,vobj):
self.setEdit(vobj)
Expand Down Expand Up @@ -559,7 +559,9 @@ def updateData(self, obj, prop):
self.line.coordIndex.setValues(0,4,(0,1,2,3))

def onChanged(self, vobj, prop):
"""called when a view property has changed"""
"""Execute when a view property is changed."""
super(ViewProviderLinearDimension, self).onChanged(vobj, prop)

if prop == "ScaleMultiplier" and hasattr(vobj, "ScaleMultiplier"):
# update all dimension values
if hasattr(self,"font"):
Expand Down Expand Up @@ -936,6 +938,9 @@ def updateData(self, obj, prop):
obj.Angle = a

def onChanged(self, vobj, prop):
"""Execute when a view property is changed."""
super(ViewProviderAngularDimension, self).onChanged(vobj, prop)

if hasattr(vobj, "ScaleMultiplier"):
if vobj.ScaleMultiplier == 0:
return
Expand Down
5 changes: 4 additions & 1 deletion src/Mod/Draft/draftviewproviders/view_label.py
Expand Up @@ -276,7 +276,10 @@ def getTextSize(self,vobj):
text.getBoundingBox(b)
return b.getBoundingBox().getSize().getValue()

def onChanged(self,vobj,prop):
def onChanged(self, vobj, prop):
"""Execute when a view property is changed."""
super(ViewProviderLabel, self).onChanged(vobj, prop)

if prop == "ScaleMultiplier":
if not hasattr(vobj,"ScaleMultiplier"):
return
Expand Down
4 changes: 3 additions & 1 deletion src/Mod/Draft/draftviewproviders/view_text.py
Expand Up @@ -162,8 +162,10 @@ def updateData(self,obj,prop):
self.trans.translation.setValue(obj.Placement.Base)
self.trans.rotation.setValue(obj.Placement.Rotation.Q)

def onChanged(self, vobj, prop):
"""Execute when a view property is changed."""
super(ViewProviderText, self).onChanged(vobj, prop)

def onChanged(self,vobj,prop):
if prop == "ScaleMultiplier":
if "ScaleMultiplier" in vobj.PropertiesList:
if vobj.ScaleMultiplier:
Expand Down

0 comments on commit 4e10690

Please sign in to comment.