Subversion Repositories wimsdev

Rev

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

Rev 17574 Rev 17578
Line 209... Line 209...
209
  dd[2]=dd[0]+dd[1]*fat; dd[3]=dd[1]-dd[0]*fat;
209
  dd[2]=dd[0]+dd[1]*fat; dd[3]=dd[1]-dd[0]*fat;
210
  dd[4]=dd[0]-dd[1]*fat; dd[5]=dd[1]+dd[0]*fat;
210
  dd[4]=dd[0]-dd[1]*fat; dd[5]=dd[1]+dd[0]*fat;
211
  ii[1].x=rint(dd[2])+ii[0].x; ii[1].y=rint(dd[3])+ii[0].y;
211
  ii[1].x=rint(dd[2])+ii[0].x; ii[1].y=rint(dd[3])+ii[0].y;
212
  ii[2].x=rint(dd[4])+ii[0].x; ii[2].y=rint(dd[5])+ii[0].y;
212
  ii[2].x=rint(dd[4])+ii[0].x; ii[2].y=rint(dd[5])+ii[0].y;
213
  gdImageFilledPolygon(image, ii,3,pm->color[0]);
213
  gdImageFilledPolygon(image, ii,3,pm->color[0]);
-
 
214
  if(tikz_file)
-
 
215
    fprintf(tikz_file, "\\draw\[%s] (%i, %i) -- (%i, %i) -- (%i, %i) -- cycle;\n",
-
 
216
      tikz_options(pm->color[0],1),ii[0].x,flip(ii[0].y),ii[1].x,flip(ii[1].y),ii[2].x,flip(ii[2].y));
-
 
217
  if(vimg_enable) vimg_polyline(scale_buf,3,1);
214
  xx=rint(dd[0])+ii[0].x;yy=rint(dd[1])+ii[0].y;
218
  xx=rint(dd[0])+ii[0].x;yy=rint(dd[1])+ii[0].y;
215
  if(twoside) {
219
  if(twoside) {
216
    ii[0].x=pm->p[0]; ii[0].y=pm->p[1];
220
    ii[0].x=pm->p[0]; ii[0].y=pm->p[1];
217
    ii[1].x=-rint(dd[2])+ii[0].x; ii[1].y=-rint(dd[3])+ii[0].y;
221
    ii[1].x=-rint(dd[2])+ii[0].x; ii[1].y=-rint(dd[3])+ii[0].y;
218
    ii[2].x=-rint(dd[4])+ii[0].x; ii[2].y=-rint(dd[5])+ii[0].y;
222
    ii[2].x=-rint(dd[4])+ii[0].x; ii[2].y=-rint(dd[5])+ii[0].y;
219
    gdImageFilledPolygon(image, ii,3,pm->color[0]);
223
    gdImageFilledPolygon(image, ii,3,pm->color[0]);
-
 
224
  if(tikz_file)
-
 
225
    fprintf(tikz_file, "\\draw\[%s] (%i, %i) -- (%i, %i) -- (%i, %i) -- cycle;\n",
-
 
226
      tikz_options(pm->color[0],1),ii[0].x,flip(ii[0].y),ii[1].x,flip(ii[1].y),ii[2].x,flip(ii[2].y));
220
  }
227
  }
221
  stem: if(pm->fill)
228
  stem: if(pm->fill)
222
    myDashedLine(image,pm->p[0],pm->p[1],xx,yy,pm->color[0]);
229
    myDashedLine(image,pm->p[0],pm->p[1],xx,yy,pm->color[0]);
223
  else
230
  else
224
    gdImageLine(image,pm->p[0],pm->p[1],xx,yy,pm->color[0]);
231
    gdImageLine(image,pm->p[0],pm->p[1],xx,yy,pm->color[0]);
225
  if(tikz_file) {
232
  if(tikz_file)
226
    if (twoside) fprintf(tikz_file,"\\draw\[%s,<->] (%i,%i) -- (%i,%i);\n",
-
 
227
      tikz_options(pm->color[0],pm->fill),pm->p[0],flip(pm->p[1]),pm->p[2],flip(pm->p[3]));
-
 
228
    else fprintf(tikz_file,"\\draw\[%s,->] (%i,%i) -- (%i,%i);\n",
233
    fprintf(tikz_file, "\\draw\[%s] (%i, %i) -- (%i, %i);\n",
229
      tikz_options(pm->color[0],pm->fill),pm->p[0],flip(pm->p[1]),pm->p[2],flip(pm->p[3]));}
234
            tikz_options(pm->color[0],pm->fill),pm->p[0],flip(pm->p[1]),xx,flip(yy));
230
    /*FIXME ne tient pas compte de la largeur de la fleche */
-
 
231
  if(vimg_enable) vimg_line(scale_buf[0],scale_buf[1],scale_buf[2],scale_buf[3]);
235
  if(vimg_enable) vimg_line(scale_buf[0],scale_buf[1],scale_buf[2],scale_buf[3]);
232
}
236
}
233
 
237
 
234
/* Arrow */
238
/* Arrow */
235
void obj_arrow(objparm *pm)
239
void obj_arrow(objparm *pm)