spiceitup 1.3.4__tar.gz → 2.0.1__tar.gz

{spiceitup-1.3.4/spiceitup.egg-info → spiceitup-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spiceitup
-Version: 1.3.4
+Version: 2.0.1
 Summary: Quicklook tool for level 2 SPICE imaging
 Home-page: https://git.ias.u-psud.fr/spice/data_quicklook
 Author: David Picard
@@ -9,7 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-Requires-Dist: PyQt5
+Requires-Dist: PyQt6
 Requires-Dist: sunraster
 Requires-Dist: pyqtgraph
 Requires-Dist: qdarkgraystyle
@@ -25,7 +25,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# SPICE data quicklook in PyQt5 / PyQtGraph
+# SPICE data quicklook in PyQt6 / PyQtGraph
 
 This graphical user interface (GUI) allows you to have a quick look in the SPICE data (provide level 2 '.fits' files in input). You will be able to navigate dynamically in the data thanks to sliders which update the maps I(x,y) ; I(lambda,y), the curve I(lambda) and more.
 
@@ -58,7 +58,9 @@ Run with `spiceitup`
 `pip install numpy --upgrade`
 
 #### B.2) Run the app  
-`python3 spiceitup/main.py` or use an IDE like pycharm (which will install the requirements automatically), open this folder as a project and run `run.py`
+`cd spiceitup`  
+`python3 run.py`  
+or use an IDE like pycharm (which will install the requirements automatically), open this folder as a project and run `run.py`
 
 #### B.3) Troubleshooting
 Error known:  
@@ -68,7 +70,7 @@ In this case, try to do: `sudo apt-get install --reinstall libxcb-xinerama0`
   
 **spiceitup: command not found**
 In this case check if spiceitup is here: `$(python -m site --user-base)/bin"`
-Then add it to $PATH: `export PATH="$PATH:$(python -m site --user-base)/bin"`
+Then add it to \$PATH: `export PATH="$PATH:$(python -m site --user-base)/bin"`
 Run again `spiceitup`  
   
 **No module spiceitup**  

{spiceitup-1.3.4 → spiceitup-2.0.1}/README.md

@@ -1,4 +1,4 @@
-# SPICE data quicklook in PyQt5 / PyQtGraph
+# SPICE data quicklook in PyQt6 / PyQtGraph
 
 This graphical user interface (GUI) allows you to have a quick look in the SPICE data (provide level 2 '.fits' files in input). You will be able to navigate dynamically in the data thanks to sliders which update the maps I(x,y) ; I(lambda,y), the curve I(lambda) and more.
 
@@ -31,7 +31,9 @@ Run with `spiceitup`
 `pip install numpy --upgrade`
 
 #### B.2) Run the app  
-`python3 spiceitup/main.py` or use an IDE like pycharm (which will install the requirements automatically), open this folder as a project and run `run.py`
+`cd spiceitup`  
+`python3 run.py`  
+or use an IDE like pycharm (which will install the requirements automatically), open this folder as a project and run `run.py`
 
 #### B.3) Troubleshooting
 Error known:  
@@ -41,7 +43,7 @@ In this case, try to do: `sudo apt-get install --reinstall libxcb-xinerama0`
   
 **spiceitup: command not found**
 In this case check if spiceitup is here: `$(python -m site --user-base)/bin"`
-Then add it to $PATH: `export PATH="$PATH:$(python -m site --user-base)/bin"`
+Then add it to \$PATH: `export PATH="$PATH:$(python -m site --user-base)/bin"`
 Run again `spiceitup`  
   
 **No module spiceitup**  

{spiceitup-1.3.4 → spiceitup-2.0.1}/setup.py

@@ -1,19 +1,11 @@
 import os
-
+from pathlib import Path
 from importlib_metadata import entry_points
 from setuptools import setup, find_packages
 
-def load_requirements(filename):
-    with open('/srv/data_quicklook/' + filename, 'r') as f:
-        return [
-            line.strip()
-            for line in f
-            if line.strip() and not line.startswith('#')
-        ]
-
 setup(
     name='spiceitup',
-    version='1.3.4',
+    version='2.0.1',
     description='Quicklook tool for level 2 SPICE imaging',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
@@ -22,8 +14,11 @@ setup(
     url='https://git.ias.u-psud.fr/spice/data_quicklook',
     packages=find_packages(),
     include_package_data=True,
+    package_data={
+        "spiceitup": ["style/*.css"],
+    },
     install_requires=[
-        "PyQt5",
+        "PyQt6",
         "sunraster",
         "pyqtgraph",
         "qdarkgraystyle",

spiceitup-2.0.1/spiceitup/__init__.py

@@ -0,0 +1,7 @@
+import os
+import sys
+
+_PACKAGE_DIR = os.path.dirname(os.path.abspath(__file__))
+
+if _PACKAGE_DIR not in sys.path:
+    sys.path.insert(0, _PACKAGE_DIR)

spiceitup-2.0.1/spiceitup/__main__.py

@@ -0,0 +1,7 @@
+# handles call from pip install
+import sys
+import os
+from main_call import main
+
+if __name__ == '__main__':
+    main()

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/layout/flow_layout.py

@@ -1,5 +1,5 @@
-from PyQt5.QtCore import QPoint, QRect, QSize, Qt
-from PyQt5.QtWidgets import (QApplication, QLayout, QPushButton, QSizePolicy, QWidget, QGridLayout)
+from PyQt6.QtCore import QPoint, QRect, QSize, Qt
+from PyQt6.QtWidgets import (QApplication, QLayout, QPushButton, QSizePolicy, QWidget, QGridLayout)
 
 class FlowLayout(QLayout):
     
@@ -71,10 +71,10 @@ class FlowLayout(QLayout):
 
         for item in self.itemList:
             wid = item.widget()
-            spaceX = self.spacing() + wid.style().layoutSpacing(QSizePolicy.PushButton,
-                                                                QSizePolicy.PushButton, Qt.Horizontal)
-            spaceY = self.spacing() + wid.style().layoutSpacing(QSizePolicy.PushButton,
-                                                                QSizePolicy.PushButton, Qt.Vertical)
+            spaceX = self.spacing() + wid.style().layoutSpacing(QSizePolicy.ControlType.PushButton,
+                                                                QSizePolicy.ControlType.PushButton, Qt.Orientation.Horizontal)
+            spaceY = self.spacing() + wid.style().layoutSpacing(QSizePolicy.ControlType.PushButton,
+                                                                QSizePolicy.ControlType.PushButton, Qt.Orientation.Vertical)
             nextX = x + item.sizeHint().width() + spaceX
             if nextX - spaceX > rect.right() and lineHeight > 0:
                 x = rect.x()

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/layout/flow_layout_edited.py

@@ -1,5 +1,5 @@
-from PyQt5.QtCore import QPoint, QRect, QSize, Qt
-from PyQt5.QtWidgets import (QApplication, QLayout, QPushButton, QSizePolicy, QWidget, QGridLayout)
+from PyQt6.QtCore import QPoint, QRect, QSize, Qt
+from PyQt6.QtWidgets import (QApplication, QLayout, QPushButton, QSizePolicy, QWidget, QGridLayout)
 
 class FlowLayout(QLayout):
     q_plot_size = None
@@ -78,10 +78,10 @@ class FlowLayout(QLayout):
 
         for item in self.itemList:
             wid = item.widget()
-            spaceX = self.spacing() + wid.style().layoutSpacing(QSizePolicy.PushButton,
-                                                                QSizePolicy.PushButton, Qt.Horizontal)
-            spaceY = self.spacing() + wid.style().layoutSpacing(QSizePolicy.PushButton,
-                                                                QSizePolicy.PushButton, Qt.Vertical)
+            spaceX = self.spacing() + wid.style().layoutSpacing(QSizePolicy.ControlType.PushButton,
+                                                                QSizePolicy.ControlType.PushButton, Qt.Orientation.Horizontal)
+            spaceY = self.spacing() + wid.style().layoutSpacing(QSizePolicy.ControlType.PushButton,
+                                                                QSizePolicy.ControlType.PushButton, Qt.Orientation.Vertical)
             nextX = x + self.q_plot_size.width() + spaceX #nextX = x + item.sizeHint().width() + spaceX
             if nextX - spaceX > rect.right() and lineHeight > 0:
                 x = rect.x()

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/layout/flow_layout_old.py

@@ -1,5 +1,5 @@
-from PyQt5.QtCore import QPoint, QRect, QSize, Qt
-from PyQt5.QtWidgets import (QApplication, QLayout, QPushButton, QSizePolicy, QWidget, QGridLayout)
+from PyQt6.QtCore import QPoint, QRect, QSize, Qt
+from PyQt6.QtWidgets import (QApplication, QLayout, QPushButton, QSizePolicy, QWidget, QGridLayout)
 
 class FlowLayout(QLayout):
     q_plot_size = None
@@ -76,10 +76,10 @@ class FlowLayout(QLayout):
 
         for item in self.itemList:
             wid = item.widget()
-            spaceX = self.spacing() + wid.style().layoutSpacing(QSizePolicy.PushButton,
-                                                                QSizePolicy.PushButton, Qt.Horizontal)
-            spaceY = self.spacing() + wid.style().layoutSpacing(QSizePolicy.PushButton,
-                                                                QSizePolicy.PushButton, Qt.Vertical)
+            spaceX = self.spacing() + wid.style().layoutSpacing(QSizePolicy.ControlType.PushButton,
+                                                                QSizePolicy.ControlType.PushButton, Qt.Orientation.Horizontal)
+            spaceY = self.spacing() + wid.style().layoutSpacing(QSizePolicy.ControlType.PushButton,
+                                                                QSizePolicy.ControlType.PushButton, Qt.Orientation.Vertical)
             nextX = x + item.sizeHint().width() + spaceX
             if nextX - spaceX > rect.right() and lineHeight > 0:
                 x = rect.x()

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/logs/log.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
 from datetime import datetime
-from ..settings.const import Const
+from settings.const import Const
 
-from ..utils.internal_utils import get_ms
+from utils.internal_utils import get_ms
 
 
 class Log:

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/main/footer.py

@@ -3,12 +3,12 @@
 from datetime import datetime
 from functools import partial
 
-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import *
+from PyQt6.QtCore import Qt
+from PyQt6.QtWidgets import *
 
-from ..logs.log import Log
-from ..processing.threads.run_thread import RunThread
-from ..settings.const import Const
+from logs.log import Log
+from processing.threads.run_thread import RunThread
+from settings.const import Const
 
 class Footer(QFrame):
     main = None
@@ -18,7 +18,7 @@ class Footer(QFrame):
     def __init__(self, main):
         super(Footer, self).__init__()
         self.main = main
-        self.setFrameShape(QFrame.StyledPanel)
+        self.setFrameShape(QFrame.Shape.StyledPanel)
 
         l_footer = QVBoxLayout(self)
         self.f_container = QFrame()
@@ -180,7 +180,7 @@ class Footer(QFrame):
         title = 'At ' + now.strftime('%H:%M:%S') + ' - ' + title
         q_title = QLabel()
         q_pc = QLabel('')
-        q_pc.setAlignment(Qt.AlignCenter)
+        q_pc.setAlignment(Qt.AlignmentFlag.AlignCenter)
         pb = QProgressBar()
         pb.setFixedHeight(Const.progress_bar_height)
         pb.setTextVisible(False)

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/main/header.py

@@ -2,18 +2,19 @@
 # -*- coding: utf-8 -*-
 import datetime
 
-from PyQt5.QtCore import Qt
-from PyQt5.QtGui import QPixmap, QKeySequence
-from ..settings.const import Const
-from PyQt5.QtWidgets import *
-from ..processing.dh import DataHandling
-from ..utils.internal_utils import *
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QPixmap, QKeySequence
+from settings.const import Const
+from PyQt6.QtWidgets import *
+from processing.dh import DataHandling
+from utils.internal_utils import *
 import os
 import pyqtgraph as pg
-from ..logs.log import Log
-from ..processing.threads.run_thread import RunThread
-from ..toolbox.clickable_qlabel import ClickableQLabel
-from ..main.winc import WindowsContainer
+
+from logs.log import Log
+from processing.threads.run_thread import RunThread
+from toolbox.clickable_qlabel import ClickableQLabel
+from main.winc import WindowsContainer
 
 
 class Header(QFrame):
@@ -26,10 +27,10 @@ class Header(QFrame):
     def __init__(self, main):
         super(Header, self).__init__()
         self.main = main
-        self.setFrameShape(QFrame.StyledPanel)
+        self.setFrameShape(QFrame.Shape.StyledPanel)
 
         self.w_fits_file_name = QLabel('Please load SPICE data (FITS file level 2)')
-        self.w_fits_file_name.setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse)
+        self.w_fits_file_name.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
         hbox = QHBoxLayout(self)
         img_i = ClickableQLabel()
         img_i.setPixmap(QPixmap('images/info.png'))
@@ -66,7 +67,7 @@ class Header(QFrame):
                 return
         else:  # from recent files (or loaded automatically in debug mode)
             self.data_path = data_file_path
-        QApplication.setOverrideCursor(Qt.WaitCursor)
+        QApplication.setOverrideCursor(Qt.CursorShape.WaitCursor)
 
         if not os.path.exists(self.data_path):
             self.cancel_file()
@@ -118,8 +119,8 @@ class Header(QFrame):
                   WindowsContainer.generateWindows, with_cancel=False)
         # Handle recent files
         append_it = True  # will append the file path in the recent files
-        if os.path.exists(Const.recent_files_path):
-            file = open(Const.recent_files_path, 'r')
+        if os.path.exists(self.main.project_path + '/' + Const.recent_files_path):
+            file = open(self.main.project_path + '/' + Const.recent_files_path, 'r')
             if self.data_path in file.read():
                 append_it = False
             file.close()
@@ -135,7 +136,7 @@ class Header(QFrame):
             a_new = self.main.m_menu_bar.subm_recent_files.addAction(now + ' ' + self.data_path)
             a_new.setShortcut('Ctrl+L')
             a_new.triggered.connect(lambda: self.a_load_fits(self.data_path))
-            file = open(Const.recent_files_path, 'a')
+            file = open(self.main.project_path + '/' + Const.recent_files_path, 'a')
             file.write('\n' + now + ' ' + self.data_path)
             file.close()
 

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/main/menu.py

@@ -2,13 +2,13 @@
 # -*- coding: utf-8 -*-
 from functools import partial
 
-from ..settings.const import Const
-from ..utils.internal_utils import *
-from PyQt5.QtWidgets import *
-from PyQt5.QtCore import *
-from ..processing.threads.run_thread import RunThread
-from ..logs.log import Log
-from ..main.winc import WindowsContainer
+from settings.const import Const
+from utils.internal_utils import *
+from PyQt6.QtWidgets import *
+from PyQt6.QtCore import *
+from processing.threads.run_thread import RunThread
+from logs.log import Log
+from main.winc import WindowsContainer
 
 class Menu(QFrame):
     main = None # widget windows visualization (main widget)
@@ -44,7 +44,7 @@ class Menu(QFrame):
     
     def __init__(self, main):
         super(Menu, self).__init__()
-        self.setFrameShape(QFrame.StyledPanel)
+        self.setFrameShape(QFrame.Shape.StyledPanel)
         self.main = main
         
         l_menu = QVBoxLayout(self)
@@ -63,7 +63,7 @@ class Menu(QFrame):
         self.c_gradient_theme.addItems(capitalized_themes)
         self.c_gradient_theme.currentIndexChanged.connect(self.a_updateGradientTheme)
         c_gt_index = self.c_gradient_theme.findText(Const.gradient_default_theme.capitalize(),
-                                                    Qt.MatchFixedString)
+                                                    Qt.MatchFlag.MatchFixedString)
         if c_gt_index >= 0:
             self.c_gradient_theme.setCurrentIndex(c_gt_index)
         else:
@@ -76,7 +76,7 @@ class Menu(QFrame):
         set_tooltip(self.c_plot_bg, tooltip_str)
         self.c_plot_bg.addItems(Const.bg_colors.keys())
         self.c_plot_bg.currentIndexChanged.connect(self.a_updatePlotBg)
-        c_bg_index = self.c_plot_bg.findText(Const.default_bg_color, Qt.MatchFixedString)
+        c_bg_index = self.c_plot_bg.findText(Const.default_bg_color, Qt.MatchFlag.MatchFixedString)
         if c_bg_index >= 0:
             self.c_plot_bg.setCurrentIndex(c_bg_index)
         else:
@@ -210,7 +210,7 @@ class Menu(QFrame):
         tooltip_str = 'Rescale the abscissa of the second map I(lambda, y)'
         set_tooltip(f_lambda_rescaling, tooltip_str)
         l_lambda_rescaling = QHBoxLayout(f_lambda_rescaling)
-        self.s_lambda_rescaling = QSlider(Qt.Horizontal)
+        self.s_lambda_rescaling = QSlider(Qt.Orientation.Horizontal)
         self.s_lambda_rescaling.setMinimum(1)  # scale = 1
         self.s_lambda_rescaling.setMaximum(Const.max_lambda_rescaling)
         self.s_lambda_rescaling.setValue(Const.default_lambda_rescaling)
@@ -230,7 +230,7 @@ class Menu(QFrame):
         tooltip_str = 'Rescale the abscissa of the first map I(x, y)'
         set_tooltip(f_x_rescaling, tooltip_str)
         l_x_rescaling = QHBoxLayout(f_x_rescaling)
-        self.s_x_rescaling = QSlider(Qt.Horizontal)
+        self.s_x_rescaling = QSlider(Qt.Orientation.Horizontal)
         self.s_x_rescaling.setMinimum(1)  # scale = 1
         self.s_x_rescaling.setMaximum(Const.max_x_rescaling)
         self.s_x_rescaling.setValue(Const.default_x_rescaling)
@@ -248,7 +248,7 @@ class Menu(QFrame):
 
         f_plot_size = QFrame()
         l_plot_size = QHBoxLayout(f_plot_size)
-        self.main.s_plot_size = QSlider(Qt.Horizontal)
+        self.main.s_plot_size = QSlider(Qt.Orientation.Horizontal)
         self.main.s_plot_size.setMinimum(Const.min_plot_size)
         self.main.s_plot_size.setMaximum(Const.max_plot_size)
         self.main.s_plot_size.setValue(Const.default_plot_size)
@@ -272,7 +272,7 @@ class Menu(QFrame):
         self.q_font_size_title = QLabel('Text font size: ')
         l_font_size.addWidget(self.q_font_size_title)
         self.q_font_size = QLabel('')  # updated by update_font_size_label()
-        self.q_font_size.setAlignment(Qt.AlignCenter)
+        self.q_font_size.setAlignment(Qt.AlignmentFlag.AlignCenter)
         self.update_font_size_label()
         self.q_font_size_min_indicator = QLabel(str(Const.min_font_size_pc) + ' %')
         l_font_size.addWidget(self.q_font_size_min_indicator)
@@ -592,13 +592,13 @@ class Menu(QFrame):
                         xy_map = plot_bloc['x_y']
                         y_range_str = '[' + str(xy_map.fit_maps_y_min) + '; ' + str(xy_map.fit_maps_y_max) + ']'
                         qm = QMessageBox()
-                        ret = qm.Yes
+                        ret = qm.StandardButton.Yes
                         if not self.main.is_generate_maps_warned:
                             self.main.is_generate_maps_warned = True
                             ret = qm.question(self, '',  'Before generating fit maps, you can adjust the y bounds in order ' +
                                               'to aim a specific region and save time, use the grey horizontal bars in I(' + self.main.dh.x_or_t + ',y) maps. ' +
-                                              '\nGenerate fit maps with current y bounds anyway?', qm.Yes | qm.No)
-                        if ret == qm.Yes:
+                                              '\nGenerate fit maps with current y bounds anyway?', qm.StandardButton.Yes | qm.StandardButton.No)
+                        if ret == qm.StandardButton.Yes:
                             self.main.fit_maps_are_generating[win_key] = True
                             RunThread('GenerateFitMaps', self.main, plot_bloc,
                                       'Generating ' + str(xy_map.w.win_key) + '\'s fit maps, y ∈ ' + y_range_str,

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/main/menu_bar.py

@@ -1,11 +1,12 @@
 from functools import partial
 import json
-from ..utils.internal_utils import *
-from PyQt5.QtWidgets import *
+from utils.internal_utils import *
+from PyQt6.QtWidgets import *
+from PyQt6.QtGui import QAction
 from pylab import *
-from ..logs.log import Log
+from logs.log import Log
 import os
-from ..settings.const import Const
+from settings.const import Const
 
 class MenuBar(QMenuBar):
     main = None
@@ -60,7 +61,7 @@ class MenuBar(QMenuBar):
 
     def a_load_state(self):
         q_state_file = QFileDialog.getOpenFileName(self, 'Open file',
-                                                   Const.default_data_path_state, '*.json')
+                                                   self.main.project_path + '/' + Const.default_data_path_state, '*.json')
         state_path = q_state_file[0]
         if state_path == '':  # cancel
             return
