legend.rb in ctioga2-0.4

- old
+ new
@@ -15,47 +15,62 @@
 require 'ctioga2/log'
 
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 359 $', '$Date: 2012-12-26 10:45:35 +0100 (Wed, 26 Dec 2012) $')
 
   module Graphics
 
     module Styles
 
       # Style of a given Legends::LegendStorage object.
       class LegendStorageStyle < BasicStyle
 
         # The distance between two lines, a Types::Dimension object.
-        attr_accessor :dy
+        typed_attribute :dy, 'dimension'
 
         # The width of the legend pictogram, a Types::Dimension object.
         attr_accessor :picto_width
 
         # The height of the legend pictogram, a Types::Dimension object.
         attr_accessor :picto_height
 
         # The distance between the legend pictogram and the text
         attr_accessor :picto_to_text
 
-        # The scale of the legend
-        attr_accessor :scale
+        # The overall scale of the legend
+        typed_attribute :scale, 'float'
 
         # The scale of the legend text -- relative to the overall
         # scale.
-        attr_accessor :text_scale
+        typed_attribute :text_scale, 'float'
 
+        # The scale of the pictogram
+        typed_attribute :symbol_scale, 'float'
+
+
+        # A frame around the legend
+        sub_style :frame, BoxStyle
+
+        # Padding around the frame
+        typed_attribute :frame_padding, 'dimension'
+
         def initialize
           @dy = Types::Dimension.new(:dy, 1.6, :y)
 
           @picto_width = Types::Dimension.new(:dy, 1.6, :x)
           @picto_height = Types::Dimension.new(:dy, 0.6, :y)
 
           @picto_to_text = Types::Dimension.new(:dy, 0.3, :x)
 
           @scale = 0.8
           @text_scale = 0.82
+          @symbol_scale = 1
+
+          @frame = BoxStyle.new()
+          
+          @frame_padding = Types::Dimension.from_text("1mm", :x)
         end
       end
     end
   end
 end