Skip to content

Commit 628cf8a

Browse files
authored
Replace pyqt with PySide2 (#2)
1 parent 96608be commit 628cf8a

File tree

6 files changed

+94
-105
lines changed

6 files changed

+94
-105
lines changed

beams/__main__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def main():
137137
parser_amf.add_argument('-d', '--db', type=str, required=True,
138138
help="Sqlite database to write results.")
139139

140-
parser_amf.add_argument('-c', '--db-mf', type=str, required=True, default="http://multiomics-int.cs.bham.ac.uk",
140+
parser_amf.add_argument('-c', '--db-mf', type=str, required=True, default="http://mfdb.bham.ac.uk",
141141
help="Molecular formulae database (reference).")
142142

143143
parser_amf.add_argument('-a', '--adducts-library', type=str, default=None, required=False,
@@ -333,10 +333,10 @@ def main():
333333
column_ppm_error="ppm_error", column_adducts="adduct")
334334

335335
if args.step == "start-gui":
336-
from PyQt5 import QtWidgets
336+
from PySide2 import QtWidgets
337337
from beams.gui import BeamsApp
338338
app = QtWidgets.QApplication(sys.argv)
339-
app.setStyle(QtWidgets.QStyleFactory.create("fusion"))
339+
app.setStyle("Fusion")
340340
form = BeamsApp()
341341
form.show()
342342
sys.exit(app.exec_())

beams/gui.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88
from beams import grouping
99
from beams import annotation
1010
from beams import plots
11-
from PyQt5 import QtCore, QtGui, QtWidgets
11+
from PySide2 import QtCore, QtGui, QtWidgets
1212
from beams.qt import form
13+
1314
from collections import OrderedDict
1415
from multiprocessing import cpu_count
1516

1617

1718
class BeamsApp(QtWidgets.QMainWindow, form.Ui_MainWindow):
18-
def __init__(self, parent=None):
19-
super(BeamsApp, self).__init__(parent)
19+
def __init__(self, *args, **kwargs):
20+
super(BeamsApp, self).__init__(*args, **kwargs)
2021
self.setupUi(self)
2122

2223
self.pushButton_cancel.clicked.connect(QtCore.QCoreApplication.instance().quit)
@@ -420,7 +421,7 @@ def run(self):
420421
rules = None
421422
max_mz = None
422423
else:
423-
db_in = "http://multiomics-int.cs.bham.ac.uk"
424+
db_in = "http://mfdb.bham.ac.uk"
424425
rules = self.checkBox_heuristic_rules.isChecked()
425426
max_mz = self.spinBox_max_mz.value()
426427

beams/plots.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
gui_env = ['TkAgg', 'GTKAgg', 'Qt5Agg', 'WXAgg']
99
elif sys.platform == "darwin":
1010
try:
11-
import PyQt5
11+
import PySide2
1212
gui_env = ['Qt5Agg']
1313
except ImportError:
1414
gui_env = ['TkAgg', 'GTKAgg', 'Qt5Agg', 'WXAgg']

0 commit comments

Comments
 (0)