Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wxGUI: Fixed bare 'except' for psmap/ #4623

Merged
merged 6 commits into from
Nov 6, 2024
Merged

wxGUI: Fixed bare 'except' for psmap/ #4623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
569c226
fixed 722
Oct 31, 2024
5041d4c
Update gui/wxpython/psmap/frame.py
arohanajit Nov 4, 2024
a7ed9e7
updates
Nov 4, 2024
5ec0808
Update gui/wxpython/psmap/frame.py
arohanajit Nov 4, 2024
1f57d3f
Merge branch 'main' into 722-psmap
echoix Nov 5, 2024
6f87314
update
Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ per-file-ignores =
gui/scripts/d.wms.py: E501
gui/wxpython/image2target/g.gui.image2target.py: E501
gui/wxpython/photo2image/g.gui.photo2image.py: E501
gui/wxpython/psmap/*: E501, E722
gui/wxpython/psmap/*: E501
gui/wxpython/vdigit/*: F841, E722, F405, F403
gui/wxpython/animation/g.gui.animation.py: E501
gui/wxpython/tplot/frame.py: F841, E722
Expand Down
18 changes: 4 additions & 14 deletions gui/wxpython/psmap/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,19 +1045,9 @@ def makePSFont(self, textDict):
if "Bold" in fontstyle:
weight = wx.FONTWEIGHT_BOLD

try:
fn = wx.Font(
pointSize=fontsize, family=family, style=style, weight=weight, face=face
)
except:
fn = wx.Font(
pointSize=fontsize,
family=wx.FONTFAMILY_DEFAULT,
style=wx.FONTSTYLE_NORMAL,
weight=wx.FONTWEIGHT_NORMAL,
)

return fn
return wx.Font(
pointSize=fontsize, family=family, style=style, weight=weight, faceName=face
)

def getTextExtent(self, textDict):
"""Estimates bounding rectangle of text"""
Expand All @@ -1071,7 +1061,7 @@ def getTextExtent(self, textDict):
dc.SetFont(fn)
w, h, lh = dc.GetFullMultiLineTextExtent(textDict["text"])
return (w, h)
except:
except (wx.PyAssertionError, ValueError, KeyError):
return (0, 0)

def getInitMap(self):
Expand Down
Loading