ctioga2 0.11 → 0.12

data/lib/ctioga2/graphics/styles.rb

@@ -40,6 +40,7 @@ require 'ctioga2/graphics/styles/background'
 require 'ctioga2/graphics/styles/plot'
 
 require 'ctioga2/graphics/styles/legend'
+require 'ctioga2/graphics/styles/scope'
 
 
 

data/lib/ctioga2/graphics/styles/arrows.rb

@@ -35,7 +35,12 @@ module CTioga2
           typed_attribute "#{e}_color".to_sym, 'color'
         end
 
-        def draw_arrow(t, x1, y1, x2, y2)
+        TiogaDefaults = {
+          'head_marker' => Tioga::MarkerConstants::Arrowhead,
+          'tail_marker' => Tioga::MarkerConstants::BarThin
+        }
+
+        def old_draw_arrow(t, x1, y1, x2, y2)
           dict = self.to_hash
           dict.rename_key('width', 'line_width')
           dict.rename_key('style', 'line_style')
@@ -49,7 +54,142 @@ module CTioga2
           t.show_arrow(dict)
         end
 
+
+        # Draws an arrow.
+        def draw_arrow(t, x1, y1, x2, y2)
+          dx = x2 - x1
+          dy = y2 - y1
+
+          angle = Types::Dimension.get_angle(t, dx, dy)
+
+          len = Types::Dimension.get_distance(t, dx, dy)
+
+          rs = symbol_size(t, "head")
+          ls = symbol_size(t, "tail")
+
+          x1n, y1n, x2n, y2n = *Types::Dimension::adjust_line(t, x1, y1, x2, y2, -ls, -rs)
+
+          # Must shorten the path first...
+          sv = t.line_cap
+          
+          # This has for effect to disable changing the line cap when
+          # there are now arrows to draw.
+          if ! (has_marker?('head') || has_marker?('tail'))
+            sv = Tioga::FigureConstants::LINE_CAP_BUTT
+          end
+          if sv != Tioga::FigureConstants::LINE_CAP_BUTT
+            t.line_cap = Tioga::FigureConstants::LINE_CAP_BUTT
+          end
+          draw_line(t, x1n, y1n, x2n, y2n)
+          if sv != Tioga::FigureConstants::LINE_CAP_BUTT
+            t.line_cap = sv
+          end
+
+          # Then, draw the arrow heads/tails
+          draw_symbol(t, 'head', angle, x2, y2)
+          draw_symbol(t, 'tail', angle - 180, x1, y1)
+          
+        end
+
+        protected
+
+        # Return the dimension of the arrow size
+        def symbol_size(t, name)
+          sz = Types::Dimension.new(:dy,self.send("#{name}_scale") || 1.0)
+          sz.value *= case just(name)
+                     when Tioga::FigureConstants::CENTERED
+                       0
+                     when Tioga::FigureConstants::RIGHT_JUSTIFIED
+                       0.5
+                     end
+          return sz
+        end
+
+        def just(name)
+          mkr = self.send("#{name}_marker")
+          if mkr == Tioga::MarkerConstants::Arrowhead or
+            mkr == Tioga::MarkerConstants::ArrowheadOpen
+            Tioga::FigureConstants::RIGHT_JUSTIFIED
+          else
+            Tioga::FigureConstants::CENTERED
+          end
+        end
+
+        def has_marker?(name)
+          mkr = self.send("#{name}_marker")
+          if ! mkr  or  mkr == 'None'
+            return false
+          else
+            return true
+          end
+        end
+
+        # Draw the arrow symbol for the given name (head or tail),
+        # with the given base angle and at the given position
+        def draw_symbol(t, name, angle, x, y)
+          hsh = {}
+          for k in %w(marker scale color angle)
+            tmp = self.send("#{name}_#{k}")
+            if tmp
+              hsh[k] = tmp
+            end
+          end
+          mkr = hsh['marker']
+          if ! mkr  or  mkr == 'None'
+            return
+          end
+
+          hsh['angle'] ||= 0
+          hsh['angle'] += angle
+
+          hsh['x'] = x
+          hsh['y'] = y
+
+          # Color defaults to line color
+          if @color and !hsh.key?('color')
+            hsh['color'] = @color
+          end
+
+          hsh['justification'] = just(name)
+          t.show_marker(hsh)
+        end
+
       end
+
+      # This class represents all the stylistic information necessary
+      # to draw a line parallel to a certain direction, indicated by
+      # an angle (default to horizontal)
+      class OrientedLineStyle < ArrowStyle
+        # The angle, in degrees.
+        typed_attribute :angle, 'float'
+
+        # The alignment of the line with respect to the point given.
+        typed_attribute :origin, 'justification'
+
+        # len is a dimension
+        def draw_oriented_arrow(t, xo, yo, len)
+
+          angle = @angle || 0.0
+
+          dx,dy = *len.to_figure(t, angle)
+
+          case @origin || Tioga::FigureConstants::LEFT_JUSTIFIED
+          when Tioga::FigureConstants::LEFT_JUSTIFIED
+            x1, y1 = xo, yo
+            x2, y2 = xo + dx, yo + dy
+          when Tioga::FigureConstants::CENTERED
+            x1, y1 = xo - 0.5 * dx, yo - 0.5 * dy
+            x2, y2 = xo + 0.5 * dx, yo + 0.5 * dy
+          when Tioga::FigureConstants::RIGHT_JUSTIFIED
+            x1, y1 = xo - dx, yo - dy
+            x2, y2 = xo, yo
+          end
+          
+          draw_arrow(t, x1, y1, x2, y2)
+        end
+        
+      end
+
     end
   end
 end

