Rev 1059 | Rev 7152 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1059 | Rev 4303 | ||
---|---|---|---|
Line 81... | Line 81... | ||
81 | else |
81 | else |
82 | intermediate_format=$w_gnuplot_format |
82 | intermediate_format=$w_gnuplot_format |
83 | fi |
83 | fi |
84 | 84 | ||
85 | ###fix compatibility with gnuplot 4 |
85 | ###fix compatibility with gnuplot 4 |
- | 86 | ### and adress new chroot... |
|
- | 87 | chroot_version=`cat $w_wims_home/chroot/version` |
|
- | 88 | if [ "$chroot_version" = "4" ] ; then |
|
- | 89 | gnuplot_version=4 |
|
- | 90 | else |
|
86 | gnuplot_version=`gnuplot --version | awk '{ print $2 }' | awk -F '.' '{ print $1 }'` |
91 | gnuplot_version=`gnuplot --version | awk '{ print $2 }' | awk -F '.' '{ print $1 }'` |
- | 92 | fi |
|
87 | if [ "$gnuplot_version" -lt "4" ] || [ -z "$gnuplot_version" ]; then |
93 | if [ "$gnuplot_version" -lt "4" ] || [ -z "$gnuplot_version" ]; then |
88 | insplot_termset="set terminal $intermediate_format $gnuplot_transp $w_insplot_font size 500,400 $insplot_colors" |
94 | insplot_termset="set terminal $intermediate_format $gnuplot_transp $w_insplot_font size 500,400 $insplot_colors" |
89 | else |
95 | else |
90 | testsize=`echo $insplot_set | perl -e 'if (<> =~ /size (\d+\.\d+),(\d+\.\d+)/) {$sx=$1*500 ; $sy=$2*400 ; print "size $sx,$sy" ; } else {print "size 500,400"}'` |
96 | testsize=`echo $insplot_set | perl -e 'if (<> =~ /size (\d+\.\d+),(\d+\.\d+)/) {$sx=$1*500 ; $sy=$2*400 ; print "size $sx,$sy" ; } else {print "size 500,400"}'` |
91 | insplot_termset="set terminal $intermediate_format $gnuplot_transp $w_insplot_font $testsize $insplot_colors" |
97 | insplot_termset="set terminal $intermediate_format $gnuplot_transp $w_insplot_font $testsize $insplot_colors" |