projects
/
MojoFacets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc8ecd6
)
gnuplot hide works for multiple checked columns
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Sun, 11 Jun 2023 12:53:04 +0000
(14:53 +0200)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Sun, 11 Jun 2023 12:53:04 +0000
(14:53 +0200)
lib/MojoFacets/Gnuplot.pm
patch
|
blob
|
history
diff --git
a/lib/MojoFacets/Gnuplot.pm
b/lib/MojoFacets/Gnuplot.pm
index
ae8d5f3
..
eebf68c
100644
(file)
--- a/
lib/MojoFacets/Gnuplot.pm
+++ b/
lib/MojoFacets/Gnuplot.pm
@@
-8,6
+8,7
@@
use base 'Mojolicious::Controller';
use Data::Dump qw(dump);
use Digest::MD5 qw(md5_hex);
use Text::Unaccent::PurePerl;
use Data::Dump qw(dump);
use Digest::MD5 qw(md5_hex);
use Text::Unaccent::PurePerl;
+use MojoFacets::Data;
sub index {
my $self = shift;
sub index {
my $self = shift;
@@
-16,11
+17,11
@@
sub index {
my $path = $self->session('path') || return $self->redirect_to('/data/load');
my $with = $self->param('with') || 'points';
my $path = $self->session('path') || return $self->redirect_to('/data/load');
my $with = $self->param('with') || 'points';
+ my $gnuplot_hide = $self->every_param('gnuplot_hide');
+ warn "## gnuplot_hide=",dump( $gnuplot_hide );
my $hide_columns;
my $hide_columns;
- if ( $self->param('gnuplot_hide') ) {
- $hide_columns->{$_}++ foreach $self->param('gnuplot_hide');
- warn "## hide_columns ", dump $hide_columns;
- }
+ $hide_columns->{$_}++ foreach @$gnuplot_hide;
+ warn "## hide_columns ", dump $hide_columns;
# my $name = join('.', 'items', map { my $n = unac_string($_); $n =~ s/\W+/_/g; $n } @$columns );
my $name = MojoFacets::Data::__export_path_name( $path, 'items', @$columns );
# my $name = join('.', 'items', map { my $n = unac_string($_); $n =~ s/\W+/_/g; $n } @$columns );
my $name = MojoFacets::Data::__export_path_name( $path, 'items', @$columns );
@@
-41,6
+42,7
@@
sub index {
my @plot;
foreach ( 1 .. $#$columns ) {
my $title = $columns->[$_];
my @plot;
foreach ( 1 .. $#$columns ) {
my $title = $columns->[$_];
+ next if $hide_columns->{$title};
$title =~ s/_/ /g;
my $n = $_ + 1 + $spaces;
push @plot, qq|"$dir/$url" using 1:$n title "$title" with $with| unless $hide_columns->{ $title };
$title =~ s/_/ /g;
my $n = $_ + 1 + $spaces;
push @plot, qq|"$dir/$url" using 1:$n title "$title" with $with| unless $hide_columns->{ $title };
@@
-67,8
+69,9
@@
set format x "$timefmt"
#set yrange [ 0 : ]
$g .= "\n\nplot " . join(',', @plot) . "\n";
#set yrange [ 0 : ]
$g .= "\n\nplot " . join(',', @plot) . "\n";
+ $g =~ s/\n\n+/\n/sg;
-warn "gnuplot $g";
+
#
warn "gnuplot $g";
open(my $gnuplot, '|-', 'gnuplot') || die "gnuplot $!";
print $gnuplot $g;
open(my $gnuplot, '|-', 'gnuplot') || die "gnuplot $!";
print $gnuplot $g;