Compare commits
40 Commits
v4.0.0-RC3
...
revised-ne
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6c0b1b7e04 | ||
|
|
c17c1fdbea | ||
|
|
8138cf8e38 | ||
|
|
0b416f0a2e | ||
|
|
1d0c459402 | ||
|
|
0f898ff6f5 | ||
|
|
c58d85c6a2 | ||
|
|
f73034c35c | ||
|
|
77c43813a0 | ||
|
|
b01bd99ecf | ||
|
|
146a5d1605 | ||
|
|
ea245c853b | ||
|
|
e57e9bf8e4 | ||
|
|
70ed158b02 | ||
|
|
1d795b688e | ||
|
|
52c4fbcce9 | ||
|
|
79891899ce | ||
|
|
dde223d2ac | ||
|
|
43ddee410a | ||
|
|
ecbf10ebb5 | ||
|
|
5d3cdb7abb | ||
|
|
5b8670814b | ||
|
|
19acf11b1a | ||
|
|
39056d1d91 | ||
|
|
436c54b733 | ||
|
|
b48a42dcc8 | ||
|
|
e00e21c46a | ||
|
|
2aa821ee65 | ||
|
|
5ab0c39aa9 | ||
|
|
f09bbd3311 | ||
|
|
91589018a3 | ||
|
|
d41c9e1ed6 | ||
|
|
0cbd9a7a0b | ||
|
|
7db68ab2ad | ||
|
|
c7c53b5a68 | ||
|
|
9d2443b0f0 | ||
|
|
2c3ffd5e66 | ||
|
|
485eccb373 | ||
|
|
faf9a5293a | ||
|
|
e58cf4d206 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -6,3 +6,6 @@ data/
|
||||
*.qtds
|
||||
artemis_rc.py
|
||||
site
|
||||
Generated
|
||||
app.build
|
||||
app.dist
|
||||
|
||||
26
CHANGELOG.md
26
CHANGELOG.md
@@ -3,7 +3,27 @@
|
||||
> [!NOTE]
|
||||
> This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and the format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||
|
||||
## [Unreleased] - 2024-05-28
|
||||
## [Unreleased]
|
||||
|
||||
### Added
|
||||
- Possibility to navigate Artemis just with the keyboard [#50](https://github.com/AresValley/Artemis/issues/50)
|
||||
|
||||
### Changed
|
||||
- Improved readability of labels for filter ranges for frequency, bandwidth, and ACF
|
||||
|
||||
### Fixed
|
||||
- Added a database load check to avoid (non critical) exceptions when applying filters without having loaded a database.
|
||||
|
||||
## [4.0.3] - 2024-06-10
|
||||
|
||||
### Changed
|
||||
- Optimized final package size (reduced by 30% to 50%) by explicitly including necessary plugins/DLLs and excluding unnecessary ones with Nuitka [#47](https://github.com/AresValley/Artemis/issues/47)
|
||||
|
||||
### Fixed
|
||||
- When the links/urls in the description field of a signal are clicked, they open the default browser [#46](https://github.com/AresValley/Artemis/issues/46)
|
||||
- Fixed an error occurig on Linux where configuration file path are not properly resolved during startup with the binary version of the program (they are if running from source) [#48](https://github.com/AresValley/Artemis/issues/48)
|
||||
|
||||
## [4.0.1] - 2024-06-9
|
||||
### Added
|
||||
- Database format has been changed from .csv to a proper relational DB (sqlite) which is much easier handled thanks to the native library shipped with python
|
||||
- Possibility to create an arbitrary number of new databases for storing new custom signals
|
||||
@@ -89,7 +109,9 @@ First release.
|
||||
|
||||
|
||||
<!-- Links definitions -->
|
||||
[Unreleased]: https://github.com/AresValley/Artemis/compare/v3.2.4...HEAD
|
||||
[Unreleased]: https://github.com/AresValley/Artemis/compare/v4.0.3...HEAD
|
||||
[4.0.3]: https://github.com/AresValley/Artemis/compare/v4.0.1...v4.0.3
|
||||
[4.0.1]: https://github.com/AresValley/Artemis/compare/v3.2.4...v4.0.1
|
||||
[3.2.4]: https://github.com/AresValley/Artemis/compare/v3.2.1...v3.2.4
|
||||
[3.2.3]: https://github.com/AresValley/Artemis/compare/v3.2.2...v3.2.3
|
||||
[3.2.2]: https://github.com/AresValley/Artemis/compare/v3.2.1...v3.2.2
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
**Artemis** is a software designed to assist **radio frequency (RF) signal identification and storage**. It simplifies real-time spectrum analysis by leveraging one of the most extensive and community-driven databases, containing nearly **500 recognized signals**. This comprehensive software solution allows users to collect RF signals with specific parameters such as frequency, bandwidth, modulation, etc. Users can also store spectrum waterfalls, audio samples, and all types of documents for future reference. Artemis provides a robust platform to manage a wide range of RF data with precision and ease.
|
||||
|
||||
<div align="center">
|
||||
<img src="docs/assets/artemis_preview.png">
|
||||
<img src="docs/assets/artemis_preview.webp">
|
||||
</div>
|
||||
|
||||
## Documentation
|
||||
|
||||
7313
artemis/resources.py
7313
artemis/resources.py
File diff suppressed because it is too large
Load Diff
@@ -6,10 +6,11 @@ from PySide6.QtCore import QObject, Slot, Signal
|
||||
from artemis.utils.constants import Constants, Messages
|
||||
from artemis.utils.sys_utils import open_directory, make_tar, unpack_tar
|
||||
from artemis.utils.sql_utils import ArtemisDatabase, ArtemisSignal
|
||||
from artemis.utils.path_utils import DATA_DIR
|
||||
from artemis.utils.network_utils import NetworkManager
|
||||
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
|
||||
|
||||
from artemis.ui.preferences import UIPreferences
|
||||
from artemis.ui.dbmanager import UIdbmanager
|
||||
@@ -24,6 +25,7 @@ import artemis.resources
|
||||
|
||||
class UIArtemis(QObject):
|
||||
# Python > QML Signals
|
||||
close_ui = Signal()
|
||||
populate_sig_list = Signal(list)
|
||||
populate_sig_details = Signal(list)
|
||||
populate_filter_modulation = Signal(list)
|
||||
@@ -36,7 +38,7 @@ class UIArtemis(QObject):
|
||||
|
||||
show_dialog_popup = Signal(str, str, str)
|
||||
show_dialog_download_db = Signal(str, str, str)
|
||||
show_dialog_download_art = Signal(str, str, str)
|
||||
show_dialog_update_artemis = Signal(str, str, str, bool)
|
||||
update_info_bar = Signal(str, str)
|
||||
|
||||
|
||||
@@ -61,13 +63,15 @@ class UIArtemis(QObject):
|
||||
# Creating istances for other windows
|
||||
self.preferences = UIPreferences(self)
|
||||
self.dbmanager = UIdbmanager(self)
|
||||
self.downloader = UIDownloader(self)
|
||||
self.spaceweather = UIspaceweather(self)
|
||||
self.docmanager = UIdocumentsmanager(self)
|
||||
self.sigeditor = UIsignaleditor(self)
|
||||
self.cateditor = UIcategoryeditor(self)
|
||||
self.downloader = UIDownloader(self)
|
||||
|
||||
self.network_manager = NetworkManager(self)
|
||||
self.update_manager = UpdateManager(self)
|
||||
|
||||
self.autoload_db()
|
||||
|
||||
|
||||
def _connect(self):
|
||||
@@ -76,8 +80,9 @@ class UIArtemis(QObject):
|
||||
self._window.loadSignal.connect(self.load_sig)
|
||||
self._window.showPref.connect(self.show_pref_ui)
|
||||
self._window.openSigEditor.connect(self.open_sig_editor)
|
||||
self._window.startDownloader.connect(self.start_download_db)
|
||||
self._window.checkDbUpdates.connect(self.check_update_db)
|
||||
self._window.checkForUpdate.connect(self.check_for_update)
|
||||
self._window.updateDb.connect(self.update_db)
|
||||
self._window.updateArtemis.connect(self.update_artemis)
|
||||
self._window.showSpaceWeather.connect(self.show_space_weather_ui)
|
||||
self._window.openDbDirectory.connect(self.open_db_directory)
|
||||
self._window.showCatManager.connect(self.open_cat_manager)
|
||||
@@ -95,12 +100,13 @@ class UIArtemis(QObject):
|
||||
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_download_art.connect(self._window.openDialogDownloadArtemis)
|
||||
self.show_dialog_update_artemis.connect(self._window.openDialogUpdateArtemis)
|
||||
self.lock_menu.connect(self._window.lockMenu)
|
||||
|
||||
self.populate_sig_details.connect(self._window_signal.populateSignalParam)
|
||||
@@ -165,6 +171,7 @@ class UIArtemis(QObject):
|
||||
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)
|
||||
@@ -210,18 +217,10 @@ class UIArtemis(QObject):
|
||||
self.docmanager.load_documentsmanager_ui()
|
||||
|
||||
|
||||
def check_update_db(self):
|
||||
""" User manual check for updates db updates
|
||||
def check_for_update(self):
|
||||
""" User manual check for updates updates
|
||||
"""
|
||||
self.network_manager.show_popup = True
|
||||
self.network_manager.check_updates()
|
||||
|
||||
|
||||
def start_download_db(self):
|
||||
""" Show the downloader and start the download of the sigid db
|
||||
"""
|
||||
self.downloader.show_ui.emit()
|
||||
self.downloader.on_start()
|
||||
self.update_manager.check_updates(True)
|
||||
|
||||
|
||||
def dialog_download_db(self, message_type, title, message):
|
||||
@@ -230,10 +229,24 @@ class UIArtemis(QObject):
|
||||
self.show_dialog_download_db.emit(message_type, title, message)
|
||||
|
||||
|
||||
def dialog_download_artemis(self, message_type, title, message):
|
||||
""" Dialog popup for artemis download confirmation
|
||||
def dialog_update_artemis(self, message_type, title, message, auto=False):
|
||||
""" Dialog popup for Artemis download confirmation
|
||||
"""
|
||||
self.show_dialog_download_art.emit(message_type, title, message)
|
||||
self.show_dialog_update_artemis.emit(message_type, title, message, auto)
|
||||
|
||||
|
||||
@Slot()
|
||||
def update_db(self):
|
||||
""" Start the download of the sigID DB
|
||||
"""
|
||||
self.update_manager.download_db()
|
||||
|
||||
|
||||
@Slot()
|
||||
def update_artemis(self):
|
||||
""" Start the download of Artemis
|
||||
"""
|
||||
self.update_manager.download_artemis()
|
||||
|
||||
|
||||
def open_db_directory(self):
|
||||
@@ -331,6 +344,13 @@ class UIArtemis(QObject):
|
||||
self.cateditor.load_cateditor_ui()
|
||||
|
||||
|
||||
def autoload_db(self):
|
||||
sig_id_path = DATA_DIR / 'SigID' / Constants.SQL_NAME
|
||||
autoload = CONFIGURE_QT.value("Database", "autoload", 0)
|
||||
if sig_id_path.exists() and int(autoload):
|
||||
self.load_db('SigID')
|
||||
|
||||
|
||||
def dialog_popup(self, message_type, title, message):
|
||||
""" Opens a general dialog popup
|
||||
|
||||
|
||||
@@ -1,17 +1,21 @@
|
||||
import requests
|
||||
|
||||
from PySide6.QtQml import QQmlApplicationEngine
|
||||
from PySide6.QtCore import QObject, Slot, Signal, QUrl, QSaveFile, QDir, QIODevice
|
||||
from PySide6.QtNetwork import QNetworkReply, QNetworkRequest, QNetworkAccessManager
|
||||
|
||||
from artemis.utils.config_utils import *
|
||||
from artemis.utils.sys_utils import delete_file, delete_dir, match_hash, unpack_tar
|
||||
from artemis.utils.constants import Messages
|
||||
from artemis.utils.path_utils import DATA_DIR
|
||||
|
||||
|
||||
class UIDownloader(QObject):
|
||||
# Python > QML Signals
|
||||
show_ui = Signal()
|
||||
close_ui = Signal()
|
||||
update_progress_bar = Signal(int, int)
|
||||
set_indeterminate_bar = Signal()
|
||||
update_status = Signal(str)
|
||||
finished = Signal()
|
||||
|
||||
|
||||
def __init__(self, parent):
|
||||
super().__init__()
|
||||
@@ -21,8 +25,13 @@ class UIDownloader(QObject):
|
||||
self._engine = QQmlApplicationEngine()
|
||||
self._engine.load('qrc:/ui/Downloader.qml')
|
||||
self._window = self._engine.rootObjects()[0]
|
||||
self._progress_bar = self._window.findChild(QObject, "progressBar")
|
||||
self._label_progress = self._window.findChild(QObject, "labelProgress")
|
||||
|
||||
self.file_url = None
|
||||
self.file_size = None
|
||||
self.dest_file = None
|
||||
self.file = None
|
||||
self.manager = None
|
||||
self.reply = None
|
||||
|
||||
self._connect()
|
||||
|
||||
@@ -34,49 +43,55 @@ class UIDownloader(QObject):
|
||||
# Python > QML connections
|
||||
self.show_ui.connect(self._window.show)
|
||||
self.close_ui.connect(self._window.close)
|
||||
self.update_progress_bar.connect(self._window.updateProgressBar)
|
||||
self.set_indeterminate_bar.connect(self._window.setIndeterminateBar)
|
||||
self.update_status.connect(self._window.updateStatus)
|
||||
|
||||
|
||||
@Slot()
|
||||
def on_start(self):
|
||||
""" Start the download of the DB taking the needed url and size from
|
||||
the attributes of the UpdatesController class
|
||||
def on_start(self, url, save_path):
|
||||
""" Start the download process using the specified URL
|
||||
|
||||
Args:
|
||||
url (str): url from where download the file
|
||||
save_path (str): path where to save the downloaded file
|
||||
"""
|
||||
url_file = QUrl(self._parent.network_manager.remote_db_url)
|
||||
dest_path = QDir(DATA_DIR)
|
||||
self.dest_file = dest_path.filePath(url_file.fileName())
|
||||
self._clear_ui()
|
||||
self.show_ui.emit()
|
||||
|
||||
self.file_url = QUrl(url)
|
||||
self.file_size = self._get_filesize(url)
|
||||
dest_path = QDir(save_path)
|
||||
self.dest_file = dest_path.filePath(self.file_url.fileName())
|
||||
self.file = QSaveFile(self.dest_file)
|
||||
|
||||
if self.file.open(QIODevice.WriteOnly):
|
||||
# Start a GET HTTP request
|
||||
self.manager = QNetworkAccessManager(self)
|
||||
self.reply = self.manager.get(QNetworkRequest(url_file))
|
||||
self.reply = self.manager.get(QNetworkRequest(self.file_url))
|
||||
self.reply.downloadProgress.connect(self.on_progress)
|
||||
self.reply.finished.connect(self.on_finished)
|
||||
self.reply.readyRead.connect(self.on_ready_read)
|
||||
self.reply.errorOccurred.connect(self.on_error)
|
||||
else:
|
||||
self.close_ui.emit()
|
||||
self.show_popup_error(
|
||||
self.file.errorString()
|
||||
)
|
||||
self.show_popup_error(self.file.errorString())
|
||||
|
||||
|
||||
@Slot()
|
||||
def on_abort(self):
|
||||
""" Stop the download when user press abort button """
|
||||
""" Stop the download when user presses the abort button
|
||||
"""
|
||||
if self.reply:
|
||||
self.reply.abort()
|
||||
self._progress_bar.setProperty("value", 0)
|
||||
|
||||
if self.file:
|
||||
self.file.cancelWriting()
|
||||
|
||||
self.close_ui.emit()
|
||||
|
||||
|
||||
@Slot()
|
||||
def on_ready_read(self):
|
||||
""" Get available bytes and store them into the file """
|
||||
""" Write available bytes to the file
|
||||
"""
|
||||
if self.reply:
|
||||
if self.reply.error() == QNetworkReply.NoError:
|
||||
self.file.write(self.reply.readAll())
|
||||
@@ -84,8 +99,9 @@ class UIDownloader(QObject):
|
||||
|
||||
@Slot()
|
||||
def on_finished(self):
|
||||
""" Delete reply, close the file, check the hash for integrity,
|
||||
extract the database and delete the downloaded zip
|
||||
""" Finalize the download process and, if no errors
|
||||
occurs, emits the finished signal usefull for
|
||||
a callback
|
||||
"""
|
||||
if self.reply:
|
||||
self.reply.deleteLater()
|
||||
@@ -93,25 +109,21 @@ class UIDownloader(QObject):
|
||||
if self.file:
|
||||
self.file.commit()
|
||||
|
||||
self._label_progress.setProperty("text", "Checking DB integrity (SHA-256)")
|
||||
if self.reply.error() == QNetworkReply.NoError:
|
||||
self.finished.emit()
|
||||
|
||||
if match_hash(self.dest_file, self._parent.network_manager.remote_db_hash):
|
||||
self._label_progress.setProperty("text", "Unpacking archive...")
|
||||
delete_dir(DATA_DIR / 'SigID')
|
||||
unpack_tar(self.dest_file, DATA_DIR / 'SigID')
|
||||
delete_file(self.dest_file)
|
||||
self._parent.load_db('SigID')
|
||||
self.close_ui.emit()
|
||||
|
||||
|
||||
@Slot(int, int)
|
||||
def on_progress(self, bytesReceived: int):
|
||||
""" Update progress bar and label
|
||||
""" Update progress bar and status label
|
||||
"""
|
||||
total_bytes = self._parent.network_manager.remote_db_size
|
||||
self._label_progress.setProperty("text", "{:.1f} Mb / {:.1f} Mb".format(bytesReceived/10**6, total_bytes/10**6))
|
||||
self._progress_bar.setProperty("to", total_bytes)
|
||||
self._progress_bar.setProperty("value", bytesReceived)
|
||||
if self.file_size is not None:
|
||||
self.update_status.emit("{:.1f} Mb / {:.1f} Mb".format(bytesReceived/10**6, self.file_size/10**6))
|
||||
self.update_progress_bar.emit(bytesReceived, self.file_size)
|
||||
else:
|
||||
self.update_status.emit("{:.1f} Mb".format(bytesReceived/10**6))
|
||||
|
||||
|
||||
@Slot(QNetworkReply.NetworkError)
|
||||
@@ -125,6 +137,28 @@ class UIDownloader(QObject):
|
||||
)
|
||||
|
||||
|
||||
def _get_filesize(self, url):
|
||||
""" Get the file size by sending a HEAD request to the URL.
|
||||
If the Content-Length in HTTP headers is missing, returns None
|
||||
and set the progress_bar as 'indeterminate' like a 'busy indicator'
|
||||
|
||||
Args:
|
||||
url (str): URL to check the file size
|
||||
"""
|
||||
try:
|
||||
response = requests.get(url, stream=True)
|
||||
size = int(response.headers.get('content-length'))
|
||||
return size
|
||||
except:
|
||||
self.set_indeterminate_bar.emit()
|
||||
return None
|
||||
|
||||
|
||||
def _clear_ui(self):
|
||||
self.update_progress_bar.emit(0, 0)
|
||||
self.update_status.emit('')
|
||||
|
||||
|
||||
def show_popup_error(self, error_msg):
|
||||
self._parent.dialog_popup(
|
||||
Messages.DIALOG_TYPE_ERROR,
|
||||
|
||||
@@ -9,6 +9,7 @@ class UIPreferences(QObject):
|
||||
show_ui = Signal()
|
||||
load_material_accent = Signal(str)
|
||||
load_material_theme = Signal(str)
|
||||
load_autoload = Signal(int)
|
||||
|
||||
|
||||
def __init__(self, parent):
|
||||
@@ -27,18 +28,21 @@ class UIPreferences(QObject):
|
||||
# QML > Python connections
|
||||
self._window.saveMaterialAccent.connect(self.save_material_accent)
|
||||
self._window.saveMaterialTheme.connect(self.save_material_theme)
|
||||
self._window.saveAutoload.connect(self.save_autoload)
|
||||
|
||||
# Python > QML connections
|
||||
self.show_ui.connect(self._window.show)
|
||||
self.load_material_accent.connect(self._window.loadMaterialAccent)
|
||||
self.load_material_theme.connect(self._window.loadMaterialTheme)
|
||||
self.load_autoload.connect(self._window.loadAutoload)
|
||||
|
||||
|
||||
def load_preferences_ui(self):
|
||||
""" Loading all the initial preferences from the conf file to the UI
|
||||
"""
|
||||
self.load_material_accent.emit(CONFIGURE_QT.get_or_default("Material", "Accent", "Green"))
|
||||
self.load_material_theme.emit(CONFIGURE_QT.get_or_default("Material", "Theme", "System"))
|
||||
self.load_material_accent.emit(CONFIGURE_QT.value("Material", "Accent", "Green"))
|
||||
self.load_material_theme.emit(CONFIGURE_QT.value("Material", "Theme", "System"))
|
||||
self.load_autoload.emit(int(CONFIGURE_QT.value("Database", "autoload", 0)))
|
||||
self.show_ui.emit()
|
||||
|
||||
|
||||
@@ -54,3 +58,10 @@ class UIPreferences(QObject):
|
||||
""" Saving material theme setting
|
||||
"""
|
||||
CONFIGURE_QT.set("Material", "Theme", material_theme)
|
||||
|
||||
|
||||
@Slot(int)
|
||||
def save_autoload(self, autoload):
|
||||
""" Saving autoload setting
|
||||
"""
|
||||
CONFIGURE_QT.set("Database", "autoload", str(autoload))
|
||||
|
||||
@@ -53,10 +53,10 @@ class UIspaceweather(QObject):
|
||||
|
||||
|
||||
def download_poseidon_report(self):
|
||||
network_manager = self._parent.network_manager
|
||||
network_manager.show_popup = True
|
||||
poseidon_data = network_manager.fetch_remote_json(
|
||||
Constants.POSEIDON_REPORT_URL
|
||||
update_manager = self._parent.update_manager
|
||||
poseidon_data = update_manager.fetch_remote_json(
|
||||
Constants.POSEIDON_REPORT_URL,
|
||||
True
|
||||
)
|
||||
if poseidon_data:
|
||||
self.load_poseidon_report.emit(poseidon_data)
|
||||
|
||||
@@ -6,7 +6,7 @@ from artemis.utils.sys_utils import copy_file
|
||||
|
||||
class Config(ConfigParser):
|
||||
""" Custom configuration class derived from ConfigParser.
|
||||
Used to get, set, save and remove any configuration from the conf file
|
||||
Used to get value, set, save and remove any configuration from the conf file
|
||||
"""
|
||||
|
||||
def __init__(self, config_file_path, space_around_delimiters=False):
|
||||
@@ -15,11 +15,13 @@ class Config(ConfigParser):
|
||||
self.read(self._config_file_path)
|
||||
self._space_around_delimiters = space_around_delimiters
|
||||
|
||||
def get_or_default(self, section, option, default_value):
|
||||
value = super().get(section, option)
|
||||
return value if value else default_value
|
||||
def value(self, section, option, default_value):
|
||||
value = super().get(section, option, fallback=default_value)
|
||||
return value
|
||||
|
||||
def set(self, section, option, value=None):
|
||||
if not self.has_section(section):
|
||||
self.add_section(section)
|
||||
super().set(section, option, value)
|
||||
self.save()
|
||||
|
||||
@@ -32,10 +34,42 @@ class Config(ConfigParser):
|
||||
self.write(f, space_around_delimiters=self._space_around_delimiters)
|
||||
|
||||
|
||||
if not (PREFERENCES_DIR / 'qtquickcontrols2.conf').exists():
|
||||
copy_file(
|
||||
BASE_DIR / 'config' / 'qtquickcontrols2.conf',
|
||||
PREFERENCES_DIR / 'qtquickcontrols2.conf'
|
||||
)
|
||||
def merge_config_files(old_config_path, template_config_path):
|
||||
""" Merge two configuration files: if the old one lacks some
|
||||
sections or options from a comparison with a template,
|
||||
this function will add what is missing to the old conf file
|
||||
"""
|
||||
old_config = ConfigParser()
|
||||
old_config.read(old_config_path)
|
||||
|
||||
new_config = ConfigParser()
|
||||
new_config.read(template_config_path)
|
||||
|
||||
for section in new_config.sections():
|
||||
if not old_config.has_section(section):
|
||||
old_config.add_section(section)
|
||||
for option in new_config.options(section):
|
||||
if not old_config.has_option(section, option):
|
||||
old_config.set(section, option, new_config.get(section, option))
|
||||
|
||||
with open(old_config_path, 'w') as f:
|
||||
old_config.write(f)
|
||||
|
||||
|
||||
def check_conf_file():
|
||||
""" Check the integrity of the used conf file.
|
||||
If it is not present it will add a copy to the PREF_DIR
|
||||
and if it is different in structure (different section/options)
|
||||
it will merge the conf file with the new template one
|
||||
"""
|
||||
active_conf = (PREFERENCES_DIR / 'qtquickcontrols2.conf').resolve()
|
||||
template_conf = (BASE_DIR / 'config' / 'qtquickcontrols2.conf').resolve()
|
||||
|
||||
if not active_conf.exists():
|
||||
copy_file(template_conf, active_conf)
|
||||
else:
|
||||
merge_config_files(active_conf, template_conf)
|
||||
|
||||
|
||||
check_conf_file()
|
||||
CONFIGURE_QT = Config((PREFERENCES_DIR / 'qtquickcontrols2.conf').resolve().as_posix())
|
||||
|
||||
@@ -10,7 +10,7 @@ class Constants():
|
||||
APPLICATION_NAME = 'Artemis'
|
||||
ORGANIZATION_NAME = 'AresValley'
|
||||
ORGANIZATION_DOMAIN = 'aresvalley.com'
|
||||
APPLICATION_VERSION = '4.0.0'
|
||||
APPLICATION_VERSION = '4.0.3'
|
||||
|
||||
SQL_NAME = 'data.sqlite'
|
||||
|
||||
@@ -39,6 +39,7 @@ class Messages:
|
||||
UP_TO_DATE = "You're up to date!"
|
||||
DB_NEW_VER = "New SigID DB version available!"
|
||||
ART_NEW_VER = "New Artemis version available!"
|
||||
DB_CORRUPTED = "Database Corruption Detected"
|
||||
|
||||
# Messages
|
||||
DB_CREATION_SUCCESS_MSG = "The new database has been created succesfully."
|
||||
@@ -50,8 +51,10 @@ class Messages:
|
||||
NO_CONNECTION_MSG = "Unable to check for updates. It appears that there is a problem with your internet connection. Please check your network settings and try again later. {}"
|
||||
UP_TO_DATE_MSG = "The latest version of Artemis and SigID wiki is installed on your computer."
|
||||
DB_NEW_VER_MSG = "A new version of the database ({}) is available for download. Download now?"
|
||||
ART_NEW_VER_MSG = "A new version of Artemis ({}) is available for download. Check GitHub page now?"
|
||||
DOWNLOAD_CORRUPTED_MSG = "Downloaded data corrupted or invalid. Please retry."
|
||||
ART_NEW_VER_MANUAL_MSG = "A new version of Artemis ({}) is available for download. Check GitHub page now?"
|
||||
ART_NEW_VER_AUTO_MSG = "A new version of Artemis ({}) is available for download. Update Artemis now?"
|
||||
DB_CORRUPTED_MSG = "Downloaded data corrupted or invalid. Please retry."
|
||||
DB_DOWNLOAD_SUCCESS_MSG = "The database has been successfully downloaded and is now being loaded."
|
||||
|
||||
|
||||
class Query():
|
||||
|
||||
@@ -1,135 +0,0 @@
|
||||
import os
|
||||
import requests
|
||||
|
||||
from packaging.version import Version
|
||||
|
||||
from artemis.utils.constants import Constants, Messages
|
||||
from artemis.utils.sql_utils import ArtemisDatabase
|
||||
from artemis.utils.sys_utils import is_windows, is_linux, is_macos
|
||||
from artemis.utils.path_utils import DATA_DIR
|
||||
|
||||
|
||||
class NetworkManager:
|
||||
""" Class that checks for DB or software updates
|
||||
"""
|
||||
|
||||
def __init__(self, parent):
|
||||
self._parent = parent
|
||||
self.sigid_db_path = DATA_DIR / 'SigID' / Constants.SQL_NAME
|
||||
|
||||
self.show_popup = False
|
||||
self.db_update = None
|
||||
self.art_update = None
|
||||
|
||||
self.remote_db_url = None
|
||||
self.remote_db_hash = None
|
||||
self.remote_db_version = None
|
||||
self.remote_db_size = None
|
||||
|
||||
self.remote_art_version = None
|
||||
|
||||
self.check_updates()
|
||||
|
||||
|
||||
def check_updates(self):
|
||||
""" Checks if a new DB update is available.
|
||||
|
||||
Args:
|
||||
popup (bool, optional): Suppress the "already up-to-date" message on startup.
|
||||
Defaults to False.
|
||||
"""
|
||||
latest_json = self.fetch_remote_json(Constants.LATEST_VERSION_URL)
|
||||
if latest_json:
|
||||
local_db = self.load_local_db()
|
||||
remote_db = latest_json['sigID_DB']
|
||||
|
||||
self.remote_db_version = remote_db['version']
|
||||
self.remote_db_url = remote_db['url']
|
||||
self.remote_db_hash = remote_db['sha256_hash']
|
||||
self.remote_db_size = remote_db['total_bytes']
|
||||
|
||||
if is_windows():
|
||||
self.remote_art_version = latest_json['windows']['version']
|
||||
elif is_linux():
|
||||
self.remote_art_version = latest_json['linux']['version']
|
||||
elif is_macos():
|
||||
self.remote_art_version = latest_json['mac']['version']
|
||||
|
||||
if Version(self.remote_art_version) > Version(Constants.APPLICATION_VERSION):
|
||||
self.art_update = True
|
||||
else:
|
||||
self.art_update = False
|
||||
|
||||
if self.art_update:
|
||||
self.show_popup_art_update()
|
||||
else:
|
||||
if local_db:
|
||||
if self.remote_db_version > local_db.version:
|
||||
self.show_popup_db_update()
|
||||
elif self.show_popup:
|
||||
self.show_popup_up_to_date()
|
||||
else:
|
||||
self.show_popup_initial_db_download()
|
||||
|
||||
|
||||
def fetch_remote_json(self, url):
|
||||
""" Fetches the remote json from a url
|
||||
"""
|
||||
try:
|
||||
response = requests.get(url)
|
||||
response.raise_for_status()
|
||||
return response.json()
|
||||
except requests.exceptions.RequestException as e:
|
||||
if self.show_popup:
|
||||
self._parent.dialog_popup(
|
||||
Messages.DIALOG_TYPE_ERROR,
|
||||
Messages.NO_CONNECTION,
|
||||
Messages.NO_CONNECTION_MSG.format(e)
|
||||
)
|
||||
return None
|
||||
|
||||
|
||||
def load_local_db(self):
|
||||
""" Loads the local database if exists
|
||||
"""
|
||||
if os.path.exists(self.sigid_db_path):
|
||||
local_db = ArtemisDatabase('SigID')
|
||||
local_db.load()
|
||||
return local_db
|
||||
return None
|
||||
|
||||
|
||||
def show_popup_db_update(self):
|
||||
"""Prompts the user to download the updated version of the database."""
|
||||
self._parent.dialog_download_db(
|
||||
Messages.DIALOG_TYPE_WARN,
|
||||
Messages.DB_NEW_VER,
|
||||
Messages.DB_NEW_VER_MSG.format(self.remote_db_version)
|
||||
)
|
||||
|
||||
|
||||
def show_popup_art_update(self):
|
||||
"""Prompts the user to download the updated version of the database."""
|
||||
self._parent.dialog_download_artemis(
|
||||
Messages.DIALOG_TYPE_WARN,
|
||||
Messages.ART_NEW_VER,
|
||||
Messages.ART_NEW_VER_MSG.format(self.remote_art_version)
|
||||
)
|
||||
|
||||
|
||||
def show_popup_up_to_date(self):
|
||||
"""Notifies the user that the database is up to date."""
|
||||
self._parent.dialog_popup(
|
||||
Messages.DIALOG_TYPE_INFO,
|
||||
Messages.UP_TO_DATE,
|
||||
Messages.UP_TO_DATE_MSG
|
||||
)
|
||||
|
||||
|
||||
def show_popup_initial_db_download(self):
|
||||
"""Prompts the user to download the database for the first time."""
|
||||
self._parent.dialog_download_db(
|
||||
Messages.DIALOG_TYPE_QUEST,
|
||||
Messages.NO_DB_DETECTED,
|
||||
Messages.NO_DB_DETECTED_MSG
|
||||
)
|
||||
@@ -21,7 +21,7 @@ def _app_dir():
|
||||
elif is_linux():
|
||||
app_dir_path = Path.home() / '.local' / 'share' / Constants.ORGANIZATION_NAME / Constants.APPLICATION_NAME
|
||||
else:
|
||||
app_dir_path = BASE_DIR
|
||||
app_dir_path = BASE_DIR.resolve()
|
||||
|
||||
if not app_dir_path.exists():
|
||||
app_dir_path.mkdir(parents=True)
|
||||
@@ -36,6 +36,15 @@ def _data_dir():
|
||||
return data_dir_path
|
||||
|
||||
|
||||
def _tmp_dir():
|
||||
if is_windows():
|
||||
tmp_dir_path = Path.home() / 'AppData' / 'Local' / 'Temp'
|
||||
else:
|
||||
tmp_dir_path = Path('/tmp')
|
||||
|
||||
return tmp_dir_path
|
||||
|
||||
|
||||
def _preference_dir():
|
||||
preference_dir_path = APP_DIR / 'config'
|
||||
if not preference_dir_path.exists():
|
||||
@@ -46,4 +55,5 @@ def _preference_dir():
|
||||
BASE_DIR = Path(os.path.dirname(__file__)) / '../..'
|
||||
APP_DIR = _app_dir()
|
||||
DATA_DIR = _data_dir()
|
||||
TMP_DIR = _tmp_dir()
|
||||
PREFERENCES_DIR = _preference_dir()
|
||||
|
||||
@@ -5,10 +5,10 @@ from artemis.utils.config_utils import CONFIGURE_QT
|
||||
|
||||
|
||||
def set_ui():
|
||||
os.environ['QT_QUICK_CONTROLS_STYLE'] = CONFIGURE_QT.get_or_default('Controls', 'style', 'Material')
|
||||
os.environ['QT_QUICK_CONTROLS_MATERIAL_VARIANT'] = CONFIGURE_QT.get_or_default('Material', 'variant', 'Dense')
|
||||
os.environ['QT_QUICK_CONTROLS_MATERIAL_THEME'] = CONFIGURE_QT.get_or_default('Material', 'theme', 'System')
|
||||
os.environ['QT_QUICK_CONTROLS_MATERIAL_ACCENT'] = CONFIGURE_QT.get_or_default('Material', 'accent', 'Green')
|
||||
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')
|
||||
|
||||
if is_windows():
|
||||
os.environ['QSG_RHI_BACKEND'] = 'opengl'
|
||||
|
||||
234
artemis/utils/update_utils.py
Normal file
234
artemis/utils/update_utils.py
Normal file
@@ -0,0 +1,234 @@
|
||||
import os
|
||||
import requests
|
||||
|
||||
from packaging.version import Version
|
||||
|
||||
from artemis.utils.constants import Constants, Messages
|
||||
from artemis.utils.sql_utils import ArtemisDatabase
|
||||
from artemis.utils.sys_utils import is_windows, is_linux, is_macos, delete_file, delete_dir, match_hash, unpack_tar, open_file
|
||||
from artemis.utils.path_utils import DATA_DIR, TMP_DIR
|
||||
|
||||
|
||||
class UpdateManager:
|
||||
""" Class used to manage DB and software updates
|
||||
"""
|
||||
|
||||
def __init__(self, parent):
|
||||
self._parent = parent
|
||||
self.sigid_db_path = DATA_DIR / 'SigID' / Constants.SQL_NAME
|
||||
|
||||
self.db_update = None
|
||||
self.art_update = None
|
||||
|
||||
self.remote_db_url = None
|
||||
self.remote_db_hash = None
|
||||
self.remote_db_version = None
|
||||
self.remote_db_size = None
|
||||
self.remote_db_file_name = None
|
||||
|
||||
self.remote_artemis_version = None
|
||||
self.remote_artemis_url = None
|
||||
self.remote_artemis_file_name = None
|
||||
|
||||
self.check_updates()
|
||||
|
||||
|
||||
def check_updates(self, show_popup=False):
|
||||
""" Checks if a software or DB update is available.
|
||||
Prioritize Artemis updates over the DB one.
|
||||
|
||||
Args:
|
||||
show_popup (bool, optional):
|
||||
If False, suppress the "already up-to-date" message on startup.
|
||||
Defaults to False. True is usefull when the user manual check for
|
||||
updates.
|
||||
"""
|
||||
latest_json = self.fetch_remote_json(Constants.LATEST_VERSION_URL, show_popup)
|
||||
if latest_json:
|
||||
local_db = self._load_local_db()
|
||||
remote_db = latest_json['sigID_DB']
|
||||
|
||||
self.remote_db_version = remote_db['version']
|
||||
self.remote_db_url = remote_db['url']
|
||||
self.remote_db_hash = remote_db['sha256_hash']
|
||||
self.remote_db_size = remote_db['total_bytes']
|
||||
self.remote_db_file_name = self.remote_db_url.split('/')[-1]
|
||||
|
||||
if is_windows():
|
||||
self.remote_artemis_version = latest_json['windows']['version']
|
||||
self.remote_artemis_url = latest_json['windows']['url']
|
||||
elif is_linux():
|
||||
self.remote_artemis_version = latest_json['linux']['version']
|
||||
self.remote_artemis_url = latest_json['linux']['url']
|
||||
elif is_macos():
|
||||
self.remote_artemis_version = latest_json['mac']['version']
|
||||
self.remote_artemis_url = latest_json['mac']['url']
|
||||
|
||||
self.remote_artemis_file_name = self.remote_artemis_url.split('/')[-1]
|
||||
|
||||
if Version(self.remote_artemis_version) > Version(Constants.APPLICATION_VERSION):
|
||||
self.art_update = True
|
||||
else:
|
||||
self.art_update = False
|
||||
|
||||
if self.art_update:
|
||||
self._show_popup_art_update()
|
||||
else:
|
||||
if local_db:
|
||||
if self.remote_db_version > local_db.version:
|
||||
self._show_popup_db_update()
|
||||
elif show_popup:
|
||||
self._show_popup_up_to_date()
|
||||
else:
|
||||
self._show_popup_initial_db_download()
|
||||
|
||||
|
||||
def fetch_remote_json(self, url, show_popup=False):
|
||||
""" Fetches the remote json from a url
|
||||
|
||||
Args:
|
||||
show_popup (bool, optional): If false, suppress any error message
|
||||
Defaults to False (to avoid error if the program is used offline)
|
||||
"""
|
||||
try:
|
||||
response = requests.get(url)
|
||||
response.raise_for_status()
|
||||
return response.json()
|
||||
except requests.exceptions.RequestException as e:
|
||||
if show_popup:
|
||||
self._parent.dialog_popup(
|
||||
Messages.DIALOG_TYPE_ERROR,
|
||||
Messages.NO_CONNECTION,
|
||||
Messages.NO_CONNECTION_MSG.format(e)
|
||||
)
|
||||
return None
|
||||
|
||||
|
||||
def _load_local_db(self):
|
||||
""" Loads the local database if exists
|
||||
"""
|
||||
if os.path.exists(self.sigid_db_path):
|
||||
local_db = ArtemisDatabase('SigID')
|
||||
local_db.load()
|
||||
return local_db
|
||||
return None
|
||||
|
||||
|
||||
def download_db(self):
|
||||
""" Open the downloader and download the sigID database in the
|
||||
TMP_DIR folder. After a succesfull download the callback function
|
||||
from the downloader is post_download_db
|
||||
"""
|
||||
self._parent.downloader.finished.connect(self.post_download_db)
|
||||
self._parent.downloader.on_start(
|
||||
self.remote_db_url,
|
||||
TMP_DIR
|
||||
)
|
||||
|
||||
|
||||
def post_download_db(self):
|
||||
""" After a succesfull DB download, this function check the hash
|
||||
for possible corrupted data, delete old sigID DB and extract
|
||||
the new one
|
||||
"""
|
||||
latest_db_tar_path = TMP_DIR / self.remote_db_file_name
|
||||
if match_hash(latest_db_tar_path, self.remote_db_hash):
|
||||
delete_dir(DATA_DIR / 'SigID')
|
||||
unpack_tar(latest_db_tar_path, DATA_DIR / 'SigID')
|
||||
self._parent.load_db('SigID')
|
||||
self._show_popup_db_download_complete()
|
||||
else:
|
||||
self._show_popup_db_hash_failed()
|
||||
delete_file(latest_db_tar_path)
|
||||
|
||||
|
||||
def download_artemis(self):
|
||||
""" Open the downloader and download Artemis in the
|
||||
TMP_DIR folder. After a succesfull download the callback function
|
||||
from the downloader is post_download_artemis
|
||||
"""
|
||||
self._parent.downloader.finished.connect(self.post_download_artemis)
|
||||
self._parent.downloader.on_start(
|
||||
self.remote_artemis_url,
|
||||
TMP_DIR
|
||||
)
|
||||
|
||||
|
||||
def post_download_artemis(self):
|
||||
""" After a succesfull Artemis download, this open the installer
|
||||
and close the application
|
||||
"""
|
||||
if is_windows():
|
||||
open_file(TMP_DIR / self.remote_artemis_file_name)
|
||||
self._parent.close_ui.emit()
|
||||
|
||||
|
||||
def _show_popup_db_update(self):
|
||||
""" Prompts the user to download the updated version of the database
|
||||
"""
|
||||
self._parent.dialog_download_db(
|
||||
Messages.DIALOG_TYPE_WARN,
|
||||
Messages.DB_NEW_VER,
|
||||
Messages.DB_NEW_VER_MSG.format(self.remote_db_version)
|
||||
)
|
||||
|
||||
|
||||
def _show_popup_art_update(self):
|
||||
""" Alerts the user of a new version of Artemis.
|
||||
Windows - asks to download with automatic update
|
||||
Linux, macOS - redirects to GitHub page
|
||||
"""
|
||||
if is_windows():
|
||||
self._parent.dialog_update_artemis(
|
||||
Messages.DIALOG_TYPE_QUEST,
|
||||
Messages.ART_NEW_VER,
|
||||
Messages.ART_NEW_VER_AUTO_MSG.format(self.remote_artemis_version),
|
||||
True
|
||||
)
|
||||
else:
|
||||
self._parent.dialog_update_artemis(
|
||||
Messages.DIALOG_TYPE_QUEST,
|
||||
Messages.ART_NEW_VER,
|
||||
Messages.ART_NEW_VER_MANUAL_MSG.format(self.remote_artemis_version),
|
||||
False
|
||||
)
|
||||
|
||||
|
||||
def _show_popup_up_to_date(self):
|
||||
""" Notifies the user that the database is up to date
|
||||
"""
|
||||
self._parent.dialog_popup(
|
||||
Messages.DIALOG_TYPE_INFO,
|
||||
Messages.UP_TO_DATE,
|
||||
Messages.UP_TO_DATE_MSG
|
||||
)
|
||||
|
||||
|
||||
def _show_popup_initial_db_download(self):
|
||||
""" Prompts the user to download the database for the first time
|
||||
"""
|
||||
self._parent.dialog_download_db(
|
||||
Messages.DIALOG_TYPE_QUEST,
|
||||
Messages.NO_DB_DETECTED,
|
||||
Messages.NO_DB_DETECTED_MSG
|
||||
)
|
||||
|
||||
|
||||
def _show_popup_db_download_complete(self):
|
||||
""" DB has been succesfully downloaded
|
||||
"""
|
||||
self._parent.dialog_popup(
|
||||
Messages.DIALOG_TYPE_INFO,
|
||||
Messages.GENERIC_SUCCESS,
|
||||
Messages.DB_DOWNLOAD_SUCCESS_MSG
|
||||
)
|
||||
|
||||
|
||||
def _show_popup_db_hash_failed(self):
|
||||
""" Notify the user after detection of a corrupted database
|
||||
"""
|
||||
self._parent.dialog_popup(
|
||||
Messages.DIALOG_TYPE_ERROR,
|
||||
Messages.DB_CORRUPTED,
|
||||
Messages.DB_CORRUPTED_MSG
|
||||
)
|
||||
@@ -9,18 +9,22 @@ pip install nuitka==2.3
|
||||
echo "Building with Nuitka ..."
|
||||
python -m nuitka app.py \
|
||||
--standalone \
|
||||
--follow-imports \
|
||||
--show-modules \
|
||||
--assume-yes-for-downloads \
|
||||
--enable-plugin=pyside6 \
|
||||
--force-stderr-spec="{TEMP}/artemis.err.log" \
|
||||
--force-stdout-spec="{TEMP}/artemis.out.log" \
|
||||
--include-qt-plugins=sensible,styles,qml,multimedia \
|
||||
--noinclude-dlls=libQt6Charts* \
|
||||
--noinclude-dlls=libQt6Quick3D* \
|
||||
--noinclude-dlls=libQt6Sensors* \
|
||||
--noinclude-dlls=libQt6Test* \
|
||||
--noinclude-dlls=libQt6WebEngine* \
|
||||
--include-qt-plugins=styles \
|
||||
--include-qt-plugins=qml \
|
||||
--include-qt-plugins=multimedia \
|
||||
--include-data-files=./artemis/resources.py=./artemis/resources.py \
|
||||
--include-data-files=./config/qtquickcontrols2.conf=./config/qtquickcontrols2.conf \
|
||||
--include-data-files=./building/Linux/create_shortcut.sh=./create_shortcut.sh \
|
||||
--include-data-files=./images/artemis_icon.svg=./images/artemis_icon.svg
|
||||
|
||||
chmod 755 ./app.dist/app.bin
|
||||
--include-data-files=./images/artemis_icon.svg=./images/artemis_icon.svg \
|
||||
--force-stderr-spec="{TEMP}/artemis.err.log" \
|
||||
--force-stdout-spec="{TEMP}/artemis.out.log"
|
||||
|
||||
echo "Building Linux target finished."
|
||||
|
||||
@@ -7,20 +7,26 @@ pip install nuitka==2.3
|
||||
Write-Output "Building with Nuitka ..."
|
||||
python -m nuitka app.py `
|
||||
--standalone `
|
||||
--follow-imports `
|
||||
--show-modules `
|
||||
--assume-yes-for-downloads `
|
||||
--windows-console-mode=disable `
|
||||
--enable-plugin=pyside6 `
|
||||
--force-stderr-spec="{TEMP}\artemis.err.log" `
|
||||
--force-stdout-spec="{TEMP}\artemis.out.log" `
|
||||
--include-qt-plugins=sensible,styles,qml,multimedia `
|
||||
--noinclude-dlls="Qt6Charts*" `
|
||||
--noinclude-dlls="Qt6Quick3D*" `
|
||||
--noinclude-dlls="Qt6Sensors*" `
|
||||
--noinclude-dlls="Qt6Test*" `
|
||||
--noinclude-dlls="Qt6WebEngine*" `
|
||||
--include-qt-plugins=styles `
|
||||
--include-qt-plugins=qml `
|
||||
--include-qt-plugins=multimedia `
|
||||
--include-data-files=.\artemis\resources.py=.\artemis\resources.py `
|
||||
--include-data-files=.\config\qtquickcontrols2.conf=.\config\qtquickcontrols2.conf `
|
||||
--force-stderr-spec="{TEMP}\artemis.err.log" `
|
||||
--force-stdout-spec="{TEMP}\artemis.out.log" `
|
||||
--windows-company-name=Aresvalley.com `
|
||||
--windows-product-name=Artemis `
|
||||
--windows-file-version=4.0.0 `
|
||||
--windows-product-version=4.0.0 `
|
||||
--windows-file-version=4.0.3 `
|
||||
--windows-product-version=4.0.3 `
|
||||
--windows-file-description=Artemis `
|
||||
--windows-icon-from-ico=images\artemis_icon.ico
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#define MyAppName "Artemis"
|
||||
#define MyAppVersion "4.0.0"
|
||||
#define MyAppVersion "4.0.3"
|
||||
#define MyAppPublisher "AresValley"
|
||||
#define MyAppURL "https://www.aresvalley.com/"
|
||||
#define MyAppExeName "artemis.exe"
|
||||
@@ -18,7 +18,7 @@ LicenseFile=..\..\LICENSE
|
||||
PrivilegesRequiredOverridesAllowed=dialog
|
||||
OutputDir=..\
|
||||
OutputBaseFilename=Artemis
|
||||
SetupIconFile=..\..\images\artemis_icon.ico
|
||||
SetupIconFile=..\..\images\installer_icon.ico
|
||||
Compression=lzma2/ultra64
|
||||
SolidCompression=yes
|
||||
VersionInfoVersion={#MyAppVersion}
|
||||
|
||||
@@ -23,6 +23,6 @@ python -m nuitka app.py \
|
||||
--macos-app-name=Artemis \
|
||||
--macos-app-mode=gui \
|
||||
--macos-sign-identity=ad-hoc \
|
||||
--macos-app-version=4.0.0
|
||||
--macos-app-version=4.0.3
|
||||
|
||||
echo "Building Linux target finished."
|
||||
|
||||
@@ -5,3 +5,6 @@ style=Material
|
||||
variant=Dense
|
||||
theme=System
|
||||
accent=Green
|
||||
|
||||
[Database]
|
||||
autoload=0
|
||||
|
||||
@@ -6,12 +6,15 @@
|
||||
"total_bytes": 244449280
|
||||
},
|
||||
"windows": {
|
||||
"version": "4.0.0"
|
||||
"version": "4.0.3",
|
||||
"url": "https://github.com/AresValley/Artemis/releases/download/v4.0.3/Artemis-Windows-x86_64-4.0.3.exe"
|
||||
},
|
||||
"linux": {
|
||||
"version": "4.0.0"
|
||||
"version": "4.0.3",
|
||||
"url": "https://github.com/AresValley/Artemis/releases/download/v4.0.3/Artemis-Linux-x86_64-4.0.3.zip"
|
||||
},
|
||||
"mac": {
|
||||
"version": "4.0.0"
|
||||
"version": "4.0.0",
|
||||
"url": ""
|
||||
}
|
||||
}
|
||||
@@ -33,7 +33,16 @@ where $Y_{i+τ}$ is a lagged data by $τ$ of $Y_i$ and $\bar{Y}$ is the average
|
||||
## Example: ACF Analysis
|
||||
### STANAG 4285
|
||||
|
||||
The first example will be a NATO standard known as STANAG 4285. You can download a .wav sample from HERE. We start to collect some information about the structure of this signal: a good starting point is the official declassified NATO document dated 1989. The main frame structure can be found at **Annex A-3/5** with a graphical view at **Annex A-7**, also reported below:
|
||||
The first example will be a NATO standard known as STANAG 4285. You can download a .wav sample from [:material-download: HERE](assets/stanag_4285.wav).
|
||||
|
||||
<div align="center">
|
||||
<audio controls>
|
||||
<source src="https://raw.githubusercontent.com/AresValley/Artemis/master/docs/assets/stanag_4285.wav" type="audio/wav">
|
||||
Your browser does not support the audio player.
|
||||
</audio>
|
||||
</div>
|
||||
|
||||
We start to collect some information about the structure of this signal: a good starting point is the official declassified NATO document dated 1989. The main frame structure can be found at **Annex A-3/5** with a graphical view at **Annex A-7**, also reported below:
|
||||
|
||||
* [STANAG 4285 (i)](assets/acf_2.png)
|
||||
* [STANAG 4285 A-3](assets/acf_3.png)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 810 KiB |
BIN
docs/assets/artemis_preview.webp
Normal file
BIN
docs/assets/artemis_preview.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 209 KiB |
BIN
docs/assets/stanag_4285.wav
Normal file
BIN
docs/assets/stanag_4285.wav
Normal file
Binary file not shown.
@@ -12,65 +12,3 @@ Artemis is maintained by Marco Dalla Tiezza and released under the [GPLv3](https
|
||||
* [**Eric Wiessner (KI7POL)**](https://github.com/WheezyE "GitHub profile") - *ARM port (Raspberry Pi3B+ and Pi4B)*
|
||||
* [**Pierpaolo Pravatto**](https://github.com/ppravatto "GitHub profile") - *Wiki page, β Tester*
|
||||
* [**Francesco Capostagno**](https://github.com/fcapostagno "GitHub profile"), **Luca**, **Pietro** - *β Tester*
|
||||
|
||||
## Donators
|
||||
|
||||
* Eric Hahn
|
||||
* Alan Lawrence
|
||||
* Diego Gil Fernandez
|
||||
* Torsten Teichert
|
||||
* Charles Preston
|
||||
* Brad Hein
|
||||
* Paolo Romani
|
||||
* Michelle Corbani
|
||||
* Martin van Duinen
|
||||
* Valentino Zardi
|
||||
* Emmanuel Fabre
|
||||
* Oscar Nilsson
|
||||
* Pierre Declercq
|
||||
* Detlef Jahn
|
||||
* Oliver Schellenberg
|
||||
* Stephane Imbertone
|
||||
* Roel Ketelaars
|
||||
* Timothy Ehrhart
|
||||
* George Mager
|
||||
* Gerhard Amon
|
||||
* Gerald Schmidt
|
||||
* Carlos Rocha
|
||||
* Joshua Frohberg
|
||||
* Bill Riches
|
||||
* Jeffrey Krehbiel
|
||||
* Володимир Багмет
|
||||
* Philip Hamlin
|
||||
* David Davies
|
||||
* Nigel P. Lawrence
|
||||
* Marco Rissi (PP5ZX)
|
||||
* Martin van Duinen
|
||||
* Alex Diamantopulo
|
||||
* Joseph Winter
|
||||
* Mark Bender
|
||||
* Rolf Gerhardt
|
||||
* Denese Harris
|
||||
* Benjamin Steele
|
||||
* Alexander Irmscher
|
||||
* Jonathan Chang
|
||||
* Torsten Lipke
|
||||
* Massimo Petrantoni
|
||||
* William Arcand
|
||||
* Jon Carp
|
||||
* Robert Crone
|
||||
* William Houston
|
||||
* Richard Quasne
|
||||
* Tom Krugliakov
|
||||
* Francisco Neira Basso
|
||||
* Alistair Macrae
|
||||
* Kevin Arburn
|
||||
* Marek Barłóg
|
||||
* Gabriel Glösmann
|
||||
* Corbin Williams
|
||||
* Ton Machielsen
|
||||
* Ivan Rancic
|
||||
* Alipio Fernandez
|
||||
* Matt Eisele
|
||||
* Martin Dudel
|
||||
* Harald Geier
|
||||
|
||||
18
docs/faq.md
Normal file
18
docs/faq.md
Normal file
@@ -0,0 +1,18 @@
|
||||
# Frequently Asked Questions
|
||||
|
||||
### What about an automatic signal recognition feature?
|
||||
This question has been asked countless times, and for good reason: in many fields, machine learning (ML) has disrupted the way we solve problems, and when applied to the right field, you can get outstanding results. **So why not on signals?**
|
||||
|
||||
Well, the story dates back to at least 2017 when I started discussing it with several people on the rtl-sdr blog: at first, it seemed promising, but like many things, all that glitters is not gold. Let us proceed in order:
|
||||
|
||||
#### ML / Deep Learning approach
|
||||
A machine learning/neural network approach would not be complex (from a technical standpoint) if there were not the problem of the dataframe completeness. To be effective, neural models need to be trained on a large number of entries. The precise number can vary and strongly depends on the nature of data used for training, but commonly, numbers can be tens of thousands of entries or even more, for example. This would not be a significant concern in the case of RF signals because the various encodings that differentiate can be created artificially using for example [Fldigi](http://www.w1hkj.com/). To make these synthetic signals more like a real one, noise and artificial distortions can be added. However, this approach allows us to have a spectrum that ranges only over civilian, non-proprietary, and non-military signals (a little bit more than 150 out of 500, in the best-case scenario). Many efforts have been made in this field and some excellent results have been reported below:
|
||||
|
||||
- [O’Shea, Corgan, and Clancy](https://arxiv.org/pdf/1602.04105) - Training Size: 900000 signals, 11 modulations
|
||||
- [Stefan Scholl](https://arxiv.org/pdf/1906.04459) - Training Size: 120000 signals, 18 modulations
|
||||
- [Stefan Scholl](https://panoradio-sdr.de/automatic-identification-of-160-shortwave-rf-signals-with-deep-learning/) - Training Size: 1.2 million signals, 143 modulations tested in HF
|
||||
|
||||
Therefore, The main point is to have a good quality data frame to train the model; this is not always an easy task for the above reasons. Subsequently, as Stefan Scholl pointed out on his blog, similar modulations (MFSK-32 vs Olivia 16/500) can significantly decrease the effectiveness of discrimination. The quality of reception can also influence the result as well: high SNR cannot always be an ideal point since the reception can be disrupted by interference or fading.
|
||||
|
||||
#### Classical Audio Analysis
|
||||
More classical methods, such as similarity recognition between audio samples (such as using Mel-frequency cepstral coefficients, for example), could be effective, albeit marginally, if applied to the 500 signals audio sample library from sigID wiki. With the same signal encoding, the content of the signal alone can affect the similarity index and, thus, the method's effectiveness. Listening to a signal with the same modulation but encoding different information can significantly decrease the accuracy of signal recognition.
|
||||
@@ -3,9 +3,12 @@ title: Documentation
|
||||
---
|
||||
#
|
||||
|
||||
<div align="center">
|
||||
<iframe width="560" height="315" src="https://www.youtube.com/embed/W_8Y_4FvoHI?si=0hBqRnxnzCUWmTxK" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
|
||||
</div>
|
||||
|
||||
<p align="center" markdown>
|
||||
{width="400"}
|
||||
{width="400"}
|
||||
[Artemis Homepage](https://www.aresvalley.com){ .md-button }
|
||||
</p>
|
||||
|
||||
**Artemis** is a software designed to assist **radio frequency (RF) signal identification and storage**. It simplifies real-time spectrum analysis by leveraging one of the most extensive and community-driven databases, containing nearly **500 recognized signals**. This comprehensive software solution allows users to collect RF signals with specific parameters such as frequency, bandwidth, modulation, etc. Users can also store spectrum waterfalls, audio samples, and all types of documents for future reference. Artemis provides a robust platform to manage a wide range of RF data with precision and ease.
|
||||
|
||||
@@ -12,7 +12,18 @@
|
||||
---
|
||||
|
||||
## :simple-linux: Linux
|
||||
1. Download `Artemis-Linux-x86_64-4.x.x.tar` in the Assets menu from the [:material-download: LATEST RELEASE](https://github.com/AresValley/Artemis/releases) and extract the tarball archive in a folder of your choice and run the executable `app.bin`.
|
||||
1. On Linux, the xcb plugin is utilized to supply the essential functionality required for Qt GUI and Qt Widgets to operate on [X11](https://doc.qt.io/qt-6/linux-requirements.html). On some Linux distributions the required dependencies are already met, but in many cases, you will need to install them. To install the dependencies use:
|
||||
|
||||
``` bash title="Debian-based distro (Ubuntu, Mint, Pop! OS, Kali, ...)"
|
||||
sudo apt install libxcb-cursor0
|
||||
```
|
||||
|
||||
2. Download `Artemis-Linux-x86_64-4.x.x.tar` in the Assets menu from the [:material-download: LATEST RELEASE](https://github.com/AresValley/Artemis/releases) and extract the tarball archive in a folder of your choice.
|
||||
3. Before running `app.bin`, be sure to have the executable permissions to the binary file with:
|
||||
|
||||
```
|
||||
chmod 700 app.bin
|
||||
```
|
||||
|
||||
### Create a Shortcut
|
||||
|
||||
@@ -38,5 +49,5 @@ The support for the macOS compiled version of the program is temporarily limited
|
||||
|
||||
* **Run the program directly from the source:** Follow the instructions provided in [this chapter](run_from_source.md) to launch the program from the source code.
|
||||
* **Compile the Artemis 4 binaries on your machine:** In this case, you can contribute by reporting any issues you encounter by [opening an Issue](https://github.com/AresValley/Artemis/issues).
|
||||
* **Use the last available compiled version (3.2.1):** Although this version is no longer officially supported, it remains available for use: [:material-download: Artemis-3.2.1.dmg](https://aresvalley.com/download/11/).
|
||||
* **Use the last available compiled version (3.2.1):** Although this version is no longer officially supported, it remains available for use: [:material-download: Artemis-3.2.1.dmg](https://www.aresvalley.com/?sdm_process_download=1&download_id=377).
|
||||
|
||||
|
||||
@@ -5,8 +5,21 @@
|
||||
## 1. Kp Index
|
||||
The **K index** is a number (from 0 to 9) that shows how much Earth's magnetic field is disturbed. A K index of 1 means things are calm, while a K index of 5 or higher indicates a geomagnetic storm. These disturbances are measured with magnetometers that track changes in Earth's magnetic field every three hours. The K itself comes from a German word "Kennziffer" meaning "characteristic digit". To get a big picture of what's happening around the world, an official planetary **Kp index** is calculated. This is done by averaging the K indices from a special network of 13 geomagnetic observatories located around the globe at mid-latitudes.
|
||||
|
||||
## 2. A Index
|
||||
The **A index** represents the three-hourly equivalent amplitude of geomagnetic activity at a specific magnetometer station, derived from the station-specific K index. Due to the quasi-logarithmic nature of the K-scale in relation to magnetometer fluctuations, directly averaging a set of K indices is not really meaningful. Instead each K is converted back into a linear scale. The **Ap index** is determined by averaging the eight daily A values, providing a measure of geomagnetic activity for a specific day. Days with higher levels of geomagnetic activity correspond to higher daily Ap values.
|
||||
|Index|Activity Level|High Latitudes|Low Latitudes|Possible Source|
|
||||
|-|-|-|-|-|
|
||||
|**Kp 0**|Inactive|Weak & slow aurora possible|Aurora extremely unlikely|Small influx of particles due to some reconnections mostly at the magnetotail|
|
||||
|**Kp 1**|Very Quiet|Weak & slow aurora likely|Aurora very unlikely|Vide supra|
|
||||
|**Kp 2**|Quiet|Moderate auroral display|Aurora unlikely|Vide supra|
|
||||
|**Kp 3**|Unsettled|Active auroral display, sporadic substorm possible|Weak aurora display possible|Coronal hole sending fast winds or remains after days of storming, enhanced solar wind|
|
||||
|**Kp 4**|Active|Active auroral display, multiple sporadic substorms possible|Weak Aurora Display Possible|Vide supra|
|
||||
|**Kp 5**|Minor Storm (G1)|Very active auroral display, multiple substorms likely|Aurora display likely|Coronal hole sending fast winds or coronal mass ejection (CME), enhanced solar wind|
|
||||
|**Kp 6**|Moderate Storm (G2)|Strong auroral display, longer substorms|Active auroral display very likely|Vide supra|
|
||||
|**Kp 7**|Strong Storm (G3)|Very strong auroral display|Strong auroral display extremely likely|Large CMEs caused by solar storms or flares, very enhanced solar wind with strong shock wave|
|
||||
|**Kp 8**|Severe Storm (G4)|Extremely strong aurora, long periods of substorming|Strong auroral display extremely likely|Vide supra|
|
||||
|**Kp 9**|Extreme Storm (G5)|Extremely strong aurora, long periods of substorming|Very strong auroral display, overhead aurora possible|Super CMEs, Carrington-class events, devastating solar wind with extreme shock waves|
|
||||
|
||||
## 2. Ap Index
|
||||
The **A index** represents the three-hourly equivalent amplitude of geomagnetic activity at a specific magnetometer station, derived from the station-specific K index. Due to the quasi-logarithmic nature of the K-scale in relation to magnetometer fluctuations, directly averaging a set of K indices is not really meaningful. Instead each K is converted back into a linear scale. The **Ap index** is determined by averaging the eight daily Ap values (3-hour) and using the same stations grid explained for the Kp index in the previous section. This provides a measure of geomagnetic activity for a specific day. Days with higher levels of geomagnetic activity correspond to higher daily Ap values.
|
||||
|
||||
## 3. NOAA Space Weather Scale
|
||||
|
||||
|
||||
BIN
images/installer_icon.ico
Normal file
BIN
images/installer_icon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 173 KiB |
@@ -73,8 +73,9 @@ nav:
|
||||
- Forecasts: 'space_weather/forecasts.md'
|
||||
- DRAP: 'space_weather/drap.md'
|
||||
- Aurora: 'space_weather/aurora.md'
|
||||
- Example:
|
||||
- ACF Analysis: 'acf_analysis.md'
|
||||
- Signal Analysis:
|
||||
- Autocorrelation (ACF): 'acf_analysis.md'
|
||||
- FAQ: 'faq.md'
|
||||
- Contribute: 'contribute.md'
|
||||
- Changelog: https://github.com/AresValley/Artemis/blob/master/CHANGELOG.md
|
||||
- License & Credits: 'credits.md'
|
||||
|
||||
@@ -31,8 +31,9 @@ Window {
|
||||
signal showCatManager()
|
||||
signal openSigEditor(string type, var sig_param, bool is_new)
|
||||
signal showSpaceWeather()
|
||||
signal checkDbUpdates()
|
||||
signal startDownloader()
|
||||
signal checkForUpdate()
|
||||
signal updateDb()
|
||||
signal updateArtemis()
|
||||
signal openDbDirectory()
|
||||
signal newDb(string name)
|
||||
signal exportDb(string path)
|
||||
@@ -121,11 +122,12 @@ Window {
|
||||
dialogDownloadDb.open()
|
||||
}
|
||||
|
||||
function openDialogDownloadArtemis(messageType, title, message) {
|
||||
dialogDownloadArtemis.messageType = messageType
|
||||
dialogDownloadArtemis.title = title
|
||||
dialogDownloadArtemis.message = message
|
||||
dialogDownloadArtemis.open()
|
||||
function openDialogUpdateArtemis(messageType, title, message, auto) {
|
||||
dialogUpdateArtemis.messageType = messageType
|
||||
dialogUpdateArtemis.title = title
|
||||
dialogUpdateArtemis.message = message
|
||||
dialogUpdateArtemis.autoUpdate = auto
|
||||
dialogUpdateArtemis.open()
|
||||
}
|
||||
|
||||
DialogMessage {
|
||||
@@ -135,18 +137,24 @@ Window {
|
||||
standardButtons: Dialog.Cancel | Dialog.Yes
|
||||
|
||||
onAccepted: {
|
||||
startDownloader()
|
||||
updateDb()
|
||||
}
|
||||
}
|
||||
|
||||
DialogMessage {
|
||||
id: dialogDownloadArtemis
|
||||
id: dialogUpdateArtemis
|
||||
modal: true
|
||||
|
||||
property bool autoUpdate
|
||||
|
||||
standardButtons: Dialog.Cancel | Dialog.Yes
|
||||
|
||||
onAccepted: {
|
||||
Qt.openUrlExternally("https://github.com/AresValley/Artemis")
|
||||
if (autoUpdate) {
|
||||
updateArtemis();
|
||||
} else {
|
||||
Qt.openUrlExternally("https://github.com/AresValley/Artemis");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -218,6 +226,11 @@ Window {
|
||||
leftPadding: 10
|
||||
bottomPadding: 10
|
||||
|
||||
focus: true
|
||||
|
||||
Keys.onDownPressed: listView.incrementCurrentIndex()
|
||||
Keys.onUpPressed: listView.decrementCurrentIndex()
|
||||
|
||||
header: MenuBar {
|
||||
id: topBar
|
||||
|
||||
@@ -315,7 +328,7 @@ Window {
|
||||
|
||||
MenuItem {
|
||||
text: "Check for Updates"
|
||||
onClicked: {checkDbUpdates()}
|
||||
onClicked: {checkForUpdate()}
|
||||
}
|
||||
|
||||
MenuSeparator {}
|
||||
@@ -389,7 +402,6 @@ Window {
|
||||
Layout.fillHeight: true
|
||||
highlightMoveDuration: 0
|
||||
clip: true
|
||||
focus: true
|
||||
ScrollBar.vertical: bar
|
||||
highlight: Rectangle { color: Material.accent; radius: 5 }
|
||||
onCurrentIndexChanged: { itemChangedList() }
|
||||
|
||||
@@ -82,18 +82,6 @@ Window {
|
||||
}
|
||||
}
|
||||
|
||||
function contentChanged() {
|
||||
if (listView.currentIndex !== -1) {
|
||||
myModel.set(
|
||||
listView.currentIndex,
|
||||
{
|
||||
'name': nameField.text,
|
||||
'description': descriptionField.text,
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
function lockMenu(toggle) {
|
||||
if (toggle) {
|
||||
openButton.enabled = false
|
||||
@@ -236,16 +224,18 @@ Window {
|
||||
}
|
||||
}
|
||||
|
||||
ScrollView {
|
||||
Layout.fillHeight: true
|
||||
Flickable {
|
||||
Layout.fillWidth: true
|
||||
ScrollBar.vertical.interactive: true
|
||||
|
||||
TextArea {
|
||||
Layout.fillHeight: true
|
||||
TextArea.flickable: TextArea {
|
||||
id: newDescriptionField
|
||||
placeholderText: qsTr("Description")
|
||||
font.pointSize: 10
|
||||
wrapMode: TextEdit.WordWrap
|
||||
}
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
width: 10
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -293,16 +283,18 @@ Window {
|
||||
}
|
||||
}
|
||||
|
||||
ScrollView {
|
||||
Layout.fillHeight: true
|
||||
Flickable {
|
||||
Layout.fillWidth: true
|
||||
ScrollBar.vertical.interactive: true
|
||||
|
||||
TextArea {
|
||||
Layout.fillHeight: true
|
||||
TextArea.flickable: TextArea {
|
||||
id: editDescriptionField
|
||||
placeholderText: qsTr("Description")
|
||||
font.pointSize: 10
|
||||
wrapMode: TextEdit.WordWrap
|
||||
}
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
width: 10
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -380,7 +372,6 @@ Window {
|
||||
Layout.fillHeight: true
|
||||
highlightMoveDuration: 0
|
||||
clip: true
|
||||
focus: true
|
||||
ScrollBar.vertical: bar
|
||||
highlight: Rectangle { color: Material.accent; radius: 5 }
|
||||
onCurrentIndexChanged: { itemChanged() }
|
||||
@@ -446,9 +437,7 @@ Window {
|
||||
id: nameField
|
||||
Layout.fillWidth: true
|
||||
placeholderText: qsTr("Name")
|
||||
onTextChanged: {
|
||||
contentChanged()
|
||||
}
|
||||
readOnly: true
|
||||
}
|
||||
|
||||
TextField {
|
||||
@@ -458,18 +447,18 @@ Window {
|
||||
readOnly: true
|
||||
}
|
||||
|
||||
ScrollView {
|
||||
Flickable {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
ScrollBar.vertical.interactive: true
|
||||
|
||||
TextArea {
|
||||
TextArea.flickable: TextArea {
|
||||
id: descriptionField
|
||||
wrapMode: TextEdit.WordWrap
|
||||
placeholderText: qsTr("Description")
|
||||
readOnly: true
|
||||
font.pointSize: 10
|
||||
onTextChanged: {
|
||||
contentChanged()
|
||||
wrapMode: TextEdit.WordWrap
|
||||
}
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
width: 10
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import QtQuick.Controls
|
||||
import QtQuick.Controls.Material
|
||||
import QtQuick.Layouts
|
||||
|
||||
|
||||
Window {
|
||||
id: windowDownloader
|
||||
|
||||
@@ -23,6 +24,23 @@ Window {
|
||||
|
||||
signal onAbort()
|
||||
|
||||
onClosing: {
|
||||
onAbort()
|
||||
}
|
||||
|
||||
function updateProgressBar(bytesReceived, bytesTotal) {
|
||||
progressBar.value = bytesReceived
|
||||
progressBar.to = bytesTotal
|
||||
}
|
||||
|
||||
function setIndeterminateBar() {
|
||||
progressBar.indeterminate = true
|
||||
}
|
||||
|
||||
function updateStatus(arg) {
|
||||
progressLabel.text = arg
|
||||
}
|
||||
|
||||
Page {
|
||||
id: page
|
||||
anchors.fill: parent
|
||||
@@ -37,22 +55,26 @@ Window {
|
||||
}
|
||||
|
||||
ProgressBar {
|
||||
objectName: "progressBar"
|
||||
id: progressBar
|
||||
Layout.rightMargin: 20
|
||||
Layout.leftMargin: 20
|
||||
Layout.fillWidth: true
|
||||
indeterminate: false
|
||||
value: 0
|
||||
to: 0
|
||||
}
|
||||
|
||||
Label {
|
||||
objectName: "labelProgress"
|
||||
id: progressLabel
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
||||
}
|
||||
|
||||
Button {
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
|
||||
text: qsTr("Abort")
|
||||
icon.source: "qrc:/images/icons/abort.svg"
|
||||
display: AbstractButton.TextBesideIcon
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
|
||||
flat: true
|
||||
onClicked: { onAbort() }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -301,11 +301,12 @@ Page {
|
||||
|
||||
Label {
|
||||
id: summaryFreq
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
color: Material.color(Material.Green)
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
font.pointSize: 16
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -390,11 +391,12 @@ Page {
|
||||
}
|
||||
Label {
|
||||
id: summaryBand
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
color: Material.color(Material.Green)
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
font.pointSize: 16
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -465,11 +467,12 @@ Page {
|
||||
}
|
||||
Label {
|
||||
id: summaryACF
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
color: Material.color(Material.Green)
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
font.pointSize: 16
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -503,7 +506,6 @@ Page {
|
||||
Layout.fillHeight: true
|
||||
highlightMoveDuration: 0
|
||||
clip: true
|
||||
focus: true
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
active: true
|
||||
}
|
||||
@@ -555,7 +557,6 @@ Page {
|
||||
Layout.fillWidth: true
|
||||
highlightMoveDuration: 0
|
||||
clip: true
|
||||
focus: true
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
active: true
|
||||
}
|
||||
@@ -607,7 +608,6 @@ Page {
|
||||
Layout.fillWidth: true
|
||||
highlightMoveDuration: 0
|
||||
clip: true
|
||||
focus: true
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
active: true
|
||||
}
|
||||
|
||||
@@ -23,10 +23,12 @@ Window {
|
||||
|
||||
signal saveMaterialAccent(string arg)
|
||||
signal saveMaterialTheme(string arg)
|
||||
signal saveAutoload(int arg)
|
||||
|
||||
function saveAll() {
|
||||
saveMaterialAccent(comboBoxAccent.currentText)
|
||||
saveMaterialTheme(comboBoxTheme.currentText)
|
||||
saveAutoload(checkBoxAutoload.checked)
|
||||
}
|
||||
|
||||
function loadMaterialAccent(accent) {
|
||||
@@ -47,6 +49,14 @@ Window {
|
||||
}
|
||||
}
|
||||
|
||||
function loadAutoload(toggle) {
|
||||
if (toggle) {
|
||||
checkBoxAutoload.checked = true
|
||||
} else {
|
||||
checkBoxAutoload.checked = false
|
||||
}
|
||||
}
|
||||
|
||||
DialogMessage {
|
||||
id: dialogPreferencesSaved
|
||||
modal: true
|
||||
@@ -132,6 +142,21 @@ Window {
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
Layout.fillWidth: true
|
||||
|
||||
Label {
|
||||
text: "Auto-load SigID Database on Startup"
|
||||
font.pixelSize: 12
|
||||
clip: true
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
||||
CheckBox {
|
||||
id: checkBoxAutoload
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
Layout.fillHeight: true
|
||||
}
|
||||
|
||||
@@ -154,17 +154,18 @@ Window {
|
||||
}
|
||||
}
|
||||
|
||||
ScrollView {
|
||||
Flickable {
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: 5
|
||||
Layout.fillHeight: true
|
||||
ScrollBar.vertical.interactive: true
|
||||
|
||||
TextArea {
|
||||
Layout.topMargin: 5
|
||||
TextArea.flickable: TextArea {
|
||||
id: paramDescription
|
||||
placeholderText: qsTr("Description")
|
||||
wrapMode: TextEdit.WordWrap
|
||||
font.pointSize: 10
|
||||
wrapMode: TextEdit.WordWrap
|
||||
}
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
width: 10
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -274,7 +274,6 @@ Page {
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
||||
|
||||
RowLayout {
|
||||
width: 100
|
||||
height: 100
|
||||
@@ -573,18 +572,23 @@ Page {
|
||||
}
|
||||
}
|
||||
|
||||
ScrollView {
|
||||
Flickable {
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: 5
|
||||
Layout.fillHeight: true
|
||||
ScrollBar.vertical.interactive: true
|
||||
|
||||
TextArea {
|
||||
Layout.topMargin: 5
|
||||
TextArea.flickable: TextArea {
|
||||
id: descriptionTextArea
|
||||
placeholderText: qsTr("Description")
|
||||
font.pointSize: 10
|
||||
wrapMode: TextEdit.WordWrap
|
||||
textFormat: Text.MarkdownText
|
||||
font.pointSize: 10
|
||||
readOnly: true
|
||||
onLinkActivated: (link) => {
|
||||
Qt.openUrlExternally(link)
|
||||
}
|
||||
}
|
||||
ScrollBar.vertical: ScrollBar {
|
||||
width: 10
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ Item {
|
||||
Layout.fillHeight: true
|
||||
clip: true
|
||||
Label {
|
||||
text: qsTr("MAJOR STORM")
|
||||
text: qsTr("STRONG STORM")
|
||||
anchors.fill: parent
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
@@ -78,7 +78,7 @@ Item {
|
||||
Layout.fillHeight: true
|
||||
clip: true
|
||||
Label {
|
||||
text: qsTr("MINOR STORM")
|
||||
text: qsTr("MODERATE STORM")
|
||||
anchors.fill: parent
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
@@ -94,7 +94,7 @@ Item {
|
||||
Layout.fillHeight: true
|
||||
clip: true
|
||||
Label {
|
||||
text: qsTr("ACTIVE")
|
||||
text: qsTr("ACTIVE-STORM")
|
||||
anchors.fill: parent
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
|
||||
@@ -58,7 +58,7 @@ Item {
|
||||
topLeftRadius: 10
|
||||
topRightRadius: 10
|
||||
Label {
|
||||
text: qsTr("SUPER STORM")
|
||||
text: qsTr("EXTREME STORM")
|
||||
anchors.fill: parent
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
@@ -74,7 +74,7 @@ Item {
|
||||
Layout.fillHeight: true
|
||||
clip: true
|
||||
Label {
|
||||
text: qsTr("EXTREME STORM")
|
||||
text: qsTr("SEVERE STORM")
|
||||
anchors.fill: parent
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
@@ -90,7 +90,7 @@ Item {
|
||||
Layout.fillHeight: true
|
||||
clip: true
|
||||
Label {
|
||||
text: qsTr("SEVERE STORM")
|
||||
text: qsTr("STRONG STORM")
|
||||
anchors.fill: parent
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
@@ -106,7 +106,7 @@ Item {
|
||||
Layout.fillHeight: true
|
||||
clip: true
|
||||
Label {
|
||||
text: qsTr("MAJOR STORM")
|
||||
text: qsTr("MODERATE STORM")
|
||||
anchors.fill: parent
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
|
||||
Reference in New Issue
Block a user