fdbpm now on pyqt5

Author: marcelrsoub

easy_gui.py

@@ -1,112 +1,58 @@
-# -*- coding: utf-8 -*-
-# @Author: Marcel Reis-Soubkovsky
-# @Date:   2020-06-28 15:46:41
-# @Last Modified by:   Marcel Reis-Soubkovsky
-# @Last Modified time: 2020-07-08 18:04:03
-
-# from PySide2.QtWidgets import *
-from PySide2.QtUiTools import QUiLoader
-from PySide2.QtCore import Qt, QFile, QIODevice
-from PySide2.QtWidgets import QApplication, QWidget, QFileDialog, QVBoxLayout, QGridLayout, QMainWindow
-from PySide2.QtGui import QIcon
-import sys
-
-from matplotlib.backends.backend_qt5agg import (
-        FigureCanvas, NavigationToolbar2QT as NavigationToolbar)
+from PyQt5 import QtWidgets, QtGui
+
+import matplotlib
+matplotlib.use('Qt5Agg')
 import matplotlib.pyplot as plt
 
+from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
 from matplotlib.figure import Figure
-from matplotlib.widgets import Slider, Button, RadioButtons
-from cycler import cycler
-
-import numpy as np
 
-
-class MplWidget(QWidget):
+class MplWidget(FigureCanvasQTAgg):
 
-    def __init__(self, parent = None):
-        
-        # super().__init__()
-        QWidget.__init__(self, parent)
-        
-        self.mpl_canvas = FigureCanvas(Figure(constrained_layout=True, facecolor='#f0f0f0'))
-        self.mpl_canvas.axes = self.mpl_canvas.figure.add_subplot(111)
-        # self.mpl_canvas.setParent()
-        
-        vertical_layout = QVBoxLayout()
-        vertical_layout.addWidget(self.mpl_canvas)
-        self.setLayout(vertical_layout)
-        # vertical_layout.addWidget(NavigationToolbar(self.mpl_canvas, self))       #uncomment in order to have the matplotlib tools
+    def __init__(self, parent=None, width=5, height=4, dpi=100):
 
+        fig = Figure(figsize=(width, height), dpi=dpi)
+        self.axes = fig.add_subplot(111)
+        super(MplWidget, self).__init__(fig)
 
 # --------------------------------------
-class EasyGUI(QWidget):
+class EasyPlotGUI(QtWidgets.QMainWindow):
 
     """Easy GUI with Matplotlib
     """
 
-    def __init__(self):
+    def __init__(self, ui_python_file):
+        self.app = QtWidgets.QApplication([])
         self.window_title="EasyPlotGUI"
-        self.ui_filepath="test_example.ui"
-        self.icon_path="logo.png"
+    
+        self.icon_path=None
+        self.ui=ui_python_file.Ui_MainWindow()
+        super().__init__()
+        self.ui.setupUi(self) 
 
-        
 
     def show_gui(self):
-        """This is the core of the execution.
+        """Shows the GUI.
         """
-        app = QApplication([])
-        
-        QWidget.__init__(self)
-
-        loader = QUiLoader()
-        loader.registerCustomWidget(MplWidget)
-        # self.ui = loader.load(designer_file, self)
-        ui_file = QFile(self.ui_filepath)
-        try:
-            ui_file.open(QIODevice.ReadOnly)
-        except:
-            raise TypeError("Unable to open {}: {}".format(self.ui_filepath, ui_file.errorString()))
-        # loader = QUiLoader()
-
-        self.ui = loader.load(ui_file, None)
-        ui_file.close()
 
         try:
-            self.ax=self.ui.MplWidget.mpl_canvas.axes
-            print("après")
-            self.canvas=self.ui.MplWidget.mpl_canvas
-
-            custom_cycler = (cycler(color=['#ed2124','#808081','c', 'm', 'y', 'k']))
-            plt.rc('axes', prop_cycle=custom_cycler)
+            self.ax=self.ui.MplWidget.axes
+            self.draw=self.ui.MplWidget.draw
             self.update_graph()
         except AttributeError:
-            # raise AttributeError("ERROR")
             pass
 
-        if not self.ui:
-            print(loader.errorString())
-            sys.exit(-1)
-
         self.update_interactivity()
 
 
         self.setWindowTitle(self.window_title)
 
-        
-
-        grid_layout = QGridLayout()
-        grid_layout.addWidget(self.ui)
-        self.setLayout(grid_layout)
-
-        self.QFileDialog=QFileDialog
-        self.QMainWindow=QMainWindow
-
         if self.icon_path!=None:
-            self.setWindowIcon(QIcon(self.icon_path))
+            
+            self.setWindowIcon(QtGui.QIcon(self.icon_path))
 
-        self.show()
-        app.exec_()
+        self.show()  # Show a window
+        self.app.exec_()
 
     def update_interactivity(self):
         """This method adds the interactivity between the GUI elements and the code. An example of execution can be seen below. This method is supposed to be overwritten when EasyGUI is imported as a parent class for adding your own graphs.
