From fea06855a24d8f5766d733c2bc47f6d5a68c5d24 Mon Sep 17 00:00:00 2001 From: "Martin O. Pollard" Date: Mon, 17 Sep 2018 16:41:45 +0100 Subject: [PATCH 01/15] Correct namespaces for qt5 --- scripts/About.py | 22 +-- scripts/App.py | 236 +++++++++++----------- scripts/Frameworks.py | 448 +++++++++++++++++++++--------------------- scripts/Manual.py | 14 +- scripts/Settings.py | 62 +++--- 5 files changed, 391 insertions(+), 391 deletions(-) diff --git a/scripts/About.py b/scripts/About.py index 94a665d..ea3d3ec 100644 --- a/scripts/About.py +++ b/scripts/About.py @@ -7,9 +7,9 @@ # WARNING! All changes made in this file will be lost! try: - from PyQt4 import QtGui,QtCore + from PyQt5 import QtGui,QtCore,QtWidgets except ImportError: - from PySide import QtGui,QtCore + from PySide2 import QtGui,QtCore,QtWidgets try: _fromUtf8 = QtCore.QString.fromUtf8 @@ -18,12 +18,12 @@ def _fromUtf8(s): return s try: - _encoding = QtGui.QApplication.UnicodeUTF8 + _encoding = QtWidgets.QApplication.UnicodeUTF8 def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) + return QtWidgets.QApplication.translate(context, text, disambig, _encoding) except AttributeError: def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) + return QtWidgets.QApplication.translate(context, text, disambig) class Ui_About(object): def setupUi(self, About): @@ -31,7 +31,7 @@ def setupUi(self, About): About.resize(378, 342) About.setMinimumSize(QtCore.QSize(378, 342)) About.setMaximumSize(QtCore.QSize(378, 342)) - self.label = QtGui.QLabel(About) + self.label = QtWidgets.QLabel(About) self.label.setGeometry(QtCore.QRect(10, 10, 191, 21)) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) @@ -40,7 +40,7 @@ def setupUi(self, About): font.setWeight(50) self.label.setFont(font) self.label.setObjectName(_fromUtf8("label")) - self.label_2 = QtGui.QLabel(About) + self.label_2 = QtWidgets.QLabel(About) self.label_2.setGeometry(QtCore.QRect(10, 30, 181, 21)) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) @@ -49,7 +49,7 @@ def setupUi(self, About): font.setWeight(50) self.label_2.setFont(font) self.label_2.setObjectName(_fromUtf8("label_2")) - self.label_3 = QtGui.QLabel(About) + self.label_3 = QtWidgets.QLabel(About) self.label_3.setGeometry(QtCore.QRect(10, 50, 211, 16)) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) @@ -57,7 +57,7 @@ def setupUi(self, About): font.setItalic(False) self.label_3.setFont(font) self.label_3.setObjectName(_fromUtf8("label_3")) - self.label_4 = QtGui.QLabel(About) + self.label_4 = QtWidgets.QLabel(About) self.label_4.setGeometry(QtCore.QRect(10, 60, 261, 31)) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) @@ -65,10 +65,10 @@ def setupUi(self, About): font.setItalic(False) self.label_4.setFont(font) self.label_4.setObjectName(_fromUtf8("label_4")) - self.textBrowser = QtGui.QTextBrowser(About) + self.textBrowser = QtWidgets.QTextBrowser(About) self.textBrowser.setGeometry(QtCore.QRect(10, 90, 361, 211)) self.textBrowser.setObjectName(_fromUtf8("textBrowser")) - self.about_bn = QtGui.QPushButton(About) + self.about_bn = QtWidgets.QPushButton(About) self.about_bn.setGeometry(QtCore.QRect(290, 310, 75, 23)) self.about_bn.setObjectName(_fromUtf8("about_bn")) diff --git a/scripts/App.py b/scripts/App.py index 64b4f3f..7706813 100644 --- a/scripts/App.py +++ b/scripts/App.py @@ -22,11 +22,11 @@ import subprocess import multiprocessing try: - from PyQt4 import QtGui,QtCore - from PyQt4.QtGui import* + from PyQt5 import QtGui,QtCore,QtWidgets + from PyQt5.QtGui import* except ImportError: - from PySide import QtGui,QtCore - from PySide.QtGui import* + from PySide2 import QtGui,QtCore,QtWidgets + from PySide2.QtGui import* from datetime import datetime from Frameworks import Ui_BioNanoAnalyst from About import Ui_About @@ -44,9 +44,9 @@ from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar #======================================================================================= -class Main(QtGui.QMainWindow): +class Main(QtWidgets.QMainWindow): def __init__(self, parent = None): - QtGui.QMainWindow.__init__(self, parent) + QtWidgets.QMainWindow.__init__(self, parent) self.ui = Ui_BioNanoAnalyst() self.ui.setupUi(self) self.ref = None @@ -66,19 +66,19 @@ def __init__(self, parent = None): self.axes = None self.canvas = None self.canvas_ctg = None - self.ref_table = QtGui.QTableWidget() - self.unqualified_table = QtGui.QTableWidget() - self.qualified_table = QtGui.QTableWidget() - self.BN_table = QtGui.QTableWidget() - self.unmapped_table = QtGui.QTableWidget() - self.mapped_table = QtGui.QTableWidget() - self.filtered_table = QtGui.QTableWidget() - self.no_data_table = QtGui.QTableWidget() - self.missing_table = QtGui.QTableWidget() - self.good_table = QtGui.QTableWidget() - self.site_p_table = QtGui.QTableWidget() - self.pos_p_table = QtGui.QTableWidget() - self.both_table = QtGui.QTableWidget() + self.ref_table = QtWidgets.QTableWidget() + self.unqualified_table = QtWidgets.QTableWidget() + self.qualified_table = QtWidgets.QTableWidget() + self.BN_table = QtWidgets.QTableWidget() + self.unmapped_table = QtWidgets.QTableWidget() + self.mapped_table = QtWidgets.QTableWidget() + self.filtered_table = QtWidgets.QTableWidget() + self.no_data_table = QtWidgets.QTableWidget() + self.missing_table = QtWidgets.QTableWidget() + self.good_table = QtWidgets.QTableWidget() + self.site_p_table = QtWidgets.QTableWidget() + self.pos_p_table = QtWidgets.QTableWidget() + self.both_table = QtWidgets.QTableWidget() #==================== menubar ==================== self.ui.actionNew.setShortcut('Ctrl+N') self.ui.actionClose.setShortcut('Ctrl+Q') @@ -127,7 +127,7 @@ def __init__(self, parent = None): self.ui.show_rsp_bn.clicked.connect(self.show_site_p) self.ui.show_pp_bn.clicked.connect(self.show_pos_p) self.ui.show_both_bn.clicked.connect(self.show_both) - self.clip = QtGui.QApplication.clipboard() + self.clip = QtWidgets.QApplication.clipboard() #==================== mapping status panel =================== self.ui.save_select_bn.clicked.connect(self.save_select) self.ui.save_clear_bn.clicked.connect(self.save_clear) @@ -143,9 +143,9 @@ def new(self): window.show() def quit(self): - response=QtGui.QMessageBox.question(self, 'Warning !', 'Do you want to close the appliction?', - QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) - if response == QtGui.QMessageBox.Yes: + response=QtWidgets.QMessageBox.question(self, 'Warning !', 'Do you want to close the appliction?', + QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No) + if response == QtWidgets.QMessageBox.Yes: sys.exit() def about(self): @@ -161,11 +161,11 @@ def feedbacks(self): def select_ref(self): if sys.platform == 'win32': - ref = QFileDialog.getOpenFileName(self, 'Select reference sequences', '','sequences (*fasta *fa *fna)') + ref = QtWidgets.QFileDialog.getOpenFileName(self, 'Select reference sequences', '','sequences (*fasta *fa *fna)') self.ref=codecs.decode(str(ref)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.ref_input.setText(self.ref) else: - self.ref = unicode(QFileDialog.getOpenFileName(self, 'Select reference sequences', '','sequences (*fasta *fa *fna)')) + self.ref = unicode(QtWidgets.QFileDialog.getOpenFileName(self, 'Select reference sequences', '','sequences (*fasta *fa *fna)')) self.ui.ref_input.setText(self.ref) def clear_ref(self): @@ -177,8 +177,8 @@ def enable_raw(self): if sys.platform =='win32': self.ui.raw_frame.setEnabled(False) self.ui.aligned_checkBox.setEnabled(False) - QtGui.QMessageBox.question(self, 'Warning !', 'Currently Option 1 is only available in Linux and MacOS system !', - QtGui.QMessageBox.Ok) + QtWidgets.QMessageBox.question(self, 'Warning !', 'Currently Option 1 is only available in Linux and MacOS system !', + QtWidgets.QMessageBox.Ok) else: self.ui.raw_frame.setEnabled(True) self.ui.aligned_checkBox.setEnabled(False) @@ -191,11 +191,11 @@ def enzyme(self): def select_bnx(self): if sys.platform == 'win32': - bnx = QFileDialog.getOpenFileName(self,'Select bnx file','','bnx file (*.bnx)') + bnx = QtWidgets.QFileDialog.getOpenFileName(self,'Select bnx file','','bnx file (*.bnx)') self.bnx = codecs.decode(str(bnx)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.raw_input.setText(self.bnx) else: - self.bnx = unicode(QFileDialog.getOpenFileName(self,'Select bnx file','','bnx file (*.bnx)')) + self.bnx = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select bnx file','','bnx file (*.bnx)')) self.ui.raw_input.setText(self.bnx) def clear_bnx(self): @@ -207,7 +207,7 @@ def raw_settings(self): self.parameters_window.show() def raw_start(self): - if QtGui.QMessageBox.Ok not in [self.handle_ref_error(), self.handle_bnx_error(), self.handle_settings_error()]: + if QtWidgets.QMessageBox.Ok not in [self.handle_ref_error(), self.handle_bnx_error(), self.handle_settings_error()]: try: self.ui.raw_status_label.setStyleSheet('color: blue') self.ui.raw_status_label.setText('Running...') @@ -226,7 +226,7 @@ def raw_start(self): self.ui.raw_status_label.setText('Crashed !') self.ui.raw_status_label.repaint() qApp.processEvents() - QtGui.QMessageBox.question(self, 'Error !', 'Something is wrong, please check the error messages!',QtGui.QMessageBox.Ok) + QtWidgets.QMessageBox.question(self, 'Error !', 'Something is wrong, please check the error messages!',QtWidgets.QMessageBox.Ok) def enable_aligned(self): @@ -239,11 +239,11 @@ def enable_aligned(self): def select_xmap(self): if sys.platform == 'win32': - xmap = QFileDialog.getOpenFileName(self,'Select xmap file','','xmap file (*.xmap)') + xmap = QtWidgets.QFileDialog.getOpenFileName(self,'Select xmap file','','xmap file (*.xmap)') self.xmap = codecs.decode(str(xmap)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.xmap_input.setText(self.xmap) else: - self.xmap = unicode(QFileDialog.getOpenFileName(self,'Select xmap file','','xmap file (*.xmap)')) + self.xmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select xmap file','','xmap file (*.xmap)')) self.ui.xmap_input.setText(self.xmap) def clear_xmap(self): @@ -252,11 +252,11 @@ def clear_xmap(self): def select_rcmap(self): if sys.platform == 'win32': - rcmap = QFileDialog.getOpenFileName(self,'Select ref cmap file','','cmap file (*_r.cmap)') + rcmap = QtWidgets.QFileDialog.getOpenFileName(self,'Select ref cmap file','','cmap file (*_r.cmap)') self.rcmap = codecs.decode(str(rcmap)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.rcmap_input.setText(self.rcmap) else: - self.rcmap = unicode(QFileDialog.getOpenFileName(self,'Select ref cmap file','','cmap file (*_r.cmap)')) + self.rcmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select ref cmap file','','cmap file (*_r.cmap)')) self.ui.rcmap_input.setText(self.rcmap) def clear_rcmap(self): @@ -265,11 +265,11 @@ def clear_rcmap(self): def select_qcmap(self): if sys.platform == 'win32': - qcmap = QFileDialog.getOpenFileName(self,'Select qry cmap file','','cmap file (*_q.cmap)') + qcmap = QtWidgets.QFileDialog.getOpenFileName(self,'Select qry cmap file','','cmap file (*_q.cmap)') self.qcmap = codecs.decode(str(qcmap)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.qcmap_input.setText(self.qcmap) else: - self.qcmap = unicode(QFileDialog.getOpenFileName(self,'Select qry cmap file','','cmap file (*_q.cmap)')) + self.qcmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select qry cmap file','','cmap file (*_q.cmap)')) self.ui.qcmap_input.setText(self.qcmap) def clear_qcmap(self): @@ -347,7 +347,7 @@ def ctgs(self): self.canvas_ctg.show() def save_select(self): - self.output_path = unicode(QFileDialog.getExistingDirectory()) + self.output_path = unicode(QtWidgets.QFileDialog.getExistingDirectory()) self.ui.save_input.setText(self.output_path) def save_clear(self): self.ui.save_input.clear() @@ -365,9 +365,9 @@ def save_fig(self): fig_name = fig_name.replace('\\','/') self.ctg_figure.savefig(fig_name) except AttributeError: - return QtGui.QMessageBox.question(self, 'Error !', 'Please select a contig !',QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please select a contig !',QtWidgets.QMessageBox.Ok) except IOError: - QtGui.QMessageBox.question(self, 'Error !', 'Please select an output path !',QtGui.QMessageBox.Ok) + QtWidgets.QMessageBox.question(self, 'Error !', 'Please select an output path !',QtWidgets.QMessageBox.Ok) def save_all_figurs(self): try: @@ -420,9 +420,9 @@ def save_all_figurs(self): fig.clf() plt.close() except IOError: - return QtGui.QMessageBox.question(self, 'Error !', 'Please select an output loaction !',QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please select an output loaction !',QtWidgets.QMessageBox.Ok) except AttributeError: - return QtGui.QMessageBox.question(self, 'Error !', 'Please check the contig(s) !',QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check the contig(s) !',QtWidgets.QMessageBox.Ok) def save_qlt(self): try: @@ -464,9 +464,9 @@ def save_qlt(self): i+=1 self.running.paired.to_csv(os.path.join(path,name_all),sep='\t', index=False) except IOError: - return QtGui.QMessageBox.question(self, 'Error !', 'Please select an output loaction !',QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please select an output loaction !',QtWidgets.QMessageBox.Ok) except AttributeError: - return QtGui.QMessageBox.question(self, 'Error !', 'No report can be saved !',QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'No report can be saved !',QtWidgets.QMessageBox.Ok) def handle_ref_error(self): try: @@ -475,59 +475,59 @@ def handle_ref_error(self): for i in range(2): line=f.next().strip() if i == 0 and line[0]!='>': - return QtGui.QMessageBox.question(self, 'Error !', 'Please check your input reference !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check your input reference !', + QtWidgets.QMessageBox.Ok) if i == 1 and len(re.findall("[^ATGCN]", line.upper()))>0: - return QtGui.QMessageBox.question(self, 'Error !', 'Please check your input reference !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check your input reference !', + QtWidgets.QMessageBox.Ok) else: - return QtGui.QMessageBox.question(self, 'Warning !', 'The selected reference file is empty, please check !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Warning !', 'The selected reference file is empty, please check !', + QtWidgets.QMessageBox.Ok) except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please input a reference file !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please input a reference file !', + QtWidgets.QMessageBox.Ok) def handle_bnx_error(self): try: if os.stat(self.bnx).st_size == 0: - return QtGui.QMessageBox.question(self, 'Warning !', 'The selected bnx file is empty, please check !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Warning !', 'The selected bnx file is empty, please check !', + QtWidgets.QMessageBox.Ok) except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please input a .bnx file !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please input a .bnx file !', QtWidgets.QMessageBox.Ok) def handle_settings_error(self): try: self.settings = self.parameters_window.parameters except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please check your settings !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check your settings !', + QtWidgets.QMessageBox.Ok) def handle_xmap_error(self): try: if os.stat(self.xmap).st_size == 0: - return QtGui.QMessageBox.question(self, 'Warning !', 'The selected xmap file is empty, please check !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Warning !', 'The selected xmap file is empty, please check !', + QtWidgets.QMessageBox.Ok) except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please input a .xmap file !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please input a .xmap file !', QtWidgets.QMessageBox.Ok) def handle_rcmap_error(self): try: if os.stat(self.rcmap).st_size == 0: - return QtGui.QMessageBox.question(self, 'Warning !', 'The selected _r.cmap file is empty, please check !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Warning !', 'The selected _r.cmap file is empty, please check !', + QtWidgets.QMessageBox.Ok) except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please input a _r.cmap file !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please input a _r.cmap file !', QtWidgets.QMessageBox.Ok) def handle_qcmap_error(self): try: if os.stat(self.qcmap).st_size == 0: - return QtGui.QMessageBox.question(self, 'Warning !', 'The selected _q.cmap file is empty, please check !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Warning !', 'The selected _q.cmap file is empty, please check !', + QtWidgets.QMessageBox.Ok) except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please input a _q.cmap file !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please input a _q.cmap file !', QtWidgets.QMessageBox.Ok) def corresponding_check(self): - if QtGui.QMessageBox.Ok not in [self.handle_xmap_error(), self.handle_rcmap_error(), self.handle_qcmap_error()]: + if QtWidgets.QMessageBox.Ok not in [self.handle_xmap_error(), self.handle_rcmap_error(), self.handle_qcmap_error()]: self.files = dict() self.files['xmap'] = self.xmap with open (self.xmap) as xmap: @@ -542,61 +542,61 @@ def corresponding_check(self): line = line.split()[-1].rsplit('/',1)[-1] rcmap = self.rcmap.rsplit('/',1)[-1] if line != rcmap: - return QtGui.QMessageBox.question(self, 'Error !', 'Rcmap file name in Xmap file is not the one you select !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Rcmap file name in Xmap file is not the one you select !', + QtWidgets.QMessageBox.Ok) else: self.files['rcmap'] = self.rcmap except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please check your xmap file !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check your xmap file !', QtWidgets.QMessageBox.Ok) if line.startswith('# Query Maps From:'): try: line = line.split()[-1] line = line.rsplit('/',1)[-1] qcmap = self.qcmap.rsplit('/',1)[-1] if line != qcmap: - return QtGui.QMessageBox.question(self, 'Error !', 'Qcmap file name in Xmap file is not the one you select !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Qcmap file name in Xmap file is not the one you select !', + QtWidgets.QMessageBox.Ok) else: self.files['qcmap'] = self.qcmap except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please check your xmap file !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check your xmap file !', QtWidgets.QMessageBox.Ok) def handle_cs_error(self): cs = self.ui.cs_input.text() try: self.cs = float(cs) if self.cs < 0: - return QtGui.QMessageBox.question(self, 'Error !', 'Please input a confidence score >=0', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please input a confidence score >=0', + QtWidgets.QMessageBox.Ok) except ValueError: - return QtGui.QMessageBox.question(self, 'Error !', 'Please input a confidence score >=0', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please input a confidence score >=0', + QtWidgets.QMessageBox.Ok) def handle_O1(self): - if QtGui.QMessageBox.Ok in [self.handle_bnx_error(), self.handle_settings_error()]: + if QtWidgets.QMessageBox.Ok in [self.handle_bnx_error(), self.handle_settings_error()]: return False else: return True def handle_O2(self): - if QtGui.QMessageBox.Ok in [self.handle_xmap_error(), self.handle_rcmap_error(), self.handle_qcmap_error()]: + if QtWidgets.QMessageBox.Ok in [self.handle_xmap_error(), self.handle_rcmap_error(), self.handle_qcmap_error()]: return False else: return True def analyse(self): - if QtGui.QMessageBox.Ok not in [self.handle_ref_error()]: + if QtWidgets.QMessageBox.Ok not in [self.handle_ref_error()]: pass else: return - if QtGui.QMessageBox.Ok not in [self.handle_cs_error()]: + if QtWidgets.QMessageBox.Ok not in [self.handle_cs_error()]: pass else: return if self.ui.raw_checkBox.isChecked(): if sys.platform == 'win32': - return QtGui.QMessageBox.question(self, 'Error !', 'Currently Option 1 is not available in Windows !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Currently Option 1 is not available in Windows !', + QtWidgets.QMessageBox.Ok) if self.handle_O1()== True: try: if os.path.exists(self.xmap) and os.path.exists(self.rcmap) and os.path.exists(self.qcmap): @@ -664,8 +664,8 @@ def analyse(self): except AttributeError: return except: - QtGui.QMessageBox.question(self, 'Error !', 'BioNano optical mapping from option 1 is incomplete, please check !', - QtGui.QMessageBox.Ok) + QtWidgets.QMessageBox.question(self, 'Error !', 'BioNano optical mapping from option 1 is incomplete, please check !', + QtWidgets.QMessageBox.Ok) if self.ui.aligned_checkBox.isChecked(): if self.handle_O2()== True: @@ -734,8 +734,8 @@ def analyse(self): except AttributeError: return if not self.ui.raw_checkBox.isChecked() and not self.ui.aligned_checkBox.isChecked(): - return QtGui.QMessageBox.question(self, 'Error !', 'Please select Option 1 or Option 2 and fill it !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please select Option 1 or Option 2 and fill it !', + QtWidgets.QMessageBox.Ok) def show_ref(self): try: @@ -1022,9 +1022,9 @@ def create_dummy_line(**kwds): -class Settings(QtGui.QWidget): +class Settings(QtWidgets.QWidget): def __init__(self): - QtGui.QWidget.__init__(self) + QtWidgets.QWidget.__init__(self) self.ui = Ui_Settings() self.ui.setupUi(self) self.tools_path = None @@ -1050,7 +1050,7 @@ def __init__(self): self.ui.setting_confirm_frame.rejected.connect(self.cancel) def select_tools_path(self): - self.tools_path = unicode(QFileDialog.getExistingDirectory()) + self.tools_path = unicode(QtWidgets.QFileDialog.getExistingDirectory()) self.ui.tools_location_input.setText(self.tools_path) def clear_tools_path(self): @@ -1058,7 +1058,7 @@ def clear_tools_path(self): self.tools_path = None def select_scripts_path(self): - self.scripts_path = unicode(QFileDialog.getExistingDirectory()) + self.scripts_path = unicode(QtWidgets.QFileDialog.getExistingDirectory()) self.ui.scripts_location_input.setText(self.scripts_path) def clear_scripts_path(self): @@ -1067,7 +1067,7 @@ def clear_scripts_path(self): def select_output_path(self): - self.output_path = str (QFileDialog.getExistingDirectory()) + self.output_path = str (QtWidgets.QFileDialog.getExistingDirectory()) self.ui.output_input.setText(self.output_path) def clear_output_path(self): @@ -1080,61 +1080,61 @@ def confirm_tool_path(self): assembler = (self.tools_path + '\WindowsAssembler.exe').replace('\\','/') refaligner = (self.tools_path + '\WindowsRefAligner.exe').replace('\\','/') if not (os.path.exists(assembler) and os.path.exists(refaligner)): - return QtGui.QMessageBox.question(self, 'Error !', 'Please check the tool path or tools inside !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check the tool path or tools inside !', + QtWidgets.QMessageBox.Ok) else: if os.access(assembler, os.X_OK) == False: - return QtGui.QMessageBox.question(self, 'Warning!', 'WindowsAssembler.exe is not executable, please check !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Warning!', 'WindowsAssembler.exe is not executable, please check !', + QtWidgets.QMessageBox.Ok) if os.access(refaligner, os.X_OK) == False: - return QtGui.QMessageBox.question(self, 'Warning!', 'WindowsRefAligner.exe is not executable, please check !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Warning!', 'WindowsRefAligner.exe is not executable, please check !', + QtWidgets.QMessageBox.Ok) else: assembler = self.tools_path + '/Assembler' refaligner = self.tools_path + '/RefAligner' if not (os.path.exists(assembler) and os.path.exists(refaligner)): - return QtGui.QMessageBox.question(self, 'Error !', 'Please check the tool path or tools inside !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check the tool path or tools inside !', + QtWidgets.QMessageBox.Ok) else: if os.access(assembler, os.X_OK) == False: - return QtGui.QMessageBox.question(self, 'Warning!', 'Assembler is not executable, please check !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Warning!', 'Assembler is not executable, please check !', + QtWidgets.QMessageBox.Ok) if os.access(refaligner, os.X_OK) == False: - return QtGui.QMessageBox.question(self, 'Warning!', 'RefAligner is not executable, please check !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Warning!', 'RefAligner is not executable, please check !', + QtWidgets.QMessageBox.Ok) except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please check the tool path or tools inside !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check the tool path or tools inside !', QtWidgets.QMessageBox.Ok) def confirm_scripts_path(self): try: script1=self.scripts_path+'/pipelineCL.py' script2=self.scripts_path+'/Pipeline.py' if not (os.path.exists(script1) and os.path.exists(script2)): - return QtGui.QMessageBox.question(self, 'Error !', 'Please check the scripts path or scripts inside !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check the scripts path or scripts inside !', + QtWidgets.QMessageBox.Ok) except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please check the scripts path or scripts inside !', - QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check the scripts path or scripts inside !', + QtWidgets.QMessageBox.Ok) def confirm_output_path(self): try: len(self.output_path) except: - return QtGui.QMessageBox.question(self, 'Error !', 'Please select a output path !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please select a output path !', QtWidgets.QMessageBox.Ok) def confirm_gs(self): self.gs= self.ui.gs_input.text() try: self.gs = float(self.gs) if self.gs<=0: - return QtGui.QMessageBox.question(self, 'Error !', 'Please input a genome size bigger than 0 !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please input a genome size bigger than 0 !', QtWidgets.QMessageBox.Ok) except ValueError: - return QtGui.QMessageBox.question(self, 'Error !', 'Please check your input genome size !', QtGui.QMessageBox.Ok) + return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check your input genome size !', QtWidgets.QMessageBox.Ok) def confirm(self): - if QtGui.QMessageBox.Ok not in [self.confirm_tool_path(),self.confirm_scripts_path(),self.confirm_gs(),self.confirm_output_path()]: + if QtWidgets.QMessageBox.Ok not in [self.confirm_tool_path(),self.confirm_scripts_path(),self.confirm_gs(),self.confirm_output_path()]: self.parameters = dict() self.parameters['tools_path'] = self.tools_path self.parameters['script_path'] = self.scripts_path @@ -1148,18 +1148,18 @@ def confirm(self): def cancel(self): self.close() -class about(QtGui.QWidget): +class about(QtWidgets.QWidget): def __init__(self): - QtGui.QWidget.__init__(self) + QtWidgets.QWidget.__init__(self) self.ui = Ui_About() self.ui.setupUi(self) self.ui.about_bn.clicked.connect(self.confirm) def confirm(self): self.close() -class manual(QtGui.QWidget): +class manual(QtWidgets.QWidget): def __init__(self): - QtGui.QWidget.__init__(self) + QtWidgets.QWidget.__init__(self) self.ui = Ui_Manual() self.ui.setupUi(self) self.ui.manual_bn.clicked.connect(self.confirm) @@ -1315,7 +1315,7 @@ def __call__(self, event): if __name__=="__main__": multiprocessing.freeze_support() - app = QtGui.QApplication(sys.argv) + app = QtWidgets.QApplication(sys.argv) window = Main() window.show() sys.exit(app.exec_()) diff --git a/scripts/Frameworks.py b/scripts/Frameworks.py index fbb22c4..bdb8df2 100644 --- a/scripts/Frameworks.py +++ b/scripts/Frameworks.py @@ -7,9 +7,9 @@ # WARNING! All changes made in this file will be lost! try: - from PyQt4 import QtGui,QtCore + from PyQt5 import QtGui,QtCore,QtWidgets except ImportError: - from PySide import QtGui,QtCore + from PySide2 import QtGui,QtCore,QtWidgets try: _fromUtf8 = QtCore.QString.fromUtf8 @@ -20,10 +20,10 @@ def _fromUtf8(s): try: _encoding = QtGui.QApplication.UnicodeUTF8 def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) + return QtWidgets.QApplication.translate(context, text, disambig, _encoding) except AttributeError: def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) + return QtWidgets.QApplication.translate(context, text, disambig) class Ui_BioNanoAnalyst(object): def setupUi(self, BioNanoAnalyst): @@ -31,13 +31,13 @@ def setupUi(self, BioNanoAnalyst): BioNanoAnalyst.resize(1310, 960) BioNanoAnalyst.setMinimumSize(QtCore.QSize(1310, 960)) BioNanoAnalyst.setMaximumSize(QtCore.QSize(1310, 16777215)) - self.centralwidget = QtGui.QWidget(BioNanoAnalyst) + self.centralwidget = QtWidgets.QWidget(BioNanoAnalyst) self.centralwidget.setObjectName(_fromUtf8("centralwidget")) - self.gridLayout = QtGui.QGridLayout(self.centralwidget) + self.gridLayout = QtWidgets.QGridLayout(self.centralwidget) self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.label = QtGui.QLabel(self.centralwidget) + self.label = QtWidgets.QLabel(self.centralwidget) self.label.setEnabled(True) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth()) @@ -51,18 +51,18 @@ def setupUi(self, BioNanoAnalyst): self.label.setFont(font) self.label.setObjectName(_fromUtf8("label")) self.gridLayout.addWidget(self.label, 0, 0, 1, 1) - self.prepare_widget = QtGui.QWidget(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.prepare_widget = QtWidgets.QWidget(self.centralwidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.prepare_widget.sizePolicy().hasHeightForWidth()) self.prepare_widget.setSizePolicy(sizePolicy) self.prepare_widget.setMinimumSize(QtCore.QSize(0, 0)) self.prepare_widget.setObjectName(_fromUtf8("prepare_widget")) - self.verticalLayout = QtGui.QVBoxLayout(self.prepare_widget) + self.verticalLayout = QtWidgets.QVBoxLayout(self.prepare_widget) self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.Ref_title = QtGui.QLabel(self.prepare_widget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.Ref_title = QtWidgets.QLabel(self.prepare_widget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.Ref_title.sizePolicy().hasHeightForWidth()) @@ -75,8 +75,8 @@ def setupUi(self, BioNanoAnalyst): self.Ref_title.setFont(font) self.Ref_title.setObjectName(_fromUtf8("Ref_title")) self.verticalLayout.addWidget(self.Ref_title) - self.Ref_frame = QtGui.QFrame(self.prepare_widget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.Ref_frame = QtWidgets.QFrame(self.prepare_widget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.Ref_frame.sizePolicy().hasHeightForWidth()) @@ -84,32 +84,32 @@ def setupUi(self, BioNanoAnalyst): self.Ref_frame.setMinimumSize(QtCore.QSize(470, 40)) self.Ref_frame.setMaximumSize(QtCore.QSize(470, 16777215)) self.Ref_frame.setAutoFillBackground(True) - self.Ref_frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.Ref_frame.setFrameShadow(QtGui.QFrame.Sunken) + self.Ref_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.Ref_frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.Ref_frame.setLineWidth(2) self.Ref_frame.setObjectName(_fromUtf8("Ref_frame")) - self.gridLayout_2 = QtGui.QGridLayout(self.Ref_frame) + self.gridLayout_2 = QtWidgets.QGridLayout(self.Ref_frame) self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) - self.ref_input = QtGui.QLineEdit(self.Ref_frame) + self.ref_input = QtWidgets.QLineEdit(self.Ref_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.ref_input.setFont(font) self.ref_input.setObjectName(_fromUtf8("ref_input")) self.gridLayout_2.addWidget(self.ref_input, 0, 0, 1, 1) - self.ref_select_bn = QtGui.QPushButton(self.Ref_frame) + self.ref_select_bn = QtWidgets.QPushButton(self.Ref_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.ref_select_bn.setFont(font) self.ref_select_bn.setObjectName(_fromUtf8("ref_select_bn")) self.gridLayout_2.addWidget(self.ref_select_bn, 0, 1, 1, 1) - self.ref_clear_bn = QtGui.QPushButton(self.Ref_frame) + self.ref_clear_bn = QtWidgets.QPushButton(self.Ref_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.ref_clear_bn.setFont(font) self.ref_clear_bn.setObjectName(_fromUtf8("ref_clear_bn")) self.gridLayout_2.addWidget(self.ref_clear_bn, 0, 2, 1, 1) self.verticalLayout.addWidget(self.Ref_frame) - self.raw_checkBox = QtGui.QCheckBox(self.prepare_widget) + self.raw_checkBox = QtWidgets.QCheckBox(self.prepare_widget) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) font.setPointSize(15) @@ -118,28 +118,28 @@ def setupUi(self, BioNanoAnalyst): self.raw_checkBox.setFont(font) self.raw_checkBox.setObjectName(_fromUtf8("raw_checkBox")) self.verticalLayout.addWidget(self.raw_checkBox) - self.raw_frame = QtGui.QFrame(self.prepare_widget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.raw_frame = QtWidgets.QFrame(self.prepare_widget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.raw_frame.sizePolicy().hasHeightForWidth()) self.raw_frame.setSizePolicy(sizePolicy) self.raw_frame.setMinimumSize(QtCore.QSize(470, 140)) self.raw_frame.setMaximumSize(QtCore.QSize(470, 16777215)) - self.raw_frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.raw_frame.setFrameShadow(QtGui.QFrame.Sunken) + self.raw_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.raw_frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.raw_frame.setLineWidth(2) self.raw_frame.setObjectName(_fromUtf8("raw_frame")) - self.gridLayout_3 = QtGui.QGridLayout(self.raw_frame) + self.gridLayout_3 = QtWidgets.QGridLayout(self.raw_frame) self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) - self.raw_clear_bn = QtGui.QPushButton(self.raw_frame) + self.raw_clear_bn = QtWidgets.QPushButton(self.raw_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.raw_clear_bn.setFont(font) self.raw_clear_bn.setObjectName(_fromUtf8("raw_clear_bn")) self.gridLayout_3.addWidget(self.raw_clear_bn, 2, 6, 1, 1) - self.enzyme_combox = QtGui.QComboBox(self.raw_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + self.enzyme_combox = QtWidgets.QComboBox(self.raw_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.enzyme_combox.sizePolicy().hasHeightForWidth()) @@ -149,14 +149,14 @@ def setupUi(self, BioNanoAnalyst): self.enzyme_combox.setFont(font) self.enzyme_combox.setObjectName(_fromUtf8("enzyme_combox")) self.gridLayout_3.addWidget(self.enzyme_combox, 0, 6, 1, 1) - self.raw_select_bn = QtGui.QPushButton(self.raw_frame) + self.raw_select_bn = QtWidgets.QPushButton(self.raw_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.raw_select_bn.setFont(font) self.raw_select_bn.setObjectName(_fromUtf8("raw_select_bn")) self.gridLayout_3.addWidget(self.raw_select_bn, 2, 5, 1, 1) - self.raw_mapping_label = QtGui.QLabel(self.raw_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.raw_mapping_label = QtWidgets.QLabel(self.raw_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.raw_mapping_label.sizePolicy().hasHeightForWidth()) @@ -168,7 +168,7 @@ def setupUi(self, BioNanoAnalyst): self.raw_mapping_label.setFont(font) self.raw_mapping_label.setObjectName(_fromUtf8("raw_mapping_label")) self.gridLayout_3.addWidget(self.raw_mapping_label, 3, 0, 1, 1) - self.enzyme_label = QtGui.QLabel(self.raw_frame) + self.enzyme_label = QtWidgets.QLabel(self.raw_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) font.setBold(True) @@ -176,8 +176,8 @@ def setupUi(self, BioNanoAnalyst): self.enzyme_label.setFont(font) self.enzyme_label.setObjectName(_fromUtf8("enzyme_label")) self.gridLayout_3.addWidget(self.enzyme_label, 0, 0, 1, 1) - self.raw_input = QtGui.QLineEdit(self.raw_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + self.raw_input = QtWidgets.QLineEdit(self.raw_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.raw_input.sizePolicy().hasHeightForWidth()) @@ -187,8 +187,8 @@ def setupUi(self, BioNanoAnalyst): self.raw_input.setFont(font) self.raw_input.setObjectName(_fromUtf8("raw_input")) self.gridLayout_3.addWidget(self.raw_input, 2, 0, 1, 5) - self.raw_label = QtGui.QLabel(self.raw_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.raw_label = QtWidgets.QLabel(self.raw_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.raw_label.sizePolicy().hasHeightForWidth()) @@ -200,8 +200,8 @@ def setupUi(self, BioNanoAnalyst): self.raw_label.setFont(font) self.raw_label.setObjectName(_fromUtf8("raw_label")) self.gridLayout_3.addWidget(self.raw_label, 1, 0, 1, 2) - self.raw_start_bn = QtGui.QPushButton(self.raw_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.raw_start_bn = QtWidgets.QPushButton(self.raw_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.raw_start_bn.sizePolicy().hasHeightForWidth()) @@ -211,8 +211,8 @@ def setupUi(self, BioNanoAnalyst): self.raw_start_bn.setFont(font) self.raw_start_bn.setObjectName(_fromUtf8("raw_start_bn")) self.gridLayout_3.addWidget(self.raw_start_bn, 3, 3, 1, 1) - self.raw_settings_bn = QtGui.QPushButton(self.raw_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.raw_settings_bn = QtWidgets.QPushButton(self.raw_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.raw_settings_bn.sizePolicy().hasHeightForWidth()) @@ -222,17 +222,17 @@ def setupUi(self, BioNanoAnalyst): self.raw_settings_bn.setFont(font) self.raw_settings_bn.setObjectName(_fromUtf8("raw_settings_bn")) self.gridLayout_3.addWidget(self.raw_settings_bn, 3, 1, 1, 1) - self.raw_stop_bn = QtGui.QPushButton(self.raw_frame) + self.raw_stop_bn = QtWidgets.QPushButton(self.raw_frame) self.raw_stop_bn.setObjectName(_fromUtf8("raw_stop_bn")) self.gridLayout_3.addWidget(self.raw_stop_bn, 3, 4, 1, 1) - self.frame = QtGui.QFrame(self.raw_frame) + self.frame = QtWidgets.QFrame(self.raw_frame) self.frame.setMinimumSize(QtCore.QSize(0, 18)) self.frame.setMaximumSize(QtCore.QSize(16777215, 20)) - self.frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.frame.setFrameShadow(QtGui.QFrame.Sunken) + self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.frame.setLineWidth(2) self.frame.setObjectName(_fromUtf8("frame")) - self.label_8 = QtGui.QLabel(self.frame) + self.label_8 = QtWidgets.QLabel(self.frame) self.label_8.setGeometry(QtCore.QRect(10, 0, 71, 21)) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) @@ -241,9 +241,9 @@ def setupUi(self, BioNanoAnalyst): font.setWeight(75) self.label_8.setFont(font) self.label_8.setObjectName(_fromUtf8("label_8")) - self.raw_status_label = QtGui.QLabel(self.frame) + self.raw_status_label = QtWidgets.QLabel(self.frame) self.raw_status_label.setGeometry(QtCore.QRect(80, 0, 51, 20)) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.MinimumExpanding) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.raw_status_label.sizePolicy().hasHeightForWidth()) @@ -256,7 +256,7 @@ def setupUi(self, BioNanoAnalyst): self.raw_status_label.setObjectName(_fromUtf8("raw_status_label")) self.gridLayout_3.addWidget(self.frame, 3, 5, 1, 2) self.verticalLayout.addWidget(self.raw_frame) - self.aligned_checkBox = QtGui.QCheckBox(self.prepare_widget) + self.aligned_checkBox = QtWidgets.QCheckBox(self.prepare_widget) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) font.setPointSize(15) @@ -265,28 +265,28 @@ def setupUi(self, BioNanoAnalyst): self.aligned_checkBox.setFont(font) self.aligned_checkBox.setObjectName(_fromUtf8("aligned_checkBox")) self.verticalLayout.addWidget(self.aligned_checkBox) - self.aligned_frame = QtGui.QFrame(self.prepare_widget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.aligned_frame = QtWidgets.QFrame(self.prepare_widget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.aligned_frame.sizePolicy().hasHeightForWidth()) self.aligned_frame.setSizePolicy(sizePolicy) self.aligned_frame.setMinimumSize(QtCore.QSize(470, 85)) self.aligned_frame.setMaximumSize(QtCore.QSize(470, 16777215)) - self.aligned_frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.aligned_frame.setFrameShadow(QtGui.QFrame.Sunken) + self.aligned_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.aligned_frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.aligned_frame.setLineWidth(2) self.aligned_frame.setObjectName(_fromUtf8("aligned_frame")) - self.gridLayout_4 = QtGui.QGridLayout(self.aligned_frame) + self.gridLayout_4 = QtWidgets.QGridLayout(self.aligned_frame) self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4")) - self.qcmap_clear_bn = QtGui.QPushButton(self.aligned_frame) + self.qcmap_clear_bn = QtWidgets.QPushButton(self.aligned_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.qcmap_clear_bn.setFont(font) self.qcmap_clear_bn.setObjectName(_fromUtf8("qcmap_clear_bn")) self.gridLayout_4.addWidget(self.qcmap_clear_bn, 2, 4, 1, 1) - self.rcmap_input = QtGui.QLineEdit(self.aligned_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + self.rcmap_input = QtWidgets.QLineEdit(self.aligned_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.rcmap_input.sizePolicy().hasHeightForWidth()) @@ -296,8 +296,8 @@ def setupUi(self, BioNanoAnalyst): self.rcmap_input.setFont(font) self.rcmap_input.setObjectName(_fromUtf8("rcmap_input")) self.gridLayout_4.addWidget(self.rcmap_input, 1, 1, 1, 2) - self.xmap_input = QtGui.QLineEdit(self.aligned_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + self.xmap_input = QtWidgets.QLineEdit(self.aligned_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.xmap_input.sizePolicy().hasHeightForWidth()) @@ -307,8 +307,8 @@ def setupUi(self, BioNanoAnalyst): self.xmap_input.setFont(font) self.xmap_input.setObjectName(_fromUtf8("xmap_input")) self.gridLayout_4.addWidget(self.xmap_input, 0, 1, 1, 2) - self.xmap_select_bn = QtGui.QPushButton(self.aligned_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) + self.xmap_select_bn = QtWidgets.QPushButton(self.aligned_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.xmap_select_bn.sizePolicy().hasHeightForWidth()) @@ -318,8 +318,8 @@ def setupUi(self, BioNanoAnalyst): self.xmap_select_bn.setFont(font) self.xmap_select_bn.setObjectName(_fromUtf8("xmap_select_bn")) self.gridLayout_4.addWidget(self.xmap_select_bn, 0, 3, 1, 1) - self.qcmap_input = QtGui.QLineEdit(self.aligned_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + self.qcmap_input = QtWidgets.QLineEdit(self.aligned_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.qcmap_input.sizePolicy().hasHeightForWidth()) @@ -329,14 +329,14 @@ def setupUi(self, BioNanoAnalyst): self.qcmap_input.setFont(font) self.qcmap_input.setObjectName(_fromUtf8("qcmap_input")) self.gridLayout_4.addWidget(self.qcmap_input, 2, 1, 1, 2) - self.qcmap_select_bn = QtGui.QPushButton(self.aligned_frame) + self.qcmap_select_bn = QtWidgets.QPushButton(self.aligned_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.qcmap_select_bn.setFont(font) self.qcmap_select_bn.setObjectName(_fromUtf8("qcmap_select_bn")) self.gridLayout_4.addWidget(self.qcmap_select_bn, 2, 3, 1, 1) - self.qcmap_label = QtGui.QLabel(self.aligned_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.qcmap_label = QtWidgets.QLabel(self.aligned_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.qcmap_label.sizePolicy().hasHeightForWidth()) @@ -348,8 +348,8 @@ def setupUi(self, BioNanoAnalyst): self.qcmap_label.setFont(font) self.qcmap_label.setObjectName(_fromUtf8("qcmap_label")) self.gridLayout_4.addWidget(self.qcmap_label, 2, 0, 1, 1) - self.xmap_label = QtGui.QLabel(self.aligned_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.xmap_label = QtWidgets.QLabel(self.aligned_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.xmap_label.sizePolicy().hasHeightForWidth()) @@ -361,14 +361,14 @@ def setupUi(self, BioNanoAnalyst): self.xmap_label.setFont(font) self.xmap_label.setObjectName(_fromUtf8("xmap_label")) self.gridLayout_4.addWidget(self.xmap_label, 0, 0, 1, 1) - self.rcmap_clear_bn = QtGui.QPushButton(self.aligned_frame) + self.rcmap_clear_bn = QtWidgets.QPushButton(self.aligned_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.rcmap_clear_bn.setFont(font) self.rcmap_clear_bn.setObjectName(_fromUtf8("rcmap_clear_bn")) self.gridLayout_4.addWidget(self.rcmap_clear_bn, 1, 4, 1, 1) - self.rcmap_label = QtGui.QLabel(self.aligned_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.rcmap_label = QtWidgets.QLabel(self.aligned_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.rcmap_label.sizePolicy().hasHeightForWidth()) @@ -380,21 +380,21 @@ def setupUi(self, BioNanoAnalyst): self.rcmap_label.setFont(font) self.rcmap_label.setObjectName(_fromUtf8("rcmap_label")) self.gridLayout_4.addWidget(self.rcmap_label, 1, 0, 1, 1) - self.rcmap_select_bn = QtGui.QPushButton(self.aligned_frame) + self.rcmap_select_bn = QtWidgets.QPushButton(self.aligned_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.rcmap_select_bn.setFont(font) self.rcmap_select_bn.setObjectName(_fromUtf8("rcmap_select_bn")) self.gridLayout_4.addWidget(self.rcmap_select_bn, 1, 3, 1, 1) - self.xmap_clear_bn = QtGui.QPushButton(self.aligned_frame) + self.xmap_clear_bn = QtWidgets.QPushButton(self.aligned_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.xmap_clear_bn.setFont(font) self.xmap_clear_bn.setObjectName(_fromUtf8("xmap_clear_bn")) self.gridLayout_4.addWidget(self.xmap_clear_bn, 0, 4, 1, 1) self.verticalLayout.addWidget(self.aligned_frame) - self.analyze_title = QtGui.QLabel(self.prepare_widget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.analyze_title = QtWidgets.QLabel(self.prepare_widget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.analyze_title.sizePolicy().hasHeightForWidth()) @@ -407,22 +407,22 @@ def setupUi(self, BioNanoAnalyst): self.analyze_title.setFont(font) self.analyze_title.setObjectName(_fromUtf8("analyze_title")) self.verticalLayout.addWidget(self.analyze_title) - self.analyse_frame = QtGui.QFrame(self.prepare_widget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.analyse_frame = QtWidgets.QFrame(self.prepare_widget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.analyse_frame.sizePolicy().hasHeightForWidth()) self.analyse_frame.setSizePolicy(sizePolicy) self.analyse_frame.setMinimumSize(QtCore.QSize(470, 0)) self.analyse_frame.setMaximumSize(QtCore.QSize(470, 16777215)) - self.analyse_frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.analyse_frame.setFrameShadow(QtGui.QFrame.Sunken) + self.analyse_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.analyse_frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.analyse_frame.setLineWidth(2) self.analyse_frame.setObjectName(_fromUtf8("analyse_frame")) - self.gridLayout_5 = QtGui.QGridLayout(self.analyse_frame) + self.gridLayout_5 = QtWidgets.QGridLayout(self.analyse_frame) self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5")) - self.analyse_bn = QtGui.QPushButton(self.analyse_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.analyse_bn = QtWidgets.QPushButton(self.analyse_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.analyse_bn.sizePolicy().hasHeightForWidth()) @@ -432,8 +432,8 @@ def setupUi(self, BioNanoAnalyst): self.analyse_bn.setFont(font) self.analyse_bn.setObjectName(_fromUtf8("analyse_bn")) self.gridLayout_5.addWidget(self.analyse_bn, 0, 2, 1, 1) - self.cs_label = QtGui.QLabel(self.analyse_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.cs_label = QtWidgets.QLabel(self.analyse_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cs_label.sizePolicy().hasHeightForWidth()) @@ -445,8 +445,8 @@ def setupUi(self, BioNanoAnalyst): self.cs_label.setFont(font) self.cs_label.setObjectName(_fromUtf8("cs_label")) self.gridLayout_5.addWidget(self.cs_label, 0, 0, 1, 1) - self.cs_input = QtGui.QLineEdit(self.analyse_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.cs_input = QtWidgets.QLineEdit(self.analyse_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.cs_input.sizePolicy().hasHeightForWidth()) @@ -454,14 +454,14 @@ def setupUi(self, BioNanoAnalyst): self.cs_input.setMaximumSize(QtCore.QSize(80, 16777215)) self.cs_input.setObjectName(_fromUtf8("cs_input")) self.gridLayout_5.addWidget(self.cs_input, 0, 1, 1, 1) - self.frame_2 = QtGui.QFrame(self.analyse_frame) + self.frame_2 = QtWidgets.QFrame(self.analyse_frame) self.frame_2.setMinimumSize(QtCore.QSize(0, 20)) self.frame_2.setMaximumSize(QtCore.QSize(16777215, 20)) - self.frame_2.setFrameShape(QtGui.QFrame.StyledPanel) - self.frame_2.setFrameShadow(QtGui.QFrame.Sunken) + self.frame_2.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.frame_2.setFrameShadow(QtWidgets.QFrame.Sunken) self.frame_2.setLineWidth(2) self.frame_2.setObjectName(_fromUtf8("frame_2")) - self.label_10 = QtGui.QLabel(self.frame_2) + self.label_10 = QtWidgets.QLabel(self.frame_2) self.label_10.setGeometry(QtCore.QRect(30, 0, 71, 21)) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) @@ -469,9 +469,9 @@ def setupUi(self, BioNanoAnalyst): font.setWeight(75) self.label_10.setFont(font) self.label_10.setObjectName(_fromUtf8("label_10")) - self.analyse_status_label = QtGui.QLabel(self.frame_2) + self.analyse_status_label = QtWidgets.QLabel(self.frame_2) self.analyse_status_label.setGeometry(QtCore.QRect(100, 0, 61, 21)) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Preferred) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.analyse_status_label.sizePolicy().hasHeightForWidth()) @@ -485,39 +485,39 @@ def setupUi(self, BioNanoAnalyst): self.gridLayout_5.addWidget(self.frame_2, 0, 4, 1, 1) self.verticalLayout.addWidget(self.analyse_frame) self.gridLayout.addWidget(self.prepare_widget, 1, 0, 2, 1) - self.mapping_status_frame = QtGui.QFrame(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) + self.mapping_status_frame = QtWidgets.QFrame(self.centralwidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.mapping_status_frame.sizePolicy().hasHeightForWidth()) self.mapping_status_frame.setSizePolicy(sizePolicy) self.mapping_status_frame.setSizeIncrement(QtCore.QSize(0, 3)) self.mapping_status_frame.setLayoutDirection(QtCore.Qt.LeftToRight) - self.mapping_status_frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.mapping_status_frame.setFrameShadow(QtGui.QFrame.Sunken) + self.mapping_status_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.mapping_status_frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.mapping_status_frame.setLineWidth(2) self.mapping_status_frame.setObjectName(_fromUtf8("mapping_status_frame")) - self.gridLayout_7 = QtGui.QGridLayout(self.mapping_status_frame) + self.gridLayout_7 = QtWidgets.QGridLayout(self.mapping_status_frame) self.gridLayout_7.setObjectName(_fromUtf8("gridLayout_7")) - self.mapping_status_view = QtGui.QGraphicsView(self.mapping_status_frame) + self.mapping_status_view = QtWidgets.QGraphicsView(self.mapping_status_frame) self.mapping_status_view.setObjectName(_fromUtf8("mapping_status_view")) self.gridLayout_7.addWidget(self.mapping_status_view, 0, 0, 1, 1) self.gridLayout.addWidget(self.mapping_status_frame, 4, 0, 1, 7) - self.mapping_frame = QtGui.QFrame(self.centralwidget) + self.mapping_frame = QtWidgets.QFrame(self.centralwidget) self.mapping_frame.setMinimumSize(QtCore.QSize(0, 40)) - self.mapping_frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.mapping_frame.setFrameShadow(QtGui.QFrame.Raised) + self.mapping_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.mapping_frame.setFrameShadow(QtWidgets.QFrame.Raised) self.mapping_frame.setObjectName(_fromUtf8("mapping_frame")) - self.gridLayout_6 = QtGui.QGridLayout(self.mapping_frame) + self.gridLayout_6 = QtWidgets.QGridLayout(self.mapping_frame) self.gridLayout_6.setObjectName(_fromUtf8("gridLayout_6")) - self.save_select_bn = QtGui.QPushButton(self.mapping_frame) + self.save_select_bn = QtWidgets.QPushButton(self.mapping_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.save_select_bn.setFont(font) self.save_select_bn.setObjectName(_fromUtf8("save_select_bn")) self.gridLayout_6.addWidget(self.save_select_bn, 0, 12, 1, 1) - self.ctg_check_label = QtGui.QLabel(self.mapping_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.ctg_check_label = QtWidgets.QLabel(self.mapping_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.ctg_check_label.sizePolicy().hasHeightForWidth()) @@ -529,27 +529,27 @@ def setupUi(self, BioNanoAnalyst): self.ctg_check_label.setFont(font) self.ctg_check_label.setObjectName(_fromUtf8("ctg_check_label")) self.gridLayout_6.addWidget(self.ctg_check_label, 0, 3, 1, 1) - self.save_all_bn = QtGui.QPushButton(self.mapping_frame) + self.save_all_bn = QtWidgets.QPushButton(self.mapping_frame) self.save_all_bn.setMinimumSize(QtCore.QSize(80, 0)) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.save_all_bn.setFont(font) self.save_all_bn.setObjectName(_fromUtf8("save_all_bn")) self.gridLayout_6.addWidget(self.save_all_bn, 0, 17, 1, 1) - self.save_clear_bn = QtGui.QPushButton(self.mapping_frame) + self.save_clear_bn = QtWidgets.QPushButton(self.mapping_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.save_clear_bn.setFont(font) self.save_clear_bn.setObjectName(_fromUtf8("save_clear_bn")) self.gridLayout_6.addWidget(self.save_clear_bn, 0, 13, 1, 1) - self.save_input = QtGui.QLineEdit(self.mapping_frame) + self.save_input = QtWidgets.QLineEdit(self.mapping_frame) self.save_input.setObjectName(_fromUtf8("save_input")) self.gridLayout_6.addWidget(self.save_input, 0, 11, 1, 1) - self.ctg_check_combox = QtGui.QComboBox(self.mapping_frame) + self.ctg_check_combox = QtWidgets.QComboBox(self.mapping_frame) self.ctg_check_combox.setMinimumSize(QtCore.QSize(120, 0)) self.ctg_check_combox.setObjectName(_fromUtf8("ctg_check_combox")) self.gridLayout_6.addWidget(self.ctg_check_combox, 0, 5, 1, 1) - self.label_9 = QtGui.QLabel(self.mapping_frame) + self.label_9 = QtWidgets.QLabel(self.mapping_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) font.setBold(True) @@ -557,8 +557,8 @@ def setupUi(self, BioNanoAnalyst): self.label_9.setFont(font) self.label_9.setObjectName(_fromUtf8("label_9")) self.gridLayout_6.addWidget(self.label_9, 0, 10, 1, 1) - self.mappin_title = QtGui.QLabel(self.mapping_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.mappin_title = QtWidgets.QLabel(self.mapping_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.mappin_title.sizePolicy().hasHeightForWidth()) @@ -571,9 +571,9 @@ def setupUi(self, BioNanoAnalyst): self.mappin_title.setFont(font) self.mappin_title.setObjectName(_fromUtf8("mappin_title")) self.gridLayout_6.addWidget(self.mappin_title, 0, 1, 1, 1) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.gridLayout_6.addItem(spacerItem, 0, 6, 1, 1) - self.label_11 = QtGui.QLabel(self.mapping_frame) + self.label_11 = QtWidgets.QLabel(self.mapping_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) font.setBold(True) @@ -581,11 +581,11 @@ def setupUi(self, BioNanoAnalyst): self.label_11.setFont(font) self.label_11.setObjectName(_fromUtf8("label_11")) self.gridLayout_6.addWidget(self.label_11, 0, 7, 1, 1) - self.fig_format_combox = QtGui.QComboBox(self.mapping_frame) + self.fig_format_combox = QtWidgets.QComboBox(self.mapping_frame) self.fig_format_combox.setMinimumSize(QtCore.QSize(50, 0)) self.fig_format_combox.setObjectName(_fromUtf8("fig_format_combox")) self.gridLayout_6.addWidget(self.fig_format_combox, 0, 15, 1, 1) - self.fig_format_label = QtGui.QLabel(self.mapping_frame) + self.fig_format_label = QtWidgets.QLabel(self.mapping_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) font.setBold(True) @@ -593,25 +593,25 @@ def setupUi(self, BioNanoAnalyst): self.fig_format_label.setFont(font) self.fig_format_label.setObjectName(_fromUtf8("fig_format_label")) self.gridLayout_6.addWidget(self.fig_format_label, 0, 14, 1, 1) - self.save_qlt_bn = QtGui.QPushButton(self.mapping_frame) + self.save_qlt_bn = QtWidgets.QPushButton(self.mapping_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.save_qlt_bn.setFont(font) self.save_qlt_bn.setObjectName(_fromUtf8("save_qlt_bn")) self.gridLayout_6.addWidget(self.save_qlt_bn, 0, 19, 1, 1) - spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.gridLayout_6.addItem(spacerItem1, 0, 18, 1, 1) - self.fig_save_bn = QtGui.QPushButton(self.mapping_frame) + self.fig_save_bn = QtWidgets.QPushButton(self.mapping_frame) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) self.fig_save_bn.setFont(font) self.fig_save_bn.setObjectName(_fromUtf8("fig_save_bn")) self.gridLayout_6.addWidget(self.fig_save_bn, 0, 16, 1, 1) - spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.gridLayout_6.addItem(spacerItem2, 0, 2, 1, 1) self.gridLayout.addWidget(self.mapping_frame, 3, 0, 1, 7) - self.Stats = QtGui.QTabWidget(self.centralwidget) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding) + self.Stats = QtWidgets.QTabWidget(self.centralwidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.Stats.sizePolicy().hasHeightForWidth()) @@ -620,217 +620,217 @@ def setupUi(self, BioNanoAnalyst): font.setFamily(_fromUtf8("Arial")) self.Stats.setFont(font) self.Stats.setObjectName(_fromUtf8("Stats")) - self.workflow = QtGui.QWidget() + self.workflow = QtWidgets.QWidget() self.workflow.setObjectName(_fromUtf8("workflow")) - self.show_ref_bn = QtGui.QPushButton(self.workflow) + self.show_ref_bn = QtWidgets.QPushButton(self.workflow) self.show_ref_bn.setGeometry(QtCore.QRect(10, 52, 91, 31)) self.show_ref_bn.setObjectName(_fromUtf8("show_ref_bn")) - self.show_unqualified_bn = QtGui.QPushButton(self.workflow) + self.show_unqualified_bn = QtWidgets.QPushButton(self.workflow) self.show_unqualified_bn.setGeometry(QtCore.QRect(200, 20, 141, 31)) self.show_unqualified_bn.setObjectName(_fromUtf8("show_unqualified_bn")) - self.line = QtGui.QFrame(self.workflow) + self.line = QtWidgets.QFrame(self.workflow) self.line.setGeometry(QtCore.QRect(100, 60, 61, 20)) - self.line.setFrameShape(QtGui.QFrame.HLine) - self.line.setFrameShadow(QtGui.QFrame.Sunken) + self.line.setFrameShape(QtWidgets.QFrame.HLine) + self.line.setFrameShadow(QtWidgets.QFrame.Sunken) self.line.setObjectName(_fromUtf8("line")) - self.line_2 = QtGui.QFrame(self.workflow) + self.line_2 = QtWidgets.QFrame(self.workflow) self.line_2.setGeometry(QtCore.QRect(160, 40, 3, 61)) - self.line_2.setFrameShape(QtGui.QFrame.VLine) - self.line_2.setFrameShadow(QtGui.QFrame.Sunken) + self.line_2.setFrameShape(QtWidgets.QFrame.VLine) + self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_2.setObjectName(_fromUtf8("line_2")) - self.line_3 = QtGui.QFrame(self.workflow) + self.line_3 = QtWidgets.QFrame(self.workflow) self.line_3.setGeometry(QtCore.QRect(160, 30, 41, 20)) - self.line_3.setFrameShape(QtGui.QFrame.HLine) - self.line_3.setFrameShadow(QtGui.QFrame.Sunken) + self.line_3.setFrameShape(QtWidgets.QFrame.HLine) + self.line_3.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_3.setObjectName(_fromUtf8("line_3")) - self.show_qualified_bn = QtGui.QPushButton(self.workflow) + self.show_qualified_bn = QtWidgets.QPushButton(self.workflow) self.show_qualified_bn.setGeometry(QtCore.QRect(200, 82, 141, 31)) self.show_qualified_bn.setObjectName(_fromUtf8("show_qualified_bn")) - self.line_4 = QtGui.QFrame(self.workflow) + self.line_4 = QtWidgets.QFrame(self.workflow) self.line_4.setGeometry(QtCore.QRect(160, 90, 41, 20)) - self.line_4.setFrameShape(QtGui.QFrame.HLine) - self.line_4.setFrameShadow(QtGui.QFrame.Sunken) + self.line_4.setFrameShape(QtWidgets.QFrame.HLine) + self.line_4.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_4.setObjectName(_fromUtf8("line_4")) - self.show_BN_bn = QtGui.QPushButton(self.workflow) + self.show_BN_bn = QtWidgets.QPushButton(self.workflow) self.show_BN_bn.setGeometry(QtCore.QRect(200, 140, 141, 31)) self.show_BN_bn.setObjectName(_fromUtf8("show_BN_bn")) - self.line_5 = QtGui.QFrame(self.workflow) + self.line_5 = QtWidgets.QFrame(self.workflow) self.line_5.setGeometry(QtCore.QRect(340, 90, 21, 20)) - self.line_5.setFrameShape(QtGui.QFrame.HLine) - self.line_5.setFrameShadow(QtGui.QFrame.Sunken) + self.line_5.setFrameShape(QtWidgets.QFrame.HLine) + self.line_5.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_5.setObjectName(_fromUtf8("line_5")) - self.line_6 = QtGui.QFrame(self.workflow) + self.line_6 = QtWidgets.QFrame(self.workflow) self.line_6.setGeometry(QtCore.QRect(340, 150, 21, 20)) - self.line_6.setFrameShape(QtGui.QFrame.HLine) - self.line_6.setFrameShadow(QtGui.QFrame.Sunken) + self.line_6.setFrameShape(QtWidgets.QFrame.HLine) + self.line_6.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_6.setObjectName(_fromUtf8("line_6")) - self.line_7 = QtGui.QFrame(self.workflow) + self.line_7 = QtWidgets.QFrame(self.workflow) self.line_7.setGeometry(QtCore.QRect(350, 100, 20, 61)) - self.line_7.setFrameShape(QtGui.QFrame.VLine) - self.line_7.setFrameShadow(QtGui.QFrame.Sunken) + self.line_7.setFrameShape(QtWidgets.QFrame.VLine) + self.line_7.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_7.setObjectName(_fromUtf8("line_7")) - self.line_8 = QtGui.QFrame(self.workflow) + self.line_8 = QtWidgets.QFrame(self.workflow) self.line_8.setGeometry(QtCore.QRect(360, 120, 71, 16)) - self.line_8.setFrameShape(QtGui.QFrame.HLine) - self.line_8.setFrameShadow(QtGui.QFrame.Sunken) + self.line_8.setFrameShape(QtWidgets.QFrame.HLine) + self.line_8.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_8.setObjectName(_fromUtf8("line_8")) - self.line_9 = QtGui.QFrame(self.workflow) + self.line_9 = QtWidgets.QFrame(self.workflow) self.line_9.setGeometry(QtCore.QRect(420, 100, 20, 61)) - self.line_9.setFrameShape(QtGui.QFrame.VLine) - self.line_9.setFrameShadow(QtGui.QFrame.Sunken) + self.line_9.setFrameShape(QtWidgets.QFrame.VLine) + self.line_9.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_9.setObjectName(_fromUtf8("line_9")) - self.line_10 = QtGui.QFrame(self.workflow) + self.line_10 = QtWidgets.QFrame(self.workflow) self.line_10.setGeometry(QtCore.QRect(430, 90, 31, 20)) - self.line_10.setFrameShape(QtGui.QFrame.HLine) - self.line_10.setFrameShadow(QtGui.QFrame.Sunken) + self.line_10.setFrameShape(QtWidgets.QFrame.HLine) + self.line_10.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_10.setObjectName(_fromUtf8("line_10")) - self.line_11 = QtGui.QFrame(self.workflow) + self.line_11 = QtWidgets.QFrame(self.workflow) self.line_11.setGeometry(QtCore.QRect(430, 150, 31, 20)) - self.line_11.setFrameShape(QtGui.QFrame.HLine) - self.line_11.setFrameShadow(QtGui.QFrame.Sunken) + self.line_11.setFrameShape(QtWidgets.QFrame.HLine) + self.line_11.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_11.setObjectName(_fromUtf8("line_11")) - self.show_unmapped_bn = QtGui.QPushButton(self.workflow) + self.show_unmapped_bn = QtWidgets.QPushButton(self.workflow) self.show_unmapped_bn.setGeometry(QtCore.QRect(460, 80, 131, 31)) self.show_unmapped_bn.setObjectName(_fromUtf8("show_unmapped_bn")) - self.show_mapped_bn = QtGui.QPushButton(self.workflow) + self.show_mapped_bn = QtWidgets.QPushButton(self.workflow) self.show_mapped_bn.setGeometry(QtCore.QRect(460, 140, 131, 31)) self.show_mapped_bn.setObjectName(_fromUtf8("show_mapped_bn")) - self.line_12 = QtGui.QFrame(self.workflow) + self.line_12 = QtWidgets.QFrame(self.workflow) self.line_12.setGeometry(QtCore.QRect(510, 170, 20, 31)) - self.line_12.setFrameShape(QtGui.QFrame.VLine) - self.line_12.setFrameShadow(QtGui.QFrame.Sunken) + self.line_12.setFrameShape(QtWidgets.QFrame.VLine) + self.line_12.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_12.setObjectName(_fromUtf8("line_12")) - self.line_13 = QtGui.QFrame(self.workflow) + self.line_13 = QtWidgets.QFrame(self.workflow) self.line_13.setGeometry(QtCore.QRect(290, 190, 411, 20)) - self.line_13.setFrameShape(QtGui.QFrame.HLine) - self.line_13.setFrameShadow(QtGui.QFrame.Sunken) + self.line_13.setFrameShape(QtWidgets.QFrame.HLine) + self.line_13.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_13.setObjectName(_fromUtf8("line_13")) - self.line_14 = QtGui.QFrame(self.workflow) + self.line_14 = QtWidgets.QFrame(self.workflow) self.line_14.setGeometry(QtCore.QRect(280, 200, 16, 51)) - self.line_14.setFrameShape(QtGui.QFrame.VLine) - self.line_14.setFrameShadow(QtGui.QFrame.Sunken) + self.line_14.setFrameShape(QtWidgets.QFrame.VLine) + self.line_14.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_14.setObjectName(_fromUtf8("line_14")) - self.line_15 = QtGui.QFrame(self.workflow) + self.line_15 = QtWidgets.QFrame(self.workflow) self.line_15.setGeometry(QtCore.QRect(370, 200, 16, 101)) - self.line_15.setFrameShape(QtGui.QFrame.VLine) - self.line_15.setFrameShadow(QtGui.QFrame.Sunken) + self.line_15.setFrameShape(QtWidgets.QFrame.VLine) + self.line_15.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_15.setObjectName(_fromUtf8("line_15")) - self.line_16 = QtGui.QFrame(self.workflow) + self.line_16 = QtWidgets.QFrame(self.workflow) self.line_16.setGeometry(QtCore.QRect(480, 200, 16, 51)) - self.line_16.setFrameShape(QtGui.QFrame.VLine) - self.line_16.setFrameShadow(QtGui.QFrame.Sunken) + self.line_16.setFrameShape(QtWidgets.QFrame.VLine) + self.line_16.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_16.setObjectName(_fromUtf8("line_16")) - self.line_17 = QtGui.QFrame(self.workflow) + self.line_17 = QtWidgets.QFrame(self.workflow) self.line_17.setGeometry(QtCore.QRect(580, 200, 16, 141)) - self.line_17.setFrameShape(QtGui.QFrame.VLine) - self.line_17.setFrameShadow(QtGui.QFrame.Sunken) + self.line_17.setFrameShape(QtWidgets.QFrame.VLine) + self.line_17.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_17.setObjectName(_fromUtf8("line_17")) - self.line_18 = QtGui.QFrame(self.workflow) + self.line_18 = QtWidgets.QFrame(self.workflow) self.line_18.setGeometry(QtCore.QRect(690, 200, 16, 51)) - self.line_18.setFrameShape(QtGui.QFrame.VLine) - self.line_18.setFrameShadow(QtGui.QFrame.Sunken) + self.line_18.setFrameShape(QtWidgets.QFrame.VLine) + self.line_18.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_18.setObjectName(_fromUtf8("line_18")) - self.show_good_bn = QtGui.QPushButton(self.workflow) + self.show_good_bn = QtWidgets.QPushButton(self.workflow) self.show_good_bn.setGeometry(QtCore.QRect(230, 250, 121, 31)) self.show_good_bn.setObjectName(_fromUtf8("show_good_bn")) - self.show_rsp_bn = QtGui.QPushButton(self.workflow) + self.show_rsp_bn = QtWidgets.QPushButton(self.workflow) self.show_rsp_bn.setGeometry(QtCore.QRect(310, 300, 141, 31)) self.show_rsp_bn.setObjectName(_fromUtf8("show_rsp_bn")) - self.show_pp_bn = QtGui.QPushButton(self.workflow) + self.show_pp_bn = QtWidgets.QPushButton(self.workflow) self.show_pp_bn.setGeometry(QtCore.QRect(410, 250, 151, 31)) self.show_pp_bn.setObjectName(_fromUtf8("show_pp_bn")) - self.show_both_bn = QtGui.QPushButton(self.workflow) + self.show_both_bn = QtWidgets.QPushButton(self.workflow) self.show_both_bn.setGeometry(QtCore.QRect(490, 340, 191, 31)) self.show_both_bn.setObjectName(_fromUtf8("show_both_bn")) - self.show_missing_bn = QtGui.QPushButton(self.workflow) + self.show_missing_bn = QtWidgets.QPushButton(self.workflow) self.show_missing_bn.setGeometry(QtCore.QRect(650, 250, 101, 31)) self.show_missing_bn.setObjectName(_fromUtf8("show_missing_bn")) - self.label_2 = QtGui.QLabel(self.workflow) + self.label_2 = QtWidgets.QLabel(self.workflow) self.label_2.setGeometry(QtCore.QRect(110, 50, 46, 13)) self.label_2.setObjectName(_fromUtf8("label_2")) - self.label_3 = QtGui.QLabel(self.workflow) + self.label_3 = QtWidgets.QLabel(self.workflow) self.label_3.setGeometry(QtCore.QRect(110, 80, 46, 13)) self.label_3.setObjectName(_fromUtf8("label_3")) - self.label_4 = QtGui.QLabel(self.workflow) + self.label_4 = QtWidgets.QLabel(self.workflow) self.label_4.setGeometry(QtCore.QRect(150, 20, 46, 13)) self.label_4.setObjectName(_fromUtf8("label_4")) - self.label_5 = QtGui.QLabel(self.workflow) + self.label_5 = QtWidgets.QLabel(self.workflow) self.label_5.setGeometry(QtCore.QRect(150, 110, 46, 13)) self.label_5.setObjectName(_fromUtf8("label_5")) - self.label_6 = QtGui.QLabel(self.workflow) + self.label_6 = QtWidgets.QLabel(self.workflow) self.label_6.setGeometry(QtCore.QRect(370, 110, 81, 16)) self.label_6.setObjectName(_fromUtf8("label_6")) - self.label_7 = QtGui.QLabel(self.workflow) + self.label_7 = QtWidgets.QLabel(self.workflow) self.label_7.setGeometry(QtCore.QRect(370, 130, 61, 16)) self.label_7.setObjectName(_fromUtf8("label_7")) - self.line_19 = QtGui.QFrame(self.workflow) + self.line_19 = QtWidgets.QFrame(self.workflow) self.line_19.setGeometry(QtCore.QRect(590, 90, 41, 16)) - self.line_19.setFrameShape(QtGui.QFrame.HLine) - self.line_19.setFrameShadow(QtGui.QFrame.Sunken) + self.line_19.setFrameShape(QtWidgets.QFrame.HLine) + self.line_19.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_19.setObjectName(_fromUtf8("line_19")) - self.line_20 = QtGui.QFrame(self.workflow) + self.line_20 = QtWidgets.QFrame(self.workflow) self.line_20.setGeometry(QtCore.QRect(620, 70, 20, 61)) - self.line_20.setFrameShape(QtGui.QFrame.VLine) - self.line_20.setFrameShadow(QtGui.QFrame.Sunken) + self.line_20.setFrameShape(QtWidgets.QFrame.VLine) + self.line_20.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_20.setObjectName(_fromUtf8("line_20")) - self.line_21 = QtGui.QFrame(self.workflow) + self.line_21 = QtWidgets.QFrame(self.workflow) self.line_21.setGeometry(QtCore.QRect(630, 60, 31, 20)) - self.line_21.setFrameShape(QtGui.QFrame.HLine) - self.line_21.setFrameShadow(QtGui.QFrame.Sunken) + self.line_21.setFrameShape(QtWidgets.QFrame.HLine) + self.line_21.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_21.setObjectName(_fromUtf8("line_21")) - self.line_22 = QtGui.QFrame(self.workflow) + self.line_22 = QtWidgets.QFrame(self.workflow) self.line_22.setGeometry(QtCore.QRect(630, 120, 31, 20)) - self.line_22.setFrameShape(QtGui.QFrame.HLine) - self.line_22.setFrameShadow(QtGui.QFrame.Sunken) + self.line_22.setFrameShape(QtWidgets.QFrame.HLine) + self.line_22.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_22.setObjectName(_fromUtf8("line_22")) - self.show_filtered_bn = QtGui.QPushButton(self.workflow) + self.show_filtered_bn = QtWidgets.QPushButton(self.workflow) self.show_filtered_bn.setGeometry(QtCore.QRect(660, 120, 101, 31)) self.show_filtered_bn.setObjectName(_fromUtf8("show_filtered_bn")) - self.show_no_mapping_bn = QtGui.QPushButton(self.workflow) + self.show_no_mapping_bn = QtWidgets.QPushButton(self.workflow) self.show_no_mapping_bn.setGeometry(QtCore.QRect(660, 50, 101, 31)) self.show_no_mapping_bn.setObjectName(_fromUtf8("show_no_mapping_bn")) - self.label_12 = QtGui.QLabel(self.workflow) + self.label_12 = QtWidgets.QLabel(self.workflow) self.label_12.setGeometry(QtCore.QRect(440, 180, 71, 16)) self.label_12.setObjectName(_fromUtf8("label_12")) self.Stats.addTab(self.workflow, _fromUtf8("")) - self.statistics = QtGui.QWidget() + self.statistics = QtWidgets.QWidget() self.statistics.setObjectName(_fromUtf8("statistics")) - self.horizontalLayout = QtGui.QHBoxLayout(self.statistics) + self.horizontalLayout = QtWidgets.QHBoxLayout(self.statistics) self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) - self.textBrowser = QtGui.QTextBrowser(self.statistics) + self.textBrowser = QtWidgets.QTextBrowser(self.statistics) font = QtGui.QFont() font.setPointSize(10) self.textBrowser.setFont(font) self.textBrowser.setObjectName(_fromUtf8("textBrowser")) self.horizontalLayout.addWidget(self.textBrowser) self.Stats.addTab(self.statistics, _fromUtf8("")) - self.mapping = QtGui.QWidget() + self.mapping = QtWidgets.QWidget() self.mapping.setObjectName(_fromUtf8("mapping")) - self.verticalLayout_3 = QtGui.QVBoxLayout(self.mapping) + self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.mapping) self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3")) self.Stats.addTab(self.mapping, _fromUtf8("")) self.gridLayout.addWidget(self.Stats, 1, 2, 1, 1) BioNanoAnalyst.setCentralWidget(self.centralwidget) - self.menubar = QtGui.QMenuBar(BioNanoAnalyst) + self.menubar = QtWidgets.QMenuBar(BioNanoAnalyst) self.menubar.setGeometry(QtCore.QRect(0, 0, 1310, 21)) self.menubar.setObjectName(_fromUtf8("menubar")) - self.menuNew = QtGui.QMenu(self.menubar) + self.menuNew = QtWidgets.QMenu(self.menubar) self.menuNew.setObjectName(_fromUtf8("menuNew")) - self.menuHelp = QtGui.QMenu(self.menubar) + self.menuHelp = QtWidgets.QMenu(self.menubar) self.menuHelp.setObjectName(_fromUtf8("menuHelp")) BioNanoAnalyst.setMenuBar(self.menubar) - self.statusbar = QtGui.QStatusBar(BioNanoAnalyst) + self.statusbar = QtWidgets.QStatusBar(BioNanoAnalyst) self.statusbar.setObjectName(_fromUtf8("statusbar")) BioNanoAnalyst.setStatusBar(self.statusbar) - self.actionNew = QtGui.QAction(BioNanoAnalyst) + self.actionNew = QtWidgets.QAction(BioNanoAnalyst) self.actionNew.setObjectName(_fromUtf8("actionNew")) - self.actionClose = QtGui.QAction(BioNanoAnalyst) + self.actionClose = QtWidgets.QAction(BioNanoAnalyst) self.actionClose.setObjectName(_fromUtf8("actionClose")) - self.actionAbout = QtGui.QAction(BioNanoAnalyst) + self.actionAbout = QtWidgets.QAction(BioNanoAnalyst) self.actionAbout.setObjectName(_fromUtf8("actionAbout")) - self.actionManual = QtGui.QAction(BioNanoAnalyst) + self.actionManual = QtWidgets.QAction(BioNanoAnalyst) self.actionManual.setObjectName(_fromUtf8("actionManual")) - self.actionFeedbacks = QtGui.QAction(BioNanoAnalyst) + self.actionFeedbacks = QtWidgets.QAction(BioNanoAnalyst) self.actionFeedbacks.setObjectName(_fromUtf8("actionFeedbacks")) self.menuNew.addAction(self.actionNew) self.menuNew.addAction(self.actionClose) diff --git a/scripts/Manual.py b/scripts/Manual.py index f53131f..b7a78ea 100644 --- a/scripts/Manual.py +++ b/scripts/Manual.py @@ -7,9 +7,9 @@ # WARNING! All changes made in this file will be lost! try: - from PyQt4 import QtGui,QtCore + from PyQt5 import QtGui,QtCore,QtWidgets except ImportError: - from PySide import QtGui,QtCore + from PySide2 import QtGui,QtCore,QtWidgets try: _fromUtf8 = QtCore.QString.fromUtf8 @@ -18,12 +18,12 @@ def _fromUtf8(s): return s try: - _encoding = QtGui.QApplication.UnicodeUTF8 + _encoding = QtWidgets.QApplication.UnicodeUTF8 def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) + return QtWidgets.QApplication.translate(context, text, disambig, _encoding) except AttributeError: def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) + return QtWidgets.QApplication.translate(context, text, disambig) class Ui_Manual(object): def setupUi(self, Manual): @@ -31,10 +31,10 @@ def setupUi(self, Manual): Manual.resize(740, 450) Manual.setMinimumSize(QtCore.QSize(740, 450)) Manual.setMaximumSize(QtCore.QSize(740, 450)) - self.textBrowser = QtGui.QTextBrowser(Manual) + self.textBrowser = QtWidgets.QTextBrowser(Manual) self.textBrowser.setGeometry(QtCore.QRect(10, 40, 721, 371)) self.textBrowser.setObjectName(_fromUtf8("textBrowser")) - self.label = QtGui.QLabel(Manual) + self.label = QtWidgets.QLabel(Manual) self.label.setGeometry(QtCore.QRect(10, 10, 271, 21)) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) diff --git a/scripts/Settings.py b/scripts/Settings.py index 58f6fbf..f666c60 100644 --- a/scripts/Settings.py +++ b/scripts/Settings.py @@ -7,9 +7,9 @@ # WARNING! All changes made in this file will be lost! try: - from PyQt4 import QtGui,QtCore + from PyQt5 import QtGui,QtCore,QtWidgets except ImportError: - from PySide import QtGui,QtCore + from PySide2 import QtGui,QtCore,QtWidgets try: _fromUtf8 = QtCore.QString.fromUtf8 @@ -20,10 +20,10 @@ def _fromUtf8(s): try: _encoding = QtGui.QApplication.UnicodeUTF8 def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) + return QtWidgets.QApplication.translate(context, text, disambig, _encoding) except AttributeError: def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) + return QtWidgets.QApplication.translate(context, text, disambig) class Ui_Settings(object): def setupUi(self, Settings): @@ -33,20 +33,20 @@ def setupUi(self, Settings): Settings.setMaximumSize(QtCore.QSize(430, 356)) self.verticalLayout = QtGui.QVBoxLayout(Settings) self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) - self.tools_frame = QtGui.QFrame(Settings) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + self.tools_frame = QtWidgets.QFrame(Settings) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.tools_frame.sizePolicy().hasHeightForWidth()) self.tools_frame.setSizePolicy(sizePolicy) - self.tools_frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.tools_frame.setFrameShadow(QtGui.QFrame.Sunken) + self.tools_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.tools_frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.tools_frame.setLineWidth(2) self.tools_frame.setObjectName(_fromUtf8("tools_frame")) self.gridLayout = QtGui.QGridLayout(self.tools_frame) self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.tools_location_label = QtGui.QLabel(self.tools_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.tools_location_label = QtWidgets.QLabel(self.tools_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.tools_location_label.sizePolicy().hasHeightForWidth()) @@ -59,8 +59,8 @@ def setupUi(self, Settings): self.tools_location_input = QtGui.QLineEdit(self.tools_frame) self.tools_location_input.setObjectName(_fromUtf8("tools_location_input")) self.gridLayout.addWidget(self.tools_location_input, 1, 1, 1, 1) - self.tools_label = QtGui.QLabel(self.tools_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.tools_label = QtWidgets.QLabel(self.tools_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.tools_label.sizePolicy().hasHeightForWidth()) @@ -77,13 +77,13 @@ def setupUi(self, Settings): self.tools_location_clear_bn.setObjectName(_fromUtf8("tools_location_clear_bn")) self.gridLayout.addWidget(self.tools_location_clear_bn, 1, 3, 1, 1) self.verticalLayout.addWidget(self.tools_frame) - self.frame = QtGui.QFrame(Settings) - self.frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.frame.setFrameShadow(QtGui.QFrame.Raised) + self.frame = QtWidgets.QFrame(Settings) + self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.frame.setFrameShadow(QtWidgets.QFrame.Raised) self.frame.setObjectName(_fromUtf8("frame")) - self.scripts_label = QtGui.QLabel(self.frame) + self.scripts_label = QtWidgets.QLabel(self.frame) self.scripts_label.setGeometry(QtCore.QRect(10, 10, 81, 22)) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.scripts_label.sizePolicy().hasHeightForWidth()) @@ -95,9 +95,9 @@ def setupUi(self, Settings): font.setWeight(75) self.scripts_label.setFont(font) self.scripts_label.setObjectName(_fromUtf8("scripts_label")) - self.scripts_location_label = QtGui.QLabel(self.frame) + self.scripts_location_label = QtWidgets.QLabel(self.frame) self.scripts_location_label.setGeometry(QtCore.QRect(10, 40, 63, 17)) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.scripts_location_label.sizePolicy().hasHeightForWidth()) @@ -118,22 +118,22 @@ def setupUi(self, Settings): self.scripts_location_selecet_bn.raise_() self.scripts_location_clear_bn.raise_() self.verticalLayout.addWidget(self.frame) - self.assembly_frame = QtGui.QFrame(Settings) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + self.assembly_frame = QtWidgets.QFrame(Settings) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.assembly_frame.sizePolicy().hasHeightForWidth()) self.assembly_frame.setSizePolicy(sizePolicy) - self.assembly_frame.setFrameShape(QtGui.QFrame.StyledPanel) - self.assembly_frame.setFrameShadow(QtGui.QFrame.Sunken) + self.assembly_frame.setFrameShape(QtWidgets.QFrame.StyledPanel) + self.assembly_frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.assembly_frame.setLineWidth(2) self.assembly_frame.setObjectName(_fromUtf8("assembly_frame")) self.gridLayout_2 = QtGui.QGridLayout(self.assembly_frame) self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) - self.iteration_label = QtGui.QLabel(self.assembly_frame) + self.iteration_label = QtWidgets.QLabel(self.assembly_frame) self.iteration_label.setObjectName(_fromUtf8("iteration_label")) self.gridLayout_2.addWidget(self.iteration_label, 3, 0, 1, 1) - self.threads_label = QtGui.QLabel(self.assembly_frame) + self.threads_label = QtWidgets.QLabel(self.assembly_frame) self.threads_label.setObjectName(_fromUtf8("threads_label")) self.gridLayout_2.addWidget(self.threads_label, 1, 0, 1, 1) self.threads_spinBox = QtGui.QSpinBox(self.assembly_frame) @@ -152,29 +152,29 @@ def setupUi(self, Settings): self.jobs_spinBox.setMaximumSize(QtCore.QSize(61, 16777215)) self.jobs_spinBox.setObjectName(_fromUtf8("jobs_spinBox")) self.gridLayout_2.addWidget(self.jobs_spinBox, 1, 5, 1, 1) - self.gs_label = QtGui.QLabel(self.assembly_frame) + self.gs_label = QtWidgets.QLabel(self.assembly_frame) self.gs_label.setObjectName(_fromUtf8("gs_label")) self.gridLayout_2.addWidget(self.gs_label, 3, 3, 1, 2) self.gs_input = QtGui.QLineEdit(self.assembly_frame) self.gs_input.setMaximumSize(QtCore.QSize(61, 16777215)) self.gs_input.setObjectName(_fromUtf8("gs_input")) self.gridLayout_2.addWidget(self.gs_input, 3, 5, 1, 1) - self.jobs_label = QtGui.QLabel(self.assembly_frame) + self.jobs_label = QtWidgets.QLabel(self.assembly_frame) self.jobs_label.setObjectName(_fromUtf8("jobs_label")) self.gridLayout_2.addWidget(self.jobs_label, 1, 3, 1, 1) self.output_input = QtGui.QLineEdit(self.assembly_frame) self.output_input.setObjectName(_fromUtf8("output_input")) self.gridLayout_2.addWidget(self.output_input, 5, 2, 1, 2) - self.output_label = QtGui.QLabel(self.assembly_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding) + self.output_label = QtWidgets.QLabel(self.assembly_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.output_label.sizePolicy().hasHeightForWidth()) self.output_label.setSizePolicy(sizePolicy) self.output_label.setObjectName(_fromUtf8("output_label")) self.gridLayout_2.addWidget(self.output_label, 5, 0, 1, 2) - self.assembly_label = QtGui.QLabel(self.assembly_frame) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + self.assembly_label = QtWidgets.QLabel(self.assembly_frame) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.assembly_label.sizePolicy().hasHeightForWidth()) From 25650570a52321b32cf7cf611575e12e2ee8179f Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Wed, 28 Oct 2020 18:12:06 +0000 Subject: [PATCH 02/15] Fix to make file compatible with Qt5 QPushButton now part of QtWidgets not QtGui --- scripts/Manual.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Manual.py b/scripts/Manual.py index b7a78ea..14e9bf1 100644 --- a/scripts/Manual.py +++ b/scripts/Manual.py @@ -43,7 +43,7 @@ def setupUi(self, Manual): font.setWeight(75) self.label.setFont(font) self.label.setObjectName(_fromUtf8("label")) - self.manual_bn = QtGui.QPushButton(Manual) + self.manual_bn = QtWidgets.QPushButton(Manual) self.manual_bn.setGeometry(QtCore.QRect(650, 420, 75, 23)) font = QtGui.QFont() font.setFamily(_fromUtf8("Arial")) From 93560d8a1f38d5426e549362675277222f3f8c5c Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Wed, 28 Oct 2020 18:18:58 +0000 Subject: [PATCH 03/15] Updating settings to make compatible with Qt5 QVBoxLayout QGridLayout QPushButton QLineEdit QSpinBox all moved from QtGui to QtWidgets in Qt5 --- scripts/Settings.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/Settings.py b/scripts/Settings.py index f666c60..cfad1d3 100644 --- a/scripts/Settings.py +++ b/scripts/Settings.py @@ -31,7 +31,7 @@ def setupUi(self, Settings): Settings.resize(430, 356) Settings.setMinimumSize(QtCore.QSize(430, 356)) Settings.setMaximumSize(QtCore.QSize(430, 356)) - self.verticalLayout = QtGui.QVBoxLayout(Settings) + self.verticalLayout = QtWidgets.QVBoxLayout(Settings) self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) self.tools_frame = QtWidgets.QFrame(Settings) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) @@ -43,7 +43,7 @@ def setupUi(self, Settings): self.tools_frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.tools_frame.setLineWidth(2) self.tools_frame.setObjectName(_fromUtf8("tools_frame")) - self.gridLayout = QtGui.QGridLayout(self.tools_frame) + self.gridLayout = QtWidgets.QGridLayout(self.tools_frame) self.gridLayout.setObjectName(_fromUtf8("gridLayout")) self.tools_location_label = QtWidgets.QLabel(self.tools_frame) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) @@ -53,10 +53,10 @@ def setupUi(self, Settings): self.tools_location_label.setSizePolicy(sizePolicy) self.tools_location_label.setObjectName(_fromUtf8("tools_location_label")) self.gridLayout.addWidget(self.tools_location_label, 1, 0, 1, 1) - self.tools_location_selecet_bn = QtGui.QPushButton(self.tools_frame) + self.tools_location_selecet_bn = QtWidgets.QPushButton(self.tools_frame) self.tools_location_selecet_bn.setObjectName(_fromUtf8("tools_location_selecet_bn")) self.gridLayout.addWidget(self.tools_location_selecet_bn, 1, 2, 1, 1) - self.tools_location_input = QtGui.QLineEdit(self.tools_frame) + self.tools_location_input = QtWidgets.QLineEdit(self.tools_frame) self.tools_location_input.setObjectName(_fromUtf8("tools_location_input")) self.gridLayout.addWidget(self.tools_location_input, 1, 1, 1, 1) self.tools_label = QtWidgets.QLabel(self.tools_frame) @@ -73,7 +73,7 @@ def setupUi(self, Settings): self.tools_label.setFont(font) self.tools_label.setObjectName(_fromUtf8("tools_label")) self.gridLayout.addWidget(self.tools_label, 0, 0, 1, 1) - self.tools_location_clear_bn = QtGui.QPushButton(self.tools_frame) + self.tools_location_clear_bn = QtWidgets.QPushButton(self.tools_frame) self.tools_location_clear_bn.setObjectName(_fromUtf8("tools_location_clear_bn")) self.gridLayout.addWidget(self.tools_location_clear_bn, 1, 3, 1, 1) self.verticalLayout.addWidget(self.tools_frame) @@ -103,13 +103,13 @@ def setupUi(self, Settings): sizePolicy.setHeightForWidth(self.scripts_location_label.sizePolicy().hasHeightForWidth()) self.scripts_location_label.setSizePolicy(sizePolicy) self.scripts_location_label.setObjectName(_fromUtf8("scripts_location_label")) - self.scripts_location_input = QtGui.QLineEdit(self.frame) + self.scripts_location_input = QtWidgets.QLineEdit(self.frame) self.scripts_location_input.setGeometry(QtCore.QRect(80, 40, 141, 27)) self.scripts_location_input.setObjectName(_fromUtf8("scripts_location_input")) - self.scripts_location_selecet_bn = QtGui.QPushButton(self.frame) + self.scripts_location_selecet_bn = QtWidgets.QPushButton(self.frame) self.scripts_location_selecet_bn.setGeometry(QtCore.QRect(230, 40, 85, 27)) self.scripts_location_selecet_bn.setObjectName(_fromUtf8("scripts_location_selecet_bn")) - self.scripts_location_clear_bn = QtGui.QPushButton(self.frame) + self.scripts_location_clear_bn = QtWidgets.QPushButton(self.frame) self.scripts_location_clear_bn.setGeometry(QtCore.QRect(320, 40, 85, 27)) self.scripts_location_clear_bn.setObjectName(_fromUtf8("scripts_location_clear_bn")) self.scripts_label.raise_() @@ -128,7 +128,7 @@ def setupUi(self, Settings): self.assembly_frame.setFrameShadow(QtWidgets.QFrame.Sunken) self.assembly_frame.setLineWidth(2) self.assembly_frame.setObjectName(_fromUtf8("assembly_frame")) - self.gridLayout_2 = QtGui.QGridLayout(self.assembly_frame) + self.gridLayout_2 = QtWidgets.QGridLayout(self.assembly_frame) self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) self.iteration_label = QtWidgets.QLabel(self.assembly_frame) self.iteration_label.setObjectName(_fromUtf8("iteration_label")) @@ -136,33 +136,33 @@ def setupUi(self, Settings): self.threads_label = QtWidgets.QLabel(self.assembly_frame) self.threads_label.setObjectName(_fromUtf8("threads_label")) self.gridLayout_2.addWidget(self.threads_label, 1, 0, 1, 1) - self.threads_spinBox = QtGui.QSpinBox(self.assembly_frame) + self.threads_spinBox = QtWidgets.QSpinBox(self.assembly_frame) self.threads_spinBox.setObjectName(_fromUtf8("threads_spinBox")) self.gridLayout_2.addWidget(self.threads_spinBox, 1, 2, 1, 1) - self.iteration_spinBox = QtGui.QSpinBox(self.assembly_frame) + self.iteration_spinBox = QtWidgets.QSpinBox(self.assembly_frame) self.iteration_spinBox.setObjectName(_fromUtf8("iteration_spinBox")) self.gridLayout_2.addWidget(self.iteration_spinBox, 3, 2, 1, 1) - self.output_clear_bn = QtGui.QPushButton(self.assembly_frame) + self.output_clear_bn = QtWidgets.QPushButton(self.assembly_frame) self.output_clear_bn.setObjectName(_fromUtf8("output_clear_bn")) self.gridLayout_2.addWidget(self.output_clear_bn, 5, 5, 1, 1) - self.output_select_bn = QtGui.QPushButton(self.assembly_frame) + self.output_select_bn = QtWidgets.QPushButton(self.assembly_frame) self.output_select_bn.setObjectName(_fromUtf8("output_select_bn")) self.gridLayout_2.addWidget(self.output_select_bn, 5, 4, 1, 1) - self.jobs_spinBox = QtGui.QSpinBox(self.assembly_frame) + self.jobs_spinBox = QtWidgets.QSpinBox(self.assembly_frame) self.jobs_spinBox.setMaximumSize(QtCore.QSize(61, 16777215)) self.jobs_spinBox.setObjectName(_fromUtf8("jobs_spinBox")) self.gridLayout_2.addWidget(self.jobs_spinBox, 1, 5, 1, 1) self.gs_label = QtWidgets.QLabel(self.assembly_frame) self.gs_label.setObjectName(_fromUtf8("gs_label")) self.gridLayout_2.addWidget(self.gs_label, 3, 3, 1, 2) - self.gs_input = QtGui.QLineEdit(self.assembly_frame) + self.gs_input = QtWidgets.QLineEdit(self.assembly_frame) self.gs_input.setMaximumSize(QtCore.QSize(61, 16777215)) self.gs_input.setObjectName(_fromUtf8("gs_input")) self.gridLayout_2.addWidget(self.gs_input, 3, 5, 1, 1) self.jobs_label = QtWidgets.QLabel(self.assembly_frame) self.jobs_label.setObjectName(_fromUtf8("jobs_label")) self.gridLayout_2.addWidget(self.jobs_label, 1, 3, 1, 1) - self.output_input = QtGui.QLineEdit(self.assembly_frame) + self.output_input = QtWidgets.QLineEdit(self.assembly_frame) self.output_input.setObjectName(_fromUtf8("output_input")) self.gridLayout_2.addWidget(self.output_input, 5, 2, 1, 2) self.output_label = QtWidgets.QLabel(self.assembly_frame) From 5ce98e96f2b6d1020f84dc033735c5a260740fa8 Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Wed, 28 Oct 2020 18:23:11 +0000 Subject: [PATCH 04/15] Further updates to make this Qt5 compatible QDialogButtonBox moved from QtGui to QtWidgets in Qt5. --- scripts/Settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Settings.py b/scripts/Settings.py index cfad1d3..ba7f391 100644 --- a/scripts/Settings.py +++ b/scripts/Settings.py @@ -188,8 +188,8 @@ def setupUi(self, Settings): self.assembly_label.setObjectName(_fromUtf8("assembly_label")) self.gridLayout_2.addWidget(self.assembly_label, 0, 0, 1, 2) self.verticalLayout.addWidget(self.assembly_frame) - self.setting_confirm_frame = QtGui.QDialogButtonBox(Settings) - self.setting_confirm_frame.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) + self.setting_confirm_frame = QtWidgets.QDialogButtonBox(Settings) + self.setting_confirm_frame.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) self.setting_confirm_frame.setObjectName(_fromUtf8("setting_confirm_frame")) self.verticalLayout.addWidget(self.setting_confirm_frame) From 82a34df6a7cb6477ee5e6c36df6e9815580da661 Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Wed, 28 Oct 2020 18:43:49 +0000 Subject: [PATCH 05/15] Fixes to dialog window returned file paths The QtWidgets.QFileDialog.getOpenFileName function returns 2 values. Only the first is required, the second argument being present generates an error. Fix required for Linux, untested if required on win32 systems. --- scripts/App.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/App.py b/scripts/App.py index 7706813..e8fccd6 100644 --- a/scripts/App.py +++ b/scripts/App.py @@ -165,7 +165,7 @@ def select_ref(self): self.ref=codecs.decode(str(ref)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.ref_input.setText(self.ref) else: - self.ref = unicode(QtWidgets.QFileDialog.getOpenFileName(self, 'Select reference sequences', '','sequences (*fasta *fa *fna)')) + self.ref = unicode(QtWidgets.QFileDialog.getOpenFileName(self, 'Select reference sequences', '','sequences (*fasta *fa *fna)')[0]) self.ui.ref_input.setText(self.ref) def clear_ref(self): @@ -195,7 +195,7 @@ def select_bnx(self): self.bnx = codecs.decode(str(bnx)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.raw_input.setText(self.bnx) else: - self.bnx = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select bnx file','','bnx file (*.bnx)')) + self.bnx = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select bnx file','','bnx file (*.bnx)')[0]) self.ui.raw_input.setText(self.bnx) def clear_bnx(self): @@ -243,7 +243,7 @@ def select_xmap(self): self.xmap = codecs.decode(str(xmap)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.xmap_input.setText(self.xmap) else: - self.xmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select xmap file','','xmap file (*.xmap)')) + self.xmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select xmap file','','xmap file (*.xmap)')[0]) self.ui.xmap_input.setText(self.xmap) def clear_xmap(self): @@ -256,7 +256,7 @@ def select_rcmap(self): self.rcmap = codecs.decode(str(rcmap)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.rcmap_input.setText(self.rcmap) else: - self.rcmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select ref cmap file','','cmap file (*_r.cmap)')) + self.rcmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select ref cmap file','','cmap file (*_r.cmap)')[0]) self.ui.rcmap_input.setText(self.rcmap) def clear_rcmap(self): @@ -269,7 +269,7 @@ def select_qcmap(self): self.qcmap = codecs.decode(str(qcmap)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.qcmap_input.setText(self.qcmap) else: - self.qcmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select qry cmap file','','cmap file (*_q.cmap)')) + self.qcmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select qry cmap file','','cmap file (*_q.cmap)')[0]) self.ui.qcmap_input.setText(self.qcmap) def clear_qcmap(self): From be79311ddc7c4c157a2894809fefc2c617bcd2b0 Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Wed, 28 Oct 2020 18:51:35 +0000 Subject: [PATCH 06/15] Fixes to make App file compatible with Qt5 QGraphicsView is now within QtWidgets instead of QtGui in Qt5. --- scripts/App.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/App.py b/scripts/App.py index e8fccd6..6237a14 100644 --- a/scripts/App.py +++ b/scripts/App.py @@ -613,7 +613,7 @@ def analyse(self): self.ui.gridLayout_7.itemAt(items).widget().deleteLater() except: pass - mapping_status_view=QtGui.QGraphicsView(self.ui.mapping_status_frame) + mapping_status_view=QtWidgets.QGraphicsView(self.ui.mapping_status_frame) self.ui.gridLayout_7.addWidget(mapping_status_view, 0, 0, 1, 1) try: ## Start analysis @@ -683,7 +683,7 @@ def analyse(self): self.ui.gridLayout_7.itemAt(items).widget().setParent(None) except: pass - mapping_status_view=QtGui.QGraphicsView(self.ui.mapping_status_frame) + mapping_status_view=QtWidgets.QGraphicsView(self.ui.mapping_status_frame) self.ui.gridLayout_7.addWidget(mapping_status_view, 0, 0, 1, 1) try: ## Start analysis From 880c5b0d4b75b83ea969c2f5cc8b730420727d2a Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Wed, 28 Oct 2020 18:57:56 +0000 Subject: [PATCH 07/15] Fixes to Appv file for Qt5 compatibility. References to qApp needs to be updated to QtWidgets.QApplication for Qt5 compatibility. --- scripts/App.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/App.py b/scripts/App.py index 6237a14..adb8cca 100644 --- a/scripts/App.py +++ b/scripts/App.py @@ -211,7 +211,7 @@ def raw_start(self): try: self.ui.raw_status_label.setStyleSheet('color: blue') self.ui.raw_status_label.setText('Running...') - qApp.processEvents() + QtWidgets.QApplication.processEvents() self.ui.raw_status_label.repaint() self.run_assembler() self.run_refAligner() @@ -225,7 +225,7 @@ def raw_start(self): self.ui.raw_status_label.setStyleSheet('color: red') self.ui.raw_status_label.setText('Crashed !') self.ui.raw_status_label.repaint() - qApp.processEvents() + QtWidgets.QApplication.processEvents() QtWidgets.QMessageBox.question(self, 'Error !', 'Something is wrong, please check the error messages!',QtWidgets.QMessageBox.Ok) @@ -622,7 +622,7 @@ def analyse(self): ## Emit the running signal self.ui.analyse_status_label.setStyleSheet('color: blue') self.ui.analyse_status_label.setText('Running...') - qApp.processEvents() + QtWidgets.QApplication.processEvents() self.ui.analyse_status_label.repaint() self.running.BioNano_stats() self.running.parse_fasta() @@ -692,7 +692,7 @@ def analyse(self): ## Emit the running signal self.ui.analyse_status_label.setStyleSheet('color: blue') self.ui.analyse_status_label.setText('Running...') - qApp.processEvents() + QtWidgets.QApplication.processEvents() self.ui.analyse_status_label.repaint() self.running.BioNano_stats() self.running.parse_fasta() From 1484b3de7cc3d9e7b44738cf8601e678e4471f20 Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Wed, 28 Oct 2020 20:52:24 +0000 Subject: [PATCH 08/15] Updated Qt reference Updated Qt4 reference to Qt5. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be5d968..2d0f19a 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Biopython ($pip install biopython or http://biopython.org/) Image ($pip install Image) -PyQt4 or PySide (https://www.riverbankcomputing.com/software/pyqt/download or $pip install PySide. If you have problem in installing this package, please refer [Issue #1](https://github.com/AppliedBioinformatics/BioNanoAnalyst/issues/1) +PyQt5 or PySide (https://www.riverbankcomputing.com/software/pyqt/download or $pip install PySide. If you have problem in installing this package, please refer [Issue #1](https://github.com/AppliedBioinformatics/BioNanoAnalyst/issues/1) # Run BioNanoAnalyst From 465fb09f2c33cf9d8490c33c58cb2a1dbd543cef Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Thu, 29 Oct 2020 11:00:15 +0000 Subject: [PATCH 09/15] Fixed print and whitespace issues. Added brackets to print statements and fixed a whitespace issue when using Python 3. --- scripts/App.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/App.py b/scripts/App.py index adb8cca..e420734 100644 --- a/scripts/App.py +++ b/scripts/App.py @@ -433,7 +433,7 @@ def save_qlt(self): path=self.output_path name='BioNanoAnalyst_report_cs%s_%s.gff3'% (self.cs,curr_time) name_all='BioNanoAnalyst_report_overall_pairs_cs%s_%s.txt'% (self.cs, curr_time) - test=len(self.running.overall) + test=len(self.running.overall) fd=open(os.path.join(path,name),'w') for j in self.running.overall['contig'].unique(): sub=self.running.overall[self.running.overall['contig']==j].reset_index(drop=True) @@ -660,7 +660,7 @@ def analyse(self): self.ui.analyse_status_label.setStyleSheet('color: green') self.ui.analyse_status_label.setText('Finished !') t2=time() - print 'The running time is %.2f seconds'%(t2-t1) + print('The running time is %.2f seconds'%(t2-t1)) except AttributeError: return except: @@ -730,7 +730,7 @@ def analyse(self): self.ui.analyse_status_label.setStyleSheet('color: green') self.ui.analyse_status_label.setText('Finished !') t2=time() - print 'The running time is %.2f seconds' % (t2-t1) + print('The running time is %.2f seconds' % (t2-t1)) except AttributeError: return if not self.ui.raw_checkBox.isChecked() and not self.ui.aligned_checkBox.isChecked(): From bea98e8ac219567299ec5cc1bb504bacbbf55e6f Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Thu, 29 Oct 2020 11:04:51 +0000 Subject: [PATCH 10/15] Removed matplotlib figure hold function call Matplotlib figure.hold function has been depreciated. This line causes the program to lock up when using Python 3. However Matplotlib defaults to false so removing this line should have no effect on the programs output. It is possible this commit maybe applicable to branches using Python 2. --- scripts/App.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/App.py b/scripts/App.py index e420734..49fd4dc 100644 --- a/scripts/App.py +++ b/scripts/App.py @@ -708,7 +708,7 @@ def analyse(self): self.ui.ctg_check_combox.activated[str].connect(self.ctgs) ## Make graphs self.figure = plt.figure(facecolor='w') - self.figure.hold(False) + self.canvas = FigureCanvas(self.figure) self.canvas.setMaximumSize(720,420) self.ui.verticalLayout_3.addWidget(self.canvas) From ed8d051d3549a83adc33144cd4503a5d93da0d9e Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Thu, 29 Oct 2020 11:11:00 +0000 Subject: [PATCH 11/15] Updated filedialog import and unicode references How the FileDialog module is imported has changed in Python 3. It is now imported from tkinter. The unicode function is no longer present in python 3, the easiest fix is to update calls to the unicode function with calls to the str function. --- scripts/App.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/App.py b/scripts/App.py index 49fd4dc..f7973f7 100644 --- a/scripts/App.py +++ b/scripts/App.py @@ -35,7 +35,7 @@ from Analysis import* import pandas as pd import numpy as np -import FileDialog +from tkinter import filedialog from matplotlib.pyplot import figure, show import matplotlib.pyplot as plt from matplotlib.figure import Figure @@ -165,7 +165,7 @@ def select_ref(self): self.ref=codecs.decode(str(ref)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.ref_input.setText(self.ref) else: - self.ref = unicode(QtWidgets.QFileDialog.getOpenFileName(self, 'Select reference sequences', '','sequences (*fasta *fa *fna)')[0]) + self.ref = str(QtWidgets.QFileDialog.getOpenFileName(self, 'Select reference sequences', '','sequences (*fasta *fa *fna)')[0]) self.ui.ref_input.setText(self.ref) def clear_ref(self): @@ -195,7 +195,7 @@ def select_bnx(self): self.bnx = codecs.decode(str(bnx)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.raw_input.setText(self.bnx) else: - self.bnx = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select bnx file','','bnx file (*.bnx)')[0]) + self.bnx = str(QtWidgets.QFileDialog.getOpenFileName(self,'Select bnx file','','bnx file (*.bnx)')[0]) self.ui.raw_input.setText(self.bnx) def clear_bnx(self): @@ -243,7 +243,7 @@ def select_xmap(self): self.xmap = codecs.decode(str(xmap)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.xmap_input.setText(self.xmap) else: - self.xmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select xmap file','','xmap file (*.xmap)')[0]) + self.xmap = str(QtWidgets.QFileDialog.getOpenFileName(self,'Select xmap file','','xmap file (*.xmap)')[0]) self.ui.xmap_input.setText(self.xmap) def clear_xmap(self): @@ -256,7 +256,7 @@ def select_rcmap(self): self.rcmap = codecs.decode(str(rcmap)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.rcmap_input.setText(self.rcmap) else: - self.rcmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select ref cmap file','','cmap file (*_r.cmap)')[0]) + self.rcmap = str(QtWidgets.QFileDialog.getOpenFileName(self,'Select ref cmap file','','cmap file (*_r.cmap)')[0]) self.ui.rcmap_input.setText(self.rcmap) def clear_rcmap(self): @@ -269,7 +269,7 @@ def select_qcmap(self): self.qcmap = codecs.decode(str(qcmap)[1:-1].split(',')[0][2:-1],'unicode_escape') self.ui.qcmap_input.setText(self.qcmap) else: - self.qcmap = unicode(QtWidgets.QFileDialog.getOpenFileName(self,'Select qry cmap file','','cmap file (*_q.cmap)')[0]) + self.qcmap = str(QtWidgets.QFileDialog.getOpenFileName(self,'Select qry cmap file','','cmap file (*_q.cmap)')[0]) self.ui.qcmap_input.setText(self.qcmap) def clear_qcmap(self): @@ -347,7 +347,7 @@ def ctgs(self): self.canvas_ctg.show() def save_select(self): - self.output_path = unicode(QtWidgets.QFileDialog.getExistingDirectory()) + self.output_path = str(QtWidgets.QFileDialog.getExistingDirectory()) self.ui.save_input.setText(self.output_path) def save_clear(self): self.ui.save_input.clear() @@ -1050,7 +1050,7 @@ def __init__(self): self.ui.setting_confirm_frame.rejected.connect(self.cancel) def select_tools_path(self): - self.tools_path = unicode(QtWidgets.QFileDialog.getExistingDirectory()) + self.tools_path = str(QtWidgets.QFileDialog.getExistingDirectory()) self.ui.tools_location_input.setText(self.tools_path) def clear_tools_path(self): @@ -1058,7 +1058,7 @@ def clear_tools_path(self): self.tools_path = None def select_scripts_path(self): - self.scripts_path = unicode(QtWidgets.QFileDialog.getExistingDirectory()) + self.scripts_path = str(QtWidgets.QFileDialog.getExistingDirectory()) self.ui.scripts_location_input.setText(self.scripts_path) def clear_scripts_path(self): From eed0a22acc9c4a4e9efc7db67398351234843947 Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Thu, 29 Oct 2020 11:13:18 +0000 Subject: [PATCH 12/15] Fix for a type error Fix a type mismatch error when using Python 3. --- scripts/App.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/App.py b/scripts/App.py index f7973f7..0e820c0 100644 --- a/scripts/App.py +++ b/scripts/App.py @@ -441,8 +441,8 @@ def save_qlt(self): i=1 ctg=sub['contig'][0] while i < len(sub): - score1=sub['score'][i-1] - score2=sub['score'][i] + score1=int(sub['score'][i-1]) + score2=int(sub['score'][i]) status1=sub['mapping_status'][i-1] status2=sub['mapping_status'][i-1] if score1==score2 and i!=len(sub)-1: From 5b93866627e76e2cc48b9b0171a39a742dd444f5 Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Thu, 29 Oct 2020 11:23:22 +0000 Subject: [PATCH 13/15] Update file line iteration call How the next function is called has changed in python 3. Updating it's use here to reflect that change. --- scripts/App.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/App.py b/scripts/App.py index 0e820c0..61597c1 100644 --- a/scripts/App.py +++ b/scripts/App.py @@ -473,7 +473,7 @@ def handle_ref_error(self): if os.stat(self.ref).st_size>0: with open(self.ref) as f: for i in range(2): - line=f.next().strip() + line=next(f).strip() if i == 0 and line[0]!='>': return QtWidgets.QMessageBox.question(self, 'Error !', 'Please check your input reference !', QtWidgets.QMessageBox.Ok) @@ -708,7 +708,6 @@ def analyse(self): self.ui.ctg_check_combox.activated[str].connect(self.ctgs) ## Make graphs self.figure = plt.figure(facecolor='w') - self.canvas = FigureCanvas(self.figure) self.canvas.setMaximumSize(720,420) self.ui.verticalLayout_3.addWidget(self.canvas) From 70e80a05bf815c34d5153efb27bea882b0b1639d Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Thu, 29 Oct 2020 11:28:58 +0000 Subject: [PATCH 14/15] Updated references to python version Replaced references to python version 2 to reflect the updates made in this branch. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2d0f19a..131d33c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Before using this tool, please make sure your platform satisfies the requirement 1. There are at least 2 CPUs in your machine -2. For Linux or macOS operating system, a Python (version:2.7.xx) and corresponding packages are required (see details below) +2. For Linux or macOS operating system, Python (version: 3.x.x) and corresponding packages are required (see details below) #Python Installation @@ -15,11 +15,11 @@ Before using this tool, please make sure your platform satisfies the requirement 2. Unpack the downloaded file, for exmaple using - $ tar -zxvf Python-2.7.xx.tar.gz in your terminal + $ tar -zxvf Python-3.x.x.tar.gz in your terminal 3. Then enter into the created directory: - $ cd Python-2.7 + $ cd Python-3.x 4. Start the build process by configuring everthing to your system: @@ -37,7 +37,7 @@ If there were no errors and eveything worked correctly, you should be able to ty $ python - Python 2.7.x (...) + Python 3.x.x (...) ... From 042f17e8802f4a7cb40360bbcdf47b3f571ffc07 Mon Sep 17 00:00:00 2001 From: Daniel Faulkner Date: Fri, 30 Oct 2020 09:16:15 +0000 Subject: [PATCH 15/15] Updating reference to PySide Replacing references to PySide to PySide2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 131d33c..eb29331 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Biopython ($pip install biopython or http://biopython.org/) Image ($pip install Image) -PyQt5 or PySide (https://www.riverbankcomputing.com/software/pyqt/download or $pip install PySide. If you have problem in installing this package, please refer [Issue #1](https://github.com/AppliedBioinformatics/BioNanoAnalyst/issues/1) +PyQt5 or PySide2 (https://www.riverbankcomputing.com/software/pyqt/download or $pip install PySide2) # Run BioNanoAnalyst