ctioga2 0.10.1 → 0.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cf1d83cc2f6ff4a0a56457aaf1343632316fc54c
+  data.tar.gz: de6664912ac0b52b32dd6dc90520556a8a3408e1
+SHA512:
+  metadata.gz: 658b6530f9b7a6b05159f779b6e2b82df15e22b05e75e7c61404212193c46044b622d9a9e68980225a116012004a79f7c92b62445fd1e2ebbc8322f3b83658c3
+  data.tar.gz: 8f4d59ab2aa53836d4bd74f30696cfc2f3d4eaaff3c138d85878619f89304cad620093ba2ecd54dc240933ecc93526156fa1934138a07a6e768b0c4864077f54

data/Changelog

@@ -1,3 +1,21 @@
+ctioga2 (0.11)
+
+  * Implemented patterned fills
+  * Implemented loops in command files
+  * Redesigned the styling system, with now fully-fledged CSS-like style
+    sheets
+  * A command to hide (and show again) elements (for step-by-step
+    construction of animations)
+  * A mathematical backend for 3D curves
+  * Multicolumn merge
+  * More flexibility in setting the frame margin
+  * Grid elements spanning several columns/rows
+  * An oriented-line primitive to draw a line of a given length in a 
+    given direction
+  * Various bug-fixes and documentation updates
+
+ -- Vincent <vincent.fourmond@9online.fr>  Thu  1 Jan 21:51:57 CET 2015
+
 ctioga2 (0.10.1)
 
   * Fix problems with Ruby1.8

data/bin/ctioga2

@@ -19,8 +19,36 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 =end
 
+# Coverage on demand
+if ARGV[0] == '--coverage'
+  ARGV.shift
+  require 'simplecov'
+  nm = ARGV.shift
+  if nm =~ /%/                  # Some formatting
+    id = begin
+           File.open(".cov") do |f|
+        f.read.to_i + 1
+      end
+         rescue
+           0
+         end
+    nm = nm % id
+    File.open('.cov', 'w') do |f|
+      f.puts id.to_s
+    end
+  end
+  SimpleCov.command_name nm
+  SimpleCov.start do
+    filters.clear
+    add_filter do |src|
+      !(src.filename =~ /ctioga2/)
+    end
+  end
+end
+
 require 'ctioga2/plotmaker'
 
 plot_maker = CTioga2::PlotMaker.new
+
 plot_maker.run(ARGV)
 

data/lib/ctioga2/commands/commands.rb

@@ -264,6 +264,7 @@ module CTioga2
         return @tg_op_names
       end
 
+
       # Returns a lowercase 
       def normalize_option_name(opt)
         return opt.gsub(/_/,"-").downcase

data/lib/ctioga2/commands/doc/documentation-commands.rb

@@ -89,6 +89,19 @@ EOH
 Prints the HTML documentation for all types.
 EOH
 
+      WriteHTMLStyles = 
+        Cmd.new("write-html-styles", nil, "--write-html-styles", 
+                [], WriteHTMLOptions) do |plotmaker, opts|
+        html = HTML.new(plotmaker.interpreter.doc)
+        html.write_styles(opts)
+      end
+      
+      WriteHTMLStyles.describe("HTML documentation for styles",
+                              <<EOH, DocumentationGenerationGroup)
+Prints the HTML documentation for all styles.
+EOH
+
+
       WriteHTMLBackends = 
         Cmd.new("write-html-backends", nil, "--write-html-backends", 
                 [], WriteHTMLOptions) do |plotmaker, opts|

data/lib/ctioga2/commands/doc/help.rb

@@ -81,13 +81,14 @@ module CTioga2
         def print_commandline_options(cmds, groups)
           @to_tty = false
           if STDOUT.tty? 
+            @to_tty = true
             begin
               require 'curses'
               Curses.init_screen
               @total_width = Curses.cols
               Curses.close_screen
-              @to_tty = true
-            rescue
+            rescue LoadError => e
+              # We'll be missing the exact term size
             end
           end
           @total_width ||= 80   # 80 by default

data/lib/ctioga2/commands/doc/html.rb

@@ -206,6 +206,54 @@ module CTioga2
             end
           end
         end
