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

     char *draw_type = "points";
     char *fly_font = "normal";
     char *input_style = "";
     char *flytext = "";
     char *affine_matrix = "[1,0,0,1,0,0]";
+    char *function_label = "f(x)=";
     int pixelsize = 1;
     int reply_format = 0;
     int input_cnt = 0;
     int ext_img_cnt = 0;
     int slider_cnt = 0;
         /*
          @ userinput function | textarea | inputfield
          @ alternative command + argment to keywords "userinput_function","userinput_textarea" and "userinput_xy"
          @ textarea and inputfield are only usable in combination with some 'userdraw draw_ type'
          @ function may be used any time (e.g. without userdraw)
+         @ use command "functionlabel some_string" to define the inputfield text : default value "f(x)="
+         @ use command 'strokecolor some_color' to adjust the plot / functionlabel color
+         @ the userinput for the function will be corrected by a simple 'rawmath' implementation...
         */
             temp = get_string_argument(infile,1);
             if(strstr(temp,"function") != 0  || strstr(temp,"curve") != 0  || strstr(temp,"plot") != 0 ){
              if( js_function[DRAW_JSFUNCTION] != 1 ){
+              add_rawmath(js_include_file);/* add simple rawmath routine to correct user input of function */
               js_function[DRAW_JSFUNCTION] = 1;
               if(reply_format == 0){reply_format = 24;}/* read canvas_input values */
-              add_input_jsfunction(js_include_file,canvas_root_id,1,input_style,input_cnt,stroke_color,stroke_opacity,line_width,use_dashed,dashtype[0],dashtype[1]);
+              add_input_jsfunction(js_include_file,canvas_root_id,input_style,function_label,input_cnt,stroke_color,stroke_opacity,line_width,use_dashed,dashtype[0],dashtype[1]);
+              input_cnt++;
+             }
+             else
+             {
+              /* no need to add DRAW_JSFUNCTION , just call it with the parameters */
+              fprintf(js_include_file,"add_input_jsfunction(%d,\"%s\",\"%s\",%d,\"%s\",\"%.2f\",%d,%d,%d);\n",input_cnt,input_style,function_label,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
               input_cnt++;
+             }
              if( use_js_math == FALSE){/* add this stuff only once...*/
               add_to_js_math(js_include_file);
               use_js_math = TRUE;
+             }
              if( use_js_plot == FALSE){
               use_js_plot = TRUE;
               add_jsplot(js_include_file,canvas_root_id); /* this plots the function on JSPLOT_CANVAS */
              }
             }
             else
+            {
              if(strstr(temp,"inputfield") != 0 ){
               if( use_input_xy != 0 ){canvas_error("userinput_xy can not be combined with usertextarea_xy command");}
               if( use_safe_eval == FALSE){use_safe_eval = TRUE;add_safe_eval(js_include_file);} /* just once */
             if( use_input_xy != 0 ){canvas_error("usertextarea_xy can not be combined with userinput_xy command");}
             if( use_safe_eval == FALSE){use_safe_eval = TRUE;add_safe_eval(js_include_file);} /* just once */
             use_input_xy = 2;
             break;
         case USERINPUT_XY:
         /*
         @ userinput_xy
         @ keyword
         @ to be used in combination with command "userdraw object_type,color"
         @ if set two (or three) input fields are added to the document<br />(one for x-values , one for y-values and in case of drawing circle one for radius-values)
         @ the student may use this as correction for (x:y) on a drawing (or to draw without mouse, using just the coordinates)
         @ math input is allowed (e.g something like: 1+3,2*6,1/3,sqrt(3), sin(pi/4),10^-2,log(2)...)<br />eval function is 'protected' against code injection.
         @ can not be combined with command "intooltip tiptext" <br />note: the 'tooltip div element' is used for placing inputfields
         @ user drawings will not zoom on zooming (or pan on panning)
         */
             /* add simple eval check to avoid code injection with unprotected eval(string) */
             if( use_input_xy != 0 ){canvas_error("userinput_xy can not be combined with usertextarea_xy command");}
             if( use_safe_eval == FALSE){use_safe_eval = TRUE;add_safe_eval(js_include_file);} /* just once */
             use_input_xy = 1;
+            break;
+        case FUNCTION_LABEL:
+            function_label = get_string_argument(infile,1);
             break;
         case USERINPUT_FUNCTION:
         /*
         @ userinput_function
         @ keyword
         @ if set , a inputfield will be added to the page
+        @ repeat keyword for more function input fields
         @ the userinput value will be plotted in the canvas
         @ this value may be read with 'read_canvas()'. <br />for do it yourself js-scripters : If this is the first inputfield in the script, it's id is canvas_input0
         @ use before this command 'userinput_function',<br />commands like 'inputstyle some_css' , 'xlabel some_description' , 'opacity int,int' , 'linewidth int' , 'dashed' and 'dashtype int,int' to modify
         @ incompatible with command 'intooltip link_text_or_image' : it uses the tooltip div for adding the inputfield
         */
             if( js_function[DRAW_JSFUNCTION] != 1 ){
              js_function[DRAW_JSFUNCTION] = 1;
+             add_rawmath(js_include_file);
              if(reply_format == 0){reply_format = 24;}/* read canvas_input values */
-             add_input_jsfunction(js_include_file,canvas_root_id,1,input_style,input_cnt,stroke_color,stroke_opacity,line_width,use_dashed,dashtype[0],dashtype[1]);
+             add_input_jsfunction(js_include_file,canvas_root_id,input_style,function_label,input_cnt,stroke_color,stroke_opacity,line_width,use_dashed,dashtype[0],dashtype[1]);
+             input_cnt++;
+            }
+            else
+            {
+              /* no need to add DRAW_JSFUNCTION , just call it with the parameters */
+             fprintf(js_include_file,"add_input_jsfunction(%d,\"%s\",\"%s\",%d,\"%s\",\"%.2f\",%d,%d,%d);\n",input_cnt,input_style,function_label,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
              input_cnt++;
+            }
             if( use_js_math == FALSE){/* add this stuff only once...*/
              add_to_js_math(js_include_file);
              use_js_math = TRUE;
             if(strncmp(draw_type,"poly",4) == 0){
                 if(strlen(draw_type) < 5){canvas_error("use command \"userdraw poly[3-9],color\" eg userdraw poly6,blue");}
                 if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
                 if(reply_format == 0){reply_format = 2;}
                 add_js_poly(js_include_file,(int) (draw_type[4]-'0'),draw_type,line_width,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if(strcmp(draw_type,"triangle") == 0){
                 if( js_function[DRAW_PATHS] != 1 ){ js_function[DRAW_PATHS] = 1;}
                 if(reply_format == 0){reply_format = 2;}
                 add_js_poly(js_include_file,3,draw_type,line_width,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if( strcmp(draw_type,"hline") == 0 ){
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_hlines(js_include_file,1,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if( strcmp(draw_type,"hlines") == 0 ){
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_hlines(js_include_file,2,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if( strcmp(draw_type,"vline") == 0 ){
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_hlines(js_include_file,3,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if( strcmp(draw_type,"vlines") == 0 ){
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_hlines(js_include_file,4,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_lines(js_include_file,1,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if( use_input_xy == 1 ){
                     add_input_line(js_include_file,1);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
                 }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if( strcmp(draw_type,"lines") == 0 ){
                 if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
                 if( js_function[DRAW_LINES] != 1 ){ js_function[DRAW_LINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_lines(js_include_file,2,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if( use_input_xy == 1 ){
                     add_input_line(js_include_file,2);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
                 }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if( strcmp(draw_type,"demilines") == 0 || strcmp(draw_type,"demilines") == 0 ){
                 if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
                 if( js_function[DRAW_DEMILINES] != 1 ){ js_function[DRAW_DEMILINES] = 1;}
                 if(reply_format == 0){reply_format = 11;}
                 add_js_demilines(js_include_file,2,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if( use_input_xy == 1 ){
                     add_input_demiline(js_include_file,2);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
                 }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if( strcmp(draw_type,"demiline") == 0 || strcmp(draw_type,"demilines") == 0 ){
                 if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
                 add_js_demilines(js_include_file,1,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if( use_input_xy == 1 ){
                     add_input_demiline(js_include_file,1);
                     add_input_x1y1x2y2(js_include_file,canvas_root_id);
+                }
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
             }
             else
             if( strcmp(draw_type,"rects") == 0){
                 if( js_function[DRAW_RECTS] != 1 ){ js_function[DRAW_RECTS] = 1;}
                 if(reply_format == 0){reply_format = 2;}
                 add_js_rect(js_include_file,2,0,draw_type,line_width,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
             else
             if( strcmp(draw_type,"roundrects") == 0){
                 if( js_function[DRAW_ROUNDRECTS] != 1 ){ js_function[DRAW_ROUNDRECTS] = 1;}
                 if(reply_format == 0){reply_format = 2;}
                 add_js_rect(js_include_file,2,1,draw_type,line_width,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype[0],dashtype[1]);
                 if(use_input_xy == 1){ canvas_error("userinput_xy not yet implemented for this userdraw type !");}
                 if(use_input_xy == 2){ canvas_error("usertextarea_xy not yet implemented for this userdraw type !");}
+            }
                             decimals = find_number_of_digits(precision);
                             string_length = snprintf(NULL,0,
                             "draw_centerstring(%d,%.*f,\"%s\",\"%s\",%.2f,\"%s\");\n",canvas_root_id,decimals,double_data[0],font_family,stroke_color,stroke_opacity,temp);
                             check_string_length(string_length);tmp_buffer = my_newmem(string_length+1);
                             snprintf(tmp_buffer,string_length,"draw_centerstring(%d,%.*f,\"%s\",\"%s\",%.2f,\"%s\");\n",canvas_root_id,decimals,double_data[0],font_family,stroke_color,stroke_opacity,temp);
                             add_to_buffer(tmp_buffer);
                             break;
                     default:break;
                 }
             }
             break;
         case MATHML:
         /*
         @ mathml x1,y1,x2,y2,mathml_string
         @ mathml will be displayed in a rectangle left top (x1:y1) , right bottom (x2:y2)
         @ can be set onclick <br />(however dragging is not supported)<br />javascript:read_dragdrop(); will return click number of mathml-object
   reply = reply + (Math.round(prec*(px2x(userdraw_x[p]))))/prec +\",\" + (Math.round(prec*(px2y(userdraw_y[p]))))/prec +\",\" + (Math.round(prec*(px2x(userdraw_x[p+1]))))/prec +\",\" + (Math.round(prec*(px2y(userdraw_y[p+1]))))/prec +\"\\n\" ;\
   p = p+2;\
  };\
  if(p == 0){alert(\"nothing drawn...\");return;};\
  if( document.getElementById(\"canvas_input0\") || document.getElementById(\"mathml0\") ){\
   var p = 0;var input_reply = new Array();\
   if( document.getElementById(\"canvas_input0\")){\
    var t = 0;\
    while(document.getElementById(\"canvas_input\"+t)){\
     if( ! document.getElementById(\"canvas_input\"+t).getAttribute(\"readonly\")){\
      input_reply[p] = document.getElementById(\"canvas_input\"+t).value;\
      p++;\
     };\
     t++;\
    };\
   };\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+input_reply+\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply +\"\\n\"+input_reply;\
   }\
  }\
  else\
  {\
   if( typeof userdraw_text != 'undefined' ){\
    return reply +\"\\n\"+userdraw_text;\
   }\
   else\
   {\
    return reply;\
   }\
  };\
 };\n\
 <!-- end function 11 read_canvas%d() -->",canvas_root_id,canvas_root_id,reply_precision,canvas_root_id);
         *yunit="yunit",
         *slider="slider",
         *killslider="killslider",
         *angle="angle",
         *halfline="halfline",
-        *demiline="demiline";
+        *demiline="demiline",
+        *functionlabel="functionlabel";
         while(((c = getc(infile)) != EOF)&&(c!='\n')&&(c!=',')&&(c!='=')&&(c!='\r')){
             if( i == 0 && (c == ' ' || c == '\t') ){
         continue; /* white spaces or tabs allowed before first command identifier */
+            }
         return ANGLE;
+        }
         if( strcmp(input_type, halfline) == 0 || strcmp(input_type, demiline) == 0  ){
         free(input_type);
         return HALFLINE;
+        }
+        if( strcmp(input_type, functionlabel) == 0 ){
+        free(input_type);
+        return FUNCTION_LABEL;
+        }
         free(input_type);
         ungetc(c,infile);
         return 0;
+}

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 8262 → 8297