Rev 4618 | Rev 4697 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4618 | Rev 4645 | ||
---|---|---|---|
Line -... | Line 1... | ||
- | 1 | !!$wims_sesdir a mettre partout y a t-il quelque chose pour s2 |
|
1 | !read lang/names.phtml.fr |
2 | !read lang/names.phtml.fr |
2 | !default step=1 |
- | |
3 | !set limit=50 |
3 | !set limit=50 |
4 | - | ||
5 |
|
4 | !reset begin |
6 | arrow=0 |
- | |
7 |
|
5 | !default ext=1 |
8 |
|
6 | javaoption=$javatype |
9 |
|
7 | !default javaoption=circle |
10 | - | ||
11 | !if $end=1 |
8 | !if $end=1 |
12 | !goto end |
9 | !goto end |
13 | !endif |
10 | !endif |
14 | !if $step <=1 |
11 | !if $step <=1 |
15 | !set wims_form_method=file |
12 | !set wims_form_method=file |
16 | !set already=!sh mkdir -p $wims_home/$wims_sesdir/$sesdir |
13 | !set already=!sh mkdir -p $wims_home/$wims_sesdir/$sesdir; ls $wims_home/$wims_sesdir/$sesdir |
17 | !set already=!words2items $already |
14 | !set already=!words2items $already |
18 | !set already=!nospace $already |
15 | !set already=!nospace $already |
19 | !endif |
16 | !endif |
20 | !if $step>$limit |
17 | !if $step>$limit |
21 | test=limit |
18 | test=limit |
Line 27... | Line 24... | ||
27 | compute= |
24 | compute= |
28 | !if $wims_deposit_old=0 |
25 | !if $wims_deposit_old=0 |
29 | !reset wims_deposit_old |
26 | !reset wims_deposit_old |
30 | !endif |
27 | !endif |
31 | !default wims_deposit=$wims_deposit_old |
28 | !default wims_deposit=$wims_deposit_old |
- | 29 | f_wims_deposit=!replace internal . by , in $wims_deposit |
|
- | 30 | f_wims_deposit=!item 1 of $f_wims_deposit |
|
32 | !if $data= |
31 | !if $data= |
33 | !if noname.file isin $wims_deposit or $wims_deposit=$empty |
32 | !if noname.file isin $wims_deposit or $wims_deposit=$empty |
34 | wims_deposit=$wims_deposit_old |
33 | wims_deposit=$wims_deposit_old |
35 | !else |
34 | !else |
36 | !reset wims_deposit_old |
35 | !reset wims_deposit_old |
37 | !endif |
36 | !endif |
38 | !endif |
37 | !endif |
39 | !if $wims_deposit_old!= |
38 | !if $wims_deposit_old!= |
- | 39 | begin=1 |
|
40 | f_wims_deposit=!replace internal . by , in $wims_deposit_old |
40 | f_wims_deposit=!replace internal . by , in $wims_deposit_old |
41 | f_wims_deposit=!item 1 of |
41 | f_wims_deposit=!item 1 of $f_wims_deposit |
42 | data=!sh cat $wims_home/$wims_sesdir/data_$f_wims_deposit |
42 | data=!sh cat $wims_home/$wims_sesdir/data_$f_wims_deposit |
- | 43 | !reset wims_deposit_old |
|
43 | insdraw_size=!line 1 of $data |
44 | insdraw_size=!line 1 of $data |
44 | step=!linecnt $data |
45 | step=!linecnt $data |
45 | test_ext=!line 2 of $data |
46 | test_ext=!line 2 of $data |
46 |
|
47 | test_extcnt=!itemcnt $test_ext |
- | 48 | test_extcnt2=!listintersect test_ext and $list_curve |
|
- | 49 | !if ($test_extcnt=3 and $type=1) or ($type<2 and $(test_ext[2]) isitemof $list_curve) \ |
|
47 |
|
50 | or ($type=2 and $test_extcnt2=$empty) |
48 | data=!line 1 of $data |
51 | data=!line 1 of $data |
49 | step=3 |
52 | step=3 |
50 | !goto 2 |
53 | !goto 2 |
51 | !endif |
54 | !endif |
52 | !if $step=0 |
55 | !if $step=0 |
53 | step=1 |
56 | step=1 |
54 | !goto 1 |
57 | !goto 1 |
55 | !endif |
58 | !endif |
56 | !for l_ =2 to $step |
59 | !for l_ =2 to $step |
57 | c_=!line $l_ of $data |
60 | c_=!line $l_ of $data |
58 | !if |
61 | !if $type=1 |
59 | dessin=!append line arrow $(c_[2..5]),5,black to $dessin |
62 | dessin=!append line arrow $(c_[2..5]),5,black to $dessin |
60 | !endif |
63 | !endif |
61 | !if |
64 | !if $type iswordof 0 2 |
62 | dessin=!append line fcircle $(c_[2..3]),10,black to $dessin |
65 | dessin=!append line fcircle $(c_[2..3]),10,black to $dessin |
63 | !endif |
66 | !endif |
- | 67 | XXXXX |
|
64 | !next |
68 | !next |
65 |
|
69 | !increase step |
66 |
|
70 | !!exit |
67 | !endif wims_deposit_old |
71 | !endif wims_deposit_old |
68 | 72 | ||
69 | :1 |
73 | :1 |
70 | - | ||
71 | !if $step=1 |
74 | !if $step=1 |
72 | !if / isin $wims_deposit or .. isin $wims_deposit or noname.file isin $wims_deposit or $wims_deposit=$empty |
75 | !if / isin $wims_deposit or .. isin $wims_deposit or noname.file isin $wims_deposit or $wims_deposit=$empty |
73 | !if $wims_deposit_old!= |
76 | !if $wims_deposit_old!= |
74 | wims_deposit=$wims_deposit_old |
77 | wims_deposit=$wims_deposit_old |
75 | !else |
78 | !else |
76 | test=noimage |
79 | test=noimage |
77 | !exit |
80 | !exit |
78 | !endif |
81 | !endif |
79 | !endif |
82 | !endif / isin |
80 | test_wims_deposit=!replace internal . by , in $wims_deposit |
83 | test_wims_deposit=!replace internal . by , in $wims_deposit |
81 | test_wims_deposit=!item -1 of $test_wims_deposit |
84 | test_wims_deposit=!item -1 of $test_wims_deposit |
82 | test_wims_deposit=!lowercase $test_wims_deposit |
85 | test_wims_deposit=!lowercase $test_wims_deposit |
83 | !if $test_wims_deposit notwordof jpg png jpeg gif |
86 | !if $test_wims_deposit notwordof jpg png jpeg gif |
84 | test=bad_image |
87 | test=bad_image |
Line 89... | Line 92... | ||
89 | mkdir -p getfile\ |
92 | mkdir -p getfile\ |
90 | mkdir -p $sesdir\ |
93 | mkdir -p $sesdir\ |
91 | mv user-deposit $sesdir/$wims_deposit |
94 | mv user-deposit $sesdir/$wims_deposit |
92 | !endif |
95 | !endif |
93 | !increase step |
96 | !increase step |
94 | !endif |
97 | !endif step=1 |
95 | :2 |
98 | :2 |
96 | !if $step>=2 |
99 | !if $step>=2 |
97 | !if $erase=yes |
100 | !if $erase=yes |
98 | !if |
101 | !if $type=0 |
99 | dessin=!line 1 to -2 of $dessin |
102 | dessin=!line 1 to -2 of $dessin |
100 | !else |
103 | !else |
101 | dessin=!line 1 to -3 of $dessin |
104 | dessin=!line 1 to -3 of $dessin |
102 | !endif |
105 | !endif type=0 |
103 |
|
106 | data=!line 1 to -2 of $data |
104 |
|
107 | !writefile wimshome/sessions/$wims_session/data_$f_wims_deposit $data |
105 |
|
108 | step=$[max($[$step-1],2)] |
106 |
|
109 | !if $step=2 |
107 |
|
110 | !reset data |
108 |
|
111 | !!!writefile wimshome/sessions/$wims_session/data_$f_wims_deposit $data |
109 |
|
112 | !endif step=2 |
110 |
|
113 | !reset legend test erase |
- | 114 | !!!! |
|
111 | !exit |
115 | !exit |
112 |
|
116 | !endif erase=yes |
113 |
|
117 | !endif step>=2 |
114 |
|
118 | !reset wims_form_method |
115 | imgsrc=$wims_ref_name?session=$session&cmd=getfile&special_parm=$sesdir1/$wims_deposit |
119 | !default imgsrc=$wims_ref_name?session=$session&cmd=getfile&special_parm=$sesdir1/$wims_deposit |
116 |
|
120 | click_x=$[$click_x] |
117 |
|
121 | click_y=$[$click_y] |
- | 122 | ||
118 |
|
123 | !if $step=2 |
- | 124 | !reset data |
|
119 | !if $click_x != 0 and $click_y != 0 |
125 | !if $click_x != 0 and $click_y != 0 |
120 | data=!append line $click_x,$click_y to $data |
126 | data=!append line $click_x,$click_y to $data |
121 | !increase step |
127 | !increase step |
122 | insdraw_size=$click_x,$click_y |
128 | insdraw_size=$click_x,$click_y |
123 | !else |
129 | !else |
124 | test=nosize |
130 | test=nosize |
- | 131 | !endif click!=0 .. |
|
- | 132 | !else |
|
- | 133 | !if $type=2 |
|
- | 134 | !if $ext=2 |
|
- | 135 | data=!append item $javaoption,$(javaoutput) to $data |
|
- | 136 | data=!replace internal ; by , in $data |
|
- | 137 | !if $javaoption=circle |
|
- | 138 | javaout2=$(javaoutput[1]),$(javaoutput[2]),$(javaoutput[3])*2,black |
|
- | 139 | !endif |
|
- | 140 | !if $javaoption=rectangle |
|
- | 141 | javaout2=$(javaoutput),black |
|
- | 142 | !endif |
|
- | 143 | !if $javaoption=polygon |
|
- | 144 | javaout2=!replace internal ; by , in black,$(javaoutput) |
|
- | 145 | !endif |
|
- | 146 | dessin=!append line $javaoption $javaout2 to $dessin |
|
- | 147 | !increase step |
|
- | 148 | ext=1 |
|
- | 149 | begin=1 |
|
- | 150 | !reset legend begin test |
|
125 | !endif |
151 | !endif |
126 |
|
152 | !endif type=2 |
- | 153 | ||
127 | !if $legend!=$empty and ($click_x!=0 or $click_y!=0) |
154 | !if ($legend!=$empty and ($click_x!=0 or $click_y!=0)) |
128 | !if $ext<=1 |
155 | !if $ext<=1 |
129 | data=!append line $legend,$click_x,$click_y to $data |
156 | data=!append line $legend,$click_x,$click_y to $data |
130 | !if |
157 | !if $type=1 |
131 | dessin=!append line fcircle $click_x,$click_y,5,black to $dessin |
158 | dessin=!append line fcircle $click_x,$click_y,5,black to $dessin |
132 | !endif |
159 | !endif |
133 | !increase step |
160 | !increase step |
134 | !if |
161 | !if $type iswordof 0 2 |
135 | !reset legend |
162 | !reset legend |
136 | dessin=!append line fcircle $click_x,$click_y,10,black to $dessin |
163 | dessin=!append line fcircle $click_x,$click_y,10,black to $dessin |
137 |
|
164 | !endif |
- | 165 | !if $type=1 |
|
138 | dessin=!append line arrow $click_x,$click_y to $dessin |
166 | dessin=!append line arrow $click_x,$click_y to $dessin |
139 | !endif |
167 | !endif |
- | 168 | !if $type iswordof 1 2 |
|
- | 169 | !increase ext |
|
- | 170 | !endif |
|
140 | !else |
171 | !else |
141 | data=!append item $click_x,$click_y to $data |
172 | data=!append item $click_x,$click_y to $data |
- | 173 | !if $type iswordof 1 |
|
142 | dessin=!append item $click_x,$click_y,10,black to $dessin |
174 | dessin=!append item $click_x,$click_y,10,black to $dessin |
- | 175 | !endif |
|
- | 176 | !if $type iswordof 2 |
|
- | 177 | !insdraw $dessin |
|
- | 178 | !set imgsrc=$ins_filename |
|
- | 179 | !endif |
|
- | 180 | ||
- | 181 | ||
143 | !reset legend |
182 | !reset legend |
144 |
|
183 | ext=1 |
145 |
|
184 | !endif ext <=1 |
146 | !else |
185 | !else legend |
147 | !if $legend=$empty |
186 | !if $legend=$empty and $begin!=1 |
148 | test=nolegend |
187 | test=nolegend |
149 | !endif |
188 | !endif |
150 | !if ($click_x=0 and $click_y=0) |
189 | !if ($click_x=0 and $click_y=0) and $begin!=1 |
151 | test=noclick |
190 | test=noclick |
152 | !endif |
191 | !endif |
153 | !endif |
192 | !endif legend |
154 | !endif |
- | |
155 | !endif |
193 | !endif |
156 | !if $step >= $limit |
194 | !if $step >= $limit |
157 | end=1 |
195 | end=1 |
158 | !endif |
196 | !endif |
159 | 197 | ||
Line 168... | Line 206... | ||
168 | :$(name_description$end)\ |
206 | :$(name_description$end)\ |
169 | $exo |
207 | $exo |
170 | 208 | ||
171 | !writefile wimshome/sessions/$wims_session/submit.oef $exo |
209 | !writefile wimshome/sessions/$wims_session/submit.oef $exo |
172 | !writefile wimshome/sessions/$wims_session/data_$f_wims_deposit $data |
210 | !writefile wimshome/sessions/$wims_session/data_$f_wims_deposit $data |
- | 211 | insdraw_size=!line 1 of $data |
|
- | 212 | !insdraw $dessin |
|
- | 213 | !set imgfilename=$ins_filename |
|
173 | 214 | ||
174 | !sh cd $wims_home/sessions/$wims_session\ |
215 | !sh cd $wims_home/sessions/$wims_session\ |
175 | mkdir -p getfile/oefimg\ |
216 | mkdir -p getfile/oefimg\ |
176 | cp $sesdir/$wims_deposit getfile/oefimg/$wims_deposit |
217 | cp $sesdir/$wims_deposit getfile/oefimg/$wims_deposit |
177 | 218 | !if $type=2 |
|
178 | mkdir -p $wims_home/log/classes/$wims_class/src/images |
- | |
179 |
|
219 | !sh cd $wims_home/\ |
180 | cp |
220 | cp s2/$wims_session/$imgfilename sessions/$wims_session/getfile/oefimg/z_$wims_deposit |
181 | - | ||
182 | !endif |
221 | !endif |
- | 222 | !sh cd $wims_home/sessions/$wims_session\ |
|
183 |
|
223 | cp getfile/oefimg/* getfile/oefimages |
184 | 224 | ||
- | 225 | !endif |
|
- | 226 | !reset click_x click_y erase javaoutput |