Merge pull request #2 from EnguerranVidal/develop

Updating main from develop

Author: EnguerranVidal

.gitignore

@@ -1,181 +1,65 @@
-# Byte-compiled / optimized / DLL files
+# -----------------------
+# PyCharm / IntelliJ
+# -----------------------
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# Workspace-specific files
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/httpRequests/
+
+# -----------------------
+# Python
+# -----------------------
 __pycache__/
 *.py[cod]
-*$py.class
-
-# C extensions
+*.pyo
+*.pyd
 *.so
 
 # Distribution / packaging
-.Python
-build/
-develop-eggs/
 dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
+build/
 *.egg-info/
-.installed.cfg
 *.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
 
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# UV
-#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#uv.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
-.pdm.toml
-.pdm-python
-.pdm-build/
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
+# Virtual environments
 venv/
+.venv/
 ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
+env/
+*.env
 
-# pytype static type analyzer
-.pytype/
+# Pip installer logs
+pip-log.txt
 
-# Cython debug symbols
-cython_debug/
+# Python byte-compiled / optimized / DLL files
+*$py.class
 
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+# Jupyter Notebook checkpoints
+.ipynb_checkpoints/
 
-# Ruff stuff:
-.ruff_cache/
+# -----------------------
+# OS files
+# -----------------------
+# macOS
+.DS_Store
+# Windows
+Thumbs.db
 
-# PyPI configuration file
-.pypirc
+# -----------------------
+# Logs
+# -----------------------
+*.log
 
-# Cursor  
-#  Cursor is an AI-powered code editor.`.cursorignore` specifies files/directories to 
-#  exclude from AI features like autocomplete and code analysis. Recommended for sensitive data
-#  refer to https://docs.cursor.com/context/ignore-files
-.cursorignore
-.cursorindexingignore
+# -----------------------
+# Local configuration
+# -----------------------
+*.local
+/data/
+settings.json

README.md

@@ -1,9 +1,9 @@
 # PySatTracker
-[![GitHub watchers](https://badgen.net/github/watchers/EnguerranVidal/PySatTracker/)](https://GitHub.com/EnguerranVidal/PySatTracker/watchers/) [![GitHub stars](https://badgen.net/github/stars/EnguerranVidal/PySatTracker)](https://GitHub.com/EnguerranVidal/PySatTracker/stargazers/)
+[![GitHub watchers](https://badgen.net/github/watchers/EnguerranVidal/PyStrato/)](https://GitHub.com/EnguerranVidal/PyStrato/watchers/) [![GitHub stars](https://badgen.net/github/stars/EnguerranVidal/PyStrato)](https://GitHub.com/EnguerranVidal/PyStrato/stargazers/)
 ![GitHub license](https://img.shields.io/github/license/EnguerranVidal/PySatTracker)
 
-[![GitHub branches](https://badgen.net/github/branches/EnguerranVidal/PySatTracker)](https://github.com/EnguerranVidal/PySatTracker/)
-[![GitHub commits](https://badgen.net/github/commits/EnguerranVidal/PySatTracker)](https://github.com/EnguerranVidal/PySatTracker/) 
+[![GitHub branches](https://badgen.net/github/branches/EnguerranVidal/PyStrato)](https://github.com/EnguerranVidal/PyStrato/)
+[![GitHub commits](https://badgen.net/github/commits/EnguerranVidal/PyStrato)](https://github.com/EnguerranVidal/PyStrato/) 
 ![GitHub last commit](https://img.shields.io/github/last-commit/EnguerranVidal/PySatTracker)
 ![Github issus open](https://img.shields.io/github/issues-raw/EnguerranVidal/PySatTracker)
 ![Github issus closed](https://img.shields.io/github/issues-closed-raw/EnguerranVidal/PySatTracker)
@@ -19,6 +19,7 @@
 
 <div style="text-align: justify"> The tool uses a Two Line Elements database extracted daily from the <a href="https://celestrak.org">Celestrak</a> archive, featuring all currently active satellites in orbit around Earth. </div>
 
+<div style="text-align: justify"> Some icons by <a href="https://icons8.com/">Icons8</a>. </div>
 ## INSTALLATION
 
 1. Cloning the Github Repository.
@@ -74,4 +75,5 @@ python3 main.py
 | Reentries Predictions | Predict satellite reentries | Planned |
 | Orbital Calculations Optimization | Optimize orbital calculations for GPU usage | Planned |
 
-<p align="left">(<a href="#readme-top">back to top</a>)</p>
+Icons 
+<p align="left">(<a href="#readme-top">back to top</a>)</p>

main.py

@@ -5,37 +5,44 @@
 from PyQt5.QtWidgets import QApplication
 from PyQt5.QtCore import QThread
 
-from src.core.tleDatabase import TLELoaderWorker
-from src.gui.widgets import LoadingScreen
+from src.core.database.general import DatabaseLoaderWorker
+from src.gui.common import LoadingScreen
 from src.gui.mainWindow import MainWindow
+from src.gui.utilities import configureOpenGLFormat
+
 
 def main():
     qdarktheme.enable_hi_dpi()
     app = QApplication(sys.argv)
+    qdarktheme.setup_theme('dark', additional_qss='QToolTip {color: black;}')
     currentDirectory = os.path.dirname(os.path.realpath(__file__))
     dataDir = os.path.join(currentDirectory, 'data')
     splash = LoadingScreen()
     splash.show()
 
     # LOADING WORKER THREAD
     thread = QThread()
-    loader = TLELoaderWorker(dataDir)
-    loader.moveToThread(thread)
-    thread.started.connect(loader.run)
-    loader.progress.connect(splash.setProgress)
-    loader.status.connect(splash.setStatus)
+    databaseLoader = DatabaseLoaderWorker(dataDir)
+    databaseLoader.moveToThread(thread)
+    thread.started.connect(databaseLoader.run)
+    databaseLoader.progress.connect(splash.setProgress)
+    databaseLoader.status.connect(splash.setStatus)
+    configureOpenGLFormat()
 
-    def onFinished(db):
+    def onFinished(databases):
+        tleDatabase, starDatabase = databases
+        splash.setToMaximumProgress()
         window = MainWindow(currentDirectory)
-        window.setDatabase(db)
+        window.setDatabases(tleDatabase, starDatabase)
         splash.launchMainWindow(window)
         thread.quit()
-        loader.deleteLater()
+        databaseLoader.deleteLater()
         thread.deleteLater()
 
-    loader.finished.connect(onFinished)
+    databaseLoader.finished.connect(onFinished)
     thread.start()
     sys.exit(app.exec_())
 
+
 if __name__ == '__main__':
     main()

requirements.txt

@@ -1,9 +1,10 @@
-numpy~=2.2.6
-pyqt5~=5.15.11
-matplotlib~=3.10.7
-imageio~=2.37.2
-pyqtgraph~=0.13.7
-pandas~=2.3.3
-requests~=2.32.5
-sgp4~=2.25
-pyqtdarktheme~=2.1.0
+numpy
+pyqt5
+matplotlib
+imageio
+pyqtgraph
+pandas
+requests
+sgp4
+pyqtdarktheme
+pyopengl