wxGUI/iclass: fix activating scatter plot pane toolbar tools (#3182)

OSGeo · Sep 27, 2023 · 6b6fb14 · 6b6fb14
1 parent 0a0218f
commit 6b6fb14
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/gui/wxpython/iscatt/toolbars.py b/gui/wxpython/iscatt/toolbars.py
@@ -21,6 +21,20 @@
 from iscatt.dialogs import SettingsDialog
 
 
+def get_tool_name(tool_name, tool_name_type=tuple):
+    """Get tool name
+
+    :param str|tuple tool_name: tool name
+    :param type tool_name_type: tool name type with default
+                                tuple type
+
+    :return str: tool name
+    """
+    if isinstance(tool_name, tool_name_type):
+        return tool_name[0]
+    return tool_name
+
+
 class MainToolbar(BaseToolbar):
     """Main toolbar"""
 
@@ -133,7 +147,7 @@ def SetPloltsMode(self, event, tool_name):
         self.scatt_mgr.modeSet.disconnect(self.ModeSet)
         if event.IsChecked():
             for i_tool_data in self.controller.data:
-                i_tool_name = i_tool_data[0]
+                i_tool_name = get_tool_name(i_tool_data[0])
                 if not i_tool_name or i_tool_name in ["cats_mgr", "sel_pol_mode"]:
                     continue
                 if i_tool_name == tool_name:
@@ -158,7 +172,7 @@ def ModeSet(self, mode):
 
     def UnsetMode(self):
         for i_tool_data in self.controller.data:
-            i_tool_name = i_tool_data[0]
+            i_tool_name = get_tool_name(i_tool_data[0])
             if not i_tool_name or i_tool_name in ["cats_mgr", "sel_pol_mode"]:
                 continue
             i_tool_id = vars(self)[i_tool_name]
@@ -280,7 +294,7 @@ def SetMode(self, event, tool_name):
         self.scatt_mgr.modeSet.disconnect(self.ModeSet)
         if event.IsChecked():
             for i_tool_data in self.controller.data:
-                i_tool_name = i_tool_data[0]
+                i_tool_name = get_tool_name(i_tool_data[0])
                 if not i_tool_name:
                     continue
                 if i_tool_name == tool_name:
@@ -298,7 +312,7 @@ def ModeSet(self, mode):
 
     def UnsetMode(self):
         for i_tool_data in self.controller.data:
-            i_tool_name = i_tool_data[0]
+            i_tool_name = get_tool_name(i_tool_data[0])
             if not i_tool_name:
                 continue
             i_tool_id = vars(self)[i_tool_name]