Author: bugman
Date: Sun Oct 9 16:14:55 2011
New Revision: 14817
URL: http://svn.gna.org/viewcvs/relax?rev=14817&view=rev
Log:
Merged revisions
14390-14391,14396,14401,14404,14406,14409,14416,14418-14420,14422-14423,14425,14428-14429,14431,14433,14436-14442,14446-14447,14455-14456,14460-14464,14467-14468,14470-14472,14475,14477-14497,14499-14816
via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
................
r14390 | bugman | 2011-08-16 18:59:34 +0200 (Tue, 16 Aug 2011) | 3 lines
Removed the unused traceit() function.
................
r14391 | bugman | 2011-08-16 19:03:36 +0200 (Tue, 16 Aug 2011) | 3 lines
Errors in the multi-processor slaves are now sent to sys.stderr.
................
r14396 | bugman | 2011-08-17 16:32:45 +0200 (Wed, 17 Aug 2011) | 3 lines
Removed some used, commented out code.
................
r14401 | bugman | 2011-08-22 14:46:03 +0200 (Mon, 22 Aug 2011) | 16 lines
Merged r14393 in from the gui_testing branch as the change should have been
in the main line.
The command used was:
svn merge -r14393:14394
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/gui_testing .
.....
r14394 | bugman | 2011-08-16 21:13:44 +0200 (Tue, 16 Aug 2011) | 5 lines
Changed paths:
M /branches/gui_testing/relax.py
Fix for the GUI mode setting which was broken in r14393.
The multi-processor code merger caused this to be an issue, as the mode
is now a class variable.
.....
................
r14404 | bugman | 2011-08-22 14:56:32 +0200 (Mon, 22 Aug 2011) | 17 lines
Merged r14394 from the gui_testing branch as this should have occurred in
the main 1.3 line.
The command used was:
svn merge -r14394:14395
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/gui_testing .
.....
r14395 | bugman | 2011-08-17 09:02:54 +0200 (Wed, 17 Aug 2011) | 6 lines
Changed paths:
M /branches/gui_testing/gui/controller.py
Created Redirect_text.flush() for the relax controller for compatibility
with the multi-processor code.
The multi-processor code calls sys.stdout.flush() and sys.stderr.flush(),
so these need to be
mimicked in the Redirect_text pseudo file object class.
.....
................
r14406 | bugman | 2011-08-22 15:52:29 +0200 (Mon, 22 Aug 2011) | 3 lines
Updated the multi package __all__ list to include the multi_processor
module.
................
r14409 | bugman | 2011-08-22 17:37:30 +0200 (Mon, 22 Aug 2011) | 6 lines
Merged the CHANGES file for relax version 1.3.12 back into the main 1.3
line.
The command used was:
svn merge -r14407:14408 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/1.3.12
................
r14416 | bugman | 2011-08-23 20:12:08 +0200 (Tue, 23 Aug 2011) | 3 lines
Updated the release checklist with a few additional shell commands to
clarify.
................
r14418 | bugman | 2011-08-24 12:05:04 +0200 (Wed, 24 Aug 2011) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-13023" from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/gui_testing
................
r14419 | bugman | 2011-08-24 13:08:04 +0200 (Wed, 24 Aug 2011) | 5501 lines
Merged revisions
13025-13027,13030,13032-13044,13048-13060,13069-13081,13083-13088,13092-13099,13107-13108,13111,13123-13131,13134-13139,13142-13152,13154-13161,13166,13168,13170-13178,13181-13210,13212-13213,13216-13226,13228-13233,13236-13238,13240-13244,13247-13248,13250-13257,13260-13282,13285-13356,13361-13410,13412-13413,13419-13509,13514-13566,13568-13576,13579-13630,13634-13640,13643-13654,13657-13659,13662-13682,13684,13687-13688,13690-13705,13708-13741,13745-13747,13751-13779,13781,13783-13821,13823,13825,13827-13834,13838-13844,13859-13890,13892-13893,13895-13899,13901-13903,13908,13913-13918,13921-13923,13925,13928,13935-13943,13945,13948-13950,13952-13954,13966-13982,13986-14007,14015-14037,14040-14066,14074-14102,14104,14106,14112-14145,14148-14156,14159-14178,14182,14184,14187-14248,14251-14261,14264-14284,14286-14291,14294-14323,14326-14328,14332,14345-14346,14357-14360,14380-14384,14394-14395,14397-14400,14402
via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/gui_testing
........
r13025 | bugman | 2011-06-14 23:43:06 +0200 (Tue, 14 Jun 2011) | 5 lines
Deleted all of the hardcoded notebook GUI elements.
The GUI now launches with nothing inside.
........
r13026 | bugman | 2011-06-14 23:50:27 +0200 (Tue, 14 Jun 2011) | 3 lines
Added a new menu entry 'File->New analysis'.
........
r13027 | bugman | 2011-06-14 23:52:53 +0200 (Tue, 14 Jun 2011) | 5 lines
Renamed the file menu entries to 'File->Open relax state' and 'File->Save
relax state'.
The open entry has been grouped with the save entries as well.
........
r13030 | bugman | 2011-06-15 10:55:27 +0200 (Wed, 15 Jun 2011) | 3 lines
Created a start screen for the GUI rather than having a empty grey main
window on startup.
........
r13032 | bugman | 2011-06-15 10:58:05 +0200 (Wed, 15 Jun 2011) | 3 lines
Improvements to the 'new analysis' button.
........
r13033 | bugman | 2011-06-15 11:01:38 +0200 (Wed, 15 Jun 2011) | 3 lines
The new() method now deletes the contents of the main sizer.
........
r13034 | bugman | 2011-06-15 11:31:28 +0200 (Wed, 15 Jun 2011) | 3 lines
Removed the 'new analysis' button from the main GUI window - it was too
ugly!
........
r13035 | bugman | 2011-06-15 12:49:37 +0200 (Wed, 15 Jun 2011) | 7 lines
The 'File->New analysis' menu entry now creates a notebook and adds the
analysis tab.
This is currently hardcoded to a model-free analysis tab until a wizard
is made. The initial sizer
with the relax icon is replaced by a new one containing the notebook.
The new method add_analysis()
adds a tab of the appropriate analysis to the notebook.
........
r13036 | bugman | 2011-06-15 14:10:26 +0200 (Wed, 15 Jun 2011) | 5 lines
The NOE analysis is now initialised within its class (like the model-free
setup).
This now allows an NOE tab to be created on demand.
........
r13037 | bugman | 2011-06-15 14:15:38 +0200 (Wed, 15 Jun 2011) | 3 lines
The R1 and R2 tabs are now also self initialised.
........
r13038 | bugman | 2011-06-15 14:52:25 +0200 (Wed, 15 Jun 2011) | 5 lines
A question dialog now appears before loading a save state if the GUI is
not in the initial state.
This is just a warning that all data would be lost.
........
r13039 | bugman | 2011-06-15 15:31:41 +0200 (Wed, 15 Jun 2011) | 3 lines
Removed some useless code from add_analysis().
........
r13040 | bugman | 2011-06-15 15:34:34 +0200 (Wed, 15 Jun 2011) | 3 lines
The analysis tabs are now being reconstructed via add_analysis().
........
r13041 | bugman | 2011-06-15 15:39:37 +0200 (Wed, 15 Jun 2011) | 3 lines
Added a map to convert the analysis name in the savefile to that used by
add_analysis().
........
r13042 | bugman | 2011-06-15 15:45:27 +0200 (Wed, 15 Jun 2011) | 5 lines
Merged new() and add_analysis() into the new_analysis() method.
The new() method is now for launching a wizard for analysis type
selection.
........
r13043 | bugman | 2011-06-15 16:01:58 +0200 (Wed, 15 Jun 2011) | 3 lines
The synchronisation of analysis tabs and the relax data store now works.
........
r13044 | bugman | 2011-06-15 16:25:59 +0200 (Wed, 15 Jun 2011) | 3 lines
All analyses are now deleted prior to loading the save file.
........
r13048 | bugman | 2011-06-15 17:07:29 +0200 (Wed, 15 Jun 2011) | 5 lines
Added a new menu entry 'File->Close analysis' which will close the
currently selected analysis.
The notebook tab, analysis object, and data store object are all deleted.
........
r13049 | bugman | 2011-06-15 17:08:16 +0200 (Wed, 15 Jun 2011) | 3 lines
There is now a waiting cursor for when a state file is being loaded.
........
r13050 | bugman | 2011-06-15 17:56:39 +0200 (Wed, 15 Jun 2011) | 3 lines
Clean up of the init_data() method for the new GUI design.
........
r13051 | bugman | 2011-06-15 17:58:27 +0200 (Wed, 15 Jun 2011) | 3 lines
The state_save() method no longer needs to sync the individual analyses.
........
r13052 | bugman | 2011-06-15 18:19:55 +0200 (Wed, 15 Jun 2011) | 5 lines
The add() method of the GUI analysis part of the relax data store now
returns the index.
This is rather than the data container itself.
........
r13053 | bugman | 2011-06-15 18:30:16 +0200 (Wed, 15 Jun 2011) | 3 lines
Fix for the GUI Analysis.add() method for returning the index of the
container.
........
r13054 | bugman | 2011-06-15 18:33:00 +0200 (Wed, 15 Jun 2011) | 3 lines
Fix for the from_xml() method based on the change to add() in the GUI
analyses data object.
........
r13055 | bugman | 2011-06-15 18:40:14 +0200 (Wed, 15 Jun 2011) | 6 lines
The relax data store GUI analysis elements are now only initialised by
the analysis classes if asked.
By passing in an index for a currently existing analysis data structure,
a new structure will now
not be initialised by the analysis classes.
........
r13056 | bugman | 2011-06-15 18:51:09 +0200 (Wed, 15 Jun 2011) | 5 lines
Fix for the R1 and R2 analysis tab initialisation.
This bug was introduced in the last commit.
........
r13057 | bugman | 2011-06-15 19:01:49 +0200 (Wed, 15 Jun 2011) | 3 lines
The initial sizer with the relax icon is now properly deleted.
........
r13058 | bugman | 2011-06-15 19:04:28 +0200 (Wed, 15 Jun 2011) | 3 lines
If all analyses are deleted, then the initial GUI state is set and the
start screen remade.
........
r13059 | bugman | 2011-06-15 19:06:19 +0200 (Wed, 15 Jun 2011) | 5 lines
add_start_screen() now re-performs a main window layout.
This allows for a proper layout once all analysis tabs have been deleted.
........
r13060 | bugman | 2011-06-15 23:04:30 +0200 (Wed, 15 Jun 2011) | 5 lines
Better handling of the return to the initial GUI screen.
This was broken on MS Windows.
........
r13069 | bugman | 2011-06-16 14:11:28 +0200 (Thu, 16 Jun 2011) | 5 lines
Removed the completely unused gui/res directory.
This was ancient rudimentary code and images.
........
r13070 | bugman | 2011-06-16 15:02:17 +0200 (Thu, 16 Jun 2011) | 6 lines
Shifted gui.user_functions.base.UF_window into gui.wizard.Wiz_window.
This is to allow the code to create Wizard-like windows, to be strung
together to form wizards
later on.
........
r13071 | bugman | 2011-06-16 16:19:59 +0200 (Thu, 16 Jun 2011) | 3 lines
Added a directory for graphics related to analyses.
........
r13072 | bugman | 2011-06-16 17:01:30 +0200 (Thu, 16 Jun 2011) | 5 lines
Removed all remnants of user functions from the Wiz_window class.
This includes renaming the add_uf() method to add_contents().
........
r13073 | bugman | 2011-06-16 17:12:28 +0200 (Thu, 16 Jun 2011) | 3 lines
Added the gui package path to all the GUI imports in relax_gui.
........
r13074 | bugman | 2011-06-16 17:22:23 +0200 (Thu, 16 Jun 2011) | 6 lines
Added the infrastructure for the operation of the 'File->New analysis'
menu entry.
The skeleton gui.analyses.wizard.Analysis_wizard class has been created
to have the run() method
which returns the analysis type and the data pipe name to the relax_gui
new() method.
........
r13075 | bugman | 2011-06-16 18:40:27 +0200 (Thu, 16 Jun 2011) | 5 lines
Split Wiz_window into two classes, Wiz_window (dialog) and Wiz_panel
(panel).
This will allow a series of panels to be created and strung together in
one dialog, i.e. a wizard.
........
r13076 | bugman | 2011-06-16 19:09:23 +0200 (Thu, 16 Jun 2011) | 5 lines
Some playing around with the analysis wizard.
This is going to take some work!
........
r13077 | bugman | 2011-06-16 19:20:40 +0200 (Thu, 16 Jun 2011) | 5 lines
Temporarily turned off all user functions, save value.set().
This will be used to redesign all of the wizard and user function dialogs
and panels.
........
r13078 | bugman | 2011-06-17 10:11:50 +0200 (Fri, 17 Jun 2011) | 5 lines
Created the add_page() and run() methods for the Wiz_window class.
These are currently non-functional.
........
r13079 | bugman | 2011-06-17 10:14:24 +0200 (Fri, 17 Jun 2011) | 3 lines
Created the Wiz_window.display_page() method for displaying the given
page.
........
r13080 | bugman | 2011-06-17 10:36:04 +0200 (Fri, 17 Jun 2011) | 3 lines
Created the UF_panel class derived from Wiz_panel for the user function
specific wizard panels.
........
r13081 | bugman | 2011-06-17 10:37:07 +0200 (Fri, 17 Jun 2011) | 3 lines
The wizard size and title are now class arguments rather than hardcoded
variables.
........
r13083 | bugman | 2011-06-17 10:49:12 +0200 (Fri, 17 Jun 2011) | 3 lines
The dialog ShowModal() and Destroy() methods are now executed by the
wizard run() method.
........
r13084 | bugman | 2011-06-17 10:49:39 +0200 (Fri, 17 Jun 2011) | 3 lines
The value.set() GUI user function now uses the new wizard.
........
r13085 | bugman | 2011-06-17 10:53:55 +0200 (Fri, 17 Jun 2011) | 5 lines
The GUI and interpreter objects are no longer passed into Wiz_panel.
This is only for the user function specific classes, and is performed in
UF_panel instead.
........
r13086 | bugman | 2011-06-17 10:55:18 +0200 (Fri, 17 Jun 2011) | 3 lines
Missing import and fixed the initialisation of Wiz_panel.
........
r13087 | bugman | 2011-06-17 11:08:51 +0200 (Fri, 17 Jun 2011) | 3 lines
Missing import.
........
r13088 | bugman | 2011-06-17 11:09:12 +0200 (Fri, 17 Jun 2011) | 3 lines
Fix for a variable name.
........
r13092 | bugman | 2011-06-17 12:14:13 +0200 (Fri, 17 Jun 2011) | 3 lines
Shifted the border from the panel into the wizard dialog.
........
r13093 | bugman | 2011-06-17 12:21:30 +0200 (Fri, 17 Jun 2011) | 3 lines
The wizard arguments are now stored as class variables.
........
r13094 | bugman | 2011-06-17 12:46:30 +0200 (Fri, 17 Jun 2011) | 3 lines
The page is now the full size of the wizard dialog.
........
r13095 | bugman | 2011-06-17 12:52:32 +0200 (Fri, 17 Jun 2011) | 3 lines
The Wiz_window.add_page() method now constructs the basic wizard layout.
........
r13096 | bugman | 2011-06-17 12:54:15 +0200 (Fri, 17 Jun 2011) | 5 lines
The Wiz_panel class now expects a parent GUI element to be set.
This is needed to prevent segfaults.
........
r13097 | bugman | 2011-06-17 12:57:34 +0200 (Fri, 17 Jun 2011) | 3 lines
The parent GUI object is now propagated through the value.set() user
function and UF_panel.
........
r13098 | bugman | 2011-06-17 13:02:42 +0200 (Fri, 17 Jun 2011) | 3 lines
Fixes for the initialisation of the UF_panel class.
........
r13099 | semor | 2011-06-17 13:03:17 +0200 (Fri, 17 Jun 2011) | 12 lines
Added SVG and PNG files for the consistency testing icon.
This follows a thread started at:
https://mail.gna.org/public/relax-devel/2011-06/msg00137.html
Message-id: <BANLkTi=981VwxU9PwHG6+yt0G+de-dLmMw@xxxxxxxxxxxxxx>
As discussed in this thread, a SVG file is attached, along with 2 PNG
files,
one of 200 pixels width, and one of 100 pixels width, the height being
scaled
to the image dimension (i.e. 200x94, and 100x47).
........
r13107 | bugman | 2011-06-17 15:44:38 +0200 (Fri, 17 Jun 2011) | 3 lines
A number of fixes for the wizard.
........
r13108 | bugman | 2011-06-17 15:51:27 +0200 (Fri, 17 Jun 2011) | 3 lines
Shifted the add_buttons() method from the panel to the wizard.
........
r13111 | bugman | 2011-06-17 17:03:40 +0200 (Fri, 17 Jun 2011) | 3 lines
The panels inside the wizard can now expand to the full size.
........
r13123 | bugman | 2011-06-20 18:18:58 +0200 (Mon, 20 Jun 2011) | 6 lines
The buttons are now added to the wizards.
The add_button() method has been converted to build_buttons() and is
executed at the start of the
run() wizard method.
........
r13124 | bugman | 2011-06-20 18:25:40 +0200 (Mon, 20 Jun 2011) | 3 lines
Added 22x22 Oxygen icons for the back and next wizard buttons.
........
r13125 | bugman | 2011-06-20 18:26:06 +0200 (Mon, 20 Jun 2011) | 3 lines
Added the next navigation icons to the paths module.
........
r13126 | bugman | 2011-06-20 18:32:09 +0200 (Mon, 20 Jun 2011) | 6 lines
The back and next buttons are now partially functional.
The icons are displayed and the go_back() and go_next() methods are
executed. But there are still
bugs and the page layout is incorrect.
........
r13127 | bugman | 2011-06-20 18:33:22 +0200 (Mon, 20 Jun 2011) | 3 lines
Too many empty lines.
........
r13128 | bugman | 2011-06-20 18:38:07 +0200 (Mon, 20 Jun 2011) | 5 lines
The cancel button now destroys the wizard dialog and is not a panel
method any more.
There is still a bug causing segfaults when the dialog is destroyed!
........
r13129 | bugman | 2011-06-20 18:53:49 +0200 (Mon, 20 Jun 2011) | 5 lines
Fixes for how wizard pages are displayed sequentially.
This is now functional.
........
r13130 | bugman | 2011-06-20 18:59:48 +0200 (Mon, 20 Jun 2011) | 3 lines
Consistent sizing and better spacing of the wizard buttons.
........
r13131 | bugman | 2011-06-20 19:02:21 +0200 (Mon, 20 Jun 2011) | 3 lines
Removed the 5 pt spacer after the next button in the wizard as the 15 pt
spacer comes straight after.
........
r13134 | bugman | 2011-06-20 19:10:46 +0200 (Mon, 20 Jun 2011) | 3 lines
The ok() method executed by the ok wizard button is now a wizard method
which destroys the window.
........
r13135 | bugman | 2011-06-20 19:49:46 +0200 (Mon, 20 Jun 2011) | 3 lines
Fix for the Value_panel class docstring.
........
r13136 | bugman | 2011-06-20 19:50:08 +0200 (Mon, 20 Jun 2011) | 3 lines
The pipe user function GUI elements now use the wizard design.
........
r13137 | bugman | 2011-06-20 19:51:28 +0200 (Mon, 20 Jun 2011) | 17 lines
Reverted the temporary r13077.
The command used was:
svn merge -r13077:13076 .
.....
r13077 | bugman | 2011-06-16 19:20:40 +0200 (Thu, 16 Jun 2011) | 5 lines
Changed paths:
M /branches/gui_testing/gui/menu.py
M /branches/gui_testing/gui/user_functions/__init__.py
Temporarily turned off all user functions, save value.set().
This will be used to redesign all of the wizard and user function
dialogs and panels.
.....
........
r13138 | bugman | 2011-06-20 20:14:53 +0200 (Mon, 20 Jun 2011) | 3 lines
Updated all the user function GUI elements to use the new wizard design.
........
r13139 | bugman | 2011-06-20 20:22:02 +0200 (Mon, 20 Jun 2011) | 5 lines
Fix for clicking on the wizard 'ok' and 'finish' buttons.
A click will now go through and execute the apply() method of all pages
of the wizard.
........
r13142 | bugman | 2011-06-20 21:57:43 +0200 (Mon, 20 Jun 2011) | 6 lines
The wizard panel execute() base class method no longer raises a
RelaxError.
[... 8265 lines stripped ...]
r14817 - in /branches/cst: ./ auto_analyses/ data/ docs/ docs/latex/ generic_fns/ generic_fns/structure/ graphics/ graphics/...