+
+        # Write a summary list of all style items
+        def write_styles(opts, out = STDOUT)
+
+          styles = Graphics::Elements::TiogaElement::styled_classes
+
+          names = styles.keys.sort
+          
+          write_page_menu(opts, out) do |out|
+            out.puts "<div class='quick-jump'>"
+            out.puts "<h3>Quick jump</h3>"
+            out.puts "<ul>\n"
+            for k in names
+              out.puts "<li><a href='#style-#{k}'>#{k}</a></li>\n"
+            end
+            out.puts "</ul>\n"
+            out.puts "</div>"
+          end
+
+          write_page(opts, out) do |out|
+            for n in names
+              out.puts "<h3 id='style-#{n}' class='style'><code>#{n}</code></h3>\n"
+              cls = styles[n].style_class
+              if cls
+                aliases = cls.defined_aliases
+                out.puts "<ul>\n"
+                
+                opts = cls.options_hash
+                op_names = opts.keys.sort
+                for k in op_names
+                  type = opts[k].type
+                  extra = if aliases.key? k
+                            " (alias for <code>#{cls.normalize_out(aliases[k])}</code>)"
+                          else
+                            ""
+                          end
+                            
+                  puts "<li><code>#{cls.normalize_out(k)}</code>#{extra}: <a href='#{@types_url}#type-#{type.name}'>#{type.name}</a></li>\n"
+                end
+                out.puts "</ul>\n"
+
+              else
+                out.puts "No specific style information"
+              end
+            end
+          end
+
+        end
         
 
         protected

data/lib/ctioga2/commands/doc/introspection.rb

@@ -135,7 +135,7 @@ module CTioga2
         def list_styles
 
           puts "Available color sets:"
-          sets = Graphics::Styles::CurveStyleFactory::parameters['line_color'].sets
+          sets = Graphics::Styles::CurveStyleFactory::parameters['color'].sets
           set_names = sets.keys.sort
 
           sets_by_prefix = Utils.group_by_prefix(set_names, /(.*?)\d+$/)
@@ -147,7 +147,7 @@ module CTioga2
           end
 
           puts "\nAvailable marker sets:"
-          sets = Graphics::Styles::CurveStyleFactory::parameters['marker_marker'].sets
+          sets = Graphics::Styles::CurveStyleFactory::parameters['marker'].sets
           set_names = sets.keys.sort
 
           sets_by_prefix = Utils.group_by_prefix(set_names, /(.*?)\d+$/)

data/lib/ctioga2/commands/general-types.rb

@@ -80,6 +80,16 @@ EOD
 
     IntegerType = CmdType.new('integer', :integer, <<EOD)
 An integer.
