Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fea0685
Correct namespaces for qt5
mp15 Sep 17, 2018
2565057
Fix to make file compatible with Qt5
DanielFaulkner Oct 28, 2020
93560d8
Updating settings to make compatible with Qt5
DanielFaulkner Oct 28, 2020
5ce98e9
Further updates to make this Qt5 compatible
DanielFaulkner Oct 28, 2020
fd98840
Merge pull request #1 from DanielFaulkner/AutoGenFixes
DanielFaulkner Oct 28, 2020
82a34df
Fixes to dialog window returned file paths
DanielFaulkner Oct 28, 2020
94a4cf9
Merge pull request #2 from DanielFaulkner/dialog-box-fixes
DanielFaulkner Oct 28, 2020
be79311
Fixes to make App file compatible with Qt5
DanielFaulkner Oct 28, 2020
57c6e97
Merge pull request #3 from DanielFaulkner/qt5-fixes
DanielFaulkner Oct 28, 2020
880c5b0
Fixes to Appv file for Qt5 compatibility.
DanielFaulkner Oct 28, 2020
d356723
Merge pull request #4 from DanielFaulkner/qt5-fixes
DanielFaulkner Oct 28, 2020
1484b3d
Updated Qt reference
DanielFaulkner Oct 28, 2020
465fb09
Fixed print and whitespace issues.
DanielFaulkner Oct 29, 2020
bea98e8
Removed matplotlib figure hold function call
DanielFaulkner Oct 29, 2020
ed8d051
Updated filedialog import and unicode references
DanielFaulkner Oct 29, 2020
eed0a22
Fix for a type error
DanielFaulkner Oct 29, 2020
5b93866
Update file line iteration call
DanielFaulkner Oct 29, 2020
70e80a0
Updated references to python version
DanielFaulkner Oct 29, 2020
93e9a3c
Merge pull request #5 from DanielFaulkner/master
DanielFaulkner Oct 29, 2020
042f17e
Updating reference to PySide
DanielFaulkner Oct 30, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ 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

1. Please download python from https://www.python.org/downloads/

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:

Expand All @@ -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 (...)

...

Expand Down Expand Up @@ -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 PySide2 (https://www.riverbankcomputing.com/software/pyqt/download or $pip install PySide2)

# Run BioNanoAnalyst

Expand Down
22 changes: 11 additions & 11 deletions scripts/About.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,20 +18,20 @@ 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):
About.setObjectName(_fromUtf8("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"))
Expand All @@ -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"))
Expand All @@ -49,26 +49,26 @@ 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"))
font.setPointSize(8)
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"))
font.setPointSize(8)
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"))

Expand Down
Loading