Subversion Repositories wimsdev

Rev

Rev 7152 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7152 Rev 12023
Line 57... Line 57...
57
 
57
 
58
if [ ! -z "$w_insplot_data" ]; then
58
if [ ! -z "$w_insplot_data" ]; then
59
  cat >$2/insplot_data <<@
59
  cat >$2/insplot_data <<@
60
$w_insplot_data
60
$w_insplot_data
61
@
61
@
62
fi 
62
fi
63
if [ -z "$w_ins_anim_loop" ]; then w_ins_anim_loop=0; fi
63
if [ -z "$w_ins_anim_loop" ]; then w_ins_anim_loop=0; fi
64
insplot_colors=`echo $w_insplot_colors | tr ';\12' '  '`
64
insplot_colors=`echo $w_insplot_colors | tr ';\12' '  '`
65
 
65
 
66
if [ ! -z $w_insplot_transparent ]; then
66
if [ ! -z $w_insplot_transparent ]; then
67
 gnuplot_transp=transparent
67
 gnuplot_transp=transparent
Line 80... Line 80...
80
 intermediate_format=$w_ins_format
80
 intermediate_format=$w_ins_format
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...
86
### and adress new chroot...
87
chroot_version=`cat $w_wims_home/chroot/version`
87
chroot_version=`cat $w_wims_home/chroot/version`
88
if [ "$chroot_version" = "4" ] ; then
88
if [ "$chroot_version" = "4" ] ; then
89
    gnuplot_version=4
89
    gnuplot_version=4
90
else
90
else
Line 95... Line 95...
95
else
95
else
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"}'`
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"}'`
97
  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"
98
# insplot_set=`echo $insplot_set | perl -e '$ins_set=<> ; $ins_set =~ s/(set +size +\d+\.\d+,\d+\.\d+)// ; $ins_set =~ s/set/\nset/g ; print $ins_set;'`
98
# insplot_set=`echo $insplot_set | perl -e '$ins_set=<> ; $ins_set =~ s/(set +size +\d+\.\d+,\d+\.\d+)// ; $ins_set =~ s/set/\nset/g ; print $ins_set;'`
99
  insplot_set=`echo "$insplot_set" | sed "s/set[ 	]*size *[0-9]\.[0-9]*,[0-9]\.[0-9]*//g"`
99
  insplot_set=`echo "$insplot_set" | sed "s/set[ 	]*size *[0-9]\.[0-9]*,[0-9]\.[0-9]*//g"`
-
 
100
  insplot_set=`echo "$insplot_set" | sed "s/set +no/unset /g"`
100
fi
101
fi
101
 
102
 
102
### todo : dans les nouvelles versions de gnuplot, transformer "set noxxx" en "unset xxx"
103
### todo : dans les nouvelles versions de gnuplot, transformer "set noxxx" en "unset xxx"
103
if [ ! -z "$multiplot" ]; then
104
if [ ! -z "$multiplot" ]; then
104
 plotcmd="set multiplot"
105
 plotcmd="set multiplot"
105
 i=1
106
 i=1
106
 until [ $i -gt $multiplot ]; do
107
 until [ $i -gt $multiplot ]; do
107
  tt=`echo "$insplot_parm" | awk 'FNR=='$i' {print;exit}'`
108
  tt=`echo "$insplot_parm" | awk 'FNR=='$i' {print;exit}'`
108
  t2=`echo "$w_insplot_split" \
109
  t2=`echo "$w_insplot_split" \
109
	| awk -F ';' 'FNR=='$i' {for(j=1;j<=NF;j++) print "set "$j;exit}'`
110
	| awk -F ';' 'FNR=='$i' {for(j=1;j<=NF;j++) print "set "$j;exit}'`
-
 
111
  t2=`echo "$t2" | sed "s/set +no/unset /g"`
110
  c1=`echo $tt | awk '{print $1}'`
112
  c1=`echo $tt | awk '{print $1}'`
111
  c2=`echo $tt | awk '{print substr($0,3)}'`
113
  c2=`echo $tt | awk '{print substr($0,3)}'`
112
  if [ $c1 = "2D" ]; then 
114
  if [ $c1 = "2D" ]; then
113
    cc="$plot_cmd_2D $c2"
115
    cc="$plot_cmd_2D $c2"
114
  else
116
  else
115
    if [ $c1 = "3D" ]; then
117
    if [ $c1 = "3D" ]; then
116
      cc="$plot_cmd_3D $c2"
118
      cc="$plot_cmd_3D $c2"
117
    else
119
    else
Line 122... Line 124...
122
	$t2
124
	$t2
123
	$cc"
125
	$cc"
124
  i=$(( $i+1 ))
126
  i=$(( $i+1 ))
125
 done
127
 done
126
 plotcmd="$plotcmd
128
 plotcmd="$plotcmd
127
	set nomultiplot"
129
	unset multiplot"
128
else
130
else
129
 plotcmd="$insplot_cmd $plot_parm"
131
 plotcmd="$insplot_cmd $plot_parm"
130
fi
132
fi
131
 
133
 
132
plot_content=
134
plot_content=