Update of /cvsroot/octave/octave-forge/extra/jhandles/inst In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20700/inst Modified Files: __bar__.m enable_jhandles.m Added Files: __jhandles_exit.m __jhandles_get.m __jhandles_go_axes.m __jhandles_go_axes_init.m __jhandles_go_barseries.m __jhandles_go_delete.m __jhandles_go_figure.m __jhandles_go_surface.m __jhandles_go_text.m __jhandles_ishandle.m __jhandles_set.m Removed Files: jhandles_exit.m jhandles_get.m jhandles_go_axes.m jhandles_go_axes_init.m jhandles_go_barseries.m jhandles_go_delete.m jhandles_go_figure.m jhandles_go_surface.m jhandles_go_text.m jhandles_ishandle.m jhandles_set.m Log Message: Modify all uses of function names jhandles_ to __jhandles_ --- NEW FILE: __jhandles_go_text.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function [ h ] = __jhandles_go_text (ax, dummy1, txt, dummy2, pos, varargin) ax_obj = __get_object__ (ax); txt_obj = java_new ("org.octave.graphics.TextObject", ax_obj, txt, pos); h = txt_obj.getHandle (); if (length (varargin) > 0) set (h, varargin{:}); endif txt_obj.validate (); endfunction --- NEW FILE: __jhandles_go_axes.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function [ h ] = __jhandles_go_axes (fig, varargin) fig_obj = __get_object__ (fig); ax_obj = java_new ("org.octave.graphics.AxesObject", fig_obj, 0); h = ax_obj.getHandle (); if (length (varargin) > 0) set (h, varargin{:}); endif ax_obj.validate (); endfunction --- jhandles_go_axes.m DELETED --- --- NEW FILE: __jhandles_get.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function [ varargout ] = __jhandles_get (h, property) handle = __get_object__ (h); if (! isempty (handle)) if (nargin == 2) varargout{1} = java2mat (handle.get (property)); elseif (nargout > 0) names = char (handle.getNames ()); ret = struct([]); for k = 1:length (names) ret.(tolower(names{k})) = java2mat (handle.get (names{k})); endfor varargout{1} = ret; else handle.show (); endif else error ("invalid handle"); endif endfunction --- jhandles_exit.m DELETED --- --- NEW FILE: __jhandles_go_delete.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function __jhandles_go_delete (handle) obj = __get_object__ (handle); obj.delete; __request_drawnow__; endfunction Index: __bar__.m =================================================================== RCS file: /cvsroot/octave/octave-forge/extra/jhandles/inst/__bar__.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- __bar__.m 31 May 2007 14:44:22 -0000 1.2 +++ __bar__.m 31 May 2007 14:44:46 -0000 1.3 @@ -23,7 +23,7 @@ if (mode3D) tmp = makeBar3D (ax, xx, yy, w, mode, c, orient); else - tmp = jhandles_go_barseries (ax, xx, yy, w, mode, c, orient); + tmp = __jhandles_go_barseries (ax, xx, yy, w, mode, c, orient); endif if (nargout > 0) h = tmp; Index: enable_jhandles.m =================================================================== RCS file: /cvsroot/octave/octave-forge/extra/jhandles/inst/enable_jhandles.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- enable_jhandles.m 31 May 2007 14:44:22 -0000 1.1 +++ enable_jhandles.m 31 May 2007 14:44:46 -0000 1.2 @@ -21,12 +21,12 @@ javaaddpath ("."); endif javaaddpath ("jogl.jar"); -dispatch ("get", "jhandles_get", "any"); -dispatch ("set", "jhandles_set", "any"); -dispatch ("ishandle", "jhandles_ishandle", "any"); -dispatch ("__go_figure__", "jhandles_go_figure", "any"); -dispatch ("__go_delete__", "jhandles_go_delete", "any"); -dispatch ("__go_axes__", "jhandles_go_axes", "any"); -dispatch ("__go_axes_init__", "jhandles_go_axes_init", "any"); -dispatch ("__go_text__", "jhandles_go_text", "any"); -dispatch ("__go_surface__", "jhandles_go_surface", "any"); +dispatch ("get", "__jhandles_get", "any"); +dispatch ("set", "__jhandles_set", "any"); +dispatch ("ishandle", "__jhandles_ishandle", "any"); +dispatch ("__go_figure__", "__jhandles_go_figure", "any"); +dispatch ("__go_delete__", "__jhandles_go_delete", "any"); +dispatch ("__go_axes__", "__jhandles_go_axes", "any"); +dispatch ("__go_axes_init__", "__jhandles_go_axes_init", "any"); +dispatch ("__go_text__", "__jhandles_go_text", "any"); +dispatch ("__go_surface__", "__jhandles_go_surface", "any"); --- jhandles_go_delete.m DELETED --- --- jhandles_set.m DELETED --- --- jhandles_go_figure.m DELETED --- --- jhandles_go_barseries.m DELETED --- --- jhandles_go_text.m DELETED --- --- NEW FILE: __jhandles_ishandle.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function [ ret ] = __jhandles_ishandle (handle) if (isnumeric (handle) && isscalar (handle)) ret = java_invoke ("org.octave.graphics.HandleObject", "isHandle", handle); else ret = 0; endif endfunction --- NEW FILE: __jhandles_go_surface.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function [ h ] = __jhandles_go_surface (ax, varargin) x = []; y = []; z = []; others = {}; args = varargin; for k = 1:2:length (args) switch args{k} case "xdata" x = args{k+1}; case "ydata" y = args{k+1}; case "zdata" z = args{k+1}; otherwise others{end+1} = args{k}; others{end+1} = args{k+1}; endswitch endfor if (isvector (x) && isvector (y)) [x,y] = meshgrid (x, y); endif ax_obj = __get_object__ (ax); surf_obj = java_new ("org.octave.graphics.SurfaceObject", ax_obj, ... mat2java (x), mat2java (y), mat2java (z)); surf_obj.set ("facecolor", "w"); surf_obj.set ("edgecolor", "flat"); surf_obj.validate (); tmp = surf_obj.getHandle (); if (length (others) > 0) set (tmp, others{:}); else __request_drawnow__; endif if (nargout > 0) h = tmp; endif endfunction --- NEW FILE: __jhandles_go_figure.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function [ f ] = __jhandles_go_figure (fnum) root = __get_object__ (0); if (isempty (fnum) || isnan (fnum)) f = root.createNewFigure(); else f = root.createNewFigure(fnum); endif f_obj = __get_object__ (f); if (! isempty (f_obj)) f_obj.validate (); endif endfunction --- NEW FILE: __jhandles_exit.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function __jhandles_exit close all; endfunction --- jhandles_ishandle.m DELETED --- --- jhandles_go_surface.m DELETED --- --- NEW FILE: __jhandles_set.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function __jhandles_set(h, varargin) for hk = h handle = __get_object__ (hk); if (! isempty (handle)) for k = 1:2:length(varargin) handle.set (varargin{k}, mat2java (varargin{k+1})); endfor else error ("invalid handle"); endif endfor __request_drawnow__; endfunction --- jhandles_get.m DELETED --- --- NEW FILE: __jhandles_go_axes_init.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function __jhandles_go_axes_init (h, mode) ax_obj = __get_object__ (h); ax_obj.reset (mode); endfunction --- jhandles_go_axes_init.m DELETED --- --- NEW FILE: __jhandles_go_barseries.m --- ## Copyright (C) 2007 Michael Goffioul ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 2 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA function [ h ] = __jhandles_go_barseries (ax, xx, yy, width, mode, color, orient) xx = xx(:); if (isvector (yy)) yy = yy(:); endif h = []; for k = 1:size (yy, 2) obj = java_new ("org.octave.graphics.BarseriesObject", __get_object__ (ax), xx, yy(:,k), orient); obj.validate (); h = [h obj.getHandle()]; set (h(end), "barwidth", width, "barlayout", mode, "facecolor", color); endfor set(h, "bargroup", h); __get_object__ (h(1)).updateBars (); endfunction |