@@ -122,7 +123,7 @@ class MenuBar(QMenuBar):
             file.close()
 
     def a_clear_recent_files(self):
-        os.remove(Const.recent_files_path)
+        os.remove(self.main.project_path + '/' + Const.recent_files_path)
         self.subm_recent_files.clear()
         self.set_no_recent_file_action()
         show_message('Recent files history cleared', 'Recent files history has been cleared.')
@@ -135,13 +136,13 @@ class MenuBar(QMenuBar):
         no_recent_files = True
         content = ''
 
-        if os.path.exists(Const.recent_files_path):
-            file = open(Const.recent_files_path, "r")
+        if os.path.exists(self.main.project_path + '/' + Const.recent_files_path):
+            file = open(self.main.project_path + '/' + Const.recent_files_path, "r")
             content = file.read()
             no_recent_files = '.fits' not in content
             file.close()
         else:
-            file = open(Const.recent_files_path, "w")
+            file = open(self.main.project_path + '/' + Const.recent_files_path, "w")
             file.close()
 
         if no_recent_files:

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/main/w.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-from PyQt5.QtWidgets import *
+from PyQt6.QtWidgets import *
 
-from ..utils.internal_utils import *
-from ..logs.log import Log
-from ..settings.const import Const
+from utils.internal_utils import *
+from logs.log import Log
+from settings.const import Const
 
 class Window():
     main = None

