Merge pull request #85 from AresValley:UI-refactor

UI refactor

Author: AresValley

CHANGELOG.md

@@ -9,6 +9,13 @@
 
 - Added indicator if a DB and/or Artemis update is available on the main menu
 - Added native support and official packages for Arch Linux and derived distributions utilizing the pacman package manager.
+- Added official support and binaries (.pkg.tar.zst) for x64 arch-based distros along rpm and deb packages. Fix [#83](https://github.com/AresValley/Artemis/issues/83)
+
+### Changed
+
+- Completely overhauled the GUI for a more modern and fluid user experience.
+- Filters have been moved to the top menu for future implementation of new filtering functions
+- Minor chnages to the settings for logging and system-specific environement variables
 
 ### Fixed
 

artemis.qrc

@@ -20,7 +20,7 @@
         <file>data/images/icons/open.svg</file>
         <file>data/images/icons/browser.svg</file>
         <file>data/images/icons/documents.svg</file>
-        <file>data/images/icons/abort.svg</file>
+        <file>data/images/icons/cancel.svg</file>
         <file>data/images/icons/settings.svg</file>
         <file>data/images/spectrum_not_available.svg</file>
         <file>data/images/artemis_not_available.svg</file>
@@ -35,7 +35,6 @@
         <file>ui/SignalEditor.qml</file>
         <file>ui/CategoryEditor.qml</file>
 
-        <file>ui/FilterPage.qml</file>
         <file>ui/SignalPage.qml</file>
         <file>ui/SpaceWeatherCurrentPage.qml</file>
         <file>ui/SpaceWeatherForecastPage.qml</file>
@@ -50,5 +49,9 @@
         <file>ui/components/AIndexLight.qml</file>
         <file>ui/components/AudioPlayer.qml</file>
         <file>ui/components/BandBar.qml</file>
+        <file>ui/components/FilterListDialog.qml</file>
+        <file>ui/components/FilterRangeDialog.qml</file>
+        <file>ui/components/ArtemisButton.qml</file>
+        <file>ui/components/ArtemisListView.qml</file>
     </qresource>
 </RCC>

artemis/resources.py

@@ -7,7 +7,6 @@
 from artemis.utils.sys_utils import open_directory, make_tar, unpack_tar
 from artemis.utils.sql_utils import ArtemisDatabase, ArtemisSignal
 from artemis.utils.update_utils import UpdateManager
-from artemis.utils.generic_utils import generate_filter_query
 from artemis.utils.path_utils import normalize_dialog_path
 from artemis.utils.path_utils import DATA_DIR
 from artemis.utils.config_utils import CONFIGURE_QT
@@ -19,6 +18,7 @@
 from artemis.ui.spaceweather import UIspaceweather
 from artemis.ui.documentsmanager import UIdocumentsmanager
 from artemis.ui.categoryeditor import UIcategoryeditor
+from artemis.ui.filters import FiltersManager
 
 import artemis.resources
 
@@ -28,11 +28,9 @@ class UIArtemis(QObject):
     close_ui = Signal()
     populate_sig_list = Signal(list)
     populate_sig_details = Signal(list)
-    populate_filter_modulation = Signal(list)
 
     clear_list = Signal()
     clear_signal_page = Signal()
-    clear_filter_page = Signal()
     lock_audio_player = Signal()
     lock_menu = Signal(bool)
 
@@ -53,8 +51,8 @@ def __init__(self):
         self._engine.load('qrc:/ui/Artemis.qml')
         self._window = self._engine.rootObjects()[0]
 
-        self._window_filter = self._window.findChild(QObject, "filterPageObj")
         self._window_signal = self._window.findChild(QObject, "signalPageObj")
+        self._window_signal_list = self._window.findChild(QObject, "signalListObj") # <--- MODIFICATO (Nuovo riferimento)
 
         self.loaded_db = None
 
@@ -69,6 +67,7 @@ def __init__(self):
         self.cateditor = UIcategoryeditor(self)
         self.downloader = UIDownloader(self)
 
+        self.filters_manager = FiltersManager(self)
         self.update_manager = UpdateManager(self)
 
         self.autoload_db()
@@ -91,30 +90,25 @@ def _connect(self):
         self._window.exportDb.connect(self.export_db)
         self._window.importDb.connect(self.import_db)
 
-        self._window_filter.applyFilter.connect(self.apply_filter)
-        self._window_filter.sendBottomAlert.connect(self.bottom_info_bar)
-
         self._window_signal.openDocManager.connect(self.show_documentsmanager_ui)
         self._window_signal.openSigEditor.connect(self.open_sig_editor)
         self._window_signal.deleteCatTag.connect(self.delete_cat_tag)
         self._window_signal.addCatTag.connect(self.add_cat_tag)
 
         # Python > QML connections
         self.close_ui.connect(self._window.close)
-        self.populate_sig_list.connect(self._window.populateList)
-        self.clear_list.connect(self._window.clearList)
         self.update_info_bar.connect(self._window.bottomInfoBar)
         self.show_dialog_popup.connect(self._window.openGeneralDialog)
         self.show_dialog_download_db.connect(self._window.openDialogDownloadDb)
         self.show_dialog_update_artemis.connect(self._window.openDialogUpdateArtemis)
         self.lock_menu.connect(self._window.lockMenu)
 
+        self.populate_sig_list.connect(self._window_signal_list.populateList)
+        self.clear_list.connect(self._window_signal_list.clearList)
+
         self.populate_sig_details.connect(self._window_signal.populateSignalParam)
         self.lock_audio_player.connect(self._window_signal.lockPlayer)
         self.clear_signal_page.connect(self._window_signal.resetAll)
-        
-        self.clear_filter_page.connect(self._window_filter.resetAll)
-        self.populate_filter_modulation.connect(self._window_filter.loadLists)
 
 
     def load_db(self, db_dir_name):
@@ -129,9 +123,8 @@ def load_db(self, db_dir_name):
         # Clearing UI
         self.lock_menu.emit(False)
         self.clear_signal_page.emit()
-        self.clear_filter_page.emit()
         # Populating UI
-        self.load_filter_lists()
+        self.filters_manager.load_filter_lists()
         self.populate_sig_list.emit(self.loaded_db.all_signals)
         # Updating status bar
         total_signals = len(self.loaded_db.all_signals)
@@ -152,39 +145,6 @@ def load_sig(self, sig_id):
         self.populate_sig_details.emit([sig_dic])
 
 
-    def load_filter_lists(self):
-        """ Populates the 3 listviews in the FilterPage
-        """
-        self.populate_filter_modulation.emit([{
-            'modulation': self.loaded_db.all_modulation,
-            'location': self.loaded_db.all_location,
-            'category': self.loaded_db.all_category_labels
-        }])
-
-
-    @Slot(dict)
-    def apply_filter(self, filter_status):
-        """ Update the signal list according to the selected filters in the FilterPage.
-
-        Args:
-            filter_status (dic): dictionary containing the active filters with all
-            the details to generate a search query
-        """
-        filter_status = filter_status.toVariant()
-        if self.loaded_db is not None:
-            if filter_status != {}:
-                filter_query = generate_filter_query(filter_status)
-                self.loaded_db.select_by_filter(filter_query)
-                
-                self.clear_signal_page.emit()
-                self.populate_sig_list.emit(self.loaded_db.all_signals)
-
-                total_signals = len(self.loaded_db.all_signals)
-                self.bottom_info_bar("FILTERS ACTIVE: {} signals found".format(total_signals), "warning")
-            else:
-                self.load_db(self.loaded_db.db_dir_name)
-
-
     def show_pref_ui(self):
         """ Load the preference windows
         """

artemis/ui/artemis.py

@@ -0,0 +1,75 @@
+from PySide6.QtCore import QObject, Slot, Signal
+
+from artemis.utils.generic_utils import generate_filter_query
+
+
+class FiltersManager(QObject):
+    # Python > QML Signals
+    populate_filter_list = Signal(list)
+
+    def __init__(self, parent):
+        super().__init__()
+        self._parent = parent
+
+        self._window = self._parent._window
+        self.location_filter = self._window.findChild(QObject, "locationDialogObj")
+        self.category_filter = self._window.findChild(QObject, "categoryDialogObj")
+        self.modulation_filter = self._window.findChild(QObject, "moculationDialogObj")
+
+        self._connect()
+
+
+    def _connect(self):
+        # QML > Python connections
+        self._window.applyFilter.connect(self.apply_filter)
+
+        # Python > QML connections
+        self.populate_filter_list.connect(self._window.populateFilterLists)
+
+
+    def load_filter_lists(self):
+        locations = self._parent.loaded_db.all_location
+        modulations = self._parent.loaded_db.all_modulation
+        categories = self._parent.loaded_db.all_category_labels
+
+        self.populate_filter_list.emit([{
+            'location': locations,
+            'modulation': modulations,
+            'category': categories
+        }])
+
+
+    @Slot(dict)
+    def apply_filter(self, filter_status):
+        """ Update the signal list according to the selected filters.
+
+        Args:
+            filter_status (dict): dictionary containing the active filters with all
+            the details to generate a search query
+        """
+        filter_status = filter_status.toVariant()
+
+        if self._parent.loaded_db is not None:
+            if filter_status != {}:
+
+                ############### TEMPORARY CODE UNTIL ORM IMPLEMENTATION (to be deleted asap) ############
+                if 'category' in filter_status:
+                    all_categories = self._parent.loaded_db.all_category_labels
+                    category_lookup = {item['value']: item['clb_id'] for item in all_categories}
+
+                    category_list = filter_status['category']
+                    category_list = [category_lookup.get(i) for i in category_list]
+
+                    filter_status['category'] = category_list
+                ############### TEMPORARY CODE UNTIL ORM IMPLEMENTATION ############
+
+                filter_query = generate_filter_query(filter_status)
+                self._parent.loaded_db.select_by_filter(filter_query)
+
+                self._parent.clear_signal_page.emit()
+                self._parent.populate_sig_list.emit(self._parent.loaded_db.all_signals)
+
+                total_signals = len(self._parent.loaded_db.all_signals)
+                self._parent.bottom_info_bar("FILTERS ACTIVE: {} signals found".format(total_signals), "warning")
+            else:
+                self._parent.load_db(self._parent.loaded_db.db_dir_name)

artemis/ui/filters.py

@@ -1,23 +1,36 @@
 import os
 
-from artemis.utils.sys_utils import is_windows, is_linux, is_macos
+from artemis.utils.sys_utils import is_windows, is_linux
 from artemis.utils.config_utils import CONFIGURE_QT
 
 
 def set_ui():
+    # Style and aspect
     os.environ['QT_QUICK_CONTROLS_STYLE'] = CONFIGURE_QT.value('Controls', 'style', 'Material')
     os.environ['QT_QUICK_CONTROLS_MATERIAL_VARIANT'] = CONFIGURE_QT.value('Material', 'variant', 'Dense')
     os.environ['QT_QUICK_CONTROLS_MATERIAL_THEME'] = CONFIGURE_QT.value('Material', 'theme', 'System')
     os.environ['QT_QUICK_CONTROLS_MATERIAL_ACCENT'] = CONFIGURE_QT.value('Material', 'accent', 'Green')
 
+    # High DPI
+    os.environ['QT_AUTO_SCREEN_SCALE_FACTOR'] = '1'
+    os.environ['QT_ENABLE_HIGHDPI_SCALING'] = '1'
+    os.environ['QT_SCALE_FACTOR_ROUNDING_POLICY'] = 'PassThrough'
+
+    # GUI Backend
     if is_windows():
         os.environ['QSG_RHI_BACKEND'] = 'opengl'
 
     if is_linux():
-        # os.environ['GDK_BACKEND'] = 'x11'
         os.environ['QT_QPA_PLATFORM'] = 'wayland;xcb'
 
+    # Optimizations and workarounds
     os.environ['QT_ENABLE_GLYPH_CACHE_WORKAROUND'] = '1'
     os.environ['QML_USE_GLYPHCACHE_WORKAROUND'] = '1'
 
+    # Debug and loggings
+    debug = CONFIGURE_QT.value('Develop', 'debug', '0')
+
     os.environ['QT_DEBUG_PLUGINS'] = CONFIGURE_QT.value('Develop', 'debug_plugin', '0')
+
+    if debug != '1':
+        os.environ["QT_LOGGING_RULES"] = "qt.multimedia.ffmpeg*=false"

artemis/utils/ui_utils.py

@@ -10,4 +10,5 @@ accent=Green
 autoload=0
 
 [Develop]
+debug=0
 debug_plugin=0