@@ -122,55 +68,5 @@ def update_graph(self):
 
         """        
         # example, to be overwritten
-        y = np.random.rand(100)
-        x = np.linspace(0,1,100)
-
-        self.ax.clear()
-        self.ax.plot(x, y, label="Random")
-        self.ax.legend()
-        self.ax.set_title('Random Values')
-        self.canvas.draw()
-        
-if __name__ == "__main__":
-    # Test Example
-    gui = EasyGUI()
-    gui.window_title="Window Title"
-    gui.ui_filepath="test_example.ui"
-    gui.icon_path="./logo.png"
-    gui.show_gui()
-
-    # EXAMPLE OF USAGE
-    # Slider changing the frequency of a sine wave.
-
-    # class MyClass(EasyPlotGUI):
-    #     def __init__(self):
-    #         super().__init__()
-    #         self.window_title="My GUI Name"
-    #         self.ui_filepath="X:/xxxxx/xxxx/your_GUI.ui"
-    #         self.icon_path="X:/xxxxx/xxxx/your_GUI_icon.png"
-
-    #         #initialize Graph variables for first plot
-    #         self.f=1
 
-    #     def update_interactivity(self):
-    #         self.ui.mySlider.valueChanged(self.change_frequency())
-        
-    #     def change_frequency(self):
-    #         self.f=self.ui.mySlider.value()
-    #         self.update_graph()
-        
-    #     def update_graph(self):
-    #         x=np.linspace(0,1)
-    #         y=np.sin(2*np.pi*self.f*x)
-
-    #         self.ax.clear()
-    #         self.ax.plot(x, y, label="Sine")
-    #         self.ax.legend()
-    #         self.ax.set_title('Sine Wave')
-    #         self.canvas.draw()
-
-    # #calling it
-    # my_gui=MyClass()
-    # my_gui.show_gui()
-
-
+        self.draw()

fdbpm.py

@@ -1,28 +1,24 @@
-import numpy as np
 import time as t
 
-from PySide2.QtWidgets import *
-
-from cycler import cycler
-
 import numpy as np
 
 import matplotlib.pyplot as plt
-from matplotlib.widgets import Slider, Button, RadioButtons
+from matplotlib.widgets import Slider
+
 from functools import partial
 import copy
 
-from easy_gui import EasyGUI
+from easy_gui import EasyPlotGUI
+import interface_ui
 
 from numba import jit
 
 
-class FdBpm(EasyGUI):
+class FdBpm(EasyPlotGUI):
     def __init__(self):
-        super().__init__()
+        super().__init__(interface_ui)
         self.slider_realtime = True
         self.window_title = "FD-BPM"
-        self.ui_filepath = r"interface.ui"
         self.icon_path = r"fdbpm-logo.png"
 
     def create_space(self):
@@ -155,7 +151,7 @@ def make_tri_matrix(self):
 
     @staticmethod
     @jit(forceobj=True)
-    def core_propag_jit(A,B, ro, light, tridiag_matrix, h,LENGTH,NUM_SAMPLES):
+    def core_propag_jit(A, B, ro, light, tridiag_matrix, h, LENGTH, NUM_SAMPLES):
 
         propag = np.zeros((int(LENGTH), int(NUM_SAMPLES)))
         d = np.zeros((NUM_SAMPLES), dtype='complex_')
@@ -172,7 +168,8 @@ def core_propag_jit(A,B, ro, light, tridiag_matrix, h,LENGTH,NUM_SAMPLES):
             # light = np.linalg.lstsq(tridiag_matrix,d)[0]
             light = np.linalg.solve(tridiag_matrix, d)  # fastest option
             # propag[n,:] = np.abs(light)
-            propag[n, :] = (light*light.conjugate()).real
+            # propag[n, :] = (light*light.conjugate()).real
+            propag[n, :] = light.real**2 + light.imag**2
             # propag[n,:] = np.real(light) # Oscillations
             # propag[n,:] = np.angle(light) # interesting
         return propag
@@ -185,7 +182,8 @@ def calculate_propagation(self, plotOn=True, timing=True):
         if(timing == True):
             start = t.time()
 
-        propag = self.core_propag_jit(self.A,self.B, self.ro, self.light, self.tridiag_matrix, self.h,self.LENGTH,self.NUM_SAMPLES)
+        propag = self.core_propag_jit(
+            self.A, self.B, self.ro, self.light, self.tridiag_matrix, self.h, self.LENGTH, self.NUM_SAMPLES)
 
         if(timing == True):
             end = t.time()
@@ -376,8 +374,8 @@ def examples(self, name, chart_update=False):
 
     def update_graph(self, slider=False):
 
-        canvas = self.ui.MplWidget.mpl_canvas
-        ax = self.ui.MplWidget.mpl_canvas.axes  # no canvas in the object
+        
+        ax = self.ax  # no canvas in the object
 
         if int(np.floor(self.LENGTH/self.NUM_SAMPLES)) > 0:
             propag_img = self.calculate_propagation(
@@ -395,7 +393,7 @@ def update_graph(self, slider=False):
             # ax.clear()
             self.img.set_data(propag_img)
         plt.tight_layout(pad=0.)
-        canvas.draw()
+        self.draw()
 
 
 if __name__ == "__main__":

interface.ui

@@ -17,7 +17,7 @@
    <string notr="true">FDBPM</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="resource.qrc">
+   <iconset>
     <normaloff>:/icon/beampy-logo.png</normaloff>:/icon/beampy-logo.png</iconset>
   </property>
   <property name="autoFillBackground">
@@ -278,12 +278,10 @@
   <customwidget>
    <class>MplWidget</class>
    <extends>QWidget</extends>
-   <header location="global">mplwidget.h</header>
+   <header location="global">easy_gui</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="resource.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>