{spiceitup-1.3.4 → spiceitup-2.0.1}/spiceitup/main/winc.py

@@ -2,21 +2,21 @@
 # -*- coding: utf-8 -*-
 from functools import partial
 
-from ..processing.threads.run_thread import RunThread
-from ..main.w import Window
+from processing.threads.run_thread import RunThread
+from main.w import Window
 import time
-from ..settings.const import Const
-from ..utils.internal_utils import *
-from PyQt5.QtWidgets import *
-from PyQt5.QtCore import *
-from PyQt5.QtGui import *
-from ..layout.flow_layout import FlowLayout
+from settings.const import Const
+from utils.internal_utils import *
+from PyQt6.QtWidgets import *
+from PyQt6.QtCore import *
+from PyQt6.QtGui import *
+from layout.flow_layout import FlowLayout
 #from pylab import *
 import pyqtgraph as pg
-from ..plot.plot_map import PlotMap
-from ..plot.plot_line import PlotLine
-from ..toolbox.clickable_qlabel import ClickableQLabel
-from ..logs.log import Log
+from plot.plot_map import PlotMap
+from plot.plot_line import PlotLine
+from toolbox.clickable_qlabel import ClickableQLabel
+from logs.log import Log
 
 
 class WindowsContainer(QFrame):
@@ -30,7 +30,7 @@ class WindowsContainer(QFrame):
     
     def __init__(self, main):
         super(WindowsContainer, self).__init__()