data/lib/ctioga2/graphics/styles/axes.rb

@@ -67,6 +67,12 @@ module CTioga2
         # The color of the stroke for the lines of the axis
         typed_attribute :stroke_color, 'color'
 
+        # The line width
+        typed_attribute :line_width, 'float'
+
+        # The line style
+        # typed_attribute :line_style,
+
         typed_attribute :major_tick_length, 'float'
         typed_attribute :major_tick_width, 'float'
 
@@ -144,7 +150,18 @@ minor_tick_length minor_tick_width)
                          else
                            spec['type']
                          end
-          t.show_axis(spec)
+          t.context do
+            if @line_width
+              # Holy gods, there is no way in Tioga to choose the line
+              # width.
+              #
+              # Here is essentially the proof that I must reimplement
+              # the axes.
+              t.xaxis_line_width = @line_width
+              t.yaxis_line_width = @line_width
+            end
+            t.show_axis(spec)
+          end
           # Now, we draw axis ticks
           if (type == Tioga::FigureConstants::AXIS_WITH_MAJOR_TICKS_AND_NUMERIC_LABELS) || (type == Tioga::FigureConstants::AXIS_WITH_TICKS_AND_NUMERIC_LABELS)
 

data/lib/ctioga2/graphics/styles/base.rb

@@ -216,7 +216,7 @@ module CTioga2
               ret[key % k] = v
             end
           end
-            
+
           if @sub_styles        # Not always present too
             for sub in @sub_styles
               sym, cls, fmt, fc = *sub
@@ -239,7 +239,18 @@ module CTioga2
         end
 
         def self.sub_styles
-          return @sub_styles
+          # p [:ss, self]
+          rv = if self.superclass.respond_to?(:sub_styles)
+                 self.superclass.sub_styles
+               else
+                 []
+               end
+          # p [:sparents, self, rv]
+          if @sub_styles
+            rv += @sub_styles
+          end
+          # p [:sparents_own, self, rv]
+          return rv
         end
 
         # Sets the values of the attributes from the given
@@ -275,7 +286,9 @@ module CTioga2
                 cur_var = cls.new
                 set_after = true
               end
+              # p :bef, fmt
               fmt = name % fmt
+              # p :aft, fmt
               nb = cur_var.set_from_hash(hash, fmt)
 
               # Here, this means that missing attributes do not get
@@ -325,6 +338,18 @@ module CTioga2
               end
             end
           end
+
+          # Now, substyles
+          for sb in self.class.sub_styles
+            symb, cls, fmt, fc = *sb
+            if instance_variable_defined?("@#{symb.to_s}")
+              sub = instance_variable_get("@#{symb.to_s}")
+              fmt = name % fmt
+              if ! sub.nil?
+                retval.update(sub.to_hash(fmt))
+              end
+            end
+          end
           return retval
         end
 
@@ -333,6 +358,20 @@ module CTioga2
           set_from_hash(other_object.to_hash)
         end
 
+        # Sets the style from the given hash or other object, if the
+        # style is not present yet.
+        def use_defaults_from(hsh)
+          if hsh.is_a? BasicStyle
+            hsh = hsh.to_hash
+          end
+          at = self.class.attribute_types
+          for k, v in hsh
+            if at.key?(k.to_sym) and ! instance_variable_defined?("@#{k}".to_sym)
+              self.send("#{k}=", v)
+            end
+          end
+        end
+
         # Converts a hash in text format into a format suitable for
         # feeding to #set_from_hash. Only relevant keys are
         # converted. Keys that exist in the options hash but are not

data/lib/ctioga2/graphics/styles/box.rb

@@ -1,4 +1,4 @@
-# arrows.rb: style objects for lines and arrows
+# box.rb: style objects for boxes
 # copyright (c) 2012 by Vincent Fourmond
   
 # This program is free software; you can redistribute it and/or modify

data/lib/ctioga2/graphics/styles/drawable.rb

@@ -59,39 +59,6 @@ module CTioga2
 
       end
 
