zhangyiss/YouPlot
1
0
Fork 0
mirror of https://github.com/red-data-tools/YouPlot.git synced 2025-05-06 15:11:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to add xyxy fmt

Browse Source
This commit is contained in:
kojix2 2020-08-03 12:39:27 +09:00
parent 1dec36641b
commit 7e42caa506
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/uplot/command.rb
View File

@ -11,6 +11,7 @@ module Uplot
@transpose = false @transpose = false
@output = false @output = false
@count = false @count = false
@fmt = 'xyy'
@debug = false @debug = false
parse_options(argv) parse_options(argv)
end end
@ -29,6 +30,7 @@ module Uplot
opt.on('-p', '--padding VAL', Numeric) { |v| @params[:padding] = v } opt.on('-p', '--padding VAL', Numeric) { |v| @params[:padding] = v }
opt.on('-c', '--color VAL', String) { |v| @params[:color] = v.to_sym } opt.on('-c', '--color VAL', String) { |v| @params[:color] = v.to_sym }
opt.on('-l', '--labels', TrueClass) { |v| @params[:labels] = v } opt.on('-l', '--labels', TrueClass) { |v| @params[:labels] = v }
opt.on('--fmt VAL', String) { |v| @fmt = v }
opt.on('--debug', TrueClass) { |v| @debug = v } opt.on('--debug', TrueClass) { |v| @debug = v }
end end
end end
@ -109,6 +111,8 @@ module Uplot
def preprocess(input) def preprocess(input)
data = CSV.parse(input, col_sep: @delimiter) data = CSV.parse(input, col_sep: @delimiter)
data.delete([]) # Remove blank lines. data.delete([]) # Remove blank lines.
data.delete_if { |i| i.all? nil } # Room for improvement.
p parsed_csv: data if @debug
headers = nil headers = nil
if @transpose if @transpose
if @headers if @headers
@ -158,11 +162,11 @@ module Uplot
UnicodePlot.lineplot(x, y, **@params.compact) UnicodePlot.lineplot(x, y, **@params.compact)
end end
def x1_y1_y2_style(data, headers, call1, call2) # Fix method name def xyy_plot(data, headers, call1, call2) # improve method name
data.map! { |series| series.map(&:to_f) } data.map! { |series| series.map(&:to_f) }
@params[:name] ||= headers[1] if headers @params[:name] ||= headers[1] if headers
@params[:xlabel] ||= headers[0] if headers @params[:xlabel] ||= headers[0] if headers
@params[:ylim] ||= data[1..-1].flatten.minmax @params[:ylim] ||= data[1..-1].flatten.minmax # need?
plot = UnicodePlot.public_send(call1, data[0], data[1], **@params.compact) plot = UnicodePlot.public_send(call1, data[0], data[1], **@params.compact)
2.upto(data.size - 1) do |i| 2.upto(data.size - 1) do |i|
UnicodePlot.public_send(call2, plot, data[0], data[i], name: headers[i]) UnicodePlot.public_send(call2, plot, data[0], data[i], name: headers[i])
@ -170,21 +174,44 @@ module Uplot
plot plot
end end
def xyxy_plot(data, headers, call1, call2) # improve method name
data.map! { |series| series.map(&:to_f) }
data = data.each_slice(2).to_a
@params[:name] ||= headers[0] if headers
@params[:xlim] = data.map(&:first).flatten.minmax
@params[:ylim] = data.map(&:last).flatten.minmax
x1, y1 = data.shift
plot = UnicodePlot.public_send(call1, x1, y1, **@params.compact)
data.each_with_index do |(xi, yi), i|
UnicodePlot.public_send(call2, plot, xi, yi, name: headers[i * 2])
end
plot
end
def lines(data, headers) def lines(data, headers)
if true # x1_y1_y2_style case @fmt
x1_y1_y2_style(data, headers, :lineplot, :lineplot!) when 'xyy'
xyy_plot(data, headers, :lineplot, :lineplot!)
when 'xyxy'
xyxy_plot(data, headers, :lineplot, :lineplot!)
end end
end end
def scatter(data, headers) def scatter(data, headers)
if true # x1_y1_y2_style case @fmt
x1_y1_y2_style(data, headers, :scatterplot, :scatterplot!) when 'xyy'
xyy_plot(data, headers, :scatterplot, :scatterplot!)
when 'xyxy'
xyxy_plot(data, headers, :scatterplot, :scatterplot!)
end end
end end
def density(data, headers) def density(data, headers)
if true # x1_y1_y2_style case @fmt
x1_y1_y2_style(data, headers, :densityplot, :densityplot!) when 'xyy'
xyy_plot(data, headers, :densityplot, :densityplot!)
when 'xyxy'
xyxy_plot(data, headers, :densityplot, :densityplot!)
end end
end end