diff --git a/src/gui/DamarisGUI.py b/src/gui/DamarisGUI.py index 209cb1d..c6677fc 100644 --- a/src/gui/DamarisGUI.py +++ b/src/gui/DamarisGUI.py @@ -248,7 +248,7 @@ class DamarisGUI: self.main_window.present( ) def glade_layout_init( self ): - glade_file = os.path.join( os.path.dirname( __file__ ), "damaris.xml" ) + glade_file = os.path.join( os.path.dirname( __file__ ), "damaris3.glade" ) self.xml_gui = gtk.Builder() self.xml_gui.add_from_file(glade_file) self.main_window = self.xml_gui.get_object( "main_window" ) @@ -1983,7 +1983,7 @@ pygobject version %(pygobject)s # find compression extensions for combo box and write version numbers # list is taken from ValueError output of tables.which_lib_version("") model = self.config_data_pool_complib.get_model( ) - for libname in ('hdf5', 'zlib', 'lzo', 'blosc'): + for libname in ('hdf5', 'zlib', 'lzo', 'blosc', 'bzip2', 'szip'): version_info = None try: version_info = tables.which_lib_version( libname ) diff --git a/src/gui/damaris3.glade b/src/gui/damaris3.glade index 3582136..05907bd 100644 --- a/src/gui/damaris3.glade +++ b/src/gui/damaris3.glade @@ -1,48 +1,50 @@ - + + + + - 1 1 1 - 1 - 10 - 0 + 1 + 1 + 10 - 1 1 1 - 1 - 10 - 0 + 1 + 1 + 10 - 1 1 1 - 1 - 10 - 0 + 1 + 1 + 10 - 1 1 1 - 1 - 10 - 0 + 1 + 1 + 10 - 0 - 0 9 - 1 - 1 - 0 + 1 + 1 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + @@ -59,6 +61,7 @@ + @@ -78,6 +81,7 @@ + @@ -93,8 +97,8 @@ DArmstadt Magnetic Resonance Instrument Software, 2004-2012 Homepage https://element.fkp.physik.tu-darmstadt.de/damaris_cms/ -Python frontend written by Christopher Schmitt, Achim Gädke, Markus Rosenstihl and Christian Tacke -Backends written by Achim Gädke, Markus Rosenstihl, Christian Tacke, tested by Holger Stork +Python frontend written by Christopher Schmitt, Achim Gädke, Markus Rosenstihl and Christian Tacke +Backends written by Achim Gädke, Markus Rosenstihl, Christian Tacke, tested by Holger Stork The drivers included in the backend may use proprietary interfaces. The source code distribution may include commercial third party's code, which is specially marked and not covered by this license. @@ -440,268 +444,221 @@ library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - - - - - - Python DAMARIS - This program's documentation - python_damaris_doc_menu - - - - - - DAMARIS Homepage - DArmstadt MAgnetic Resonance Instrument Homepage - damaris_homepage_doc_menu - - - - - - Python - Python scripting Language - python_doc_menu - - - - - - numpy/scipy - Array and Numeric Processing Support - numpy_scipy_doc_menu - - - - - - pytables - Hierachical Data Format Support - pytables_doc_menu - - - - - - DAMARIS Backends - (developer's stuff) - backend_doc_menu - - - - - - DAMARIS Repository - (developers' stuff) - repository_doc_menu - - - - - - - - - - - - - - - - - - - True + False DAMARIS - GTK_WIN_POS_CENTER - 790 - - + center + 790 + + True - 3 + False + 3 True + False True + False Creates an empty script New - True - gtk-new - + True + document-new + + False True True + False Opens a script Open - True - gtk-open - + True + document-open + + False True True + False Saves a script Save - True - gtk-save - + True + document-save + + False True True + False Saves a script in a new file Save AS - True - gtk-save-as - + True + document-save-as + + False True True + False Saves all scripts Save All - True - gtk-copy - + True + edit-copy + + False True True + False Checks script's syntax Check Syntax - True - gtk-apply - + True + gtk-ok + + False True True + False + + False + False + True + False Undo - gtk-undo - + edit-undo + + False True True + False Redo - gtk-redo - + edit-redo + + False True True + False Search - gtk-find - - - - True - - - - - True - - - - - True - gtk-print - + edit-find + + False True True + False + + False + False + True + False Executes the scripts - True + True Execute - True - gtk-execute - + True + media-playback-start + + False True True + False True False - True - False - + True + False + False + True + False True - gtk-media-pause + False + gtk-media-pause 3 + + True + True + 0 + True + False Pause @@ -715,147 +672,167 @@ Public License instead of this License. + + False + False + True False + False Stops running experiment - True + True Stop - True - gtk-stop - + True + stop + + False True True + False + + False + False + True + False This progam's documentation + False Help - True - gtk-info - documentation_menu - + True + help-faq + + + False + False + - + True - True - + True + True - 2 - 5 + False + 2 + 5 True - 0 + False Column: + 0 - 3 - 4 - 1 - 2 - - + 3 + 4 + 1 + 2 + + True - 0 + False Line: + 0 - 1 - 2 - 1 - 2 - - + 1 + 2 + 1 + 2 + + True + False 0 - 1 - 2 - + 1 + 2 + True - True - GTK_SHADOW_IN + True + in True - True + True - 5 + 5 True - True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK adjustment1 - 1 + 1 True - + - 2 - 3 - 1 - 2 - - + 2 + 3 + 1 + 2 + + True - True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK adjustment2 - 1 - True + 1 + True True - + - 4 - 5 - 1 - 2 - - + 4 + 5 + 1 + 2 + + @@ -863,130 +840,152 @@ Public License instead of this License. True + False Experiment Script - False + False True - 2 - 5 + False + 2 + 5 True - 0 + False Column: + 0 - 3 - 4 - 1 - 2 - - + 3 + 4 + 1 + 2 + + True - 0 + False Line: + 0 - 1 - 2 - 1 - 2 - - + 1 + 2 + 1 + 2 + + True - True - GTK_SHADOW_IN + True + in True - True - + True + - 5 + 5 True + False 0 - 1 - 2 - + 1 + 2 + True - True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK adjustment3 - 1 + 1 True - + - 2 - 3 - 1 - 2 - - + 2 + 3 + 1 + 2 + + True - True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK adjustment4 - 1 + 1 True - + - 4 - 5 - 1 - 2 - - + 4 + 5 + 1 + 2 + + + + 1 + True + False Result Script 1 - False + False True - 3 - 6 + False + 3 + 6 + + + + + + + + + + + + @@ -1020,37 +1019,44 @@ Public License instead of this License. True - 1 - 0 + False + 1 + 0 True - 2 - 4 - 12 - 4 + False + 2 + 4 + 12 + 4 True - 2 - 4 + False + 2 + 4 True + False True + False Source False False + 0 - + True - True + False + True False @@ -1060,15 +1066,15 @@ Public License instead of this License. - + - + True - False - - model1 + False + False + @@ -1077,36 +1083,37 @@ Public License instead of this License. - 1 - 2 - 1 - 2 - - + 1 + 2 + 1 + 2 + + True - 0 + False y-Scaling + 0 - 2 - 3 - 1 - 2 - - - 3 + 2 + 3 + 1 + 2 + + + 3 - + True - False - - model2 + False + False + @@ -1115,84 +1122,89 @@ Public License instead of this License. - 1 - 2 - - + 1 + 2 + + True - 0 + False x-Scaling + 0 - 2 - 3 - - - 3 + 2 + 3 + + + 3 True - 0 + False in ... + 0 - 1 - 2 - + 1 + 2 + True + False 0 - 1 - 2 - - + 1 + 2 + + - True - True - Rescale graph if new ymax is larger than the old one or shrinked more than 20% Auto-Scaling - True - True - + True + True + False + Rescale graph if new ymax is larger than the old one or shrinked more than 20% + True + True + - 3 - 4 - 1 - 2 - - + 3 + 4 + 1 + 2 + + - True - True - Plot error-bars if result to plot uses statistic Show Statistics - True - True - + True + True + False + Plot error-bars if result to plot uses statistic + True + True + - 3 - 4 - - + 3 + 4 + + @@ -1202,54 +1214,98 @@ Public License instead of this License. True + False Settings: - True + True - 6 - 2 - 3 - fill - 2 - 2 + 6 + 2 + 3 + GTK_FILL + 2 + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True - True + True + False Save display data as text to file - + True + False 0 0 True + False 2 True + False gtk-floppy False False + 0 True + False 10 Save as text - True + True False + True 1 @@ -1259,48 +1315,67 @@ Public License instead of this License. - 5 - 6 - 1 - 2 - - GTK_FILL + 5 + 6 + 1 + 2 + + GTK_FILL + + + + + + + + + + + + True - True + True + False Copy display data as text to clipboard - + True + False 0 0 True + False 2 True + False gtk-copy False False + 0 True + False 10 Copy to Cipboard - True + True False + True 1 @@ -1310,139 +1385,170 @@ Public License instead of this License. - 4 - 5 - 1 - 2 - - GTK_FILL + 4 + 5 + 1 + 2 + + GTK_FILL + + + + + + + + + + + + + + 2 + True + False Display 2 - False + False True - 2 + False + 2 True - 3 + False + 3 True + False 0 - 2 - 3 - - 4 + 2 + 3 + + 4 True - 0 + False Lines in Buffer: 0 - GTK_JUSTIFY_RIGHT + right + 0 - - - 3 - 4 + + + 3 + 4 True - 0 + False File: Unnamed + 0 - 1 - 2 - - - 16 - 4 + 1 + 2 + + + 16 + 4 - 1 - 2 - + 1 + 2 + True - True - GTK_SHADOW_IN + True + in True - True + True False - GTK_WRAP_WORD - False - False + word + False + False + + 3 + True + False Log - True + True 3 - False + False True + False True + False True + False True + False Backend's Settings False False + 0 - True - True start backend - True + True + True + False + True True - True + True False @@ -1453,33 +1559,39 @@ Public License instead of this License. True + False True + False executable False False + 0 True - True + True backend + True + True 1 - True - True browse - True - + True + True + False + True + False @@ -1489,45 +1601,55 @@ Public License instead of this License. + True + True 2 True + False True + False spool directory False False + 0 True - True + True spool + True + True 1 + True + True 3 - True - True delete job data after execution - True + True + True + False + True True - True + True False @@ -1538,68 +1660,87 @@ Public License instead of this License. True + False True + False log file name False False + 0 True - True + True logdata + True + True 1 + True + True 5 True + False True + False maximum number of log files to keep False False + 0 True - True + True False - 4 - 3 + 4 + 3 10 False + True 1 + True + True 6 + + True + True + 0 + True + False False @@ -1610,24 +1751,28 @@ Public License instead of this License. True + False True + False Scripts' Settings False False + 0 - True - True start experiment script - True + True + True + False + True True - True + True False @@ -1637,12 +1782,13 @@ Public License instead of this License. - True - True start result script - True + True + True + False + True True - True + True False @@ -1652,12 +1798,13 @@ Public License instead of this License. - True - True delete result data after processing - True + True + True + False + True True - True + True False @@ -1667,6 +1814,8 @@ Public License instead of this License. + True + True 2 @@ -1674,11 +1823,13 @@ Public License instead of this License. False False + 0 True + False False @@ -1689,73 +1840,88 @@ Public License instead of this License. True + False True + False HDF5 Data Pool's Settings False False + 0 True + False True + False data pool file name False False + 0 True - True + True DAMARIS_data_pool.h5 + True + True 1 + True + True 1 True + False True + False data pool write interval False False + 0 True - True - 10 - 10 + True + 10 + 10 60 False + True 1 True + False min, compression @@ -1765,15 +1931,11 @@ Public License instead of this License. - - True - model3 - - - - 0 - - + + + True + model3 + False @@ -1784,6 +1946,7 @@ Public License instead of this License. True + False , ratio @@ -1795,9 +1958,9 @@ Public License instead of this License. True - True + True adjustment5 - 1 + 1 True @@ -1811,27 +1974,33 @@ Public License instead of this License. + True + True 2 False + True 2 True + False False + True 3 True + False False @@ -1842,34 +2011,43 @@ Public License instead of this License. True + False + False True + False Frontend's Settings False False + 0 True + False True + False Script Windows Font False False + 0 True - True - + True + False + Sans 12 + False @@ -1885,49 +2063,23 @@ Public License instead of this License. - - True - - - True - True - Printer Setup - True - - - - False - False - - - - - - - - 2 - + - - True - ToDo - - - False - False - 3 - + False + True 5 True + False + False False @@ -1938,74 +2090,89 @@ Public License instead of this License. True + False True + False info, authors and disclaimer False False + 0 True - True - GTK_POLICY_NEVER - GTK_SHADOW_IN + True + never + in True + False False - GTK_WRAP_WORD_CHAR - False + word-char + False textbuffer1 + True + True 1 + True + True 7 True + False True - True - True - + True + True + False + True + False 0 0 True + False 2 True + False gtk-floppy False False + 0 True + False save configuration - True + True False @@ -2021,38 +2188,45 @@ Public License instead of this License. False False + 0 True - True - True - + True + True + False + True + False 0 0 True + False 2 True + False gtk-refresh False False + 0 True + False reload configuration - True + True False @@ -2079,131 +2253,140 @@ Public License instead of this License. + + 4 + True + False Configuration 4 - False + False - 1 - 2 + 1 + 2 True - 8 + False + 8 True + False - 6 - 7 - - 5 + 6 + 7 + + 5 True + False - - 3 + + 3 True + False - 4 - 5 - - 5 + 4 + 5 + + 5 True + False - 2 - 3 - - 5 + 2 + 3 + + 5 True + False Backend: Idle. - 3 - 4 - - + 3 + 4 + + - 20 + 20 True + False Experiment Script: Idle. - 1 - 2 - - + 1 + 2 + + True + False Result Script: Idle. - 5 - 6 - - + 5 + 6 + + True - 0 + False + 0 - 7 - 8 - + 7 + 8 + - 2 - 3 - GTK_FILL - + 2 + 3 + GTK_FILL + - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -