removed garbage from beginning of file. Removed DOS line breaks.

2004-11-08  Michael Natterer  <mitch@gimp.org>

	* plug-ins/script-fu/scripts/selection-round.scm: removed garbage
	from beginning of file. Removed DOS line breaks.
This commit is contained in:
Michael Natterer 2004-11-08 15:30:21 +00:00 committed by Michael Natterer
parent 77d3e5a2f0
commit 00d3eed7c9
2 changed files with 177 additions and 172 deletions

View File

@ -1,3 +1,8 @@
2004-11-08 Michael Natterer <mitch@gimp.org>
* plug-ins/script-fu/scripts/selection-round.scm: removed garbage
from beginning of file. Removed DOS line breaks.
2004-11-08 Michael Natterer <mitch@gimp.org> 2004-11-08 Michael Natterer <mitch@gimp.org>
* libgimp/gimppixelfetcher.c: added docs derived from a patch from * libgimp/gimppixelfetcher.c: added docs derived from a patch from

View File

@ -1,172 +1,172 @@
ch;; selection-rounded-rectangle.scm -*-scheme-*- ;; selection-rounded-rectangle.scm -*-scheme-*-
;; The GIMP -- an image manipulation program ;; The GIMP -- an image manipulation program
;; Copyright (C) 1995 Spencer Kimball and Peter Mattis ;; Copyright (C) 1995 Spencer Kimball and Peter Mattis
;; ;;
;; This program is free software; you can redistribute it and/or modify ;; 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 ;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2 of the License, or ;; the Free Software Foundation; either version 2 of the License, or
;; (at your option) any later version. ;; (at your option) any later version.
;; ;;
;; This program is distributed in the hope that it will be useful, ;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details. ;; GNU General Public License for more details.
;; ;;
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with this program; if not, write to the Free Software ;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
;; CHANGE-LOG: ;; CHANGE-LOG:
;; 1.00 - initial release ;; 1.00 - initial release
;; 1.01 - some code cleanup, no real changes ;; 1.01 - some code cleanup, no real changes
;; 1.02 - made script undoable ;; 1.02 - made script undoable
;; 2.00 - ALAN's Branch. changed name, menu, location, and description ;; 2.00 - ALAN's Branch. changed name, menu, location, and description
;; 2.01 - fixed to work if there was no current selection. ;; 2.01 - fixed to work if there was no current selection.
;; 2.02 - changed scale to percentages, usability tweaking. ;; 2.02 - changed scale to percentages, usability tweaking.
;; 2.10 - added concave round edges, updated description. ;; 2.10 - added concave round edges, updated description.
;; 2.11 - tweeked description, changed comments, relinquished any rights. ;; 2.11 - tweeked description, changed comments, relinquished any rights.
;; Copyright (C) 1997, 1998, Sven Neumann ;; Copyright (C) 1997, 1998, Sven Neumann
;; Copyright (C) 2004, Alan Horkan. ;; Copyright (C) 2004, Alan Horkan.
;; Alan Horkan relinquishes all rights to his changes, ;; Alan Horkan relinquishes all rights to his changes,
;; full ownership of this script belongs to Sven Neumann. ;; full ownership of this script belongs to Sven Neumann.
(define (script-fu-selection-rounded-rectangle image drawable radius concave) (define (script-fu-selection-rounded-rectangle image drawable radius concave)
(gimp-image-undo-group-start image) (gimp-image-undo-group-start image)
(if (= (car (gimp-selection-is-empty image)) TRUE) (gimp-selection-all image)) (if (= (car (gimp-selection-is-empty image)) TRUE) (gimp-selection-all image))
(let* ((radius (/ radius 100)) ; convert from percentages (let* ((radius (/ radius 100)) ; convert from percentages
(radius (min radius 1.0)) (radius (min radius 1.0))
(radius (max radius 0.0)) (radius (max radius 0.0))
(select-bounds (gimp-selection-bounds image)) (select-bounds (gimp-selection-bounds image))
(has-selection (car select-bounds)) (has-selection (car select-bounds))
(select-x1 (cadr select-bounds)) (select-x1 (cadr select-bounds))
(select-y1 (caddr select-bounds)) (select-y1 (caddr select-bounds))
(select-x2 (cadr (cddr select-bounds))) (select-x2 (cadr (cddr select-bounds)))
(select-y2 (caddr (cddr select-bounds))) (select-y2 (caddr (cddr select-bounds)))
(select-width (- select-x2 select-x1)) (select-width (- select-x2 select-x1))
(select-height (- select-y2 select-y1)) (select-height (- select-y2 select-y1))
(cut-radius 0) (cut-radius 0)
(ellipse-radius 0)) (ellipse-radius 0))
;; select to the full bounds of the selection, ;; select to the full bounds of the selection,
;; fills in irregular shapes or holes. ;; fills in irregular shapes or holes.
(gimp-rect-select image (gimp-rect-select image
select-x1 select-y1 select-width select-height select-x1 select-y1 select-width select-height
CHANNEL-OP-ADD FALSE 0) CHANNEL-OP-ADD FALSE 0)
(if (> select-width select-height) (if (> select-width select-height)
(set! cut-radius (trunc (+ 1 (* radius (/ select-height 2))))) (set! cut-radius (trunc (+ 1 (* radius (/ select-height 2)))))
(set! cut-radius (trunc (+ 1 (* radius (/ select-width 2)))))) (set! cut-radius (trunc (+ 1 (* radius (/ select-width 2))))))
(set! ellipse-radius (* cut-radius 2)) (set! ellipse-radius (* cut-radius 2))
;; cut away rounded (concave) corners ;; cut away rounded (concave) corners
; top right ; top right
(gimp-ellipse-select image (gimp-ellipse-select image
(- select-x1 cut-radius) (- select-x1 cut-radius)
(- select-y1 cut-radius) (- select-y1 cut-radius)
(* cut-radius 2) (* cut-radius 2)
(* cut-radius 2) (* cut-radius 2)
CHANNEL-OP-SUBTRACT CHANNEL-OP-SUBTRACT
TRUE TRUE
FALSE 0) FALSE 0)
; lower left ; lower left
(gimp-ellipse-select image (gimp-ellipse-select image
(- select-x1 cut-radius) (- select-x1 cut-radius)
(- select-y2 cut-radius) (- select-y2 cut-radius)
(* cut-radius 2) (* cut-radius 2)
(* cut-radius 2) (* cut-radius 2)
CHANNEL-OP-SUBTRACT CHANNEL-OP-SUBTRACT
TRUE TRUE
FALSE 0) FALSE 0)
; top right ; top right
(gimp-ellipse-select image (gimp-ellipse-select image
(- select-x2 cut-radius) (- select-x2 cut-radius)
(- select-y1 cut-radius) (- select-y1 cut-radius)
(* cut-radius 2) (* cut-radius 2)
(* cut-radius 2) (* cut-radius 2)
CHANNEL-OP-SUBTRACT CHANNEL-OP-SUBTRACT
TRUE TRUE
FALSE 0) FALSE 0)
; bottom left ; bottom left
(gimp-ellipse-select image (gimp-ellipse-select image
(- select-x2 cut-radius) (- select-x2 cut-radius)
(- select-y2 cut-radius) (- select-y2 cut-radius)
(* cut-radius 2) (* cut-radius 2)
(* cut-radius 2) (* cut-radius 2)
CHANNEL-OP-SUBTRACT CHANNEL-OP-SUBTRACT
TRUE TRUE
FALSE 0) FALSE 0)
;; add in rounded (convex) corners ;; add in rounded (convex) corners
(if (= concave FALSE) (if (= concave FALSE)
(begin (begin
(gimp-ellipse-select image (gimp-ellipse-select image
select-x1 select-x1
select-y1 select-y1
ellipse-radius ellipse-radius
ellipse-radius ellipse-radius
CHANNEL-OP-ADD CHANNEL-OP-ADD
TRUE TRUE
FALSE 0) FALSE 0)
(gimp-ellipse-select image (gimp-ellipse-select image
select-x1 select-x1
(- select-y2 ellipse-radius) (- select-y2 ellipse-radius)
ellipse-radius ellipse-radius
ellipse-radius ellipse-radius
CHANNEL-OP-ADD CHANNEL-OP-ADD
TRUE TRUE
FALSE 0) FALSE 0)
(gimp-ellipse-select image (gimp-ellipse-select image
(- select-x2 ellipse-radius) (- select-x2 ellipse-radius)
select-y1 select-y1
ellipse-radius ellipse-radius
ellipse-radius ellipse-radius
CHANNEL-OP-ADD CHANNEL-OP-ADD
TRUE TRUE
FALSE 0) FALSE 0)
(gimp-ellipse-select image (gimp-ellipse-select image
(- select-x2 ellipse-radius) (- select-x2 ellipse-radius)
(- select-y2 ellipse-radius) (- select-y2 ellipse-radius)
ellipse-radius ellipse-radius
ellipse-radius ellipse-radius
CHANNEL-OP-ADD CHANNEL-OP-ADD
TRUE TRUE
FALSE 0))) FALSE 0)))
(gimp-image-undo-group-end image) (gimp-image-undo-group-end image)
(gimp-displays-flush))) (gimp-displays-flush)))
(define (script-fu-selection-round image (define (script-fu-selection-round image
drawable drawable
radius) radius)
(script-fu-selection-rounded-rectangle image drawable (* radius 100))) (script-fu-selection-rounded-rectangle image drawable (* radius 100)))
(script-fu-register "script-fu-selection-rounded-rectangle" (script-fu-register "script-fu-selection-rounded-rectangle"
_"<Image>/Select/Rounded R_ectangle..." _"<Image>/Select/Rounded R_ectangle..."
"Converts the current selection, to a rectangular selection with rounded edges. The radius is a percentage of half the selection width or height, whichever is smaller. Select 'Concave' if you want the round edges will to be indented. Round Edges works by subtracting and adding circles to the selection. " "Converts the current selection, to a rectangular selection with rounded edges. The radius is a percentage of half the selection width or height, whichever is smaller. Select 'Concave' if you want the round edges will to be indented. Round Edges works by subtracting and adding circles to the selection. "
"Alan Horkan, Sven Neumann" ; authors "Alan Horkan, Sven Neumann" ; authors
"Sven Neumann" ; copyright "Sven Neumann" ; copyright
"2004/06/07" "2004/06/07"
"*" "*"
SF-IMAGE "Image" 0 SF-IMAGE "Image" 0
SF-DRAWABLE "Drawable" 0 SF-DRAWABLE "Drawable" 0
SF-ADJUSTMENT _"Radius (%)" '(50 0 100 1 10 0 0) SF-ADJUSTMENT _"Radius (%)" '(50 0 100 1 10 0 0)
SF-TOGGLE _"Concave" FALSE) SF-TOGGLE _"Concave" FALSE)
(script-fu-register "script-fu-selection-round" (script-fu-register "script-fu-selection-round"
"" ""
"Rounds the active selection. This procedure exists for backward compatibility only. Please use script-fu-selection-rounded-rectangle instead." "Rounds the active selection. This procedure exists for backward compatibility only. Please use script-fu-selection-rounded-rectangle instead."
"Sven Neumann" ; authors "Sven Neumann" ; authors
"Sven Neumann" ; copyright "Sven Neumann" ; copyright
"1998/02/06" "1998/02/06"
"*" "*"
SF-IMAGE "Image" 0 SF-IMAGE "Image" 0
SF-DRAWABLE "Drawable" 0 SF-DRAWABLE "Drawable" 0
SF-ADJUSTMENT "Relative radius" '(1 0 128 .1 1 1 1)) SF-ADJUSTMENT "Relative radius" '(1 0 128 .1 1 1 1))