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

               case 4: decimals = find_number_of_digits(precision);
                 if(use_affine == TRUE ){ transform(2,2);}/* needs double_data[] */
                 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]);/* needs px */
                 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; }/* no drag&onclick but slideable */
                 if( use_slider != -1 && drag_type != -1){ onclick = 5; }
                 temp = get_string(infile,1);
                 if( strstr(temp,"\"") != 0 ){ temp = str_replace(temp,"\"","\\\""); }
                 if( strstr(temp,"<img ")!= 0){URL="image";}else{URL="html";}
                 tmp_buffer=my_newmem(MAX_BUFFER);
   */
           js_function[DRAW_IMAGEFILL] = 1;
           if(js_function[DRAW_FILLTOBORDER] != 1 ){/* use only once */
             js_function[DRAW_FILLTOBORDER] = 1;
             add_js_filltoborder(canvas_type);
           }
           for(i=0 ;i < 4 ; i++){
             switch(i){
               case 0:int_data[0] = (int) (get_real(infile,0));break;
               case 1:int_data[1] = (int) (get_real(infile,0));break;
               case 2:int_data[2] = (int) (get_real(infile,0));break; /* 0 | 1 */
   @ plotting multiple js-curves on the same canvas (for example if you want to use 'userdraw clickfill,color' on <a href="#canvastype">canvastype</a> number 111, use:<br> <code>jscurve red,fun1(x),fun2(x)...fun_n(x)</code>, you must specify individual multistrokecolors &amp; multistrokeopacity &amp; multilinewidth for these multiple js-curves to use different colors. Otherwise all curves will be the same color... Use commands like: <a href="#multistrokecolors">multistrokecolors</a>, <a href="#multilinewidth">multilinewidth</a>, <a href="#multidash">multidash</a>, <a href="#multistrokeopacity">multistroke</a>, <b>color</b> given for the command <code>jscurve color,formulas(x)</code> will not be used in that case... but the color argument must still be given in any case (otherwise syntax error...)
   @%jscurve%size 400,400%xrange -10,10%yrange -10,10%multistrokecolors red,green,blue,orange%multilinewidth 1,2,3%multistrokeopacity 0.5,0.8,1.0%jscurve red,sin(x),1/sin(x),sin(x^2)
   */
           jsplot_cnt++;/* -1 --> 0 */
           stroke_color = get_color(infile,0);
           js_function[JS_MATH] = 1;
           js_function[JS_PLOT] = 1;
           if( tmin != 0 && tmax !=0){use_parametric = TRUE;}
           temp = get_string(infile,1);
           temp = str_replace(temp,",","\",\"");
           tmp_buffer=my_newmem(MAX_BUFFER);
               case 0: double_data[0]=get_real(infile,0);break; /* x in x/y-range coord system -> pixel width */
               case 1: double_data[1]=get_real(infile,0);break; /* y in x/y-range coord system  -> pixel height */
               case 2: decimals = find_number_of_digits(precision);
                 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 = 5;}
                 if( use_slider != -1 && drag_type != -1){ onclick = 5; }
 #ifdef KATEX_INSTALLED
                 if( strstr(temp,"\\") != 0 ){ temp = str_replace(temp,"\\","\\\\"); }
                 fprintf(js_include_file,"snap_x = %f;snap_y = %f;",double_data[2] / double_data[3],double_data[5] - double_data[4] );
                 tmp_buffer=my_newmem(MAX_BUFFER);
                 check_string_length(snprintf(tmp_buffer,MAX_BUFFER, "\ndraw_numberline(%d,%d,%f,%f,%f,%f,%f,%f,%d,\"%s\",%f,\"%s\",\"%s\",%d);  ",NUMBERLINE_CANVAS+numberline_cnt,use_axis_numbering,double_data[0],double_data[1],double_data[2],double_data[3],double_data[4],double_data[5],line_width,stroke_color,stroke_opacity,font_family,font_color,precision));
                 add_to_buffer(tmp_buffer);
                 numberline_cnt++;
                 break;
               default:break;
             }
           }
           reset();
           break;
         case OBABEL:
   /*
   @ obabel x,y,type input,molecule smiles-code or file location, extra arguments,extra arguments,...
   @ will call the ''obabel`` program, if installed.
   @%points_1%size 400,400%xrange -10,10%yrange -10,10%opacity 255,255%snaptogrid%linewidth 1%drag xy%points red,0,0,1,1,2,2,3,3%drag x%points blue,0,1,1,2,2,3,3,4
   @%points_2%size 400,400%xrange -10,10%yrange -10,10%opacity 255,255%linewidth 1%onclick%points red,0,0,1,1,2,2,3,3%onclick%points blue,0,1,1,2,2,3,3,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);}
           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){
   @ 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++;
+              }
               case 2: int_data[0] = (int)(get_real(infile,0));break; /* width */
               case 3: int_data[1] = (int)(get_real(infile,0));break; /* height */
               case 4: temp = get_string_argument(infile,0); /* type: x,y,angle */
                 if( strstr(temp,"displ")!=0 ||  strstr(temp,"deg")!=0 || strstr(temp,"rad")!=0 ){int_data[5] = 1; }else{int_data[5] = 0;}
                 if(strstr(temp,"anim")!= 0){int_data[3] = 1;}else{int_data[3] = 0;}
-                if(strstr(temp,"active")!= 0){onclick = 4;}else{onclick=0;}
                 if(strstr(temp,"angle")!= 0){slider_type="R";if( strstr(temp,"rad")!= 0){int_data[2] = 3;}if( strstr(temp,"deg")!= 0){int_data[2] = 4;}}
                 else
                   if(strstr(temp,"xy") != 0){slider_type = "XY";if( strstr(temp,"disp")!= 0){int_data[2] = 5;}}
                     else
                       if(strstr(temp,"x") != 0){slider_type = "X";if( strstr(temp,"disp")!= 0){int_data[2] = 1;}}
           if(use_slider == -1 ){ /* add once */
             add_slider(int_data[3]);
             if(int_data[5] == 1 ){add_slider_display(precision,font_size,font_color,stroke_opacity);}
+          }
           use_slider++;
-          if(int_data[3] == 0){\
+          if(int_data[3] == 0){
             tmp_buffer=my_newmem(MAX_BUFFER);
             check_string_length(snprintf(tmp_buffer,MAX_BUFFER,"slider%d = new slider(\"%s\",\"%s\",%d,%d,%d,%d,\"%s\",\"%s\",[%f,%f],%f,%f,'%s',%d);\n",use_slider,slider_type,temp,use_slider,int_data[0],int_data[1],line_width,fill_color,stroke_color,fill_opacity,stroke_opacity,double_data[0],double_data[1],font_family,int_data[2]));
           }else{
             add_slider(int_data[3]);/* use only once !! */
+          }
           add_to_buffer(tmp_buffer);
           fprintf(js_include_file,"var slider%d;",use_slider);
           use_dragstuff = 2;
 //      dragstuff[22] = 1; /* dragstuff switch no 22 is a slider...*/
-          if(onclick != 4 ){ js_function[INTERACTIVE] = 1; }/* no need to click on object to use slider... */
+          js_function[INTERACTIVE] = 1; /* no need to click on object to use slider... */
       //js_function[JS_ROTATE_MOUSE] = 1;
           c = 0;
           for(i=last_slider;i<=use_slider;i++){
             int_data[c] = i; c++;
+          }

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 18655 → 18656