spiceitup 1.3.3__tar.gz → 2.0.0__tar.gz

{spiceitup-1.3.3 → spiceitup-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spiceitup
-Version: 1.3.3
+Version: 2.0.0
 Summary: Quicklook tool for level 2 SPICE imaging
 Home-page: https://git.ias.u-psud.fr/spice/data_quicklook
 Author: David Picard
@@ -9,12 +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: sunraster
-Requires-Dist: pyqtgraph
-Requires-Dist: qdarkgraystyle
-Requires-Dist: scipy
-Requires-Dist: opencv-python-headless
+Requires-Dist: requirements.txt
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -25,7 +20,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 +53,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 +65,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.3 → spiceitup-2.0.0}/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.3 → spiceitup-2.0.0}/setup.py

@@ -3,32 +3,17 @@ import os
 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.3',
+    version='2.0.0',
     description='Quicklook tool for level 2 SPICE imaging',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
     author='David Picard',
     author_email='david.picard@universite-paris-saclay.fr',
     url='https://git.ias.u-psud.fr/spice/data_quicklook',
-    packages=find_packages(),
-    install_requires=[
-        "PyQt5",
-        "sunraster",
-        "pyqtgraph",
-        "qdarkgraystyle",
-        "scipy",
-        "opencv-python-headless"
-    ],
+    packages=['spiceitup'],
+    install_requires='requirements.txt',
     classifiers=[
         'Programming Language :: Python :: 3',
         'License :: OSI Approved :: MIT License',

spiceitup-2.0.0/spiceitup/__main__.py

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

spiceitup-1.3.3/spiceitup/__main__.py → spiceitup-2.0.0/spiceitup/main_call.py

@@ -1,12 +1,15 @@
 import sys
 import warnings
-import os
-from .settings.const import Const
-from .run import Main
-from PyQt5.QtGui import *
-from PyQt5.QtWidgets import *
+from pathlib import Path
+
+from run import Main
+from settings.const import Const
+from PyQt6.QtGui import *
+from PyQt6.QtWidgets import *
+
 
 def main():
+    project_path = str(Path(__file__).resolve().parent)
     warnings.filterwarnings("ignore")
     # Used to prevent to show All-NaN RuntimeWarning
     # Slices in the data cube can be filled with NaN
@@ -16,14 +19,13 @@ def main():
         app = QApplication(sys.argv)
     else:
         app = QApplication.instance()
-
-    win = Main()
+    win = Main(project_path)
     win.applyStyle(app)
     win.resize(Const.window_width, Const.window_height)
-    win.setWindowIcon(QIcon('images/icon.png'))
+    win.setWindowIcon(QIcon(win.project_path + '/images/icon.png'))
     win.show()
 
     sys.exit(app.exec())
 
 if __name__ == '__main__':
-    main()
+    print('To run the app, run "python run.py"')

{spiceitup-1.3.3 → spiceitup-2.0.0}/spiceitup/run.py

@@ -1,20 +1,24 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+import os
 import sys
 import warnings
 
 from os import path
-from .logs.log import Log
-from .plot.plot_map import PlotMap
-from .settings.const import *
-from .utils.internal_utils import *
-from PyQt5.QtGui import *
-from PyQt5.QtCore import *
-from PyQt5.QtWidgets import *
-from .main.footer import Footer
-from .main.header import Header
-from .main.menu_bar import MenuBar
+from pathlib import Path
+
+from logs.log import Log
+from plot.plot_map import PlotMap
+from utils.internal_utils import *
+from PyQt6.QtGui import *
+from PyQt6.QtCore import *
+from PyQt6.QtWidgets import *
+from main.footer import Footer
+from main.header import Header
+from main.menu_bar import MenuBar
 import qdarkgraystyle
-from .main.menu import Menu
-from .main.winc import WindowsContainer
+from main.menu import Menu
+from main.winc import WindowsContainer
 
 class Main(QMainWindow):
     windows = []  # list of Window objects, see Window.py
@@ -44,12 +48,13 @@ class Main(QMainWindow):
     lambda_I_bar_moves = False  # avoid recursive behavior when moving I(lambda)'s vertical bar
     updating_levels = []  # contains RunThread instances related to running levels process
     lambda_unit = True  # Angstrom otherwise cube index
-    qs_fit_label = {}  # {'win_key': {'fit_1': QLabel(), 'fit_2': QLabel(), 'fit_3': QLabel()}, ...}
+    qs_fit_label = {} # {'win_key': {'fit_1': QLabel(), 'fit_2': QLabel(), 'fit_3': QLabel()}, ...}
     nb_available_bin = {}  # {'win_key': <nb>} in order to hide fit if nb < 4
     python_state = None  # when not None, a state is being restored
 
-    def __init__(self, parent=None):
+    def __init__(self, project_path, parent=None):
         super(QMainWindow, self).__init__(parent)
+        self.project_path = project_path
         Log.p('------------------------- Application was run')
         self.initialization()
         central_widget = QFrame()
@@ -64,29 +69,29 @@ class Main(QMainWindow):
         self.f_header = Header(self)
         self.m_menu_bar = MenuBar(self)
 
-        s1 = QSplitter(Qt.Horizontal)
-        # win_label.setStyleSheet("border: 1px solid black;")
-
+        s1 = QSplitter(Qt.Orientation.Horizontal)
+        #win_label.setStyleSheet("border: 1px solid black;")
+        
         s1.addWidget(self.f_menu)
         s1.addWidget(self.f_winc)
         s1.setSizes(split_w_pc(0.2))
 
-        s2 = QSplitter(Qt.Vertical)
+        s2 = QSplitter(Qt.Orientation.Vertical)
         s2.addWidget(s1)
         s2.addWidget(self.f_footer)
         s2.setSizes(split_h_pc(0.85))
-
-        s0 = QSplitter(Qt.Vertical)
+        
+        s0 = QSplitter(Qt.Orientation.Vertical)
         s0.addWidget(self.f_header)
         s0.addWidget(s2)
         s0.setSizes(split_h_pc(0.05))
-
+        
         hbox.addWidget(s0)
 
         QApplication.setStyle(QStyleFactory.create('Cleanlooks'))
 
-        self.setWindowTitle('SPICE-IT Quicklook')
-
+        self.setWindowTitle('SPICE-IT-UP Quicklook')
+        
     """def __del__(self):
         for th in self.th:
             th.quit()"""
@@ -131,7 +136,7 @@ class Main(QMainWindow):
                 for plot_key, plot in plot_bloc.items():
                     plots.append(plot)
         return plots  # list of PlotMap and/or PlotLine
-
+    
     def get_plots(self, given_plot_key):
         plots = []
         for win_key, plot_bloc in self.global_plots.items():
@@ -139,7 +144,7 @@ class Main(QMainWindow):
                 if given_plot_key == plot_key:
                     plots.append(plot)
         return plots  # list of PlotMap or PlotLine
-
+    
     def get_plot_bloc(self, given_plot):
         """plot_bloc is the parent element from a specific plot, it is a dict
         which is a value-element of global_plots and containing all the PlotMaps
@@ -156,16 +161,16 @@ class Main(QMainWindow):
             for key in keys:
                 plot_bloc[key].main_plot_item.setXLink(None)
                 plot_bloc[key].main_plot_item.setYLink(None)
-
+    
     def link_axes(self, between_windows=False):
         previous_lambda_y = None
         previous_x_y = None
-
+        
         self.unlink_axes()
         for win_key, plot_bloc in self.global_plots.items():
             # Zoom / Pane link
-            # plot_bloc['x_y'].main_plot_item.setYLink(plot_bloc['lambda_y'].main_plot_item)
-            # generates zoom issues
+            #plot_bloc['x_y'].main_plot_item.setYLink(plot_bloc['lambda_y'].main_plot_item)
+            #generates zoom issues
             if between_windows:
                 if previous_lambda_y is not None:  # not the first window
                     PlotMap.link_maps(previous_x_y, plot_bloc['x_y'])
@@ -198,22 +203,27 @@ class Main(QMainWindow):
         elif plot_key == 'lambda_y':
             factor = self.f_menu.s_lambda_rescaling.value()
         return float(factor)
-
+            
     def initialization(self):
         if not path.isdir(Const.default_data_path):
             Log.p(Const.default_data_path + ' does not exist.', 'warn')
             Const.default_data_path = ''
-
+        
     def applyStyle(self, app):
         css_content = self.read_css()
         if Const.debug_mode:
             css_content += self.read_css(True)
         qdgs_css = qdarkgraystyle.load_stylesheet().replace('opacity: 100;', '')  # Fix tooltip Windows issue
         app.setStyleSheet(qdgs_css + css_content)
-
+        #app.setStyleSheet(css_content)
+        
     def read_css(self, debug=False):
         debug_str = '_debug' if debug else ''
-        file = open(BASE_DIR + '/style/style' + debug_str + '.css', mode='r')
+        file = open(self.project_path + '/style/style' + debug_str + '.css', mode='r')
         css_content = file.read()
         file.close()
         return css_content
+
+if __name__ == '__main__':
+    from main_call import main
+    main()

{spiceitup-1.3.3 → spiceitup-2.0.0}/spiceitup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spiceitup
-Version: 1.3.3
+Version: 2.0.0
 Summary: Quicklook tool for level 2 SPICE imaging
 Home-page: https://git.ias.u-psud.fr/spice/data_quicklook
 Author: David Picard
@@ -9,12 +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: sunraster
-Requires-Dist: pyqtgraph
-Requires-Dist: qdarkgraystyle
-Requires-Dist: scipy
-Requires-Dist: opencv-python-headless
+Requires-Dist: requirements.txt
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -25,7 +20,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 +53,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 +65,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-2.0.0/spiceitup.egg-info/SOURCES.txt

@@ -0,0 +1,12 @@
+README.md
+pyproject.toml
+setup.py
+spiceitup/__main__.py
+spiceitup/main_call.py
+spiceitup/run.py
+spiceitup.egg-info/PKG-INFO
+spiceitup.egg-info/SOURCES.txt
+spiceitup.egg-info/dependency_links.txt
+spiceitup.egg-info/entry_points.txt
+spiceitup.egg-info/requires.txt
+spiceitup.egg-info/top_level.txt

spiceitup-2.0.0/spiceitup.egg-info/requires.txt

@@ -0,0 +1 @@
+requirements.txt

spiceitup-1.3.3/spiceitup/layout/flow_layout.py

@@ -1,91 +0,0 @@
-from PyQt5.QtCore import QPoint, QRect, QSize, Qt
-from PyQt5.QtWidgets import (QApplication, QLayout, QPushButton, QSizePolicy, QWidget, QGridLayout)
-
-class FlowLayout(QLayout):
-    
-    def __init__(self, parent = None, margin = 0, spacing = -1):
-        super(FlowLayout, self).__init__(parent)
-
-        if parent is not None:
-            self.setContentsMargins(margin, margin, margin, margin)
-
-        self.setSpacing(spacing)
-
-        self.itemList = []
-
-    def __del__(self):
-        item = self.takeAt(0)
-        while item:
-            item = self.takeAt(0)
-
-    def addItem(self, item):
-        self.itemList.append(item)
-
-    def count(self):
-        return len(self.itemList)
-
-    def itemAt(self, index):
-        if index >= 0 and index < len(self.itemList):
-            return self.itemList[index]
-
-        return None
-
-    def takeAt(self, index):
-        if index >= 0 and index < len(self.itemList):
-            return self.itemList.pop(index)
-
-        return None
-
-    def expandingDirections(self):
-        return Qt.Orientations(Qt.Orientation(0))
-
-    def hasHeightForWidth(self):
-        return True
-
-    def heightForWidth(self, width):
-        height = self.doLayout(QRect(0, 0, width, 0), True)
-        return height
-
-    def setGeometry(self, rect):
-        super(FlowLayout, self).setGeometry(rect)
-        self.doLayout(rect, False)
-
-    def sizeHint(self):
-        return self.minimumSize()
-
-    def minimumSize(self):
-        size = QSize()
-
-        for item in self.itemList:
-            size = size.expandedTo(item.minimumSize())
-
-        margin, _, _, _ = self.getContentsMargins()
-
-        size += QSize(2 * margin, 2 * margin)
-        return size
-
-    def doLayout(self, rect, testOnly):
-        x = rect.x()
-        y = rect.y()
-        lineHeight = 0
-
-        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)
-            nextX = x + item.sizeHint().width() + spaceX
-            if nextX - spaceX > rect.right() and lineHeight > 0:
-                x = rect.x()
-                y = y + lineHeight + spaceY
-                nextX = x + item.sizeHint().width() + spaceX
-                lineHeight = 0
-
-            if not testOnly:
-                item.setGeometry(QRect(QPoint(x, y), item.sizeHint()))
-
-            x = nextX
-            lineHeight = max(lineHeight, item.sizeHint().height())
-
-        return y + lineHeight - rect.y()

spiceitup-1.3.3/spiceitup/layout/flow_layout_edited.py

@@ -1,98 +0,0 @@
-from PyQt5.QtCore import QPoint, QRect, QSize, Qt
-from PyQt5.QtWidgets import (QApplication, QLayout, QPushButton, QSizePolicy, QWidget, QGridLayout)
-
-class FlowLayout(QLayout):
-    q_plot_size = None
-    
-    def __init__(self, parent = None, margin = 0, spacing = -1, q_plot_size = None):
-        # plot_size must be a QSize object
-        super(FlowLayout, self).__init__(parent)
-        
-        if q_plot_size is not None:
-            self.q_plot_size = q_plot_size
-            self.q_plot_size.setHeight(int(self.q_plot_size.width() * 1.3)) # because of win title
-            self.q_plot_size.setWidth(self.q_plot_size.width() * 2) # because 2 plots x,y and lambda,y
-
-        if parent is not None:
-            self.setContentsMargins(margin, margin, margin, margin)
-
-        self.setSpacing(spacing)
-
-        self.itemList = []
-
-    def __del__(self):
-        item = self.takeAt(0)
-        while item:
-            item = self.takeAt(0)
-
-    def addItem(self, item):
-        self.itemList.append(item)
-
-    def count(self):
-        return len(self.itemList)
-
-    def itemAt(self, index):
-        if index >= 0 and index < len(self.itemList):
-            return self.itemList[index]
-
-        return None
-
-    def takeAt(self, index):
-        if index >= 0 and index < len(self.itemList):
-            return self.itemList.pop(index)
-
-        return None
-
-    def expandingDirections(self):
-        return Qt.Orientations(Qt.Orientation(0))
-
-    def hasHeightForWidth(self):
-        return True
-
-    def heightForWidth(self, width):
-        height = self.doLayout(QRect(0, 0, width, 0), True)
-        return height
-
-    def setGeometry(self, rect):
-        super(FlowLayout, self).setGeometry(rect)
-        self.doLayout(rect, False)
-
-    def sizeHint(self):
-        return self.minimumSize()
-
-    def minimumSize(self):
-        size = QSize()
-
-        for item in self.itemList:
-            size = size.expandedTo(item.minimumSize())
-
-        margin, _, _, _ = self.getContentsMargins()
-
-        size += QSize(2 * margin, 2 * margin)
-        return size
-
-    def doLayout(self, rect, testOnly):
-        x = rect.x()
-        y = rect.y()
-        lineHeight = 0
-
-        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)
-            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()
-                y = y + lineHeight + spaceY
-                nextX = x + self.q_plot_size.width() + spaceX #nextX = x + item.sizeHint().width() + spaceX
-                lineHeight = 0
-
-            if not testOnly:
-                item.setGeometry(QRect(QPoint(x, y), self.q_plot_size)) #item.setGeometry(QRect(QPoint(x, y), item.sizeHint()))
-
-            x = nextX
-            lineHeight = max(lineHeight, self.q_plot_size.height()) #lineHeight = max(lineHeight, item.sizeHint().height())
-
-        return y + lineHeight - rect.y()