nyaplot 0.1.6 → 0.2.0.rc1

data/lib/nyaplot/position.rb

@@ -0,0 +1,7 @@
+module Nyaplot
+  class Position2D
+    include Nyaplot::Base
+    type :position2d
+    required_args :x, :y
+  end
+end

data/lib/nyaplot/scale.rb

@@ -0,0 +1,19 @@
+module Nyaplot
+  class RowScale
+    include Nyaplot::Base
+    type :row_scale
+    required_args :scale, :column
+  end
+
+  class DataFrameScale
+    include Nyaplot::Base
+    type :df_scale
+    required_args :data, :column, :range
+  end
+
+  class Scale
+    include Nyaplot::Base
+    type :scale
+    required_args :domain, :range, :type
+  end
+end

data/lib/nyaplot/sheet.rb

@@ -0,0 +1,83 @@
+module Nyaplot
+  module Sheet
+    # Root class for glyphs
+    class Context
+      include Nyaplot::Base
+      type :context2d
+      required_args :glyphs
+      optional_args :width, :height
+
+      def add_glyph(*glyph)
+        glyphs([]) if glyphs.nil?
+
+        glyph.each{|g|
+          glyph.push(g.child) if g.respond_to? :child
+        }
+
+        glyphs.concat(glyph)
+        add_dependency(*glyph)
+
+        class << glyphs
+          def to_json(*args)
+            self.map{|obj| obj.uuid}.to_json
+          end
+        end
+      end
+
+      def range(method_name)
+        glyphs.reduce([Float::INFINITY, -Float::INFINITY]) do |memo, g|
+          if (r = g.send(method_name)).length != 2 || r.any? {|val| !(val.is_a?(Numeric))}
+            memo.delete(Float::INFINITY)
+            memo.delete(-Float::INFINITY)
+            memo.concat(r.to_a).uniq
+          else
+            min, max = r
+            memo[0] = [min, memo[0]].min
+            memo[1] = [max, memo[1]].max
+            memo
+          end
+        end
+      end
+
+      def xscale(range)
+        r = range(:range_x)
+        s = Scale.new(domain: r, range: range)
+        s.type(r.all? {|v| v.is_a? Numeric} ? :linear : :ordinal)
+        s
+      end
+
+      def yscale(range)
+        r = range(:range_y)
+        s = Scale.new(domain: r, range: range)
+        s.type(r.all? {|v| v.is_a? Numeric} ? :linear : :ordinal)
+        s
+      end
+
+      def position(pos)
+        @dependency.each do |g|
+          g.position(pos)
+        end
+      end
+
+      alias :add :add_glyph
+    end
+
+    class Axis
+      include Nyaplot::Base
+      type :axis2d
+      required_args :xscale, :yscale, :width, :height
+      optional_args :margin, :stroke_color, :stroke_width, :grid
+
+      def before_to_json
+        raise "width and height should be specified" if [width, height].any? {|a| a.nil?}
+      end
+    end
+
+    class Background
+      include Nyaplot::Base
+      type :background2d
+      required_args :width, :height
+      optional_args :bg_color, :stroke_width, :stroke_color
+    end
+  end
+end

data/lib/nyaplot/simple/stage.rb

@@ -0,0 +1,29 @@
+module Nyaplot
+  module Simple
+    class DefaultStage < Stage2D
+      def initialize(width=500, height=500)
+        @width = width; @height = height
+        @background = Nyaplot::Sheet::Background.new
+        @context = Nyaplot::Sheet::Context.new
+        @axis = Nyaplot::Sheet::Axis.new
+        super(background, context, axis)
+      end
+
+      def adjust_size
+        [@background, @context, @axis].each do |sheet|
+          sheet.width
+          sheet.height
+        end
+      end
+
+      def adjust_margin
+      end
+
+      def before_to_json
+
+        adjust_size
+        adjust_margin
+      end
+    end
+  end
+end

data/lib/nyaplot/stage2d.rb

