disable description table on plot canvas (fixes #24), move xminpos, yminpos to the log scale sections (fixes #21), disable right click menu (partial fix for #23)
This commit is contained in:
@@ -2278,8 +2278,9 @@ class MonitorWidgets:
|
||||
# add figure to canvas
|
||||
self.matplot_canvas = FigureCanvas( self.matplot_figure )
|
||||
|
||||
# add right-click context menu to canvas
|
||||
self.matplot_canvas.connect("button-press-event", self.on_canvas_button_press)
|
||||
# add right-click context menu to canva
|
||||
# disable right lcikc for now
|
||||
#self.matplot_canvas.connect("button-press-event", self.on_canvas_button_press)
|
||||
|
||||
self.display_table = self.xml_gui.get_object( "display_table" )
|
||||
self.display_table.attach( self.matplot_canvas, 0, 6, 0, 1, gtk.AttachOptions.EXPAND | gtk.AttachOptions.FILL, gtk.AttachOptions.EXPAND | gtk.AttachOptions.FILL, 0, 0 )
|
||||
@@ -2927,11 +2928,9 @@ class MonitorWidgets:
|
||||
if isinstance( in_result, Accumulation ) or isinstance( in_result, ADC_Result ):
|
||||
|
||||
xmin = in_result.get_xmin( )
|
||||
xminpos = in_result.get_xminpos( )
|
||||
xmax = in_result.get_xmax( )
|
||||
|
||||
ymin = in_result.get_ymin( )
|
||||
yminpos = in_result.get_yminpos()
|
||||
ymax = in_result.get_ymax( )
|
||||
|
||||
# Initial rescaling needed?
|
||||
@@ -2943,6 +2942,7 @@ class MonitorWidgets:
|
||||
self.matplot_axes.set_xscale( "linear" )
|
||||
self.matplot_axes.set_xlim(xmin, xmax)
|
||||
elif x_scale == "log10":
|
||||
xminpos = in_result.get_xminpos( )
|
||||
self.matplot_axes.set_xscale("log", base=10, nonpositive="mask")
|
||||
self.matplot_axes.set_xlim(xminpos, xmax)
|
||||
elif x_scale == "ppm":
|
||||
@@ -2956,6 +2956,7 @@ class MonitorWidgets:
|
||||
self.matplot_axes.set_yscale( "linear" )
|
||||
self.matplot_axes.set_ylim(ymin, ymax)
|
||||
elif y_scale == "log10":
|
||||
yminpos = in_result.get_yminpos()
|
||||
self.matplot_axes.set_yscale("log", base=10, nonpositive="mask")
|
||||
self.matplot_axes.set_ylim( yminpos, ymax )
|
||||
self.__rescale = False
|
||||
@@ -3070,7 +3071,7 @@ class MonitorWidgets:
|
||||
self.matplot_axes.set_ylabel( "" )
|
||||
|
||||
# Any variables to be drawn on plot
|
||||
if True:
|
||||
if False:
|
||||
descriptions = None
|
||||
if isinstance(in_result, Accumulation):
|
||||
descriptions = in_result.common_descriptions
|
||||
|
||||
Reference in New Issue
Block a user