relax SVN archive

Properly removed the conflict of r14287.

Reverted r14027 and r14033 as the results viewer will soon be launched via an observer notification.

The command used was:
svn merge -r14033:r14026 gui/analyses/execute.py

.....
r14033 | bugman | 2011-08-01 15:26:35 +0200 (Mon, 01 Aug 2011) | 3 lines
Changed paths:
M /branches/gui_testing/gui/analyses/execute.py

The opening of the results viewer window after an analysis is now thread safe!

.....
r14027 | bugman | 2011-08-01 11:12:04 +0200 (Mon, 01 Aug 2011) | 3 lines
Changed paths:
M /branches/gui_testing/gui/analyses/execute.py

The results display window is now shown at the end of the auto-analysis execution.

.....

PyMOL is now always launched as an external program.

The pymol module method was causing huge problems for the GUI.

The pymol.tensor_pdb() user function now shows the diffusion tensor using PyMOL sticks.

Diffusion tensor PDB files are now opened in PyMOL from the results viewer window.

The cdp.result_file structure has been modified to include a type, a label, and the file path.

This is for the results viewer window to use, and allows the label to change to anything while the
code still operates normally.

Fixes for the file paths to the tensor PDB geometric objects in cdp.result_files.

The results viewer window now presents the results files in a wx.TextCtrl.

The geometric shape PDB files are now being added to the cdp.results_files list.

Removed all references to 'analysis' in the results viewer window.