ImageDescription's fill parameters are settable now.

diff --git a/ChangeLog b/ChangeLog
index a391212baaefff82d80f08b0794277120f5e09b7..9f483eacbbce82960213e90bd9b2036b500ec639 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 --
-$Id: ChangeLog 60 2005-06-14 15:41:44Z tilman $
+$Id: ChangeLog 62 2005-07-16 18:51:44Z tilman $
 ++
 
+2005-07-16 Tilman Sauerbeck (tilman at code-monkey de)
+        * lib/redact/part.rb: ImageDescription's fill parameters are
+          settable now
+
 2005-06-14 Tilman Sauerbeck (tilman at code-monkey de)
         * Released version 0.1.3
 

diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index c9dc87f16e81e3645ebfa2aea37073fe46538ab4..20bd38d35421bb9baa1f3135826e9f2420c8d580 100644 (file)
--- a/lib/redact/part.rb
+++ b/lib/redact/part.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: part.rb 49 2005-06-09 17:21:05Z tilman $
+# $Id: part.rb 62 2005-07-16 18:51:44Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -425,7 +425,9 @@ module Redact
        end
 
        class ImageDescription < Description
-               attr_reader :image, :auto_rel, :tweens, :border_fill_middle
+               attr_reader :image, :auto_rel, :tweens, :border_fill_middle,
+                           :fill_smooth, :fill_pos_rel, :fill_pos_abs,
+                           :fill_rel, :fill_abs
 
                def initialize(name = "default", value = 0.0)
                        super
@@ -434,7 +436,13 @@ module Redact
                        @tweens = Tweens.new
                        @border = [0, 0, 0, 0]
                        @border_fill_middle = true
+
                        @fill_smooth = true
+                       @fill_pos_rel = [0.0, 0.0]
+                       @fill_pos_abs = [0, 0]
+                       @fill_rel = [1.0, 1.0]
+                       @fill_abs = [0, 0]
+
                        @auto_rel = false
                end
 
@@ -473,6 +481,26 @@ module Redact
                        @border = [r, r, t, b]
                end
 
+               def fill_smooth=(v)
+                       @fill_smooth = (v == true)
+               end
+
+               def fill_pos_rel=(x, y)
+                       @fill_pos_rel = [x.to_f, y.to_f]
+               end
+
+               def fill_pos_abs=(x, y)
+                       @fill_pos_abs = [x.to_i, y.to_i]
+               end
+
+               def fill_rel=(x, y)
+                       @fill_rel = [x.to_f, y.to_f]
+               end
+
+               def fill_abs=(x, y)
+                       @fill_abs = [x.to_i, y.to_i]
+               end
+
                protected
                def to_eet_properties
                        super.merge!(
@@ -484,14 +512,14 @@ module Redact
                         "border.b" => [@border[3]],
                         "border.no_fill" => [!@border_fill_middle],
                         "fill.smooth" => [@fill_smooth],
-                        "fill.pos_rel_x" => [0.0, :double],
-                        "fill.pos_abs_x" => [0],
-                        "fill.rel_x" => [1.0, :double],
-                        "fill.abs_x" => [0],
-                        "fill.pos_rel_y" => [0.0, :double],
-                        "fill.pos_abs_y" => [0],
-                        "fill.rel_y" => [1.0, :double],
-                        "fill.abs_y" => [0]})
+                        "fill.pos_rel_x" => [@fill_pos_rel[0], :double],
+                        "fill.pos_abs_x" => [@fill_pos_abs[0]],
+                        "fill.rel_x" => [@fill_rel[0], :double],
+                        "fill.abs_x" => [@fill_abs[0]],
+                        "fill.pos_rel_y" => [@fill_pos_rel[1], :double],
+                        "fill.pos_abs_y" => [@fill_pos_abs[1]],
+                        "fill.rel_y" => [@fill_rel[1], :double],
+                        "fill.abs_y" => [@fill_abs[1]]})
                end
 
                private