marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

feature/port-to-py3 #11

Merged
marcel merged 59 commits from feature/port-to-py3 into develop 2022-03-21 15:30:06 +01:00
Conversation 0 Commits 59 Files Changed 45 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5efe75f4ea - Show all commits

4
pylot/core/util/array_map.py
View File

@ -17,7 +17,7 @@ import matplotlib.patheffects as PathEffects
import cartopy.crs as ccrs import cartopy.crs as ccrs
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import cartopy.feature as cf import cartopy.feature as cf
from cartopy.io.shapereader import Reader import cartopy.io.shapereader as shpr
from cartopy.feature import ShapelyFeature from cartopy.feature import ShapelyFeature
from cartopy.mpl.gridliner import LONGITUDE_FORMATTER, LATITUDE_FORMATTER from cartopy.mpl.gridliner import LONGITUDE_FORMATTER, LATITUDE_FORMATTER
@ -156,6 +156,8 @@ class Array_map(QtWidgets.QWidget):
self.canvas.axes.add_feature(cf.OCEAN) self.canvas.axes.add_feature(cf.OCEAN)
self.canvas.axes.add_feature(cf.COASTLINE, linewidth=1, edgecolor='gray') self.canvas.axes.add_feature(cf.COASTLINE, linewidth=1, edgecolor='gray')
self.canvas.axes.add_feature(cf.BORDERS, alpha=0.7) self.canvas.axes.add_feature(cf.BORDERS, alpha=0.7)
self.canvas.axes.add_feature(cf.LAKES, alpha=0.7)
self.canvas.axes.add_feature(cf.RIVERS, linewidth=0.8)
# parallels and meridians # parallels and meridians
self.add_merid_paral() self.add_merid_paral()

2
pylot/core/util/widgets.py
View File

@ -1836,7 +1836,7 @@ class PickDlg(QDialog):
self.statusbar = QtWidgets.QStatusBar(self) self.statusbar = QtWidgets.QStatusBar(self)
# add hotkeys # add hotkeys
self._shortcut_space = QtWidgets.QShortcut(QtWidgets.QKeySequence(' '), self) self._shortcut_space = QtWidgets.QShortcut(QtGui.QKeySequence(' '), self)
self._shortcut_space.activated.connect(self.accept_button.clicked) self._shortcut_space.activated.connect(self.accept_button.clicked)
# button shortcuts (1 for P-button, 2 for S-button) # button shortcuts (1 for P-button, 2 for S-button)
# self.p_button.setShortcut(QKeySequence('1')) # self.p_button.setShortcut(QKeySequence('1'))