-        self.setFrameShape(QFrame.StyledPanel)
+        self.setFrameShape(QFrame.Shape.StyledPanel)
         self.main = main
         self.vbox = QVBoxLayout(self)
         self.f_plots = QFrame()
@@ -196,12 +196,12 @@ class WindowsContainer(QFrame):
         set_tooltip(q_x_y_label, tooltip_str)
         q_x_y_label.setFont(Const.css_plot_font)
         q_x_y_label.setStyleSheet(Const.css_borders + ' ' + Const.css_plot_title)
-        q_x_y_label.setAlignment(Qt.AlignCenter)
+        q_x_y_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
         f_bottom_plot1 = QFrame()
         l_bottom_plot1 = QVBoxLayout(f_bottom_plot1)
         q_label_lambda = QLabel('')  # updated in PlotMap()
         q_label_lambda.setStyleSheet('color: ' + Const.slider_cursor_color + ';')
-        q_label_lambda.setAlignment(Qt.AlignCenter)
+        q_label_lambda.setAlignment(Qt.AlignmentFlag.AlignCenter)
         l_bottom_plot1.addWidget(q_label_lambda)
         
         f_x_y_options = QFrame()
@@ -252,12 +252,12 @@ class WindowsContainer(QFrame):
         set_tooltip(q_lambda_y_label, tooltip_str)
         q_lambda_y_label.setFont(Const.css_plot_font)
         q_lambda_y_label.setStyleSheet(Const.css_borders + ' ' + Const.css_plot_title)
-        q_lambda_y_label.setAlignment(Qt.AlignCenter)
+        q_lambda_y_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
         f_bottom_plot2 = QFrame()
         l_bottom_plot2 = QVBoxLayout(f_bottom_plot2)
         q_label_x = QLabel('')  # updated in PlotMap()
         q_label_x.setStyleSheet('color: ' + Const.slider_cursor_color + ';')
-        q_label_x.setAlignment(Qt.AlignCenter)
+        q_label_x.setAlignment(Qt.AlignmentFlag.AlignCenter)
         l_bottom_plot2.addWidget(q_label_x)
         
         f_lambda_y_options = QFrame()
@@ -305,7 +305,7 @@ class WindowsContainer(QFrame):
         tooltip_str = 'This is the I(lambda) histogram, it\'s computed according to the blue cross positions in the' + \
                       ' previous maps, related values of ' + self.main.dh.x_or_t + ' and y are displayed in green here'
         set_tooltip(q_lambda_I_label, tooltip_str)
-        q_lambda_I_label.setAlignment(Qt.AlignCenter)
+        q_lambda_I_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
         q_lambda_I_label.setFont(Const.css_plot_font)
         q_lambda_I_label.setStyleSheet('color: ' + Const.green_text +
                                        '; ' + Const.css_borders + ' ' + Const.css_plot_title)
