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

Compare commits

base: marcel:92c328e3c65976c85f3ffcb48fc61dd059b32848
Branches Tags
marcel:develop
marcel:feature/residual_plot
marcel:master
marcel:correlation_picker
marcel:38-simplify-data-structure
marcel:improve-util-utils
marcel:0.2
marcel:0.1a
..
compare: marcel:bd9c1d0f73bddb9c33c20f53ff91c730c18ef171
Branches Tags
marcel:develop
marcel:feature/residual_plot
marcel:master
marcel:correlation_picker
marcel:38-simplify-data-structure
marcel:improve-util-utils
marcel:0.2
marcel:0.1a

No commits in common. "92c328e3c65976c85f3ffcb48fc61dd059b32848" and "bd9c1d0f73bddb9c33c20f53ff91c730c18ef171" have entirely different histories.
92c328e3c6 ... bd9c1d0f73

2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

4
PyLoT.py
View File

@ -3692,8 +3692,8 @@ class MainWindow(QMainWindow):
# self.closing.emit() # self.closing.emit()
# QMainWindow.closeEvent(self, event) # QMainWindow.closeEvent(self, event)
def setParameter(self, checked=0, show=True): def setParameter(self, show=True):
if checked: pass # dummy argument to receive trigger signal (checked) if called by QAction show = True
if not self.paraBox: if not self.paraBox:
self.paraBox = PylotParaBox(self._inputs, parent=self, windowflag=Qt.Window) self.paraBox = PylotParaBox(self._inputs, parent=self, windowflag=Qt.Window)
self.paraBox.accepted.connect(self._setDirty) self.paraBox.accepted.connect(self._setDirty)

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

@ -508,7 +508,7 @@ class Array_map(QtWidgets.QWidget):
# self.sc = self.basemap.scatter(lons, lats, s=self.pointsize, facecolor='none', latlon=True, marker='.', # self.sc = self.basemap.scatter(lons, lats, s=self.pointsize, facecolor='none', latlon=True, marker='.',
# zorder=10, picker=True, edgecolor='0.5', label='Not Picked') # zorder=10, picker=True, edgecolor='0.5', label='Not Picked')
self.sc = self.canvas.axes.scatter(lons, lats, s=self.pointsize * 3, facecolor='none', marker='.', self.sc = self.canvas.axes.scatter(lons, lats, s=self.pointsize, facecolor='none', marker='.',
zorder=10, picker=True, edgecolor='0.5', label='Not Picked', zorder=10, picker=True, edgecolor='0.5', label='Not Picked',
transform=ccrs.PlateCarree()) transform=ccrs.PlateCarree())
@ -549,7 +549,7 @@ class Array_map(QtWidgets.QWidget):
color = 'lightgrey' color = 'lightgrey'
if st in self.marked_stations: if st in self.marked_stations:
color = 'red' color = 'red'
self.annotations.append(self.canvas.axes.annotate(' %s' % st, xy=(x+0.003, y+0.003), fontsize=self.pointsize / 4., self.annotations.append(self.canvas.axes.annotate(' %s' % st, xy=(x, y), fontsize=self.pointsize / 4.,
fontweight='semibold', color=color, fontweight='semibold', color=color,
transform=ccrs.PlateCarree(), zorder=14, transform=ccrs.PlateCarree(), zorder=14,
path_effects=[PathEffects.withStroke(linewidth=self.pointsize / 4., foreground='k')])) path_effects=[PathEffects.withStroke(linewidth=self.pointsize / 4., foreground='k')]))