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

                     temp = get_string(infile,1);
                     if(use_affine == TRUE ){ transform(2,2);}/* slider will use css-rotate transformation */
                     if( use_offset != 0 || drag_type != -1 ){int_data[2] = 1;}else{int_data[2] = 0;} /* only centered or not-centered */
                     int_data[0] = x2px(double_data[0]);
                     int_data[1] = y2px(double_data[1]);
-                    if( use_slider != -1 && onclick == 0 ){ onclick = 3;}/* no drag&onclick but slideable */
+                    if( use_slider != -1 && onclick == 0 ){ onclick = 5;}
                     if( use_slider != -1 && drag_type != -1){ onclick = 5; }
 #ifdef KATEX_INSTALLED
                     if( strstr(temp,"\\") != 0 ){ temp = str_replace(temp,"\\","\\\\"); }
                     if( strstr(temp,"\"") != 0 ){ temp = str_replace(temp,"\"","'"); }
-                    string_length = 1 + snprintf(NULL,0,"var draw_xml%d = {id:%d,type:'katex',x:[%d],y:[%d],mathml:\"%s\",drag_type:%d,onclick:%d,object_cnt:%d,stroke_color:\"%s\",stroke_opacity:%.2f,fill_color:\"%s\",fill_opacity:%.2f,use_center:%d,use_snap:%d,angle:%f,fontfamily:\"%s\",transform:%s,use_affine:%d,offset:[0,0],use_slider:%s,rotation_center:%s,once:true};slidergroup[%d] = null;draw_xml(draw_xml%d);\n",drawxml_cnt,drawxml_cnt,int_data[0],int_data[1],temp,drag_type,onclick,object_cnt,stroke_color,stroke_opacity,fill_color,fill_opacity,int_data[2],use_snap,angle,font_family,doubledata2js_array(affine_matrix,6,decimals),use_affine,my_sliders,rotation_center,object_cnt,drawxml_cnt);
+                    string_length = 1 + snprintf(NULL,0,"var draw_xml%d = {id:%d,type:'katex',x:[%d],y:[%d],mathml:\"%s\",drag_type:%d,onclick:%d,object_cnt:%d,stroke_color:\"%s\",stroke_opacity:%.2f,fill_color:\"%s\",fill_opacity:%.2f,use_center:%d,use_snap:%d,angle:%f,fontfamily:\"%s\",transform:%s,use_affine:%d,offset:[0,0],use_slider:%s,rotation_center:%s,once:true};draw_xml(draw_xml%d);\n",drawxml_cnt,drawxml_cnt,int_data[0],int_data[1],temp,drag_type,onclick,object_cnt,stroke_color,stroke_opacity,fill_color,fill_opacity,int_data[2],use_snap,angle,font_family,doubledata2js_array(affine_matrix,6,decimals),use_affine,my_sliders,rotation_center,drawxml_cnt);
                     check_string_length(string_length);tmp_buffer = my_newmem(string_length);
-                    snprintf(tmp_buffer,string_length,  "var draw_xml%d = {id:%d,type:'katex',x:[%d],y:[%d],mathml:\"%s\",drag_type:%d,onclick:%d,object_cnt:%d,stroke_color:\"%s\",stroke_opacity:%.2f,fill_color:\"%s\",fill_opacity:%.2f,use_center:%d,use_snap:%d,angle:%f,fontfamily:\"%s\",transform:%s,use_affine:%d,offset:[0,0],use_slider:%s,rotation_center:%s,once:true};slidergroup[%d] = null;draw_xml(draw_xml%d);\n",drawxml_cnt,drawxml_cnt,int_data[0],int_data[1],temp,drag_type,onclick,object_cnt,stroke_color,stroke_opacity,fill_color,fill_opacity,int_data[2],use_snap,angle,font_family,doubledata2js_array(affine_matrix,6,decimals),use_affine,my_sliders,rotation_center,object_cnt,drawxml_cnt);
+                    snprintf(tmp_buffer,string_length,  "var draw_xml%d = {id:%d,type:'katex',x:[%d],y:[%d],mathml:\"%s\",drag_type:%d,onclick:%d,object_cnt:%d,stroke_color:\"%s\",stroke_opacity:%.2f,fill_color:\"%s\",fill_opacity:%.2f,use_center:%d,use_snap:%d,angle:%f,fontfamily:\"%s\",transform:%s,use_affine:%d,offset:[0,0],use_slider:%s,rotation_center:%s,once:true};draw_xml(draw_xml%d);\n",drawxml_cnt,drawxml_cnt,int_data[0],int_data[1],temp,drag_type,onclick,object_cnt,stroke_color,stroke_opacity,fill_color,fill_opacity,int_data[2],use_snap,angle,font_family,doubledata2js_array(affine_matrix,6,decimals),use_affine,my_sliders,rotation_center,drawxml_cnt);
 #else
                     temp = getMML(temp);/* generate MathML for Firefox or MathJaX */
                     if( strstr(temp,"\"") != 0 ){ temp = str_replace(temp,"\"","'"); }
