[LIBISIS-code-svn] r963 - in trunk/bindings/matlab/graphics/GTK_Application: lowlevelfunctions/general lowlevelfunctions/get_property lowlevelfunctions/plotfig lowlevelfunctions/set_property stduserfunctions/@ixtdataset_1d stduserfunctions/set stduserfunctions/set/namevalue userfunctions

apache at libisis.org apache at libisis.org
Wed Jan 3 09:41:30 GMT 2007 

Author: Dean Whittaker
Date: Wed Jan  3 09:41:25 2007
New Revision: 963

Added:
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_gallnt.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_get_nametag.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_parse_properties.m
Removed:
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_getfile.m
Modified:
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/general/ixf_checkinit.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/general/ixf_globaldefault.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/general/ixf_validate_params.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_check_figureapptag.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_checkforfigure.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_get_arrayvalue.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_get_countdata.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/plotfig/ixf_multiplot.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/plotfig/ixf_plotfigure.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/set_property/ixf_set_arrayprop.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/set_property/ixf_set_defaultprop.m
   trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/set_property/ixf_set_prop.m
   trunk/bindings/matlab/graphics/GTK_Application/stduserfunctions/@ixtdataset_1d/uib_plotgeneral.m
   trunk/bindings/matlab/graphics/GTK_Application/stduserfunctions/set/namevalue/uinv_setdefaultprop.m
   trunk/bindings/matlab/graphics/GTK_Application/stduserfunctions/set/ui_resetall.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/acolor.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/aline.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/amark.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dh.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dl.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dm.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dp.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/pe.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/ph.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/pl.m
   trunk/bindings/matlab/graphics/GTK_Application/userfunctions/pm.m

Log:
fixes #37 and closes #30 - The way in which defaults are set has now been (almost) completely changed. acolor, amark and aline have been adapted so that they now perform much of the work themselves (since the lower level uinv_setdefaultprop.m should retain it's functionality for the more general case in which you want to set any property.

The lower level functions uinv_setdefaultprop.m and ixf_set_defaultprop.m have been changed to accept name tags - i.e. you must provide the name tags of the graphs for which you want to alter. This allows for better control of default values. 

The functions ixf_gallnt.m and ixf_get_nametag.m were added - the first will get all names and tags of all currently open graphs - this is required when acolor is applied to all graphs (i.e. all nametags). The second removes any formatting that we put into the name and returns the true name and tag values - i.e. given a figure handle it will  remove labels like '(HOLD)' in each individual function (and indeed we can add different labels later without too much alteration). 

ixf_globaldefault has been changed so that a list of default counter values is given - i.e. instead of a simple true or false statement, ixf_get_countdata.m now accepts IXG_ST_STDVALUES.counter_increment (or other such inputs) to determine how (or whether) it should do the counting. 

There is also the "reset" option which will reset the count to 1 - this is the default setting, while all over plots need to give the specific argument 'counter',IXG_ST_STDVALUES.counter_increment, in order to inrement the counter. ixf_multiplot.m and ixf_plotfigure.m have been changed so that they now have separate counters for markers, lines and color. These counters are only incremented if a color/marker/line is used (i.e. marker is only incremented if the marker value is not 'none'). ixf_get_countdata.m was changed so that it now accepts a "type" option. This can be any string and will be appended to the userdata.counter as a field and stored in the figure's userdata. This allows for quick expansion if counters for more properties are needed. ixf_parse_properties.m was added so that amark and aline can tell the difference between valid properties and numbers - which is then  used along with the ixf_checkforfigure.m function (which tells acolor etc. if the first two arguments are a valid name and tag or not) to determine which path the user has chosen to take (see below). This means that users can enter a name and tag as the first two arguments which can be used to identify a specific graph 'type' and then apply the following attributes to that graph type, or can merely enter attributes to be applied to all graphs. If there is any ambiguity, the user is asked which path to take. 

ixf_set_arrayprop.m, ixf_set_defaultprop.m and ixf_set_prop.m all had a similar minor bug which was spotted - to do with the way in which they check that the arguments are valid. 

All plot functions had to be changed to give the correct counter settings (though dh, dl, dm, de, dp, dd were not changed in the end) 

ui_resetall.m had a small bug

uib_plotgeneral.m was altered to fit in with the new regime, very small alterations were needed. 

Also note, ixf_getfile has been deleted - this is an old and out of date function (unrelated to the fixes) which should no longer be in gtk 



Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/general/ixf_checkinit.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/general/ixf_checkinit.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/general/ixf_globaldefault.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/general/ixf_globaldefault.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/general/ixf_validate_params.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/general/ixf_validate_params.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_check_figureapptag.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_check_figureapptag.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_checkforfigure.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_checkforfigure.m?r1=962&r2=963

Added: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_gallnt.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_gallnt.m?view=markup&revision=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_get_arrayvalue.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_get_arrayvalue.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_get_countdata.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_get_countdata.m?r1=962&r2=963

Added: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_get_nametag.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_get_nametag.m?view=markup&revision=963

Added: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_parse_properties.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/get_property/ixf_parse_properties.m?view=markup&revision=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/plotfig/ixf_multiplot.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/plotfig/ixf_multiplot.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/plotfig/ixf_plotfigure.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/plotfig/ixf_plotfigure.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/set_property/ixf_set_arrayprop.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/set_property/ixf_set_arrayprop.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/set_property/ixf_set_defaultprop.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/set_property/ixf_set_defaultprop.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/set_property/ixf_set_prop.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/lowlevelfunctions/set_property/ixf_set_prop.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/stduserfunctions/@ixtdataset_1d/uib_plotgeneral.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/stduserfunctions/%40ixtdataset_1d/uib_plotgeneral.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/stduserfunctions/set/namevalue/uinv_setdefaultprop.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/stduserfunctions/set/namevalue/uinv_setdefaultprop.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/stduserfunctions/set/ui_resetall.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/stduserfunctions/set/ui_resetall.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/acolor.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/acolor.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/aline.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/aline.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/amark.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/amark.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dh.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dh.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dl.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dl.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dm.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dm.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dp.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/dp.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/pe.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/pe.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/ph.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/ph.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/pl.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/pl.m?r1=962&r2=963

Modified: trunk/bindings/matlab/graphics/GTK_Application/userfunctions/pm.m
Url: http://svn.libisis.org/viewvc/LIBISISCode/trunk/bindings/matlab/graphics/GTK_Application/userfunctions/pm.m?r1=962&r2=963

More information about the LIBISIS-code-svn mailing list