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

 var use_xlogscale = 0;\
 var use_ylogscale = 0;\
 var x_strings = null;\
 var y_strings = null;\
 var use_pan_and_zoom = 0;\
+var x_use_snap_to_grid = 0;\
-var use_snap_to_grid = 0;\
+var y_use_snap_to_grid = 0;\
 var xstart = 0;\
 var ystart = 0",canvas_root_id,xsize,ysize,canvas_root_id,canvas_root_id,canvas_root_id,canvas_root_id,canvas_root_id);
 /* default add the drag code : nearly always used ...*/
 add_drag_code(js_include_file,DRAG_CANVAS,canvas_root_id);
             break;
         case SNAPTOGRID:
         /*
          @ snaptogrid
          @ keyword (no arguments rewquired) needs to be defined before command 'userdraw' and after command 'grid'
          @ in case of userdraw the drawn points will snap to xmajor / ymajor grid
-         @ if xminor / yminor is defined, the drawing will snap to xminor/yminor <br />use only even dividers in x/y-minor...for example<br />snaptogrid<br />axis<br />grid 2,1,grey,4,4,7,red<br /> will snap on x=0, x=0.5, x=1, x=1.5 ....<br /> will snap on y=0, y=0.25 y=0.5 y=0.75 ...<br />
+         @ if xminor / yminor is defined, the drawing will snap to xminor and yminor<br />use only even dividers in x/y-minor...for example<br />snaptogrid<br />axis<br />grid 2,1,grey,4,4,7,red<br /> will snap on x=0, x=0.5, x=1, x=1.5 ....<br /> will snap on y=0, y=0.25 y=0.5 y=0.75 ...<br />
         */
-        fprintf(js_include_file,"\nuse_snap_to_grid = 1;var snap_x = 1;var snap_y = 1;\nfunction snap_to_x(x){return x2px(snap_x*(Math.round((px2x(x))/snap_x)));};function snap_to_y(y){return y2px(snap_y*(Math.round((px2y(y))/snap_y)));;};\n");
+        fprintf(js_include_file,"\nx_use_snap_to_grid = 1;y_use_snap_to_grid = 1;var snap_x = 1;var snap_y = 1;function snap_to_x(x){return x2px(snap_x*(Math.round((px2x(x))/snap_x)));};function snap_to_y(y){return y2px(snap_y*(Math.round((px2y(y))/snap_y)));};\n");
+        break;
+        case XSNAPTOGRID:
+        /*
+         @ xsnaptogrid
+         @ keyword (no arguments rewquired) needs to be defined before command 'userdraw' and after command 'grid'
+         @ in case of userdraw the drawn points will snap to xmajor grid
+         @ if xminor / yminor is defined, the drawing will snap to xminor <br />use only even dividers in x-minor...for example<br />xsnaptogrid<br />axis<br />grid 2,1,grey,4,4,7,red<br /> will snap on x=0, x=0.5, x=1, x=1.5 ....<br /> will snap on y=0, y=0.25 y=0.5 y=0.75 ...<br />
+        */
+        fprintf(js_include_file,"\nx_use_snap_to_grid = 1;var snap_x = 1;if (typeof snap_y === 'undefined') { var snap_y = 1;};var snap_y = 1;function snap_to_x(x){return x2px(snap_x*(Math.round((px2x(x))/snap_x)));};\n");
+        break;
+        case YSNAPTOGRID:
+        /*
+         @ ysnaptogrid
+         @ keyword (no arguments rewquired) needs to be defined before command 'userdraw' and after command 'grid'
+         @ in case of userdraw the drawn points will snap to ymajor grid
+         @ if xminor / yminor is defined, the drawing will snap to yminor <br />use only even dividers in y-minor...for example<br />ysnaptogrid<br />axis<br />grid 2,1,grey,4,4,7,red<br /> will snap on x=0, x=0.5, x=1, x=1.5 ....<br /> will snap on y=0, y=0.25 y=0.5 y=0.75 ...<br />
+        */
+        fprintf(js_include_file,"\ny_use_snap_to_grid = 1;if (typeof snap_x === 'undefined') { var snap_x = 1;};var snap_y = 1;\nfunction snap_to_y(y){return y2px(snap_y*(Math.round((px2y(y))/snap_y)));};\n");
         break;
         case USERTEXTAREA_XY:
         /*
         @ usertextarea_xy
         @ keyword
             draw_type = get_string_argument(infile,0);
             stroke_color = get_color(infile,1);
             if( strcmp(draw_type,"point") == 0 ){
                 if( js_function[DRAW_CIRCLES] != 1 ){ js_function[DRAW_CIRCLES] = 1;}
                 if(reply_format < 1 ){reply_format = 8;}
                 /* 7 = x1:y1,x2:y2,x3:y3,x4:y4...x_n:y_n in x/y-range */
                 if(use_input_xy == 1){
                     add_input_circle(js_include_file,1,1);
                     add_input_xy(js_include_file,canvas_root_id);
+                }
                 add_js_points(js_include_file,1,draw_type,line_width,line_width,stroke_color,stroke_opacity,1,stroke_color,stroke_opacity,0,1,1);
