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

                     reset();
                     break;
                     default:break;
+                }
+            }
+        break;
+        case GROUP:
+        /*
+         @ group
+         @ keyword
+         @ work in 'progress'
+         @ all objects(*) after the command and until <a href="#kill">kill group</a> or <a href="#killslider">killslider</a> may be moved together with mouse moverments<br /> (*) for now all real canvas objects and latex / xml ; but no images (work in progress)
+         @ may be combined with slider driven movements or drag & drop
+         @%group%%size 400,400%xrange -10,10%yrange -10,10%axis%axisnumbering%precision 1%grid 2,2,grey,2,2,5,grey%precision 100%linewidth 4%rotationcenter 0,0%slider -2*pi,2*pi,300,40,angle active,rotate%snaptogrid%ftriangle 0,-4,-2,-2,4,--5,blue%fillcolor red%fcircle -4.4,4.4,40,blue%kill slider%slider -20,20,300,40,x active,x-slide%ftriangle -2,0,0,4,2,0,green%fcircle 4.4,4.5,40,red%kill slider%slider -20,20,300,40,y active,y-slide%fcircle 4,-4,40,green%linewidth 4%fcircle -4,-4,40,orange%kill slider%group%fcircle -4.4,4.5,10,blue%fcircle -5.4,4.5,10,blue%fcircle -6.4,4.5,10,blue%fcircle -4.4,8,16,green%fcircle -5.4,8,16,green%fcircle -6.4,8,16,green%mouse red,22%zoom red
+        */
+            use_slider++;
+            add_slider(2);
+            no_reset = TRUE;
+            int c = 0;
+            for(i=last_slider;i<=use_slider;i++){ int_data[c] = i; c++; }
+            my_sliders = data2js_array(int_data,use_slider - last_slider+1);
+            if( precision == 0 ){precision = 100;}
+            onclick = 5;
+            use_dragstuff = 2;
+            drag_type = 0;
+            js_function[INTERACTIVE] = 1;
+            fprintf(js_include_file,"var slider%d;dragdrop_precision = %d;use_dragdrop_reply = true;",use_slider,precision);
+            string_length = 1 + snprintf(NULL,0,"slider%d = new move_group(%d);\n",use_slider);
+            check_string_length(string_length);tmp_buffer = my_newmem(string_length);
+            snprintf(tmp_buffer,string_length  ,"slider%d = new move_group(%d);\n",use_slider,use_slider);
+            add_to_buffer(tmp_buffer);
         break;
         case HALFLINE:
         /*
         @ demiline x1,y1,x2,y2,color
         @ draws halflines starting in (x1:y1) and through (x2:y2) in color 'color' (colorname or hex) etc
         @ may be set <a href="#drag">draggable</a> / <a href="#onclick">onclick</a> indiviually
         @%halflines%size 400,400%xrange -10,10%yrange -10,10%halflines red,-5,5,0,0,-5,-5,0,0
         */
             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 */
         */
             js_function[DRAW_HATCHFILL] = 1;
             if(js_function[DRAW_FILLTOBORDER] != 1 ){/* use only once */
              js_function[DRAW_FILLTOBORDER] = 1;
              add_js_filltoborder(canvas_type);
             }
             decimals = find_number_of_digits(precision);
             for(i=0;i<5;i++){
                 switch(i){
                     case 0: double_data[0] = get_real(infile,0); break; /* x */
                     case 1: double_data[1] = get_real(infile,0); break; /* y  */
                     case 2: int_data[0] = (int) (get_real(infile,0)); break; /* dx pixel */
                     case 3: int_data[1] = (int) (get_real(infile,0)); break; /* dy pixel*/
                     case 4: stroke_color = get_color(infile,1);
+            }
             reset();
             break;
         case IMAGEFILL:
         /*
         @ imagefill x,y,scaling to xsize &times; ysize?,image_url
         @ The next suitable <b>filled object</b> will be filled with "image_url" tiled
         @ scaling to xsize &times; ysize ? ... 1 = yes 0 = no
         @ After pattern filling, the fill-color should be reset !
         @ wims getins / image from class directory: imagefill 80,80,my_image.gif
             js_function[INTERACTIVE] = 1;
             break;
         case MOUSE_DEGREE:
         /*
          @ mouse_degree color,fontsize
          @ will display the angle in degrees between x-axis, (0:0) and the cursor (x:y) in 'color' and 'font size'<br /> using a fontfamily Arial
          @ The angle is positive in QI and QIII and the angle value is negative in QII and QIV
          @ note: use command 'mouse' at the end of your script code (the same is true for command 'zoom')
          @%mouse_degree%size 400,400%xrange -10,10%yrange -10,10%userdraw arc,blue%precision 100000%mouse_degree red,22
          @ may be set draggable or onclick (every individual ray)
          @%rays_onclick%size 400,400%xrange -10,10%yrange -10,10%onclick%rays blue,0,0,3,9,-3,5,-4,0,4,-9,7,9,-8,1,-1,-9
          @%rays_drag_xy%size 400,400%xrange -10,10%yrange -10,10%drag xy%rays blue,0,0,3,9,-3,5,-4,0,4,-9,7,9,-8,1,-1,-9
         */
             stroke_color=get_color(infile,0);
             fill_color = stroke_color;
             double_data[0] = get_real(infile,0);/* xc */
             double_data[1] = get_real(infile,0);/* yc */
             i=2;
             while( ! done ){     /* get next item until EOL*/
                 if(i > MAX_INT - 1){canvas_error("in command rays too many points / rays in argument: repeat command multiple times to fit");}
              int_data[c] = i; c++;
+            }
             my_sliders = data2js_array(int_data,use_slider - last_slider+1);
         break;
-        case GROUP:
-            use_slider++;
-            add_slider(2);
-            no_reset = TRUE;
-            int c = 0;
-            for(i=last_slider;i<=use_slider;i++){ int_data[c] = i; c++; }
-            my_sliders = data2js_array(int_data,use_slider - last_slider+1);
-            if( precision == 0 ){precision = 100;}
-            onclick = 5;
-            use_dragstuff = 2;
-            drag_type = 0;
-            js_function[INTERACTIVE] = 1;
-            fprintf(js_include_file,"var slider%d;dragdrop_precision = %d;use_dragdrop_reply = true;",use_slider,precision);
-            string_length = 1 + snprintf(NULL,0,"slider%d = new move_group(%d);\n",use_slider);
-            check_string_length(string_length);tmp_buffer = my_newmem(string_length);
-            snprintf(tmp_buffer,string_length  ,"slider%d = new move_group(%d);\n",use_slider,use_slider);
-            add_to_buffer(tmp_buffer);
-        /*
-         @ group
-         @ keyword
-         @ work in 'progress'
-         @ all objects(*) after the command and until <a href="#kill">kill group</a> or <a href="#killslider">killslider</a> may be moved together with mouse moverments<br /> (*) for now all real canvas objects and latex / xml ; but no images (work in progress)
-         @ may be combined with slider driven movements or drag & drop
-         @%group%%size 400,400%xrange -10,10%yrange -10,10%axis%axisnumbering%precision 1%grid 2,2,grey,2,2,5,grey%precision 100%linewidth 4%rotationcenter 0,0%slider -2*pi,2*pi,300,40,angle active,rotate%snaptogrid%ftriangle 0,-4,-2,-2,4,--5,blue%fillcolor red%fcircle -4.4,4.4,40,blue%kill slider%slider -20,20,300,40,x active,x-slide%ftriangle -2,0,0,4,2,0,green%fcircle 4.4,4.5,40,red%kill slider%slider -20,20,300,40,y active,y-slide%fcircle 4,-4,40,green%linewidth 4%fcircle -4,-4,40,orange%kill slider%group%fcircle -4.4,4.5,10,blue%fcircle -5.4,4.5,10,blue%fcircle -6.4,4.5,10,blue%fcircle -4.4,8,16,green%fcircle -5.4,8,16,green%fcircle -6.4,8,16,green%mouse red,22%zoom red
-        */
-        break;
         case SGRAPH:
         /*
          @ sgraph xstart,ystart,xmajor,ymajor,xminor,yminor,majorgrid_color,minorgrid_color
          @ primitive implementation of a ''broken scale`` graph...
          @ not very versatile: only usable in combination with userdraw <br />eg no other objects will obey this "coordinate system"<br />if you want to place an object into this coordinate system, be aware that 10% or 20% of xsize and/or ysize is ''lost``.<br />Use these "formulas" to recalculate the virtual coordinates:<br />factor=0.8 in case xstart != xmin (or ystart != ymin)<br />factor=0.9 in case xstart = xmin (or ystart = ymin)<br />px_x_point = ((factor*xsize)/(xmax - xstart))*(x_point - xmax)+xsize<br />x_recalculated = px*(xmax - xmin)/xsize + $xmin<br />px_y_point = -1*factor*y_point*ysize/(ymax - ystart) + ymax*factor*ysize/(ymax - ystart)<br />y_recalculated = ymax - py*(ymax - ymin)/ysize<br />

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 16882 → 16892