+EOD
+
+    IntegerList = CmdType.new('integer-list', 
+                            {
+                              :type => :array,
+                              :subtype => :integer,
+                              :separator => /\s+|\s*,\s*/,
+                              :separator_out => " "
+                            }, <<EOD)
+A list of space-separated or comma-separated integers
 EOD
 
     PartialFloatRangeType = CmdType.new('partial-float-range', 

data/lib/ctioga2/commands/parsers/file.rb

@@ -24,7 +24,8 @@ module CTioga2
 
     module Parsers
 
-      # This class parses a "new style" command file, delegating
+      # This class parses a "new style" command file, delegating to
+      # the old parser if this looks like an old style command file.
       class FileParser
 
         include Log
@@ -75,7 +76,7 @@ module CTioga2
           ## @todo line counting ?
           for l in lines
             idx += 1
-            # If we find something that looks like a command at the
+            # If we find something that looks like an old  command at the
             # beginning of a line, we say this is an old style file.
 
             ## @todo Find a way to disable this compatibility stuff --
@@ -116,6 +117,9 @@ module CTioga2
           # Now, we rearrange the lines...
           idx = -1
           ruby = false
+
+          # False, or a [var, values, code] triplet
+          loop = false
           for l in parsed_lines
             idx += 1
             interpreter.context.parsing_file(nil, io, lines_indices[idx])
@@ -132,6 +136,23 @@ module CTioga2
               else
                 ruby << l
               end
+            elsif l =~ /^\s*for\s+(\w+)\s+in\s+(.*)/
+              v = $2
+              var = $1
+              v << "\n"
+              s = InterpreterString.parse_until_unquoted(StringIO.new(v),"\n")
+              vals = s.expand_and_split(/\s+/, interpreter)
+              loop = [var, vals, ""]
+            elsif loop
+              if l =~ /^\s*for\s+end\s*$/
+                for v in loop[1]
+                  interpreter.variables.define_variable(loop[0], v)
+                  run_commands(loop[2], interpreter)
+                end
+                loop = false
+              else
+                loop[2] << l
+              end
             elsif l =~ /^\s*([a-zA-Z0-9_-]+)\s*(\??)(=|:=)\s*(.*)/
               symbol = $1
               value = InterpreterString.parse_until_unquoted(StringIO.new($4),"\n", false)

data/lib/ctioga2/data/backends/backends.rb

@@ -34,7 +34,6 @@ for file in files.uniq
   begin
     require "ctioga2/data/backends/backends/#{file}"
   rescue Exception => e
-    CTioga2::Log::warn { "There was a problem trying to load 'ctioga2/data/backends/backends/#{file}': "  }
-    CTioga2::Log::warn { "#{e.inspect}" }
+    CTioga2::Log::warn { "There was a problem trying to load 'ctioga2/data/backends/backends/#{file}':\n#{e.inspect}" }
   end
 end

data/lib/ctioga2/data/backends/backends/smath.rb

@@ -0,0 +1,129 @@
+# smath.rb :multi-dimensional math backend
+# Copyright (C) 2014 Vincent Fourmond
+
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+require 'Dobjects/Dvector'
+require 'Dobjects/Function'
+
+module CTioga2
+
+  module Data
+
+    module Backends
+
+      class SMathBackend < Backend
+        
+        include Dobjects
+        include Math
+      
+        describe 'smath', 'Mathematical functions (multi-D)', <<EOD
+This backends computes mathematical formulas of two or more variables
+EOD
+
+        param_accessor :samples, 'samples',  "Sample number", 'integer', 
+        "Number of samples (default, overriden by variable-specific specs)"
+
+
+        param_accessor :u_range, 'urange',  "U Range", 'float-range', 
+        "U range (a:b)"
+
+        param_accessor :u_samples, 'usamples',  "U samples", 'integer', 
+        "Number of U samples"
+
+        param_accessor :v_range, 'vrange',  "V Range", 'float-range', 
+        "V range (a:b)"
+
+        param_accessor :v_samples, 'vsamples',  "V samples", 'integer', 
+        "Number of V samples"
+
+        def initialize
+          super()
+          @samples = 30
+          @u_range = -10.0..10.0
+          @v_range = -10.0..10.0
+        end
+
+        # This is called by the architecture to get the data. It first
+        # splits the set name into func@range.
+        def query_dataset(set)
+          name = "#{set}"
+
+          u_values = make_dvector(@u_range, @u_samples || @samples)
+          v_values = make_dvector(@v_range, @v_samples || @samples)
+
+          if ! (set.split_at_toplevel(/:/).size > 1)
+            set = "u:v:#{set}"
+          end
+
+          val_u = Dvector.new
+          val_v = Dvector.new
+          for u in u_values
+            for v in v_values
+              val_u << u
+              val_v << v
+            end
+          end
+
+          
+
+          return Dataset.dataset_from_spec(name, set) do |b|
+            get_data_column(b, [val_u, val_v])
+          end
+        end
+
+
+        protected
+        
+        # Turns a Range and a number of points into a Dvector
+        def make_dvector(range, nb_points, log = @log)
+          n = nb_points -1
+          a = Dvector.new(nb_points) { |i| 
+            i.to_f/(n.to_f)
+          }
+          # a is in [0:1] inclusive...
+          if log
+            delta = range.last/range.first
+            # delta is positive necessarily
+            a *= delta.log
+            a.exp!
+            a *= range.first
+          else
+            delta = range.last - range.first
+            a *= delta
+            a += range.first
+          end
+          return a
+        end
+
+        # Uses compute_formula to get data from 
+        def get_data_column(column, values)
+          column.gsub!(/\b(u|v)\b/) do
+            cl = if $1 == 'u'
+                   0
+                 else
+                   1
+                 end
+            "(column[#{cl}])"
+          end
+          return Ruby.compute_formula(column, values)
+        end
+
+        
+      end
+    end
+  end
+end

data/lib/ctioga2/data/backends/backends/text.rb

@@ -149,6 +149,7 @@ EOD
           else
             m = Dir::glob(spec)
             if m.size > 0
+              m.sort!
               return m
             else
               return super

data/lib/ctioga2/data/dataset.rb

@@ -104,8 +104,8 @@ module CTioga2
             specs[idx][mod] = yield s
           else
             specs[i] = {"value" =>  yield(s)}
+            i += 1
           end
-          i += 1
         end
         columns = []
         for s in specs

data/lib/ctioga2/data/stack.rb

@@ -463,12 +463,20 @@ EOH
               [], 
               {
                 'number' => CmdArg.new('integer'), 
-                'which' => CmdArg.new('stored-dataset')
+                'precision' => CmdArg.new('float'), 
+                'which' => CmdArg.new('stored-dataset'),
+                'columns' => CmdArg.new('integer-list')
               }
               ) do |plotmaker, opts|
       stack = plotmaker.data_stack
+      cols = if opts.key? 'columns'
+               opts['columns'].map { |x| x - 1 }
+             else
+               [0]
+             end
       datasets = stack.latest_datasets(opts)
-      plotmaker.data_stack.merge_datasets_into_last(datasets)
+      plotmaker.data_stack.merge_datasets_into_last(datasets, cols,
+                                                    opts['precision'])
     end
     
     MergeToLastCommand.describe("Merge datasets based on X column",
@@ -476,7 +484,9 @@ EOH
 This commands merges data with matching X values from a dataset (by
 default the one before the last) into the last one. Data points that
 have no corresponding X value in the current dataset are simply
-ignored.
+ignored. If the @columns@ option is provided, the numbered columns are
+use instead of the X columns (X is 1). More than one column can be
+provided this way, in which case *all* values must match.
 
 This can be used to build 3D datasets for {command: xyz-map} or 
 {command: xy-parametric}.