Commit fd6453d7 authored by James Harle's avatar James Harle
Browse files

QT4 > QT5

parent 11e1d12c
......@@ -6,11 +6,11 @@ Created on 21 Jan 2015
# pylint: disable=E1103
# pylint: disable=no-name-in-module
# pylint: disable=E1002
from PyQt4 import QtGui
from PyQt5 import QtGui
from .nemo_bdy_namelist_edit import NameListEditor
from .nemo_bdy_mask_gui import MatplotlibWidget
from PyQt4.QtGui import QSizePolicy
from PyQt4.Qt import Qt
from PyQt5.QtGui import QSizePolicy
from PyQt5.Qt import Qt
class InputWindow(QtGui.QDialog):
'''
......
......@@ -12,8 +12,8 @@ import logging
from scipy import ndimage
import matplotlib.pyplot as plt
from pynemo.utils import gcoms_break_depth
from PyQt4.QtGui import QMessageBox
from PyQt4 import QtCore
from PyQt5.QtWidgets import QMessageBox
from PyQt5 import QtCore
class Mask(object):
"""This is a Mask holder. which reads from a netCDF bathymetry file and
......
......@@ -10,15 +10,15 @@ from mpl_toolkits.basemap import Basemap, cm
import numpy as np
from .selection_editor import PolygonEditor, BoxEditor
import os.path
from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt
from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt
from .nemo_bdy_mask import Mask
import logging
from PyQt4.QtGui import QSizePolicy
from PyQt5.QtGui import QSizePolicy
from matplotlib.colors import Normalize
mask_alpha = 0.3
from PyQt4 import QtGui
from PyQt5 import QtGui
import matplotlib.pyplot as plt
from matplotlib.figure import Figure
from matplotlib.path import Path
......
......@@ -6,13 +6,14 @@ Editor for namelist.bdy file
# pylint: disable=E1103
# pylint: disable=no-name-in-module
# pylint: disable=E1002
from PyQt4 import QtGui, QtCore
from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint
from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import pyqtSignal, Qt, QRect, QPoint
import ast
from PyQt4.QtGui import QMessageBox, QRegion, QIcon, QToolTip, QCursor
from PyQt5.QtGui import QRegion, QIcon, QCursor
from PyQt5.QtWidgets import QMessageBox, QToolTip
class NameListEditor(QtGui.QWidget):
class NameListEditor(QtWidgets.QWidget):
'''
This class creates a gui for the Namelist file options
'''
......
......@@ -6,9 +6,9 @@ Created on 6 Aug 2015
import logging
import os
import xml.etree.ElementTree as ET
from PyQt4 import QtGui
from PyQt4 import QtCore
from PyQt4.QtCore import pyqtSlot
from PyQt5 import QtGui
from PyQt5 import QtCore
from PyQt5.QtCore import pyqtSlot
from . import nemo_ncml_tab_widget
from thredds_crawler.crawl import Crawl
......
......@@ -5,9 +5,9 @@ Created on 2 Jul 2015
'''
import logging
import os
from PyQt4 import QtGui
from PyQt4 import QtCore
from PyQt4.QtCore import pyqtSlot
from PyQt5 import QtGui
from PyQt5 import QtCore
from PyQt5.QtCore import pyqtSlot
class Ncml_tab(QtGui.QWidget):
'''
......
......@@ -34,7 +34,7 @@ $Last commit on:$
import time
import logging
import numpy as np
from PyQt4.QtGui import QMessageBox
from PyQt5.QtWidgets import QMessageBox
#Local imports
from pynemo import pynemo_settings_editor
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment