Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replacing PySide2 dependency with PyQt5 library #28

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ismrmrdviewer/__main__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env python
from PySide2 import QtCore
from PyQt5 import QtCore
import ismrmrdviewer.ui as ui
import sys
import logging
import argparse

from PySide2 import QtWidgets
from PyQt5 import QtWidgets


def main():
Expand Down
6 changes: 3 additions & 3 deletions ismrmrdviewer/ui/FileWidget.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

import ismrmrd

from PySide2 import QtWidgets
from PySide2.QtCore import Qt
from PySide2.QtGui import QGuiApplication, QCursor
from PyQt5 import QtWidgets
from PyQt5.QtCore import Qt
from PyQt5.QtGui import QGuiApplication, QCursor
from ismrmrdviewer.viewer import HeaderViewer, ImageViewer, AcquisitionViewer, WaveformViewer


Expand Down
10 changes: 5 additions & 5 deletions ismrmrdviewer/ui/MainWindow.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@

import os
import logging
from PySide2 import QtCore
from PySide2 import QtWidgets
from PySide2.QtCore import Signal, Slot
from PyQt5 import QtCore
from PyQt5 import QtWidgets
from PyQt5.QtCore import pyqtSignal, pyqtSlot

from .FileWidget import FileWidget


class MainWindow(QtWidgets.QMainWindow):

open = Signal(str)
open = pyqtSignal(str)

def __init__(self):
super().__init__()
Expand All @@ -22,7 +22,7 @@ def __init__(self):

self.open.connect(self.open_file)

@Slot()
@pyqtSlot()
def open_file_dialog(self):

file_name, file_type = QtWidgets.QFileDialog.getOpenFileName(
Expand Down
4 changes: 2 additions & 2 deletions ismrmrdviewer/viewer/AcquisitionViewer.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging

from PySide2 import QtWidgets, QtCore, QtGui
from PySide2.QtCore import Qt
from PyQt5 import QtWidgets, QtCore, QtGui
from PyQt5.QtCore import Qt

import numpy as np
import matplotlib as mpl
Expand Down
2 changes: 1 addition & 1 deletion ismrmrdviewer/viewer/HeaderViewer.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
import xml.etree.ElementTree as ET

from PySide2 import QtWidgets, QtCore
from PyQt5 import QtWidgets, QtCore


class HeaderViewer(QtWidgets.QTreeWidget):
Expand Down
2 changes: 1 addition & 1 deletion ismrmrdviewer/viewer/ImageViewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import matplotlib.pyplot as pyplot
import matplotlib.animation as animation

from PySide2 import QtCore, QtGui, QtWidgets as QTW
from PyQt5 import QtCore, QtGui, QtWidgets as QTW

from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.figure import Figure
Expand Down
4 changes: 2 additions & 2 deletions ismrmrdviewer/viewer/WaveformViewer.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

import logging

from PySide2 import QtWidgets, QtCore, QtGui
from PySide2.QtCore import Qt
from PyQt5 import QtWidgets, QtCore, QtGui
from PyQt5.QtCore import Qt

import numpy as np
import matplotlib as mpl
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kiwisolver==1.1.0
matplotlib==3.0.3
numpy==1.16.2
pyparsing==2.4.0
PySide2==5.15.1
PyQt5==5.15.1
python-dateutil==2.8.0
shiboken2==5.15.1
six==1.12.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'matplotlib',
'numpy',
'pyparsing',
'PySide2',
'PyQt5',
'python-dateutil',
'shiboken2',
'six'
Expand Down