-                    string_length = 1 + snprintf(NULL,0,"var draw_xml%d = {id:%d,type:'mathml',x:[%d],y:[%d],mathml:\"%s\",drag_type:%d,onclick:%d,object_cnt:%d,stroke_color:\"%s\",stroke_opacity:%.2f,fill_color:\"%s\",fill_opacity:%.2f,use_center:%d,use_snap:%d,angle:%f,fontfamily:\"%s\",transform:%s,use_affine:%d,offset:[0,0],use_slider:%s,rotation_center:%s,once:true};slidergroup[%d] = null;draw_xml(draw_xml%d);\n",drawxml_cnt,drawxml_cnt,int_data[0],int_data[1],temp,drag_type,onclick,object_cnt,stroke_color,stroke_opacity,fill_color,fill_opacity,int_data[2],use_snap,angle,font_family,doubledata2js_array(affine_matrix,6,decimals),use_affine,my_sliders,rotation_center,object_cnt,drawxml_cnt);
+                    string_length = 1 + snprintf(NULL,0,"var draw_xml%d = {id:%d,type:'mathml',x:[%d],y:[%d],mathml:\"%s\",drag_type:%d,onclick:%d,object_cnt:%d,stroke_color:\"%s\",stroke_opacity:%.2f,fill_color:\"%s\",fill_opacity:%.2f,use_center:%d,use_snap:%d,angle:%f,fontfamily:\"%s\",transform:%s,use_affine:%d,offset:[0,0],use_slider:%s,rotation_center:%s,once:true};draw_xml(draw_xml%d);\n",drawxml_cnt,drawxml_cnt,int_data[0],int_data[1],temp,drag_type,onclick,object_cnt,stroke_color,stroke_opacity,fill_color,fill_opacity,int_data[2],use_snap,angle,font_family,doubledata2js_array(affine_matrix,6,decimals),use_affine,my_sliders,rotation_center,drawxml_cnt);
                     check_string_length(string_length);tmp_buffer = my_newmem(string_length);
