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

[update] canvas used for tune-fig, not yet pan

Browse Source
This commit is contained in:
Marcel Paffrath 2017-08-24 11:35:53 +02:00
parent 070c32e007
commit c83671f140
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QtPyLoT.py
View File

@ -1903,6 +1903,8 @@ class MainWindow(QMainWindow):
''' '''
self.init_canvas_dict() self.init_canvas_dict()
self.tap.fill_tabs(picked=True) self.tap.fill_tabs(picked=True)
for canvas in self.canvas_dict.values():
canvas.setZoomBorders2content()
def autoPick(self): def autoPick(self):
autosave = self.get_current_event_path() autosave = self.get_current_event_path()

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

@ -600,7 +600,9 @@ class PylotCanvas(FigureCanvas):
if not figure: if not figure:
figure = Figure() figure = Figure()
# create axes # create axes
self.axes = figure.add_subplot(111) self.ax = figure.add_subplot(111)
self.axes = figure.axes
self.figure = figure self.figure = figure
self.figure.set_facecolor((.92, .92, .92)) self.figure.set_facecolor((.92, .92, .92))
# attribute plotdict is a dictionary connecting position and a name # attribute plotdict is a dictionary connecting position and a name
@ -609,7 +611,7 @@ class PylotCanvas(FigureCanvas):
super(PylotCanvas, self).__init__(self.figure) super(PylotCanvas, self).__init__(self.figure)
if multicursor: if multicursor:
# add a cursor for station selection # add a cursor for station selection
self.multiCursor = MultiCursor(self.figure.canvas, (self.axes,), self.multiCursor = MultiCursor(self.figure.canvas, self.axes,
horizOn=True, useblit=True, horizOn=True, useblit=True,
color='m', lw=1) color='m', lw=1)
# update labels of the entire widget # update labels of the entire widget
@ -725,7 +727,7 @@ class PylotCanvas(FigureCanvas):
self.draw() self.draw()
def getAxes(self): def getAxes(self):
return self.axes return self.axes[0]
def getXLims(self): def getXLims(self):
return self.getAxes().get_xlim() return self.getAxes().get_xlim()
@ -803,6 +805,8 @@ class PylotCanvas(FigureCanvas):
self.draw() self.draw()
def setZoomBorders2content(self): def setZoomBorders2content(self):
if not self.axes:
return
xlims = self.getXLims() xlims = self.getXLims()
ylims = self.getYLims() ylims = self.getYLims()
@ -1894,7 +1898,7 @@ class PickDlg(QDialog):
self.drawPhaseText() self.drawPhaseText()
def panPress(self, gui_event): def panPress(self, gui_event):
ax = self.getPlotWidget().axes ax = self.getPlotWidget().axes[0]
if gui_event.inaxes != ax: return if gui_event.inaxes != ax: return
self.cur_xlim = ax.get_xlim() self.cur_xlim = ax.get_xlim()
self.cur_ylim = ax.get_ylim() self.cur_ylim = ax.get_ylim()
@ -1902,15 +1906,15 @@ class PickDlg(QDialog):
self.xpress, self.ypress = self.press self.xpress, self.ypress = self.press
def panRelease(self, gui_event): def panRelease(self, gui_event):
ax = self.getPlotWidget().axes figure = self.getPlotWidget().figure
self.press = None self.press = None
self.refreshPhaseText() self.refreshPhaseText()
self.refreshArrivalsText() self.refreshArrivalsText()
ax.figure.canvas.draw() figure.canvas.draw()
def panMotion(self, gui_event): def panMotion(self, gui_event):
if self.press is None: return if self.press is None: return
ax = self.getPlotWidget().axes ax = self.getPlotWidget().axes[0]
if gui_event.inaxes != ax: return if gui_event.inaxes != ax: return
dx = gui_event.xdata - self.xpress dx = gui_event.xdata - self.xpress
dy = gui_event.ydata - self.ypress dy = gui_event.ydata - self.ypress