@@ -0,0 +1,56 @@
+module Nyaplot
+  # the wrapper class for stage2d of Nyaplotjs
+  # (https://github.com/domitry/Nyaplotjs/blob/v2/src/parser/stage2d.js)
+  #
+  class Stage2D
+    include Nyaplot::Base
+    type :stage2d
+    required_args :sheets
+    optional_args :margin, :width, :height
+    attr_accessor :background, :context, :axis
+
+    def initialize(*args)
+      super()
+      attr(width: 500, height: 400)
+      @background = Nyaplot::Sheet::Background.new
+      @context = Nyaplot::Sheet::Context.new
+      @axis = Nyaplot::Sheet::Axis.new
+      add_sheet(@background, @axis, @context)
+    end
+
+    def add_sheet(*given)
+      sheets([]) if sheets.nil?
+      sheets.concat(given.map{|obj| obj.uuid})
+      add_dependency(*given)
+    end
+
+    def adjust_size(width, height)
+      [[:width, width], [:height, height]].each do |val|
+        name, base = val
+        if @axis.send(name).nil?
+          @axis.send(name, (val = @background.send(name)).nil? ? base : val)
+        end
+        @background.send(name, @axis.send(name)) if @background.send(name).nil?
+      end
+    end
+
+    def adjust_margin
+    end
+
+    def resolve_dependency
+      child_width, child_height = [width*0.9, height*0.9]
+
+      adjust_size(child_width, child_height)
+      adjust_margin
+
+      x_pad, y_pad = [child_width*0.05, child_height*0.05]
+      xscale = @context.xscale([x_pad, child_width - x_pad])
+      yscale = @context.yscale([child_height - y_pad, y_pad])
+
+      pos = Position2D.new(x: xscale, y: yscale)
+
+      @context.position(pos)
+      @axis.xscale(xscale).yscale(yscale)
+    end
+  end
+end

data/lib/nyaplot/templates/init.js.erb

@@ -20,7 +20,7 @@ end
 
 	var script = d3.select("head")
 	    .append("script")
