Merge pull request bitcraze#638 from bitcraze/config-file-regex-fix

Fixed regex bug in file dialog
cafeciaojoe · Nov 29, 2022 · 45ba7e6 · 45ba7e6
2 parents 473fabd + 47ac6be
commit 45ba7e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/cfclient/ui/dialogs/anchor_position_dialog.py b/src/cfclient/ui/dialogs/anchor_position_dialog.py
@@ -28,6 +28,7 @@
 import logging
 
 import cfclient
+from cfclient.utils.logconfigreader import FILE_REGEX_YAML
 from PyQt5 import QtWidgets
 from PyQt5 import uic
 from PyQt5.QtCore import QAbstractTableModel, QVariant, Qt
@@ -212,7 +213,7 @@ def anchor_postions_updated(self, anchor_positions):
         self._data_model.anchor_postions_updated(anchor_positions)
 
     def _load_button_clicked(self):
-        names = QFileDialog.getOpenFileName(self, 'Open file', self._helper.current_folder, "*.yaml;*.*")
+        names = QFileDialog.getOpenFileName(self, 'Open file', self._helper.current_folder, FILE_REGEX_YAML)
 
         if names[0] == '':
             return
@@ -234,7 +235,7 @@ def _save_button_clicked(self):
         for id, pos in anchor_positions.items():
             data[id] = {'x': pos[0], 'y': pos[1], 'z': pos[2]}
 
-        names = QFileDialog.getSaveFileName(self, 'Save file', self._helper.current_folder, "*.yaml;*.*")
+        names = QFileDialog.getSaveFileName(self, 'Save file', self._helper.current_folder, FILE_REGEX_YAML)
 
         if names[0] == '':
             return

diff --git a/src/cfclient/ui/tabs/lighthouse_tab.py b/src/cfclient/ui/tabs/lighthouse_tab.py
@@ -49,6 +49,7 @@
 from cfclient.ui.dialogs.lighthouse_bs_geometry_dialog import LighthouseBsGeometryDialog
 from cfclient.ui.dialogs.basestation_mode_dialog import LighthouseBsModeDialog
 from cfclient.ui.dialogs.lighthouse_system_type_dialog import LighthouseSystemTypeDialog
+from cfclient.utils.logconfigreader import FILE_REGEX_YAML
 
 from vispy import scene
 import numpy as np
@@ -676,7 +677,7 @@ def _update_basestation_status_indicators(self):
                         label.setToolTip('')
 
     def _load_sys_config_button_clicked(self):
-        names = QFileDialog.getOpenFileName(self, 'Open file', self._helper.current_folder, "*.yaml;;*.*")
+        names = QFileDialog.getOpenFileName(self, 'Open file', self._helper.current_folder, FILE_REGEX_YAML)
 
         if names[0] == '':
             return
@@ -698,7 +699,7 @@ def _calibration_read_cb(self, calibs):
         self._save_sys_config(self._lh_geos, calibs, system_type)
 
     def _save_sys_config(self, geos, calibs, system_type):
-        names = QFileDialog.getSaveFileName(self, 'Save file', self._helper.current_folder, "*.yaml;;*.*")
+        names = QFileDialog.getSaveFileName(self, 'Save file', self._helper.current_folder, FILE_REGEX_YAML)
 
         if names[0] == '':
             return

diff --git a/src/cfclient/utils/logconfigreader.py b/src/cfclient/utils/logconfigreader.py
@@ -55,6 +55,8 @@
 DEFAULT_CONF_NAME = 'log_config'
 DEFAULT_CATEGORY_NAME = 'category'
 
+FILE_REGEX_YAML = "Config *.yaml;;All *.*"
+
 
 class LogConfigReader():
     """Reads logging configurations from file"""

diff --git a/src/cfloader/__init__.py b/src/cfloader/__init__.py
@@ -35,8 +35,6 @@
 from cflib.bootloader import Bootloader, Target
 from cflib.bootloader.boottypes import BootVersion
 
-from typing import Optional, List
-
 
 def main():
     # Initialise the CRTP link driver