X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fpart.rb;h=66bc43918ae300ebf3f5794186fce86b4c3f9f83;hb=49c2fbf248e6e1d4b35cfbc96fca0efb38423d80;hp=20bd38d35421bb9baa1f3135826e9f2420c8d580;hpb=dce1a66224c5acc1b0ad4ba936bbc38ddc52b229;p=redact.git diff --git a/lib/redact/part.rb b/lib/redact/part.rb index 20bd38d..66bc439 100644 --- a/lib/redact/part.rb +++ b/lib/redact/part.rb @@ -1,5 +1,5 @@ #-- -# $Id: part.rb 62 2005-07-16 18:51:44Z tilman $ +# $Id: part.rb 77 2006-07-28 17:30:51Z tilman $ # # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) # @@ -112,6 +112,7 @@ module Redact "dragable.y" => [@dragable.enabled[1], :char], "dragable.step_y" => [@dragable.step[1]], "dragable.count_y" => [@dragable.count[1]], + "dragable.events_id" => [-1], "dragable.counfine_id" => [confine_id]} # not a typo! end @@ -202,13 +203,13 @@ module Redact attr_reader :rel, :to_id, :offset def initialize(rel, offset) - @rel = [rel, rel] + @rel = [rel.to_f, rel.to_f] @to_id = [-1, -1] @offset = [offset, offset] end def set_rel(x, y) - @rel = [x, y] + @rel = [x.to_f, y.to_f] end def set_offset(x, y) @@ -244,6 +245,20 @@ module Redact @color_class = "" end + def inherit(other) + unless other.is_a?(Description) + raise(ArgumentError, "Cannot inherit from description") + end + + prot = ["@name", "@value"] + + (instance_variables - prot).each do |v| + n = other.instance_variable_get(v.intern) + n = n.dup rescue n + instance_variable_set(v.intern, n) + end + end + def visible=(v) @visible = (v == true) end @@ -478,26 +493,26 @@ module Redact end def set_border(l = 0, r = 0, t = 0, b = 0) - @border = [r, r, t, b] + @border = [l, r, t, b] end def fill_smooth=(v) @fill_smooth = (v == true) end - def fill_pos_rel=(x, y) + def set_fill_pos_rel(x, y) @fill_pos_rel = [x.to_f, y.to_f] end - def fill_pos_abs=(x, y) + def set_fill_pos_abs(x, y) @fill_pos_abs = [x.to_i, y.to_i] end - def fill_rel=(x, y) + def set_fill_rel(x, y) @fill_rel = [x.to_f, y.to_f] end - def fill_abs=(x, y) + def set_fill_abs(x, y) @fill_abs = [x.to_i, y.to_i] end