IPKM/python3-damaris
Public Access
3
0
Fork 0
Code Issues 7 Pull Requests Actions Releases Activity

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)
Build Debian Packages / build (bookworm, debian12) (push) Successful in 13m41s
Details
Build Debian Packages / build (trixie, debian13) (push) Successful in 13m39s
Details
Build Debian Packages / build (bullseye, debian11) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Markus Rosenstihl
2026-07-04 14:43:52 +02:00
parent 357a1bd694
commit cf71907cfa
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/damaris/gui/DamarisGUI.py
+6 -5
View File
@@ -2278,8 +2278,9 @@ class MonitorWidgets:
# add figure to canvas # add figure to canvas
self.matplot_canvas = FigureCanvas( self.matplot_figure ) self.matplot_canvas = FigureCanvas( self.matplot_figure )
# add right-click context menu to canvas # add right-click context menu to canva
self.matplot_canvas.connect("button-press-event", self.on_canvas_button_press) # 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 = 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 ) 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 ): if isinstance( in_result, Accumulation ) or isinstance( in_result, ADC_Result ):
xmin = in_result.get_xmin( ) xmin = in_result.get_xmin( )
xminpos = in_result.get_xminpos( )
xmax = in_result.get_xmax( ) xmax = in_result.get_xmax( )
ymin = in_result.get_ymin( ) ymin = in_result.get_ymin( )
yminpos = in_result.get_yminpos()
ymax = in_result.get_ymax( ) ymax = in_result.get_ymax( )
# Initial rescaling needed? # Initial rescaling needed?
@@ -2943,6 +2942,7 @@ class MonitorWidgets:
self.matplot_axes.set_xscale( "linear" ) self.matplot_axes.set_xscale( "linear" )
self.matplot_axes.set_xlim(xmin, xmax) self.matplot_axes.set_xlim(xmin, xmax)
elif x_scale == "log10": elif x_scale == "log10":
xminpos = in_result.get_xminpos( )
self.matplot_axes.set_xscale("log", base=10, nonpositive="mask") self.matplot_axes.set_xscale("log", base=10, nonpositive="mask")
self.matplot_axes.set_xlim(xminpos, xmax) self.matplot_axes.set_xlim(xminpos, xmax)
elif x_scale == "ppm": elif x_scale == "ppm":
@@ -2956,6 +2956,7 @@ class MonitorWidgets:
self.matplot_axes.set_yscale( "linear" ) self.matplot_axes.set_yscale( "linear" )
self.matplot_axes.set_ylim(ymin, ymax) self.matplot_axes.set_ylim(ymin, ymax)
elif y_scale == "log10": elif y_scale == "log10":
yminpos = in_result.get_yminpos()
self.matplot_axes.set_yscale("log", base=10, nonpositive="mask") self.matplot_axes.set_yscale("log", base=10, nonpositive="mask")
self.matplot_axes.set_ylim( yminpos, ymax ) self.matplot_axes.set_ylim( yminpos, ymax )
self.__rescale = False self.__rescale = False
@@ -3070,7 +3071,7 @@ class MonitorWidgets:
self.matplot_axes.set_ylabel( "" ) self.matplot_axes.set_ylabel( "" )
# Any variables to be drawn on plot # Any variables to be drawn on plot
if True: if False:
descriptions = None descriptions = None
if isinstance(in_result, Accumulation): if isinstance(in_result, Accumulation):
descriptions = in_result.common_descriptions descriptions = in_result.common_descriptions