Author: bugman
Date: Thu Jul 24 17:08:01 2014
New Revision: 24719
URL: http://svn.gna.org/viewcvs/relax?rev=24719&view=rev
Log:
Merged revisions 24714,24718 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r24714 | bugman | 2014-07-24 16:36:49 +0200 (Thu, 24 Jul 2014) | 8 lines
Added a 128x128 pixel version of the zoom-in Oxygen icon.
This icon size is not available in the repository located at
svn://anonsvn.kde.org/home/kde/trunk/kdesupport/oxygen-icons. Therefore the
scalable/actions/small/48x48/zoom-in.svgz file was copied and then exported
into a 128x128 PNG, and
finally converted to a Gzipped EPS file for the relax manual.
........
r24718 | bugman | 2014-07-24 17:07:06 +0200 (Thu, 24 Jul 2014) | 6 lines
The minimise.grid_search user function incs argument can no longer be a
list with None elements.
This essentially reverts r11498. The new skip_preset argument together
with a grid increment value
of 1 has the same effect of skipping the parameter in the grid search.
........
Added:
branches/frame_order_cleanup/graphics/oxygen_icons/128x128/actions/zoom-in.eps.gz
- copied unchanged from r24718,
trunk/graphics/oxygen_icons/128x128/actions/zoom-in.eps.gz
branches/frame_order_cleanup/graphics/oxygen_icons/128x128/actions/zoom-in.png
- copied unchanged from r24718,
trunk/graphics/oxygen_icons/128x128/actions/zoom-in.png
branches/frame_order_cleanup/graphics/oxygen_icons/scalable/actions/small/48x48/zoom-in.svgz
- copied unchanged from r24718,
trunk/graphics/oxygen_icons/scalable/actions/small/48x48/zoom-in.svgz
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/user_functions/minimisation.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 24 17:08:01 2014
@@ -1 +1 @@
-/trunk:1-24707
+/trunk:1-24718
Modified: branches/frame_order_cleanup/user_functions/minimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/minimisation.py?rev=24719&r1=24718&r2=24719&view=diff
==============================================================================
--- branches/frame_order_cleanup/user_functions/minimisation.py (original)
+++ branches/frame_order_cleanup/user_functions/minimisation.py Thu Jul 24
17:08:01 2014
@@ -345,7 +345,7 @@
py_type = "int_or_int_list",
desc_short = "incrementation value",
desc = "The number of increments to search over. If a single integer is
given then the number of increments will be equal in all dimensions.
Different numbers of increments in each direction can be set if 'inc' is set
to an array of integers of length equal to the number of parameters.",
- none_elements = True
+ none_elements = False
)
uf.add_keyarg(
name = "verbosity",
r24719 - in /branches/frame_order_cleanup: ./ graphics/oxygen_icons/128x128/actions/ graphics/oxygen_icons/scalable/actions/...