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

           break;
         case HYPSEGMENTS:
   /*
   @ hypsegments color,x1,y1,x2,y2,...,x_n,y_n
   @ draw multiple hyperbolic segments in the Poincaré disk between points (x1:y1)--(x2:y2).....and... (x_n-1:y_n-1)--(x_n:y_n) in color ''color``
-  @ use command ''linewidth int`` to adjust size
-  may be set <a href="#drag">draggable</a> / <a href="#onclick">onclick</a> individually (!)
+  @ use command ''linewidth int`` to adjust size may be set <a href="#drag">draggable</a> / <a href="#onclick">onclick</a> individually (!)
   @%hypsegments%size 400,400%xrange -1,1%yrange -1,1%circles black,0,0,1%linewidth 2%hypsegments green,0.1,-0.3,0.6,0.7,0.3,0,-0.8,0.6,0.6,0.5,-0.5,0.6
+  */
+  /*
   segments_onclick%size 400,400%xrange -10,10%yrange -10,10%linewidth 2%onclick%segments green,1,1,3,3,0,0,-3,3,1,1,4,-1,-5,5,-3,-1
   segments_drag_y%size 400,400%xrange -10,10%yrange -10,10%linewidth 2%drag y%segments green,1,1,3,3,0,0,-3,3,1,1,4,-1,-5,5,-3,-1
   */
           stroke_color=get_color(infile,0); /* how nice: now the color comes first...*/
           fill_color = stroke_color;
           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++;
           }
           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+4){
             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));
             }
             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++;}
           reset();
           dragstuff[4] = 1;dragstuff[12] = 1;
           if(use_dragstuff == 0 ){ use_dragstuff = 1; }
           break;
         case HYPLINES:
-        /*
+  /*
   @ hyplines color,x1,y1,x2,y2...x_n-1,y_n-1,x_n,y_n
-  @ draw multiple hyperbolic lines in the Poincaré disk through points (x1:y1)--(x2:y2) ...(x_n-1:y_n-1)--(x_n:y_n) in color 'color'
+  @ draw multiple hyperbolic lines in the Poincaré disk through points (x1:y1)--(x2:y2) ...(x_n-1:y_n-1)--(x_n:y_n) in color 'color' may be set <a href="#drag">draggable</a> / <a href="#onclick">onclick</a>
-  may be set <a href="#drag">draggable</a> / <a href="#onclick">onclick</a>
   @%hyplines%size 400,400%xrange -1,1%yrange -1,1%circles black,0,0,1%hyplines green,0,0.1,0.1,0.3,0.2,0.3,0.1,0.3,0,0.5,-0.5,0.4
   */
           stroke_color=get_color(infile,0); /* how nice: now the color comes first...*/
           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++;
+          }
           if(use_rotate == TRUE ){rotate(i-1,angle,rotationcenter,2);}
             tmp_buffer=my_newmem(MAX_BUFFER);
             if (hypgeodaux(double_data+c,res,1)){
               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));}
             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,res[0],decimals,res[2],decimals,res[1],decimals,res[3],line_width,stroke_color,stroke_opacity,fill_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++;}
+          }
           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
+    @ 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'
+    @ 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>
-    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);
           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);}
           reset();
           break;
         case HYPRAYS:
   /*
   @ hyprays color,xc,yc,x1,y1,x2,y2,x3,y3...x_n,y_n
-  @ draw hyperbolic rays in the Poincaré disk in color 'color' and center (xc:yc)
+  @ draw hyperbolic rays in the Poincaré disk in color 'color' and center (xc:yc) may be set draggable or onclick (every individual ray)
-   may be set draggable or onclick (every individual ray)
   @%hyprays%size 400,400%xrange -1,1%yrange -1,1%circles black,0,0,1%onclick%hyprays blue,0.5,0.5,0.3,0.9,-0.3,0.5,-0.4,0,0.4,-0.9,-0.8,0.1,-0.1,-0.9
+  */
+  /*
    hyprays_onclick%size 400,400%xrange -1,1%yrange -1,1%circles black,0,0,1%onclick%hyprays blue,0.5,0.5,0.3,0.9,-0.3,0.5,-0.4,0,0.4,-0.9,-0.8,0.1,-0.1,-0.9
    hyprays_drag_xy%size 400,400%xrange -1,1%yrange -1,1%circles black,0,0,1%drag xy%hyprays blue,0,0,0.3,0.9,-0.3,0.5,-0.4,0,0.4,-0.9,-0.8,0.1,-0.1,-0.9
   */
           stroke_color=get_color(infile,0);
           if(fillcolor) {fill_color=fillcolor;} else {fill_color=stroke_color;}
   @ draw hyperbolic circles in Poincaré disk
   @ <b>attention</b> r = radius in x-range (!)
   @ use keyword <code>filled</code> or command <code>fhypcircles</code> to produce solid circles
   @ use command <code>fillcolor color</code> to set the fillcolor
   @%hypcircles%size 400,400%xrange -1,1%yrange -1,1%filled%fillcolor lightblue%opacity 255,50%hypcircles blue,0,0,1,0.4,0.4,3,0.2,0.6,6
+  */
+  /*
   hypcircles_drag%size 400,400%xrange -1,1%yrange -1,1%filled%fillcolor lightblue%opacity 255,50%drag xy%hypcircles blue,0,0,2,0.2,0.2,3,0.2,0.2,5%zoom red
   hypcircles_onclick%size 400,400%xrange -1,1%yrange -1,1%filled%fillcolor lightblue%opacity 255,50%onclick%hypcircles blue,0,0,2,0.2,0.2,3,0.2,0.2,5%zoom red
   hypcircles_drag_slider%size 400,400%xrange -1,1%yrange -1,1%linewidth 2%drag xy%# Click circles(s) to activate%opacity 200,50%fillcolor orange%rotationcenter 2,3%slider 0,2*pi,300,30,angle degrees,Rotate%slider -5,5*pi,300,30,x display,move in x-direction%slider -10,10*pi,300,30,y display,move in y-direction%hypcircles blue,0,0,2,0.2,0.2,3,0.2,0.2,5
   */
           stroke_color=get_color(infile,0); /* how nice: now the color comes first...*/

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 18638 → 18639