diff options
| author | Tom Rondeau <tom@trondeau.com> | 2016-03-09 17:23:43 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2016-03-09 17:23:43 -0500 |
| commit | 95c2afab85b75df1b07a66187d7cf0b81c7d8e18 (patch) | |
| tree | 090bdf2ec2d2d66df63d8df462463df3951af5ad /gnuradio-runtime/python | |
| parent | 6ee44604465f8c0c405be58c04346d38e60ce093 (diff) | |
ctrlport: gr-perf-monitorx - don't stash the canvas, ask the figure.
Diffstat (limited to 'gnuradio-runtime/python')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx index 4fd09dcc22..d22e6e1ebc 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx +++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx @@ -326,13 +326,12 @@ class DataTable(QtGui.QWidget): self.sp = self.f.add_subplot(111) self.sp.autoscale_view(True,True,True) self.sp.set_autoscale_on(True) - self.canvas = FigureCanvas(self.f) # set up tabs self.tabber = QtGui.QTabWidget(); self.layout.addWidget(self.tabber); self.tabber.addTab(self.perfTable,"Table View"); - self.tabber.addTab(self.canvas, "Graph View"); + self.tabber.addTab(self.f.canvas, "Graph View"); # set up timer self.timer = QtCore.QTimer() @@ -418,7 +417,7 @@ class DataTableBuffers(DataTable): for r,w in zip(self.disp, sorted_fullness): r.set_height(w[1]) - self.canvas.draw() + self.f.canvas.draw() class DataTableRuntimes(DataTable): def __init__(self, radioclient, G): @@ -439,7 +438,7 @@ class DataTableRuntimes(DataTable): total_work = 1 work_times = dict(zip( map(lambda x: x.split("::")[0], wrk_knobs.keys()), - map(lambda x: x.value/total_work, wrk_knobs.values()))) + map(lambda x: 1e-10 + x.value/total_work, wrk_knobs.values()))) # update table view if(self.perfTable.isVisible()): @@ -457,7 +456,6 @@ class DataTableRuntimes(DataTable): else: sorted_work = work_times.items() - f = plt.figure(self.f.number) if(not self.disp): self.disp = self.sp.bar(range(0,len(sorted_work)), map(lambda x: x[1], sorted_work), @@ -472,7 +470,7 @@ class DataTableRuntimes(DataTable): for r,w in zip(self.disp, sorted_work): r.set_height(w[1]) - self.canvas.draw() + self.f.canvas.draw() class MForm(QtGui.QWidget): def update(self): @@ -791,8 +789,7 @@ class MForm(QtGui.QWidget): self.sp.autoscale_view(True,True,True); self.sp.set_autoscale_on(True) - self.canvas = FigureCanvas(self.f) - self.layout.addWidget(self.canvas); + self.layout.addWidget(self.f.canvas); self.pos = graphviz_layout(self.G); #self.pos = pygraphviz_layout(self.G); @@ -856,7 +853,7 @@ class MForm(QtGui.QWidget): def drawGraph(self): self.do_update = True - self.canvas.updateGeometry() + self.f.canvas.updateGeometry() self.sp.clear() plt.figure(self.f.number) plt.subplot(111) @@ -873,8 +870,7 @@ class MForm(QtGui.QWidget): nx.draw_networkx_labels(self.G, self.pos, font_size=12) - self.canvas.draw() - self.canvas.show() + self.f.canvas.show() def updateGraph(self): @@ -896,7 +892,7 @@ class MForm(QtGui.QWidget): nx.draw_networkx_labels(self.G, self.pos, ax=self.sp, font_size=12) - self.canvas.draw() + self.f.canvas.draw() class MyApp(object): |