@@ -313,12 +313,12 @@ class WindowsContainer(QFrame):
         q_lambda_I_title = QLabel('')  # below plot, updated in get_gaussian_fit()
         tooltip_str = 'Gaussian formula used to compute the fit'
         set_tooltip(q_lambda_I_title, tooltip_str)
-        q_lambda_I_title.setAlignment(Qt.AlignCenter)
+        q_lambda_I_title.setAlignment(Qt.AlignmentFlag.AlignCenter)
         q_lambda_I_title.setStyleSheet('color: white;')
         q_fit_label = QLabel('')  # updated in PlotLine()
         tooltip_str = 'Gaussian fit parameters that are retrieved'
         set_tooltip(q_fit_label, tooltip_str)
-        q_fit_label.setAlignment(Qt.AlignCenter)
+        q_fit_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
         q_fit_label.setStyleSheet('color: ' + Const.fit_text_color + ';')
         
         x_index = round(self.main.dh.get_dim(win_key, self.main.dh.x_or_t) / 2.)
@@ -335,7 +335,7 @@ class WindowsContainer(QFrame):
         q_fit_1_label = QLabel(self.fit_labels['fit_1'] + ' ' + self.main.dh.I_unit)
         q_fit_1_label.setFont(Const.css_plot_font)
         q_fit_1_label.setStyleSheet(Const.css_borders + ' ' + Const.css_plot_title)