-      # This class represents all the stylistic information necessary
-      # to draw a line parallel to a certain direction, indicated by
-      # an angle (default to horizontal)
-      class OrientedLineStyle < StrokeStyle
-        # The angle, in degrees.
-        typed_attribute :angle, 'float'
-
-        # The alignment of the line with respect to the point given.
-        typed_attribute :origin, 'justification'
-
-        # len is a dimension
-        def draw_oriented_line(t, xo, yo, len)
-
-          angle = @angle || 0.0
-
-          dx,dy = *len.to_figure(t, angle)
-
-          case @origin || Tioga::FigureConstants::LEFT_JUSTIFIED
-          when Tioga::FigureConstants::LEFT_JUSTIFIED
-            x1, y1 = xo, yo
-            x2, y2 = xo + dx, yo + dy
-          when Tioga::FigureConstants::CENTERED
-            x1, y1 = xo - 0.5 * dx, yo - 0.5 * dy
-            x2, y2 = xo + 0.5 * dx, yo + 0.5 * dy
-          when Tioga::FigureConstants::RIGHT_JUSTIFIED
-            x1, y1 = xo - dx, yo - dy
-            x2, y2 = xo, yo
-          end
-
-          draw_line(t, x1, y1, x2, y2)
-        end
-        
-      end
 
       # This class represents all the stylistic information to draw a
       # Marker.
@@ -102,42 +69,81 @@ module CTioga2
       #   be handled directly in the marker specification...
       class MarkerStyle < BasicStyle
 
-        # The color
-        typed_attribute :color, 'color'
-        
         # The marker
         typed_attribute :marker, 'marker'
 
         # The marker scale
         typed_attribute :scale, 'float'
 
+        # The angle
+        typed_attribute :angle, 'float'
+
+        # The default for color
+        typed_attribute :color, 'color-or-false'
+
+        # The stroke color
+        typed_attribute :line_color, 'color-or-false'
+
+        # The fill color
+        typed_attribute :fill_color, 'color-or-false'
+
+        # The stroke width
+        typed_attribute :line_width, 'float'
+
         # Shows the marker at a given location/set of locations.
         # 
         # \p override is a hash that can override part of the
         # dictionnary specification.
         def draw_markers_at(t, x, y, override = nil)
           return if (! @marker || @marker == 'None')
+
+          dict = { 
+            'marker' => @marker
+          }
+          if @line_width
+            dict['stroke_width'] = @line_width
+          end
+          if !(@fill_color.nil?) || !(@line_color.nil?)
+            dict['fill_color'] = @fill_color.nil? ? @color : @fill_color
+            dict['stroke_color'] = @line_color.nil? ? @color : @line_color
+            dict['rendering_mode'] = 
+              if dict['fill_color']
+                if dict['stroke_color']
+                  Tioga::FigureConstants::FILL_AND_STROKE
+                else
+                  Tioga::FigureConstants::FILL
+                end
+              else
+                Tioga::FigureConstants::STROKE
+              end
+            dict.strip_if_false!(%w{fill_color stroke_color})
+          else
+            dict['color'] = @color
+            if ! @color
+              return            # Nothing to do !
+            end
+          end
+          if @angle
+            dict['angle'] = @angle
+          end
+          
+          if x.is_a? Numeric
+            dict['x'] = x
+            dict['y'] = y
+          else
+            dict['Xs'] = x
+            dict['Ys'] = y
+          end
+
+          if @scale
+            dict['scale'] = @scale
+          end
+          if override
+            dict.merge!(override)
+          end
           t.context do
             ## \todo allow custom line types for markers ?
             t.line_type = LineStyles::Solid
-            dict = { 
-              'marker' => @marker, 
-              'color' => @color
-            }
-            if x.is_a? Numeric
-              dict['x'] = x
-              dict['y'] = y
-            else
-              dict['Xs'] = x
-              dict['Ys'] = y
-            end
-
-            if @scale
-              dict['scale'] = @scale
-            end
-            if override
-              dict.merge!(override)
-            end
             t.show_marker(dict)
           end
         end

data/lib/ctioga2/graphics/styles/errorbar.rb

@@ -26,7 +26,12 @@ module CTioga2
       # This class represents the stylistic information necessary to
       # draw an error bar. It derives from StrokeStyle, as it is
       # essentially a stroke.
-      class ErrorBarStyle < StrokeStyle
+      class ErrorBarStyle < BasicStyle
+
+        # The style of the line that is drawn, as a StrokeStyle. 
+        sub_style :line, StrokeStyle
+
+        alias_for :color, :line_color
 
         # The error bar style. For now, not much here.
         attr_accessor :style
@@ -42,8 +47,8 @@ module CTioga2
         def show_error_bar(t, x, xmin, xmax, y, ymin, ymax)
           d = { 'x' => x,
             'y' => y,
-            'color' => @color || Tioga::ColorConstants::Black,
-            'line_width' => @width || 1.0,
+            'color' => @line.color || Tioga::ColorConstants::Black,
+            'line_width' => @line.width || 1.0,
           }
           has = false
           if (xmin && xmax && (xmax - xmin != 0))
@@ -60,6 +65,8 @@ module CTioga2
           # We won't draw something when there isn't anything to draw
           # !
           if(has)
+            # We should stop relying on Tioga for that.
+            # Probably this is the place to reimplement that ?
             t.show_error_bars(d)
           end
         end