diff --git a/scripts/DAMARIS3 b/scripts/DAMARIS3 index c3397da..a5a7cd8 100755 --- a/scripts/DAMARIS3 +++ b/scripts/DAMARIS3 @@ -53,7 +53,6 @@ if args.debug: resource.setrlimit(resource.RLIMIT_CORE, (-1, -1)) except ImportError: pass - matplotlib.rcParams["verbose.level"] = "debug" print(args) d = damaris.gui.DamarisGUI.DamarisGUI(args.exp_script, args.res_script, start_immediately=args.run) d.run() diff --git a/src/gui/DamarisGUI.py b/src/gui/DamarisGUI.py index 3854b6b..de6bad7 100644 --- a/src/gui/DamarisGUI.py +++ b/src/gui/DamarisGUI.py @@ -50,8 +50,7 @@ import numpy # math graphics import matplotlib -# force noninteractive and use of numpy -# matplotlib.rcParams["numerix"]="numpy" +# force noninteractive matplotlib.rcParams[ "interactive" ] = "False" matplotlib.rcParams[ "text.usetex" ] = "False" matplotlib.rcParams[ "axes.formatter.limits" ] = "-3,3" @@ -193,7 +192,7 @@ class DamarisGUI: # lock file to prevent other DAMARIS to start immediatly self.lockfile = LockFile() # = os.path.expanduser("~/.damaris.lock") self.id = None - + #to stop queued experiments self.stop_experiment_flag = threading.Event() @@ -2475,9 +2474,8 @@ class MonitorWidgets: 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.matplot_canvas.show( ) - # Matplot Toolbar hinzufuegen (Display_Table, 2. Zeile) - self.matplot_toolbar = matplotlib.backends.backend_gtk3.NavigationToolbar2GTK3( self.matplot_canvas, - self.main_window ) + # Matplot Toolbar hinzufuegen (Display_Table, 2. Zeile) + self.matplot_toolbar = matplotlib.backends.backend_gtk3.NavigationToolbar2GTK3( self.matplot_canvas ) self.display_table.attach( self.matplot_toolbar, 0, 1, 1, 2, gtk.AttachOptions.FILL | gtk.AttachOptions.EXPAND, 0, 0, 0 ) self.matplot_toolbar.show( ) @@ -2969,8 +2967,9 @@ class MonitorWidgets: if not hasattr( self, "graphen" ): self.graphen = [ ] elif self.graphen: - for l in self.graphen: - self.matplot_axes.lines.remove( l ) + for line in self.graphen: + #self.matplot_axes.lines.remove( line ) + line.remove() self.graphen = [ ] self.matplot_axes.clear( ) self.matplot_axes.grid( True ) diff --git a/tests/exp_test.py b/tests/exp_test.py index df72a6e..43e00b2 100644 --- a/tests/exp_test.py +++ b/tests/exp_test.py @@ -7,5 +7,5 @@ def test(): return e def experiment(): - for i in range(100): + for i in range(10): yield test() \ No newline at end of file