+            }
             else
             if( strcmp(draw_type,"polyline") == 0 ){
                 if( js_function[DRAW_POLYLINE] != 1 ){ js_function[DRAW_POLYLINE] = 1;}
                 if(reply_format < 1){reply_format = 23;}
                 if( use_input_xy == 1 ){
                     add_input_polyline(js_include_file);
                     add_input_xy(js_include_file,canvas_root_id);
+                }
                 add_js_polyline(js_include_file,draw_type,line_width,stroke_color,stroke_opacity,use_dashed,dashtype[0],dashtype[1]);
+            }
                     decimals = find_number_of_digits(precision);
                     temp = get_string_argument(infile,1);
                     string_length = snprintf(NULL,0,"draw_text(%d,%d,%d,%d,\"%s\",\"%s\",%.2f,90,\"%s\",%d,%.2f,%d,[%d,%d]);\n",STATIC_CANVAS,int_data[0],int_data[1],font_size,font_family,font_color,stroke_opacity,temp,use_rotate,angle,use_translate,translate_x,translate_y);
                     check_string_length(string_length);tmp_buffer = my_newmem(string_length+1);
                     snprintf(tmp_buffer,string_length,"draw_text(%d,%d,%d,%d,\"%s\",\"%s\",%.2f,90,\"%s\",%d,%.2f,%d,[%d,%d]);\n",STATIC_CANVAS,int_data[0],int_data[1],font_size,font_family,font_color,stroke_opacity,temp,use_rotate,angle,use_translate,translate_x,translate_y);
                     add_to_buffer(tmp_buffer);
                     break;
                     default:break;