-	    .attr("src", "http://cdn.rawgit.com/domitry/Nyaplotjs/master/release/nyaplot.js")
+	    .attr("src", "http://rawgit.com/domitry/Nyaplotjs/v2/release/nyaplot.js")
 	    .attr("async", true);
 
 	script[0][0].onload = script[0][0].onreadystatechange = function(){

data/lib/nyaplot/templates/init_interactive.js

@@ -0,0 +1,77 @@
+(function(){
+    if(window.IPython !== undefined){
+        var comm_global = null;
+
+        var callback = function(uuid, ranges){
+            comm_global.send({
+                type: "selected",
+                stage_uuid: uuid,
+                range: ranges.x
+            });
+        };
+
+        window.Nyaplot.sheet_manager.register_sheet(
+            "interactive_layer",
+            ["parent", "scalex", "scaley", "stage_uuid"],
+            {
+                opacity: 0.125,
+                color: 'gray'
+            },
+            function(parent, scalex, scaley, stage_uuid, options){
+                var brushed = function(){
+                    var ranges = {
+                        x: (brush.empty() ? scalex.domain() : brush.extent()),
+                        y: scaley.domain()
+                    };
+                    callback(stage_uuid, ranges);
+                };
+
+                var brush = d3.svg.brush()
+                        .x(scalex)
+                        .on("brushend", brushed);
+
+                var model = parent.append("g");
+                console.log(scaley);
+                var height = d3.max(scaley.range()) - d3.min(scaley.range());
+                var y = d3.min(scaley.range());
+
+                parent.call(brush)
+                    .selectAll("rect")
+                    .attr("y", y)
+                    .attr("height", height)
+                    .style({
+                        "fill-opacity": options.opacity,
+                        "fill": options.color,
+                        "shape-rendering": "crispEdges"
+                    });
+            }
+        );
+
+        window.IPython.notebook.kernel.comm_manager.register_target("nyaplot_interactive", function(comm, msg){
+            comm.on_msg(function(msg_){
+                console.log("msg has come.", msg_);
+                var msg = msg_.content.data;
+
+                switch(msg.type){
+                case "hello":
+                    comm_global = comm;
+                    break;
+                case "update":
+                    /*
+                     msg: {
+                     type: "update",
+                     model: model
+                     }
+                     */
+                    console.log("update");
+                    var model = JSON.parse(msg.model);
+                    window.Nyaplot.core.parse(model);
+                    break;
+                default:
+                    console.log("error", msg);
+                    break;
+                }
+            });
+        });
+    }
+})();

data/lib/nyaplot/templates/iruby.erb

@@ -2,15 +2,8 @@
 <script>
 (function(){
     var render = function(){
-        var model = <%= model %>
-        var id_name = '#vis-<%= id %>';
-        Nyaplot.core.parse(model, id_name);
-
-        require(['downloadable'], function(downloadable){
-          var svg = d3.select(id_name).select("svg");
-	  if(!svg.empty())
-	    svg.call(downloadable().filename('fig'));
-	});
+        var model = <%= model %>;
+        Nyaplot.core.parse(model);
     };
     if(window['Nyaplot']==undefined){
         window.addEventListener('load_nyaplot', render, false);

data/lib/nyaplot/version.rb

@@ -1,3 +1,3 @@
 module Nyaplot
-  VERSION = "0.1.6"
+  VERSION = "0.2.0.rc1"
 end

data/lib/nyaplot3d/core.rb

@@ -1,6 +1,6 @@
 module Nyaplot
   add_extension("Elegans")
   add_dependency("THREE","http://cdnjs.cloudflare.com/ajax/libs/three.js/r66/three.min")
-  add_dependency("Elegans","https://cdn.rawgit.com/domitry/elegans/d81a728f62edaeeb67261516a272438fb39fa80a/release/elegans")
+  add_dependency("Elegans","http://cdn.rawgit.com/domitry/elegans/nyaplot-extension/release/elegans")
   init_iruby if defined? IRuby
 end

data/nyaplot.gemspec

@@ -51,33 +51,8 @@ EOF
   spec.required_ruby_version = ">= 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_runtime_dependency "mikon", "~> 0.1.2.rc1"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
-
-  root_path = File.expand_path(File.dirname(__FILE__))
-
-  # get an array of submodule dirs by executing 'pwd' inside each submodule
-  `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
-    # for each submodule, change working directory to that submodule
-    Dir.chdir(submodule_path) do
-      # issue git ls-files in submodule's directory
-      submodule_files = `git ls-files`.split($\)
-      
-      # prepend the submodule path to create absolute file paths
-      submodule_files_fullpaths = submodule_files.map do |filename|
-        "#{submodule_path}/#{filename}"
-      end
-      
-      # remove leading path parts to get paths relative to the gem's root dir
-      # (this assumes, that the gemspec resides in the gem's root dir)
-      submodule_files_paths = submodule_files_fullpaths.map do |filename|
-        str = filename.gsub root_path, ""
-        str[1..(str.length-1)]
-      end
-
-      # add relative paths to gem.files
-      spec.files += submodule_files_paths
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyaplot
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0.rc1
 platform: ruby
 authors:
 - Naoki Nishida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: mikon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +112,7 @@ files:
 - examples/notebook/Mapnya.ipynb
 - examples/notebook/Mapnya2.ipynb
 - examples/notebook/Mapnya3.ipynb
+- examples/notebook/Nyaplotv2.ipynb
 - examples/notebook/data/11-1-result0.6.csv
 - examples/notebook/data/UNdata_Export_20140813_215958400.csv
 - examples/notebook/data/circular/category.csv
@@ -658,9 +673,6 @@ files:
 - lib/mapnya/datasets/countries/dist/countries.xml
 - lib/mapnya/datasets/countries/index.js
 - lib/mapnya/datasets/countries/package.json
-- lib/mapnya/datasets/geo-boundaries-world-110m/README.md
-- lib/mapnya/datasets/geo-boundaries-world-110m/countries.geojson
-- lib/mapnya/datasets/geo-boundaries-world-110m/datapackage.json
 - lib/mapnya/datasets/world.geo.json
 - lib/mapnya/js/.gitignore
 - lib/mapnya/js/Gruntfile.js
@@ -690,12 +702,18 @@ files:
 - lib/nyaplot/colorbrewer/colorbrewer.json
 - lib/nyaplot/core.rb
 - lib/nyaplot/data.rb
-- lib/nyaplot/database.rb
-- lib/nyaplot/diagram.rb
-- lib/nyaplot/frame.rb
+- lib/nyaplot/glyph.rb
+- lib/nyaplot/interactive.rb
 - lib/nyaplot/monkeys.rb
+- lib/nyaplot/pane.rb
 - lib/nyaplot/plot.rb
+- lib/nyaplot/position.rb
+- lib/nyaplot/scale.rb
+- lib/nyaplot/sheet.rb
+- lib/nyaplot/simple/stage.rb
+- lib/nyaplot/stage2d.rb
 - lib/nyaplot/templates/init.js.erb
+- lib/nyaplot/templates/init_interactive.js
 - lib/nyaplot/templates/iruby.erb
 - lib/nyaplot/templates/static_html.erb
 - lib/nyaplot/version.rb
@@ -745,9 +763,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -771,3 +789,4 @@ test_files:
 - spec/nyaplot3d_spec.rb
 - spec/nyaplot_spec.rb
 - spec/spec_helper.rb
+has_rdoc: