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: Added TypeError to lmgr/ #4537

Merged
merged 2 commits into from
Oct 17, 2024
Merged

wxGUI: Added TypeError to lmgr/ #4537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec6c3df
added type error
Oct 17, 2024
61c34d7
added type error
Oct 17, 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
6 changes: 3 additions & 3 deletions gui/wxpython/lmgr/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@ def GetMenuCmd(self, event):
layer = self.GetLayerTree().layer_selected
name = self.GetLayerTree().GetLayerInfo(layer, key="maplayer").name
type = self.GetLayerTree().GetLayerInfo(layer, key="type")
except AttributeError:
except (AttributeError, TypeError):
layer = None

if layer and len(cmdlist) == 1: # only if no parameters given
Expand Down Expand Up @@ -1183,7 +1183,7 @@ def OnVDigit(self, event):
# available only for vector map layers
try:
mapLayer = tree.GetLayerInfo(layer, key="maplayer")
except AttributeError:
except (AttributeError, TypeError):
mapLayer = None

if not mapLayer or mapLayer.GetType() != "vector":
Expand Down Expand Up @@ -1860,7 +1860,7 @@ def OnShowAttributeTable(self, event, selection=None):
# available only for vector map layers
try:
maptype = tree.GetLayerInfo(layer, key="maplayer").type
except AttributeError:
except (AttributeError, TypeError):
maptype = None

if not maptype or maptype != "vector":
Expand Down
4 changes: 2 additions & 2 deletions gui/wxpython/lmgr/layertree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1758,7 +1758,7 @@ def OnDeleteLayer(self, event):
try:
if self.GetLayerInfo(item, key="type") != "group":
self.Map.DeleteLayer(self.GetLayerInfo(item, key="maplayer"))
except AttributeError:
except (AttributeError, TypeError):
pass

# redraw map if auto-rendering is enabled
Expand Down Expand Up @@ -2399,7 +2399,7 @@ def __FindSubItemByName(self, item, value):
while item and item.IsOk():
try:
itemLayer = self.GetLayerInfo(item, key="maplayer")
except KeyError:
except (KeyError, TypeError):
return None

if itemLayer and value == itemLayer.GetName():
Expand Down
Loading