flammarion 0.1.8pre → 0.1.8pre1

data/lib/flammarion.rb

@@ -15,6 +15,7 @@ begin
 rescue LoadError
 end
 
+require_relative 'flammarion/plot.rb'
 require_relative 'flammarion/writeable.rb'
 require_relative 'flammarion/pane.rb'
 require_relative 'flammarion/server.rb'

data/lib/flammarion/plot.rb

@@ -0,0 +1,47 @@
+module Flammarion
+  # A representation of a plot in a writeable area. See {Writeable#plot}
+  class Plot
+    attr_reader :engraving
+    def initialize(*args)
+      if args.size == 0 then
+        @engraving = Engraving.new
+        @id = @engraving.make_id
+        @target = "default"
+      elsif args.size == 3 then
+        id, target, engraving = args
+        @id = id
+        @target = target
+        @engraving = engraving
+      else
+        raise ArgumentError.new("ArgumentError: wrong number of arguments (#{args.size} for 0 or 3)")
+      end
+    end
+
+    def plot(data, options = {})
+      if data.respond_to?(:keys)
+        options = options.merge(data)
+        if data.include?(:xy) then
+          data = data.clone
+          data[:x] = data[:xy].map(&:first)
+          data[:y] = data[:xy].map(&:last)
+          data.delete(:xy)
+        end
+        data = [data]
+      elsif not data.first.respond_to?(:keys)
+        data = [{y:data, x:(1..data.size).to_a}.merge(options)]
+      end
+      @engraving.send_json({action:'plot', id:@id, target:@target, data:data}.merge(options))
+    end
+
+    def to_svg
+      svg = nil
+      @engraving.script(%|$('#plot-i9').find('svg')[0].outerHTML|, coffee:false) {|r| svg = r['result'] || "Error"}
+      sleep(0.1) while svg.nil?
+      return svg
+    end
+
+    def layout(options)
+      @engraving.send_json({action:'plot', id:@id, target: @target, layout: options})
+    end
+  end
+end

data/lib/flammarion/version.rb

@@ -1,3 +1,3 @@
   module Flammarion
-    VERSION = "0.1.8pre"
+    VERSION = "0.1.8pre1"
   end

data/lib/flammarion/writeable.rb

@@ -40,39 +40,6 @@ module Flammarion
       end
     end
 
-    # A representation of a plot in a writeable area. See {Writeable#plot}
-    class Plot
-      attr_reader :engraving
-      def initialize(id, target, engraving)
-        @id = id
-        @target = target
-        @engraving = engraving
-      end
-
-      def plot(data, options = {})
-        if data.respond_to?(:keys)
-          options = options.merge(data)
-          if data.include?(:xy) then
-            data = data.clone
-            data[:x] = data[:xy].map(&:first)
-            data[:y] = data[:xy].map(&:last)
-            data.delete(:xy)
-          end
-          data = [data]
-        elsif not data.first.respond_to?(:keys)
-          data = [{y:data, x:(1..data.size).to_a}.merge(options)]
-        end
-        @engraving.send_json({action:'plot', id:@id, target:@target, data:data}.merge(options))
-      end
-
-      def to_svg
-        svg = nil
-        @engraving.script(%|$('#plot-i9').find('svg')[0].outerHTML|, coffee:false) {|r| svg = r['result'] || "Error"}
-        sleep(0.1) while svg.nil?
-        return svg
-      end
-    end
-
     # @!macro [new] escape_options
     #  @option options [Boolean] :raw (false) Perform no escaping at all.
     #  @option options [Boolean] :colorize (true) Translate ANSI color escape

data/lib/html/build/javascripts/all.js

@@ -7427,7 +7427,10 @@ window.font_awesome_list = ["glass","music","search","envelope-o","heart","star"
         }, window.default_plot_options, data));
       } else {
         plotDiv[0].data = data.data;
-        return Plotly.redraw(plotDiv[0]);
+        Plotly.redraw(plotDiv[0]);
+        if (data.layout) {
+          return Plotly.relayout(plotDiv[0], data);
+        }
       }
     }
   });

data/lib/html/build/javascripts/plot.js

@@ -52,7 +52,10 @@
         }, window.default_plot_options, data));
       } else {
         plotDiv[0].data = data.data;
-        return Plotly.redraw(plotDiv[0]);
+        Plotly.redraw(plotDiv[0]);
+        if (data.layout) {
+          return Plotly.relayout(plotDiv[0], data);
+        }
       }
     }
   });

data/lib/html/source/javascripts/plot.coffee

@@ -35,3 +35,4 @@ $.extend WSClient.prototype.actions,
     else
       plotDiv[0].data = data.data
       Plotly.redraw(plotDiv[0])
+      Plotly.relayout(plotDiv[0], data) if data.layout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.8pre
+  version: 0.1.8pre1
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame
@@ -3819,6 +3819,7 @@ files:
 - lib/flammarion/server.rb
 - lib/flammarion/engraving.rb
 - lib/flammarion/pane.rb
+- lib/flammarion/plot.rb
 - lib/flammarion/version.rb
 - lib/flammarion/revelator.rb
 - lib/flammarion/writeable.rb