-                    snprintf(tmp_buffer,string_length,  "var draw_xml%d = {id:%d,type:'mathml',x:[%d],y:[%d],mathml:\"%s\",drag_type:%d,onclick:%d,object_cnt:%d,stroke_color:\"%s\",stroke_opacity:%.2f,fill_color:\"%s\",fill_opacity:%.2f,use_center:%d,use_snap:%d,angle:%f,fontfamily:\"%s\",transform:%s,use_affine:%d,offset:[0,0],use_slider:%s,rotation_center:%s,once:true};slidergroup[%d] = null;draw_xml(draw_xml%d);\n",drawxml_cnt,drawxml_cnt,int_data[0],int_data[1],temp,drag_type,onclick,object_cnt,stroke_color,stroke_opacity,fill_color,fill_opacity,int_data[2],use_snap,angle,font_family,doubledata2js_array(affine_matrix,6,decimals),use_affine,my_sliders,rotation_center,object_cnt,drawxml_cnt);
+                    snprintf(tmp_buffer,string_length,  "var draw_xml%d = {id:%d,type:'mathml',x:[%d],y:[%d],mathml:\"%s\",drag_type:%d,onclick:%d,object_cnt:%d,stroke_color:\"%s\",stroke_opacity:%.2f,fill_color:\"%s\",fill_opacity:%.2f,use_center:%d,use_snap:%d,angle:%f,fontfamily:\"%s\",transform:%s,use_affine:%d,offset:[0,0],use_slider:%s,rotation_center:%s,once:true};draw_xml(draw_xml%d);\n",drawxml_cnt,drawxml_cnt,int_data[0],int_data[1],temp,drag_type,onclick,object_cnt,stroke_color,stroke_opacity,fill_color,fill_opacity,int_data[2],use_snap,angle,font_family,doubledata2js_array(affine_matrix,6,decimals),use_affine,my_sliders,rotation_center,drawxml_cnt);
 #endif
                     add_to_buffer(tmp_buffer);
                     if(onclick != 0 ){object_cnt++;}
                     drawxml_cnt++;/* keeps track on imported img,div,p,span,mathml,svg */
                     break;
         @ default 1
         @%linewidth%size 400,400%xrange -10,10%yrange -10,10%linewidth 1%line -5,-5,-5,5,red%linewidth 2%line -4,-5,-4,5,green%linewidth 3%line -3,-5,-3,5,blue%linewidth 4%line -2,-5,-2,5,orange%linewidth 1%line -1,-5,-1,5,brown%linewidth 5%line 1,-5,1,5,cyan%linewidth 6%line 3,-5,3,5,purple%linewidth 7%line 5,-5,5,5,black
         */
             line_width = (int) (get_real(infile,1));
             break;
         case LEVELCURVE:
         /*
         @ levelcurve color,expression in x/y,l1,l2,...
         @ draws very primitive level curves for expression, with levels l1,l2,l3,...,l_n
         @ the quality is <b>not to be compared</b> with the Flydraw levelcurve. <br />(choose flydraw if you want quality...)
             i = 0;
             done = FALSE;
             while( !done ){
              double_data[i] = get_real(infile,1);
              i++;
             }
             if( use_slider != -1 && onclick == 0){ onclick = 3; }/* no drag&onclick but slideable */
             for(c = 0 ; c < i; c++){
              string_length = 1 + snprintf(NULL,0,"dragstuff.addShape(new Shape(%d,%d,%d,%d,16,%s,[%d],[%d],%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,eval_levelcurve(xsize,ysize,fun1,xmin,xmax,ymin,ymax,plot_steps,precision,double_data[c]),line_width,line_width,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(string_length);tmp_buffer = my_newmem(string_length);
              add_to_buffer(tmp_buffer);
              if(onclick != 0){object_cnt++;}
              /* object_cnt++; */
+            }
             dragstuff[16] = 1;
             if(use_dragstuff == 0 ){ use_dragstuff = 1; }
             reset();
             break;
         case LEGEND:
         /*
         /*
          @ mouse color,fontsize
          @ will display the cursor (x:y) coordinates in ''color`` and ''fontsize`` using default fontfamily Arial
          @ note: use command ''mouse`` at the end of your script code (the same is true for command ''zoom``)
          @%mouse%size 400,400%xrange -10,10%yrange -10,10%mouse red,22
         */
             stroke_color = get_color(infile,0);
             font_size = (int) (get_real(infile,1));
             tmp_buffer = my_newmem(26);
             snprintf(tmp_buffer,26,"use_mouse_coordinates();\n");add_to_buffer(tmp_buffer);
             add_js_mouse(MOUSE_CANVAS,precision,stroke_color,font_size,stroke_opacity,2);
             js_function[INTERACTIVE] = 1;
             break;
         case MOUSEX:
         /*
          @ mousex color,fontsize
          @ will display the cursor x-coordinate in ''color`` and ''font size`` using the fontfamily Arial.
          @ note: use command ''mouse`` at the end of your script code (the same is true for command ''zoom``).
         */
             stroke_color = get_color(infile,0);
             font_size = (int) (get_real(infile,1));
             tmp_buffer = my_newmem(26);
             snprintf(tmp_buffer,26,"use_mouse_coordinates();\n");add_to_buffer(tmp_buffer);
             add_js_mouse(MOUSE_CANVAS,precision,stroke_color,font_size,stroke_opacity,0);
             js_function[INTERACTIVE] = 1;
             break;
         case MOUSEY:
         /*
          @ mousey color,fontsize
          @ will display the cursor y-coordinate in ''color`` and ''font size`` using default fontfamily Arial.
          @ note: use command ''mouse`` at the end of your script code (the same is true for command ''zoom``).
         */
             stroke_color = get_color(infile,0);
             font_size = (int) (get_real(infile,1));
             tmp_buffer = my_newmem(26);
             snprintf(tmp_buffer,26,"use_mouse_coordinates();\n");add_to_buffer(tmp_buffer);
             add_js_mouse(MOUSE_CANVAS,precision,stroke_color,font_size,stroke_opacity,1);
          @ multidash 0,1,1
          @ meaning draw objects no. 2 (circle) and 3 (segments), in the list of command like <code>multifill points,circle,segments</code>, are dashed
          @ use before command <a href='#multidraw'>multidraw</a>
          @ if not set all objects will be set ''not dashed``... unless a generic keyword ''dashed`` was given before command ''multidraw``
          @ the dash-type is not -yet- adjustable <br />(e.g. command <code>dashtype line_px,space_px</code> will give no control over multidraw objects)
          @ wims will <b>not</b> check if the number of 0 or 1's matches the amount of draw primitives...
          @ always use the same sequence as is used for ''multidraw``
         */
             if( use_tooltip == 1 ){canvas_error("command 'multidraw' is incompatible with command 'intooltip tip_text'");}
             temp = get_string(infile,1);
             temp = str_replace(temp,",","\",\"");
             fprintf(js_include_file,"var multidash = [\"%s\"];",temp);
             reset();/* if command 'dashed' was given...reset to not-dashed */
             break;
                         case 6: int_data[0] = (int) (get_real(infile,0));break; /* n  */
                         case 7: stroke_color=get_color(infile,1);/* name or hex color */
                         string_length = 1 + snprintf(NULL,0,"dragstuff.addShape(new Shape(%d,%d,%d,%d,11,[%.*f,%.*f,%.*f],[%.*f,%.*f,%.*f],[%d,%d,%d],[%d,%d,%d],%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[0],decimals,double_data[2],decimals,double_data[4],decimals,double_data[1],decimals,double_data[3],decimals,double_data[5],int_data[0],int_data[0],int_data[0],int_data[0],int_data[0],int_data[0],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(string_length);tmp_buffer = my_newmem(string_length);
                         snprintf(tmp_buffer,string_length,"dragstuff.addShape(new Shape(%d,%d,%d,%d,11,[%.*f,%.*f,%.*f],[%.*f,%.*f,%.*f],[%d,%d,%d],[%d,%d,%d],%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[0],decimals,double_data[2],decimals,double_data[4],decimals,double_data[1],decimals,double_data[3],decimals,double_data[5],int_data[0],int_data[0],int_data[0],int_data[0],int_data[0],int_data[0],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);
                         add_to_buffer(tmp_buffer);
                         if(onclick != 0){object_cnt++;}
                         break;
                         default: break;
+                    }
                     dragstuff[11] = 1;
+                }
+            }
         @ draw closed polygon
         @ use command ''fpoly`` to fill it or use keyword <a href='#filled'>filled</a>
         @ may be set <a href="#drag">draggable</a> / <a href="#onclick">onclick</a>
         @%polygon_1%size 400,400%xrange -10,10%yrange -10,10%opacity 255,25%fillcolor orange%filled%linewidth 2%drag xy%snaptogrid%poly blue,0,0,1,3,3,1,2,4,-1,3
         @%polygon_2%size 400,400%xrange -10,10%yrange -10,10%opacity 255,25%fillcolor orange%filled%linewidth 1%onclick%poly green,0,0,1,3,3,1,2,4,-1,3
         */
             stroke_color=get_color(infile,0); /* how nice: now the color comes first...*/
             i=0;
             c=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");}
                 for( c = 0 ; c < 2; c++){
                     if(c == 0 ){
                         double_data[i] = get_real(infile,0);
                         i++;
                     }
                     else
                     {
                         double_data[i] = get_real(infile,1);
                         i++;
+                    }
+                }
+            }
             if(use_rotate == TRUE ){rotate(i-1,angle,rotationcenter,2);}
             if(use_affine == TRUE ){ transform(i-1,2);}
                     add_to_buffer(tmp_buffer);
                     reply_precision = precision;
                     /* no reply from protractor if non-interactive */
                     if( reply_format == 0 && int_data[1] == -1 ){reply_format = 30;}
                     js_function[INTERACTIVE] = 1;
                     break;
                     default: break;
                 }
             }
             break;
         case PIXELS:
         /*
         @ pixels color,x1,y1,x2,y2,x3,y3...
         @ draw rectangular "points" with diameter 1 pixel
         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 = 2;
+            onclick = 5;
             use_dragstuff = 2;
+            drag_type = 0;
             js_function[INTERACTIVE] = 1;
-            fprintf(js_include_file,"move_group(%d);dragdrop_precision = %d;use_dragdrop_reply = true;",use_slider,precision);
+            fprintf(js_include_file,"var slider%d;dragdrop_precision = %d;use_dragdrop_reply = true;",use_slider,precision);
-            fprintf(js_include_file,"var slider%d;",use_slider);
+            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
+         @ 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:
         /*

Subversion Repositories wimsdev

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