+                }
+            }
             reset();
             break;
         case FONTFAMILY:
             break;
         case AXIS:
         /*
             @ axis
             @ keyword, no aguments required
         */
             use_axis = TRUE;
             break;
         case SGRAPH:
         /*
          @ sgraph xstart,ystart,xmajor,ymajor,xminor,yminor,majorgrid_color,minorgrid_color
          @ primitive implementation of a 'broken scale' graph...
          @ not very versatile.
          @ example:<br />size 400,400<br />xrange 0,10000<br />yrange 0,100<br />sgraph 9000,50,100,10,4,4,grey,blue<br />userinput_xy<br />linewidth 2<br />userdraw segments,red
         */
             if( js_function[DRAW_SGRAPH] != 1 ){ js_function[DRAW_SGRAPH] = 1;}
             for(i = 0 ; i < 8 ;i++){
                 switch(i){
                     case 0:double_data[0] = get_real(infile,0);break;
                     case 1:double_data[1] = get_real(infile,0);break;
                     string_length = snprintf(NULL,0,  "draw_grid%d(%d,%d,%.2f,%.*f,%.*f,%d,%d,%d,%d,\"%s\",\"%s\",%d,\"%s\",%d,%d,%d,%.2f,%d,[%d,%d],%d,%d,%d,\"%s\",%.2f);\n",canvas_root_id,GRID_CANVAS,precision,stroke_opacity,decimals,double_data[0],decimals,double_data[1],int_data[0],int_data[1],int_data[2],line_width,stroke_color,fill_color,font_size,font_family,use_axis,use_axis_numbering,use_rotate,angle,use_translate,translate_x,translate_y,use_dashed,dashtype[0],dashtype[1],font_color,fill_opacity);
                     check_string_length(string_length);tmp_buffer = my_newmem(string_length+1);
                     snprintf(tmp_buffer,string_length,"draw_grid%d(%d,%d,%.2f,%.*f,%.*f,%d,%d,%d,%d,\"%s\",\"%s\",%d,\"%s\",%d,%d,%d,%.2f,%d,[%d,%d],%d,%d,%d,\"%s\",%.2f);\n",canvas_root_id,GRID_CANVAS,precision,stroke_opacity,decimals,double_data[0],decimals,double_data[1],int_data[0],int_data[1],int_data[2],line_width,stroke_color,fill_color,font_size,font_family,use_axis,use_axis_numbering,use_rotate,angle,use_translate,translate_x,translate_y,use_dashed,dashtype[0],dashtype[1],font_color,fill_opacity);
                     add_to_buffer(tmp_buffer);
                     break;
                 }
             }
             reset();
             break;
         case OPACITY:
         /*
         @ opacity 0-255,0-255
         */
             for(i = 0 ; i<2;i++){
                 switch(i){
                     case 0: double_data[0]=(int)(get_real(infile,0));break;
                     case 1: double_data[1]=(int)(get_real(infile,1));break;
                     default: break;
                 }
             }
             if( double_data[0] < 0 || double_data[0] > 255 || double_data[1] < 0 || double_data[1] > 255  ){ canvas_error("opacity [0 - 255] , [0 - 255]");}/* typo or non-RGB ? */
             stroke_opacity = (double) (0.0039215*double_data[0]);/* 0.0 - 1.0 */
             fill_opacity = (double) (0.0039215*double_data[1]);/* 0.0 - 1.0 */
             break;
         case ROTATE:
