Fixed find/replace dialogs to work on int/hex/float

KyonkoYuuki · Oct 29, 2020 · 3c30a70 · 3c30a70
1 parent 822a6ac
commit 3c30a70
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -30,4 +30,5 @@ This tool is here to help out with creating and modifying BCMs. In addition to g
 0.2.2 - Add automatic backup creation on saving
 0.2.3 - Improved editing performance with very large BCM's, fixed child/sibling indexes cutting off at 32767
 0.2.4 - Added primary activator conditions
+0.2.5 - Fixed find/replace dialogs so it works with int/hex/float
 ```
diff --git a/YaBCM Organizer.py b/YaBCM Organizer.py
@@ -16,7 +16,7 @@
 from yabcm.dlg.replace import ReplaceDialog
 from pyxenoverse.gui.file_drop_target import FileDropTarget
 
-VERSION = '0.2.4'
+VERSION = '0.2.5'
 
 
 class MainWindow(wx.Frame):

diff --git a/yabcm/dlg/find.py b/yabcm/dlg/find.py
@@ -101,7 +101,8 @@ def find(self, selected, entry_type, find):
         item = get_next_item(self.entry_list, selected)
         while item != selected:
             data = self.entry_list.GetItemData(item)
-            if data[entry_type] == find:
+            if find is None or data[entry_type] == find or (
+                    isinstance(data[entry_type], float) and abs(data[entry_type] - find) < 0.000001):
                 self.select_found(item, entry_type)
                 break
 
@@ -113,18 +114,21 @@ def find(self, selected, entry_type, find):
 
     def on_find(self, _):
         entry_type = self.choices[self.entry.GetSelection()]
-        value = self.find_ctrl.GetValue()
-        if value:
-            try:
-                find = int(value, 0)
-            except ValueError:
-                self.status_bar.SetStatusText("Invalid Value")
-                return
-        else:
-            find = None
+        value = None
+        try:
+            value = self.get_value(self.find_ctrl)
+        except ValueError:
+            self.status_bar.SetStatusText("Invalid Value")
         selected = self.entry_list.GetSelections()
         if len(selected) == 1 and selected[0] != self.entry_list.GetRootItem():
             selected = selected[0]
         else:
             selected = get_first_item(self.entry_list)[0]
-        self.find(selected, entry_type, find)
+        self.find(selected, entry_type, value)
+
+    @staticmethod
+    def get_value(ctrl):
+        value = ctrl.GetValue()
+        if value.startswith('0x'):
+            return int(value, 16)
+        return float(value)
diff --git a/yabcm/dlg/replace.py b/yabcm/dlg/replace.py
@@ -32,8 +32,8 @@ def __init__(self, parent, entry_list, *args, **kw):
     def on_replace(self, _):
         entry_type = self.choices[self.entry.GetSelection()]
         try:
-            find = int(self.find_ctrl.GetValue(), 0)
-            replace = int(self.replace_ctrl.GetValue(), 0)
+            find = self.get_value(self.find_ctrl)
+            replace = self.get_value(self.replace_ctrl)
         except ValueError:
             self.status_bar.SetStatusText("Invalid Value")
             return None
@@ -52,16 +52,17 @@ def on_replace(self, _):
     def on_replace_all(self, _):
         entry_type = self.choices[self.entry.GetSelection()]
         try:
-            find = int(self.find_ctrl.GetValue(), 0)
-            replace = int(self.replace_ctrl.GetValue(), 0)
+            find = self.get_value(self.find_ctrl)
+            replace = self.get_value(self.replace_ctrl)
         except ValueError:
             self.status_bar.SetStatusText("Invalid Value")
             return None
         count = 0
         item = get_first_item(self.entry_list)[0]
         while item.IsOk():
             data = self.entry_list.GetItemData(item)
-            if data[entry_type] == find:
+            if data[entry_type] == find or (
+                    isinstance(data[entry_type], float) and abs(data[entry_type] - find) < 0.000001):
                 data[entry_type] = replace
                 count += 1
             item = get_next_item(self.entry_list, item)