Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
thopri
PyNEMO
Commits
fd6453d7
Commit
fd6453d7
authored
5 years ago
by
James Harle
Browse files
Options
Download
Email Patches
Plain Diff
QT4 > QT5
parent
11e1d12c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
19 deletions
+20
-19
pynemo/gui/nemo_bdy_input_window.py
pynemo/gui/nemo_bdy_input_window.py
+3
-3
pynemo/gui/nemo_bdy_mask.py
pynemo/gui/nemo_bdy_mask.py
+2
-2
pynemo/gui/nemo_bdy_mask_gui.py
pynemo/gui/nemo_bdy_mask_gui.py
+3
-3
pynemo/gui/nemo_bdy_namelist_edit.py
pynemo/gui/nemo_bdy_namelist_edit.py
+5
-4
pynemo/gui/nemo_ncml_generator.py
pynemo/gui/nemo_ncml_generator.py
+3
-3
pynemo/gui/nemo_ncml_tab_widget.py
pynemo/gui/nemo_ncml_tab_widget.py
+3
-3
pynemo/profile.py
pynemo/profile.py
+1
-1
No files found.
pynemo/gui/nemo_bdy_input_window.py
View file @
fd6453d7
...
...
@@ -6,11 +6,11 @@ Created on 21 Jan 2015
# pylint: disable=E1103
# pylint: disable=no-name-in-module
# pylint: disable=E1002
from
PyQt
4
import
QtGui
from
PyQt
5
import
QtGui
from
.nemo_bdy_namelist_edit
import
NameListEditor
from
.nemo_bdy_mask_gui
import
MatplotlibWidget
from
PyQt
4
.QtGui
import
QSizePolicy
from
PyQt
4
.Qt
import
Qt
from
PyQt
5
.QtGui
import
QSizePolicy
from
PyQt
5
.Qt
import
Qt
class
InputWindow
(
QtGui
.
QDialog
):
'''
...
...
This diff is collapsed.
Click to expand it.
pynemo/gui/nemo_bdy_mask.py
View file @
fd6453d7
...
...
@@ -12,8 +12,8 @@ import logging
from
scipy
import
ndimage
import
matplotlib.pyplot
as
plt
from
pynemo.utils
import
gcoms_break_depth
from
PyQt
4
.Qt
Gui
import
QMessageBox
from
PyQt
4
import
QtCore
from
PyQt
5
.Qt
Widgets
import
QMessageBox
from
PyQt
5
import
QtCore
class
Mask
(
object
):
"""This is a Mask holder. which reads from a netCDF bathymetry file and
...
...
This diff is collapsed.
Click to expand it.
pynemo/gui/nemo_bdy_mask_gui.py
View file @
fd6453d7
...
...
@@ -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
PyQt
4
.QtCore
import
pyqtSignal
,
pyqtSlot
,
Qt
from
PyQt
5
.QtCore
import
pyqtSignal
,
pyqtSlot
,
Qt
from
.nemo_bdy_mask
import
Mask
import
logging
from
PyQt
4
.QtGui
import
QSizePolicy
from
PyQt
5
.QtGui
import
QSizePolicy
from
matplotlib.colors
import
Normalize
mask_alpha
=
0.3
from
PyQt
4
import
QtGui
from
PyQt
5
import
QtGui
import
matplotlib.pyplot
as
plt
from
matplotlib.figure
import
Figure
from
matplotlib.path
import
Path
...
...
This diff is collapsed.
Click to expand it.
pynemo/gui/nemo_bdy_namelist_edit.py
View file @
fd6453d7
...
...
@@ -6,13 +6,14 @@ Editor for namelist.bdy file
# pylint: disable=E1103
# pylint: disable=no-name-in-module
# pylint: disable=E1002
from
PyQt
4
import
QtGui
,
QtCore
from
PyQt
4
.QtCore
import
pyqtSignal
,
Qt
,
QRect
,
QPoint
from
PyQt
5
import
QtGui
,
QtCore
,
QtWidgets
from
PyQt
5
.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
(
Qt
Gui
.
QWidget
):
class
NameListEditor
(
Qt
Widgets
.
QWidget
):
'''
This class creates a gui for the Namelist file options
'''
...
...
This diff is collapsed.
Click to expand it.
pynemo/gui/nemo_ncml_generator.py
View file @
fd6453d7
...
...
@@ -6,9 +6,9 @@ Created on 6 Aug 2015
import
logging
import
os
import
xml.etree.ElementTree
as
ET
from
PyQt
4
import
QtGui
from
PyQt
4
import
QtCore
from
PyQt
4
.QtCore
import
pyqtSlot
from
PyQt
5
import
QtGui
from
PyQt
5
import
QtCore
from
PyQt
5
.QtCore
import
pyqtSlot
from
.
import
nemo_ncml_tab_widget
from
thredds_crawler.crawl
import
Crawl
...
...
This diff is collapsed.
Click to expand it.
pynemo/gui/nemo_ncml_tab_widget.py
View file @
fd6453d7
...
...
@@ -5,9 +5,9 @@ Created on 2 Jul 2015
'''
import
logging
import
os
from
PyQt
4
import
QtGui
from
PyQt
4
import
QtCore
from
PyQt
4
.QtCore
import
pyqtSlot
from
PyQt
5
import
QtGui
from
PyQt
5
import
QtCore
from
PyQt
5
.QtCore
import
pyqtSlot
class
Ncml_tab
(
QtGui
.
QWidget
):
'''
...
...
This diff is collapsed.
Click to expand it.
pynemo/profile.py
View file @
fd6453d7
...
...
@@ -34,7 +34,7 @@ $Last commit on:$
import
time
import
logging
import
numpy
as
np
from
PyQt
4
.Qt
Gui
import
QMessageBox
from
PyQt
5
.Qt
Widgets
import
QMessageBox
#Local imports
from
pynemo
import
pynemo_settings_editor
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment