WebSVN – wimsdev – Diff – /trunk/wims/src/Misc/canvasdraw/canvasdraw.c

   double stroke_opacity = 0.95; /* use some opacity as default */
   double fill_opacity = 0.5;/* use some opacity as default */
   char *URL = "http://localhost/images";
   memset(buffer,'\0',MAX_BUFFER);
   void *tmp_buffer = "";
-  double res[7];
+  double res[10];
   /* default writing a unzipped js-include file into wims getfile directory */
   char *w_wims_session = getenv("w_wims_session");
   if( w_wims_session == NULL || *w_wims_session == 0 ){canvas_error("Hmmm, your wims environment does not exist...\nCanvasdraw should be used within wims.");}
   int L0=strlen(w_wims_session) + 21;
   char *getfile_dir = my_newmem(L0); /* create memory to fit string precisely */
           if(use_dragstuff == 0 ){ use_dragstuff = 1; }
           break;
         case FILLALL:
   /*
   @ fillall color,x1,y1,x2,y2...x_n,y_n
-  @ fill all region containing points (x1:y1),(x2:y2)...(x_n:y_n) with color 'color'
+  @ fill all the region containing points (x1:y1),(x2:y2)...(x_n:y_n) with color 'color'
-  @ any other colors (objects) in the <a href="#canvastype">canvastype</a> will act as border to the bucket fill
+  @ any color (object) in the <a href="#canvastype">canvastype</a> will act as border to the bucket fill
   @ use this command after all boundary objects are declared.
   @ Use command 'userdraw clickfill,color' for user click driven flood fill.
   @ use command <a href="#canvastype">canvastype </a> to fill another canvas (default should be fine: DRAG_CANVAS = 5)
   @ note: the fill-family of commands are very (client) cpu intensive operations!<br>filling is done pixel by pixel e.g. image size of 400x400 uses 160000 pixels: each pixel contains 4 data (R,G,B,Opacity) = 640000 data.<br>on every data a few operations / comparisons are done...<br>So have pity on your students CPU..
   @%fillall%size 400,400%xrange -10,10%yrange -10,10%linewidth 2%vlines black,-5,0,-5,0,-4,0,-4,0,3,0,3,0%hlines black,-5,0,-5,0,-5,4,-5,4,-5,-2,-5,-2%circles green,0,0,2,3,3,5,-5,-5,3%opacity 240,50%fillall blue,1,1,8,8,-8,-8
           break;
         case FILLTOBORDER:
   /*
   @ filltoborder x,y,bordercolor,color
   @ fill the region of point (x:y) with color 'color'
-  @ any other color will not act as border to the bucket fill
+  @ any other color than bordercolor will not act as border to the bucket fill
+  @ the filling is done in the connex component whih contains (x,y) of the set of points which are in a color different of bordercolor
   @ use this command after all boundary objects are declared.
+  @ it can be useful to increase strokeopacity or linewidth
   @ use command <a href="#canvastype">canvastype </a> to fill another canvas (default should be fine: DRAG_CANVAS = 5)
   @ note: filltoborder is a very (client) cpu intensive operation!<br>filling is done pixel by pixel e.g. image size of 400x400 uses 160000 pixels: each pixel contains 4 data (R,G,B,Opacity) = 640000 data.<br>on every data a few operations / comparisons are done...<br>So have pity on your students CPU..
   @ maybe used together with command <a href="#userdraw">userdraw clickfill,color</a>
-  @%filltoborder%size 400,400%xrange -10,10%yrange -10,10%canvastype 100%linewidth 2%precision 1000%jsplot blue,5*sin(x)%opacity 200,50%filltoborder 6,6,blue,blue%filltoborder 6,-6,blue,red
+  @%filltoborder%size 400,400%xrange -10,10%yrange -10,10%canvastype 100%linewidth 2%precision 1000%jsplot blue,5*sin(x)%opacity 200,50%filltoborder 6,6,blue,green%filltoborder 6,-6,blue,red
   */
           for(i=0 ;i < 4 ; i++){
             switch(i){
               case 0:double_data[0] = get_real(infile,0);break;
               case 1:double_data[1] = get_real(infile,0);break;
           reset();
           dragstuff[4] = 1;dragstuff[12] = 1;
           if(use_dragstuff == 0 ){ use_dragstuff = 1; }
           break;
         case HYPPOLY:
+/*  @ hyppolygon color,x1,y1,x2,y2...x_n-1,y_n-1,x_n,y_n
+    @ draw hyperbolicpolygon in the Poincaré disk through points (x1:y1)--(x2:y2) ...(x_n-1:y_n-1)--(x_n:y_n) -- (x1:y1)  in color 'color'
+    may be set <a href="#drag">draggable</a> / <a href="#onclick">onclick</a>
+    @ option fhyppolygon only for convex polygon for the moment
+    @%hyppolygon%size 400,400%xrange -1,1%yrange -1,1%circles black,0,0,1%hyppolygon green,0,0,0.5,0.3,0.8,-0.1,0.4,-0.5
+*/
-          stroke_color=get_color(infile,0); /* how nice: now the color comes first...*/
+          stroke_color=get_color(infile,0);
           fill_color = stroke_color;
           i=0;
           while( ! done ){     /* get next item until EOL*/
             if(i > MAX_INT - 1){canvas_error("too many points in argument: repeat command multiple times to fit");}
             if(i%2 == 0 ){
               double_data[i] = get_real(infile,0); /* x */
             }
             else {
               double_data[i] = get_real(infile,1); /* y */
             }
             i++;
+          }
           /* il faut rajouter le premier point à la fin*/
           double_data[i]=double_data[0]; double_data[i+1]=double_data[1];
           if(use_rotate == TRUE ){rotate(i-1,angle,rotationcenter,2);}
           if(use_affine == TRUE ){ transform(i-1,2);}
           if( use_slider != -1 && onclick == 0){ onclick = 3; }/* no drag&onclick but slideable */
           decimals = find_number_of_digits(precision);
           for(c = 0 ; c < i-1 ; c = c+2){
-          tmp_buffer=my_newmem(MAX_BUFFER);
+            tmp_buffer=my_newmem(MAX_BUFFER);
             if (hypgeodaux(double_data+c,res,0)){
-              check_string_length(snprintf(tmp_buffer,MAX_BUFFER,"dragstuff.addShape(new Shape(%d,%d,%d,%d,12,[%.*f,%.*f],[%.*f,%.*f],[%.*f,%.*f],[%.*f,%.*f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%s,%s,%d));\n",drag_type,object_cnt,onclick,use_snap,decimals,res[0],decimals,res[0],decimals,res[1],decimals,res[1],decimals,res[2],decimals,res[3],decimals,res[4],decimals,res[5],line_width,stroke_color,stroke_opacity,fill_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,my_sliders,rotation_center,use_offset));
+              check_string_length(snprintf(tmp_buffer,MAX_BUFFER,"dragstuff.addShape(new Shape(%d,%d,%d,%d,12,[%.*f,%.*f],[%.*f,%.*f],[%.*f,%.*f],[%.*f,%.*f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%s,%s,%d));\n",drag_type,object_cnt,onclick,use_snap,decimals,res[0],decimals,res[0],decimals,res[1],decimals,res[1],decimals,res[2],decimals,res[3],decimals,res[4],decimals,res[5],line_width,stroke_color,stroke_opacity,fill_color,fill_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,my_sliders,rotation_center,use_offset));
+            }
             else {
               check_string_length(snprintf(tmp_buffer,MAX_BUFFER,"dragstuff.addShape(new Shape(%d,%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%s,%s,%d));\n",drag_type,object_cnt,onclick,use_snap,decimals,double_data[c],decimals,double_data[c+2],decimals,double_data[c+1],decimals,double_data[c+3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,my_sliders,rotation_center,use_offset));
+            }
             add_to_buffer(tmp_buffer);
             if(onclick != 0){object_cnt++;}
+          }
+          if(use_filled){
+            hypgeodaux(double_data+2,res,0);
+            res[4]=double_data[0]; res[5]=double_data[1];
+            hypgeodaux(res+4,res,0);
+            add_js_filltoborder(canvas_type);
+            check_string_length(snprintf(tmp_buffer,MAX_BUFFER,"setTimeout(function(){filltoborder (%.*f,%.*f,[%s,%d],[%s,%d],%d,false,null);},1000);\n",decimals,res[6],decimals,res[7],fill_color,(int) (fill_opacity/0.0039215),fill_color,(int) (fill_opacity/0.0039215),FILL_CANVAS+fill_cnt));
+            add_to_buffer(tmp_buffer);
+                fill_cnt++;
+                }
           dragstuff[4] = 1; dragstuff[12] = 1;
           if(use_dragstuff == 0 ){ use_dragstuff = 1; }
           reset();
           break;
     canvas_error("problem with your arguments to command...");
+  }
   return;
+}
 /* useful in hyp commands: determine if the hypsegment is an arc or a line */
+/* give a point on the arc */
 int hypgeodaux(double *q, double* ress, int full){
   double alpha,beta,gamma,r,cx,cy,a1,a2,a3,tmp,
     nx = -q[0]*q[2]*q[2]+(q[0]*q[0]+q[1]*q[1]+1)*q[2]-q[0]*q[3]*q[3]-q[0],
     ny = -q[1]*q[2]*q[2]-q[1]*q[3]*q[3]+(q[0]*q[0]+q[1]*q[1]+1)*q[3]-q[1],
     dy = -2*q[1]*q[2]+2*q[0]*q[3];
         gamma = atan2(q[3],q[2]);
       ress[0]=cos(gamma); ress[1]=sin(gamma); ress[2]=-cos(gamma); ress[3]=-sin(gamma);
+    }
     else
       {int i;for(i=0;i<4;++i) ress[i]=q[i];}
-    ress[5]=(q[0]+q[2])/2;
+    ress[6]=(q[0]+q[2])/2;
-    ress[6]=(q[1]+q[3])/2;
+    ress[7]=(q[1]+q[3])/2;
     return 0;}
   cx = ny/dy; cy=-nx/dy;
   r = sqrt(cx*cx+cy*cy-1);
   if(full)
     {alpha=atan(1/r); beta = atan2(cy,cx);a1=M_PI+beta-alpha;a2=M_PI+beta+alpha;}
 {"farc",ARC,usefilled},
 {"fcircle",CIRCLE,usefilled},
 {"fcircles",CIRCLES,usefilled},
 {"fellipse",ELLIPSE,usefilled},
 {"fhypcircles",HYPCIRCLES,usefilled},
+{"fhyppolygon",HYPPOLY,usefilled},
 {"fill",FLOODFILL,0},
 {"fillall",FILLALL,0},
 {"fillcolor",FILLCOLOR,0},
 {"fillcolors",MULTIFILLCOLORS,0},
 {"filled",FILLED,0},

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 18609 → 18615