+            }
             if(reply_format < 1 ){reply_format = 15;}
             reset();
             break;
         case MOUSE_PRECISION:
         /*
             @ precision int
             @ 10 = 1 decimal ; 100 = 2 decimals etc
             @ may be used / changed before every object
         */
             precision = (int) (get_real(infile,1));
                     case 4: stroke_color = get_color(infile,1);
                     /* draw_hatchfill(ctx,x0,y0,dx,dy,linewidth,color,opacity,xsize,ysize) */
                     string_length = snprintf(NULL,0,  "draw_hatchfill(%d,%d,%d,%d,%d,%d,\"%s\",%.2f,%d,%d);\n",STATIC_CANVAS,int_data[0],int_data[1],int_data[2],int_data[3],line_width,stroke_color,stroke_opacity,xsize,ysize);
                     check_string_length(string_length);tmp_buffer = my_newmem(string_length+1);
                     snprintf(tmp_buffer,string_length,"draw_hatchfill(%d,%d,%d,%d,%d,%d,\"%s\",%.2f,%d,%d);\n",STATIC_CANVAS,int_data[0],int_data[1],int_data[2],int_data[3],line_width,stroke_color,stroke_opacity,xsize,ysize);
                     add_to_buffer(tmp_buffer);
                     break;
                     default:break;
                 }
             }
             reset();
         break;
         case DIAMONDFILL:
         /*
         @ diamondfill x0,y0,dx,dy,color
         @ x0,y0 in xrange / yrange
         @ distances dx,dy in pixels
             temp = get_string(infile,1);
             if( strstr( temp,":") != 0 ){ temp = str_replace(temp,":","\",\""); }
             fprintf(js_include_file,"var legendcolors%d = [\"%s\"];",canvas_root_id,temp);
             break;
         case LEGEND:
         /*
         @ legend string1:string2:string3....string_n
         @ will be used to create a legend for a graph
         @ also see command 'piechart'
         */
             temp = get_string(infile,1);
         @ sets the logbase number for the y-axis
         @ default value 10
         @ use together with commands ylogscale / xylogscale
         */
             fprintf(js_include_file,"ylogbase=%d;",(int)(get_real(infile,1)));
             break;
         case XLOGSCALE:
         /*
          @ xlogscale ymajor,yminor,majorcolor,minorcolor
          @ the x/y-range are set using commands 'xrange xmin,xmax' and 'yrange ymin,ymax'
          @ ymajor is the major step on the y-axis; yminor is the divisor for the y-step
+}
 void canvas_error(char *msg){
     fprintf(stdout,"\n</script><hr /><span style=\"color:red\">FATAL syntax error:line %d : %s</span><hr />",line_number-1,msg);
     finished = 1;
     exit(EXIT_SUCCESS);
 }
 /* convert x/y coordinates to pixel */
 int x2px(double x){
  return x*xsize/(xmax - xmin) -  xsize*xmin/(xmax - xmin);
  if(use_dashed == TRUE){use_dashed = FALSE;}
  if(use_translate == TRUE){use_translate = FALSE;}
  if(use_rotate == TRUE){use_rotate = FALSE;}
  onclick = 0;
+}
 /* What reply format in read_canvas();
 note:if userdraw is combined with inputfields...every "userdraw" based answer will append "\n" and  inputfield.value()
 = x1,x2,x3,x4....x_n
     y1,y2,y3,y4....y_n
     x/y in pixels
     r in pixels
 = x1,x2,x3,x4....x_n
     y1,y2,y3,y4....y_n
     r1,r2,r3,r4....r_n
     x/y in  xrange / yrange coordinate system
     r in pixels
 = Ax1,Ax2,Ax3,Ax4....Ax_n
     Ay1,Ay2,Ay3,Ay4....Ay_n
     Bx1,Bx2,Bx3,Bx4....Bx_n
     By1,By2,By3,By4....By_n
     Cx1,Cx2,Cx3,Cx4....Cx_n
     Cy1,Cy2,Cy3,Cy4....Cy_n
     ....
     Zx1,Zx2,Zx3,Zx4....Zx_n
     Zy1,Zy2,Zy3,Zy4....Zy_n
     x/y in pixels
 = Ax1,Ax2,Ax3,Ax4....Ax_n
     Ay1,Ay2,Ay3,Ay4....Ay_n
     Bx1,Bx2,Bx3,Bx4....Bx_n
     By1,By2,By3,By4....By_n
     Cx1,Cx2,Cx3,Cx4....Cx_n
     Cy1,Cy2,Cy3,Cy4....Cy_n
     ....
     Zx1,Zx2,Zx3,Zx4....Zx_n
     Zy1,Zy2,Zy3,Zy4....Zy_n
     x/y in  xrange / yrange coordinate system
 = x1:y1,x2:y2,x3:y3,x4:y4...x_n:y_n
     x/y in pixels
 = x1:y1,x2:y2,x3:y3,x4:y4...x_n:y_n
     break;
     case DRAW_ELLIPSES:/* not  used for userdraw */
 fprintf(js_include_file,"\n<!-- draw ellipses -->\n\
 draw_ellipses = function(canvas_type,x_points,y_points,line_width,stroke_color,stroke_opacity,use_filled,fill_color,fill_opacity,use_dashed,dashtype0,use_rotate,angle,use_translate,vector){\
  var obj;\
  if( document.getElementById(\"wims_canvas%d\"+canvas_type) ){\
   obj = document.getElementById(\"wims_canvas%d\"+canvas_type);\
  }\
  else\
  {\
   obj = create_canvas%d(canvas_type,xsize,ysize);\
  };\
         *clock="clock",
         *animate="animate",
         *video="video",
         *status="status",
         *snaptogrid="snaptogrid",
+        *xsnaptogrid="xsnaptogrid",
+        *ysnaptogrid="ysnaptogrid",
         *userinput_xy="userinput_xy",
         *usertextarea_xy="usertextarea_xy",
         *sgraph="sgraph";
         while(((c = getc(infile)) != EOF)&&(c!='\n')&&(c!=',')&&(c!='=')&&(c!='\r')){
         return STATUS;
+        }
         if( strcmp(input_type, snaptogrid) == 0 ){
         free(input_type);
         return SNAPTOGRID;
+        }
+        if( strcmp(input_type, xsnaptogrid) == 0 ){
+        free(input_type);
+        return XSNAPTOGRID;
+        }
+        if( strcmp(input_type, ysnaptogrid) == 0 ){
+        free(input_type);
+        return YSNAPTOGRID;
+        }
         if( strcmp(input_type, userinput_xy) == 0 ){
         free(input_type);
         return USERINPUT_XY;
+        }

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 7783 → 7784