-        q_fit_1_label.setAlignment(Qt.AlignCenter)
+        q_fit_1_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
         #Log.p_ms('fit_1...', self.first_time_ms)
         w.plots['fit_1'] = PlotMap(w, self.main, 'fit_1', q_fit_1_label)
         #Log.p_ms('fit_1 done.', self.first_time_ms)
@@ -343,7 +343,7 @@ class WindowsContainer(QFrame):
         q_fit_2_label = QLabel(self.fit_labels['fit_2'] + ' km/s')
         q_fit_2_label.setFont(Const.css_plot_font)
         q_fit_2_label.setStyleSheet(Const.css_borders + ' ' + Const.css_plot_title)
-        q_fit_2_label.setAlignment(Qt.AlignCenter)
+        q_fit_2_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
         #Log.p_ms('fit_2...', self.first_time_ms)
         w.plots['fit_2'] = PlotMap(w, self.main, 'fit_2', q_fit_2_label)
         #Log.p_ms('fit_2 done.', self.first_time_ms)
@@ -351,7 +351,7 @@ class WindowsContainer(QFrame):
         q_fit_3_label = QLabel(self.fit_labels['fit_3'] + ' km/s')
         q_fit_3_label.setFont(Const.css_plot_font)
         q_fit_3_label.setStyleSheet(Const.css_borders + ' ' + Const.css_plot_title)
-        q_fit_3_label.setAlignment(Qt.AlignCenter)
+        q_fit_3_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
         #Log.p_ms('fit_3...', self.first_time_ms)
         w.plots['fit_3'] = PlotMap(w, self.main, 'fit_3', q_fit_3_label)
         #Log.p_ms('fit_3 done.', self.first_time_ms)
@@ -386,7 +386,7 @@ class WindowsContainer(QFrame):
         for i in range(3):
             plot_key = 'fit_' + str(i + 1)
             self.main.qs_fit_label[win_key][plot_key] = QLabel(not_generated_text)
-            self.main.qs_fit_label[win_key][plot_key].setAlignment(Qt.AlignCenter)
+            self.main.qs_fit_label[win_key][plot_key].setAlignment(Qt.AlignmentFlag.AlignCenter)
             self.main.qs_fit_label[win_key][plot_key].setStyleSheet(Const.css_borders + ' ' + Const.css_plot_title)
             self.main.qs_fit_label[win_key][plot_key].setVisible(False)
             l_grid.addWidget(self.main.qs_fit_label[win_key][plot_key], 6, i, 1, 1)