[Octave-cvsupdate] SF.net SVN: octave:[8236] trunk/octave-forge/main

[<car...@us...>]

Revision: 8236
          http://octave.svn.sourceforge.net/octave/?rev=8236&view=rev
Author:   carandraug
Date:     2011-04-28 15:12:52 +0000 (Thu, 28 Apr 2011)

Log Message:
-----------
Undoing some changes from 8235 which were committed by accident

Modified Paths:
--------------
    trunk/octave-forge/main/image/inst/imopen.m
    trunk/octave-forge/main/zenity/inst/zenity_scale.m

Modified: trunk/octave-forge/main/image/inst/imopen.m
===================================================================
--- trunk/octave-forge/main/image/inst/imopen.m	2011-04-28 14:58:09 UTC (rev 8235)
+++ trunk/octave-forge/main/image/inst/imopen.m	2011-04-28 15:12:52 UTC (rev 8236)
@@ -9,33 +9,33 @@
 ## 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.
-
-## -*- texinfo -*-
-## @deftypefn {Function File} @var{B} = imopen (@var{A}, @var{se})
-## Perform morphological opening on a given image.
-## The image @var{A} must be a grayscale or binary image, and @var{se} must be a
-## structuring element.
-##
-## The opening corresponds to an erosion followed by a dilation of the image, i.e.
-## @example
-## B = imdilate(imerode(A, se), se);
-## @end example
-## @seealso{imdilate, imerode, imclose}
-## @end deftypefn
-
-function retval = imopen(im, se)
-  ## Checkinput
-  if (nargin != 2)
-    print_usage();
-  endif
-  if (!ismatrix(im) || !isreal(im))
-    error("imopen: first input argument must be a real matrix");
-  endif
-  if (!ismatrix(se) || !isreal(se))
-    error("imopen: second input argument must be a real matrix");
-  endif
-  
-  ## Perform filtering
-  retval = imdilate(imerode(im, se), se);
-
-endfunction
+
+## -*- texinfo -*-
+## @deftypefn {Function File} @var{B} = imopen (@var{A}, @var{se})
+## Perform morphological opening on a given image.
+## The image @var{A} must be a grayscale or binary image, and @var{se} must be a
+## structuring element.
+##
+## The opening corresponds to an erosion followed by a dilation of the image, i.e.
+## @example
+## B = imdilate(imerode(A, se), se);
+## @end example
+## @seealso{imdilate, imerode, imclose}
+## @end deftypefn
+
+function retval = imopen(im, se)
+  ## Checkinput
+  if (nargin != 2)
+    print_usage();
+  endif
+  if (!ismatrix(im) || !isreal(im))
+    error("imopen: first input argument must be a real matrix");
+  endif
+  if (!ismatrix(se) || !isreal(se))
+    error("imopen: second input argument must be a real matrix");
+  endif
+  
+  ## Perform filtering
+  retval = imdilate(imerode(im, se), se);
+
+endfunction

Modified: trunk/octave-forge/main/zenity/inst/zenity_scale.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_scale.m	2011-04-28 14:58:09 UTC (rev 8235)
+++ trunk/octave-forge/main/zenity/inst/zenity_scale.m	2011-04-28 15:12:52 UTC (rev 8236)
@@ -1,9 +1,8 @@
 ## Copyright (C) 2006 Muthiah Annamalai
-## Copyright (C) 2010 Carnë Draug
 ## 
 ## 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 3 of the License, or
+## 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,
@@ -64,16 +63,9 @@
   else
     error("zenity_scale: %s", output); ##kill -9 
   endif
-
-
-  ## In the future, this can be changed to return a file-handle if --print-partial
-  ## is selected. If so, a pipe can be open with
-  ## fid  = fopen("zenity --scale --print-partial", "r")
-  ## read = fgets(fid)
-  ##
-  ## However, fgets can't read the value currently selected, only the one right
-  ## before the last selection
-
-
-
 endfunction
+%
+%(Shamelessly copied from Søren Hauberg's zenity_calendar).
+%zenity --scale --text 'What is in your Wallet' --value 10 --min-value 0 --max-value 100 --step 5
+%zenity_scale('','What is in your Wallet',10,0,100,5)
+%
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.