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

 double tmin = -2;
 /* flag to indicate parsing of line status */
 int done = FALSE;
 int type; /* eg command number */
 int onclick = 0;/* 0 = noninteractive ; 1 = onclick ; 2 = draggable*/
+int use_affine = FALSE;
 int use_rotate = FALSE;
 int use_translate = FALSE;
 int use_filled = FALSE;
 int use_dashed = FALSE; /* dashing not natively supported in firefox  , for now... */
 char buffer[MAX_BUFFER];/* contains js-functions with arguments ... all other basic code is directly printed into js-include file */
     char *font_color = "#00000";
     char *draw_type = "points";
     char *fly_font = "normal";
     char *input_style = "";
     char *flytext = "";
+    char *affine_matrix = "[1,0,0,1,0,0]";
     int pixelsize = 1;
     int reply_format = 0;
     int input_cnt = 0;
     int ext_img_cnt = 0;
     int font_size = 12;
                 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: stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,7,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],crosshair_size,crosshair_size,line_width,stroke_color,stroke_opacity,fill_color,fill_opacity,use_filled,0,0,0,use_rotate,angle,flytext,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,7,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],crosshair_size,crosshair_size,line_width,stroke_color,stroke_opacity,fill_color,fill_opacity,use_filled,0,0,0,use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();
                         break;
                     default:break;
+                }
+            }
+                }
                 i++;
+            }
             decimals = find_number_of_digits(precision);
             for(c=0 ; c < i-1 ; c = c+2){
-                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,7,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[c],decimals,double_data[c+1],crosshair_size,crosshair_size,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,1,0,0,0,use_rotate,angle,flytext,font_size,font_family);
+                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,7,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[c],decimals,double_data[c+1],crosshair_size,crosshair_size,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,1,0,0,0,use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                 click_cnt++;
+            }
             reset();
             break;
         case POINT:
                 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: stroke_color = get_color(infile,1);/* name or hex color */
                     decimals = find_number_of_digits(precision);
-                    fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,2,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],line_width,line_width,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,1,0,0,0,use_rotate,angle,flytext,font_size,font_family);
+                    fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,2,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],line_width,line_width,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,1,0,0,0,use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                     click_cnt++;break;
                     default: break;
+                }
+            }
             reset();
+                }
                 i++;
+            }
             decimals = find_number_of_digits(precision);
             for(c = 0 ; c < i-1 ; c = c+2){
-                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,2,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[c],decimals,double_data[c+1],line_width,line_width,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,1,0,0,0,use_rotate,angle,flytext,font_size,font_family);
+                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,2,[%.*f],[%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[c],decimals,double_data[c+1],line_width,line_width,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,1,0,0,0,use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                 click_cnt++;
+            }
             reset();
             break;
         case SEGMENT:
                     case 1: double_data[1]= get_real(infile,0);break; /* y1-values */
                     case 2: double_data[2]= get_real(infile,0);break; /* x2-values */
                     case 3: double_data[3]= get_real(infile,0);break; /* y2-values */
                     case 4: stroke_color=get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();
                         break;
                     default: break;
+                }
+            }
                             double_data[0] = xmin;
                             double_data[2] = xmax;
+                        }
+                    }
                     decimals = find_number_of_digits(precision);
-                    fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                    fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                     click_cnt++;reset();
                     break;
+                }
+            }
             break;
                     case 0: double_data[0] = get_real(infile,0);break; /* x-values */
                     case 1: double_data[1] = get_real(infile,0);break; /* y-values */
                     case 2: stroke_color = get_color(infile,1);/* name or hex color */
                     double_data[3] = double_data[1];
                     decimals = find_number_of_digits(precision);
-                    fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,xmin,decimals,xmax,decimals,double_data[1],decimals,double_data[3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                    fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,xmin,decimals,xmax,decimals,double_data[1],decimals,double_data[3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                     click_cnt++;reset();
                     break;
+                }
+            }
             break;
                     case 0: double_data[0] = get_real(infile,0);break; /* x-values */
                     case 1: double_data[1] = get_real(infile,0);break; /* y-values */
                     case 2: stroke_color=get_color(infile,1);/* name or hex color */
                         double_data[2] = double_data[0];
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,ymin,decimals,ymax,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);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,ymin,decimals,ymax,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,use_affine,affine_matrix);
                         click_cnt++;reset();
                     break;
+                }
+            }
             break;
                     case 2:double_data[2] = get_real(infile,0);
                            double_data[3] = double_data[2];
                            break; /* x-values */
                     case 3:stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,1,[%.*f,%.*f],[%.*f,%.*f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],decimals,double_data[2],decimals,double_data[3],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);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,1,[%.*f,%.*f],[%.*f,%.*f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],decimals,double_data[2],decimals,double_data[3],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,use_affine,affine_matrix);
                         click_cnt++;reset();
                         break;
+                }
+            }
             break;
                     case 2:double_data[2] = get_real(infile,0);break; /* x-values */
                     case 3:double_data[3] = get_real(infile,0);break; /* y-values */
                     case 4:int_data[0] = (int) (get_real(infile,0));break; /* radius value in pixels */
                     case 5:stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,6,[%.*f,%.*f],[%.*f,%.*f],[%d,%d],[%d,%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],int_data[0],int_data[0],int_data[0],int_data[0],line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,6,[%.*f,%.*f],[%.*f,%.*f],[%d,%d],[%d,%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],int_data[0],int_data[0],int_data[0],int_data[0],line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();
                     break;
+                }
+            }
             break;
                     case 1:double_data[1] = get_real(infile,0);break; /* y-values */
                     case 2:double_data[2] = get_real(infile,0);break; /* x-values */
                     case 3:double_data[3] = get_real(infile,0);break; /* y-values */
                     case 4:stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,1,[%.*f,%.*f,%.*f,%.*f],[%.*f,%.*f,%.*f,%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[2],decimals,double_data[0],decimals,double_data[1],decimals,double_data[1],decimals,double_data[3],decimals,double_data[3],line_width,line_width,line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,1,[%.*f,%.*f,%.*f,%.*f],[%.*f,%.*f,%.*f,%.*f],[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[2],decimals,double_data[0],decimals,double_data[1],decimals,double_data[1],decimals,double_data[3],decimals,double_data[3],line_width,line_width,line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();
                         break;
+                }
+            }
             break;
+                    }
+                }
+            }
             /* draw path : not closed & not filled */
             decimals = find_number_of_digits(precision);
-            fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,%s,[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,double_xy2js_array(double_data,i,decimals),line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+            fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,%s,[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,double_xy2js_array(double_data,i,decimals),line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
             click_cnt++;reset();
             break;
         case POLY:
         /*
         @ poly color,x1,y1,x2,y2...x_n,y_n
+                    }
+                }
+            }
             /* draw path :  closed & optional filled */
                 decimals = find_number_of_digits(precision);
-                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,5,%s,[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,double_xy2js_array(double_data,i,decimals),line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,5,%s,[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,double_xy2js_array(double_data,i,decimals),line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                 click_cnt++;reset();
             break;
         case ARC:
         /*
          @ arc xc,yc,width,height,start_angle,end_angle,color
                         y[0] = y[1] = yc
                         w[0] = w[1] = radius = width = height
                         h[0] = start_angle ; h[1] = end_engle
                     */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,12,[%.*f,%.*f],[%.*f,%.*f],[%d,%d],[%.*f,%.*f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[0],decimals,double_data[1],decimals,double_data[1],int_data[0],int_data[0],decimals,double_data[2],decimals,double_data[3],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);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,12,[%.*f,%.*f],[%.*f,%.*f],[%d,%d],[%.*f,%.*f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[0],decimals,double_data[1],decimals,double_data[1],int_data[0],int_data[0],decimals,double_data[2],decimals,double_data[3],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,use_affine,affine_matrix);
                         reset();
                     break;
+                }
+            }
             break;
                     case 1:double_data[1] = get_real(infile,0);break; /* y-values */
                     case 2:double_data[2] = get_real(infile,0);break; /* rx -> px  */
                     case 3:double_data[3] = get_real(infile,0);break; /* ry -> px  */
                     case 4:stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,3,[%.*f],[%.*f],[%.*f],[%.*f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],decimals,double_data[2],decimals,double_data[3],line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,3,[%.*f],[%.*f],[%.*f],[%.*f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],decimals,double_data[2],decimals,double_data[3],line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();
                     break;
+                }
+            }
             break;
                     case 0: double_data[0] = get_real(infile,0);break; /* x */
                     case 1: double_data[1] = get_real(infile,0);break; /* y */
                     case 2: double_data[2] = px2x((get_real(infile,0))/2) - px2x(0);break; /* radius in 'dx' xrange*/
                     case 3: stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,13,[%.*f],[%.*f],[%.3f],[%.3f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],double_data[2],double_data[2],line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,13,[%.*f],[%.*f],[%.3f],[%.3f],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],double_data[2],double_data[2],line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();
                     break;
+                }
+            }
             break;
+                }
+            }
             decimals = find_number_of_digits(precision);
             for(c=0; c<i;c = c+4){
                 click_cnt++;
-                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[c+2],decimals,double_data[0],decimals,double_data[c+3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,4,[%.*f,%.*f],[%.*f,%.*f],[30,30],[30,30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[c+2],decimals,double_data[0],decimals,double_data[c+3],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
+            }
             reset();
             break;
         case ARROW:
         /*
                     case 2: double_data[2] = get_real(infile,0);break; /* x */
                     case 3: double_data[3] = get_real(infile,0);break; /* y */
                     case 4: arrow_head = (int) get_real(infile,0);break;/* h */
                     case 5: stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,8,[%.*f,%.*f],[%.*f,%.*f],[%d,%d],[%d,%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],arrow_head,arrow_head,arrow_head,arrow_head,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,8,[%.*f,%.*f],[%.*f,%.*f],[%d,%d],[%d,%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],arrow_head,arrow_head,arrow_head,arrow_head,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;
                         reset();
                         break;
+                }
+            }
                     case 2: double_data[2] = get_real(infile,0);break; /* x */
                     case 3: double_data[3] = get_real(infile,0);break; /* y */
                     case 4: arrow_head = (int) get_real(infile,0);break;/* h */
                     case 5: stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,10,[%.*f,%.*f],[%.*f,%.*f],[%d,%d],[%d,%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],arrow_head,arrow_head,arrow_head,arrow_head,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,10,[%.*f,%.*f],[%.*f,%.*f],[%d,%d],[%d,%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[2],decimals,double_data[1],decimals,double_data[3],arrow_head,arrow_head,arrow_head,arrow_head,line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();
                         break;
+                }
+            }
             break;
                     case 4: double_data[4] = xmin + get_real(infile,0);break; /* xv -> x-pixels */
                     case 5: double_data[5] = ymax + get_real(infile,0);break; /* yv -> y-pixels */
                     case 6: int_data[0] = (int) (get_real(infile,0));break; /* n  */
                     case 7: stroke_color=get_color(infile,1);/* name or hex color */
                     decimals = find_number_of_digits(precision);
-                    fprintf(js_include_file,"dragstuff.addShape(new Shape(%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\"));\n",click_cnt,onclick,drag_type,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);
+                    fprintf(js_include_file,"dragstuff.addShape(new Shape(%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\",%d,%s));\n",click_cnt,onclick,drag_type,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,use_affine,affine_matrix);
                     click_cnt++;reset();
                     break;
                     default: break;
+                }
+            }
                     case 3: double_data[3] = get_real(infile,0);break; /* y */
                     case 4: double_data[4] = get_real(infile,0);break; /* x */
                     case 5: double_data[5] = get_real(infile,0);break; /* y */
                     case 6: stroke_color = get_color(infile,1);/* name or hex color */
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,5,%s,[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,double_xy2js_array(double_data,6,decimals),line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,5,%s,[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,double_xy2js_array(double_data,6,decimals),line_width,stroke_color,stroke_opacity,stroke_color,fill_opacity,use_filled,use_dashed,dashtype[0],dashtype[1],use_rotate,angle,flytext,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();
                         break;
                     default: break;
+                }
+            }
                 stroke_color = get_color(infile,0);
                 char *fun1 = get_string_argument(infile,0);
                 char *fun2 = get_string_argument(infile,1);
                 if( strlen(fun1) == 0 || strlen(fun2) == 0 ){canvas_error("parametric functions are NOT OK !");}
                 use_parametric = FALSE;
-                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,%d,%s,[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,animation_type,eval_parametric(xsize,ysize,fun1,fun2,xmin,xmax,ymin,ymax,tmin,tmax,plot_steps,precision),2*line_width,2*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);
+                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,%d,%s,[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,animation_type,eval_parametric(xsize,ysize,fun1,fun2,xmin,xmax,ymin,ymax,tmin,tmax,plot_steps,precision),2*line_width,2*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,use_affine,affine_matrix);
                 click_cnt++;
+            }
             else
+            {
                 stroke_color = get_color(infile,0);
                 char *fun1 = get_string_argument(infile,1);
                 if( strlen(fun1) == 0 ){canvas_error("function is NOT OK !");}
-                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,%d,%s,[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,animation_type,eval(xsize,ysize,fun1,xmin,xmax,ymin,ymax,plot_steps,precision),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);
+                fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,%d,%s,[%d],[%d],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%.1f,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,animation_type,eval(xsize,ysize,fun1,xmin,xmax,ymin,ymax,plot_steps,precision),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,use_affine,affine_matrix);
                 click_cnt++;
+            }
             animation_type = 9;/* rest to curve plotting without animation */
             reset();
             break;
+                            }
                             break; /* font_size ! */
                     case 4:
                         temp = get_string_argument(infile,1);
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,14,[%.*f],[%.*f],[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%d,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,0,0,0,0,0,temp,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,14,[%.*f],[%.*f],[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%d,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,0,0,0,0,0,temp,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();break;
                     default:break;
+                }
+            }
             break;
                     case 1: double_data[0] = get_real(infile,0);break; /* x in xrange*/
                     case 2: double_data[1] = get_real(infile,0);break; /* y in yrange*/
                     case 3: decimals = find_number_of_digits(precision);
                         temp = get_string_argument(infile,1);
                         decimals = find_number_of_digits(precision);
-                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,14,[%.*f],[%.*f],[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%d,\"%s\",%d,\"%s\"));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,0,0,0,0,0,temp,font_size,font_family);
+                        fprintf(js_include_file,"dragstuff.addShape(new Shape(%d,%d,%d,14,[%.*f],[%.*f],[30],[30],%d,\"%s\",%.2f,\"%s\",%.2f,%d,%d,%d,%d,%d,%d,\"%s\",%d,\"%s\",%d,%s));\n",click_cnt,onclick,drag_type,decimals,double_data[0],decimals,double_data[1],line_width,stroke_color,stroke_opacity,stroke_color,stroke_opacity,0,0,0,0,0,0,temp,font_size,font_family,use_affine,affine_matrix);
                         click_cnt++;reset();break;
                             break;
                     default:break;
+                }
+            }
             use_translate = TRUE;
             translate_x = x2px(0);
             translate_y = y2px(0);
             angle = get_real(infile,1);
             break;
+        case KILLAFFINE:
+        /*
+        @ killaffine
+        @ keyword : resets the transformation matrix to 1,0,0,1,0,0
+        */
+            use_affine = FALSE;
+            snprintf(affine_matrix,14,"[1,0,0,1,0,0]");
+            break;
+        case AFFINE:
+        /*
+         @affine a,b,c,d,tx,ty
+         @ defines a transformation matrix for subsequent objects
+         @ use keyword 'killaffine' to end the transformation
+         @ note 1: only 'draggable' / 'noclick' objects can be transformed.
+         @ note 2: do not use 'onclick' or 'drag xy' with tranformation objects : the mouse coordinates do not get transformed (yet)
+         @ note 3: no matrix operations on the transformation matrix implemented (yet)
+         @ a : Scales the drawings horizontally
+         @ b : Skews the drawings horizontally
+         @ c : Skews the drawings vertically
+         @ d : Scales the drawings vertically
+         @ tx: Moves the the drawings horizontally in pixels !
+         @ ty: Moves the the drawings vertically in pixels !
+        */
+            for(i = 0 ; i<6;i++){
+                switch(i){
+                    case 0: double_data[0] = get_real(infile,0);break;
+                    case 1: double_data[1] = get_real(infile,0);break;
+                    case 2: double_data[2] = get_real(infile,0);break;
+                    case 3: double_data[3] = get_real(infile,0);break;
+                    case 4: int_data[0] = (int)(get_real(infile,0));break;
+                    case 5: int_data[1] = (int)(get_real(infile,1));
+                        use_affine = TRUE;
+                        string_length = snprintf(NULL,0,"[%.2f,%.2f,%.2f,%.2f,%d,%d] ",double_data[0],double_data[1],double_data[2],double_data[3],int_data[0],int_data[1]);
+                        check_string_length(string_length);affine_matrix = my_newmem(string_length+1);
+                        snprintf(affine_matrix,string_length,"[%.2f,%.2f,%.2f,%.2f,%d,%d] ",double_data[0],double_data[1],double_data[2],double_data[3],int_data[0],int_data[1]);
+                    break;
+                    default: break;
+                }
+            }
+        break;
         case KILLTRANSLATION:
         /*
          killtranslation
         */
             break;
 function read_canvas(){\
  var reply = new Array();\
  var p = 0;\
  while(userdraw_x[p]){\
   reply[p] = px2x(userdraw_x[p]) +\":\" + px2y(userdraw_y[p]);\
   p++;\
  };\
  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++;\
  iframe.src = URL;\
  iframe.setAttribute(\"width\",w);\
  iframe.setAttribute(\"height\",h);\
  return;\
 };");
     break;
     case DRAW_XML:
 fprintf(js_include_file,"\n<!-- draw xml -->\n\
 draw_xml = function(canvas_root_id,x,y,w,h,mathml,onclick){\
  var canvas_div = document.getElementById(\"canvas_div\"+canvas_root_id);\
  var xml_div = document.createElement(\"div\");\
  for(var y = zero_y - snor_y ; y > 0; y = y - step_y){\
   ctx.moveTo(zero_x,y);\
   ctx.lineTo(xsize,y);\
   ctx.fillText(num,zero_x - ctx.measureText(num+\" \").width,parseInt(y+0.2*font_size));\
   num = num + ymajor;\
  };\
  ctx.stroke();\
  ctx.closePath();\
  if( yminor > 1){\
   ctx.lineWidth = 0.5;\
   ctx.beginPath();\
   ctx.moveTo(p,0);\
   ctx.lineTo(p,ysize);\
  };\
  for(var p = zero_x ; p > 0; p = p - x2step){\
   ctx.moveTo(p,0);\
   ctx.lineTo(p,ysize);\
  };\
  for(var p = zero_y ; p < ysize; p = p + y2step){\
   ctx.moveTo(0,p);\
   ctx.lineTo(xsize,p);\
  };\
    txt = legend%d[p];\
    txt_size = ctx.measureText(txt).width;\
    if( x_center + radius + txt_size > xsize ){ x_offset =  x_center + radius + txt_size - xsize;} else { x_offset = 0; };\
    ctx.fillText(legend%d[p],x_center + radius - x_offset, y_center - radius + y_offset);\
    y_offset = parseInt(y_offset + 1.5*font_size);\
   };\
  };\
  ctx.restore();\
 };",canvas_root_id,canvas_root_id,canvas_root_id,canvas_root_id,canvas_root_id,canvas_root_id);
     break;
    if(use_translate == 1 ){ctx.translate(vector[0],vector[1]);}\
    if(use_rotate == 1 ){ctx.rotate(angle*Math.PI/180);}\
   };\
   if( font_family.indexOf('px') != null ){\
    ctx.font = font_family;\
   }\
   else\
   {\
    ctx.font = \"+font_size+'px '+font_family \";\
   };\
   ctx.fillStyle = \"rgba(\"+stroke_color+\",\"+stroke_opacity+\")\";\
   if(angle2 != 0){\
    ctx.save();\
 textarea.setAttribute(\"style\",\"position:absolute;left:\"+x+\"px;top:\"+y+\"px;\"+style);\
 textarea.setAttribute(\"cols\",cols);\
 textarea.setAttribute(\"rows\",rows);\
 textarea.innerHTML = value;\
 canvas_div.appendChild(textarea);};");
     break;
 case DRAW_PIXELS:
 fprintf(js_include_file,"\n<!-- draw pixel -->\n\
 draw_setpixel = function(x,y,color,opacity,pixelsize){\
  var canvas = create_canvas%d(10,xsize,ysize);\
  if(use_axis_numbering == 1){\
   ctx.font = font_family;\n\
   xmarge = ctx.measureText(ymax.toFixed(prec)+' ').width;\n\
   ymarge = parseInt(1.5*font_size);\n\
   ctx.save();\n\
   ctx.fillStyle=\"rgba(255,215,0,0.2)\";\n\
   ctx.rect(0,0,xmarge,ysize);\n\
   ctx.rect(0,ysize-ymarge,xsize,ysize);\n\
   ctx.fill();\n\
   ctx.restore();\n\
  }else{xmarge = 0;ymarge = 0;};\n\
  if( typeof xaxislabel !== 'undefined' ){\
   ctx.save();\n\
   ctx.font = \"italic \"+font_size+\"px Ariel\";\n\
   ctx.fillStyle = \"rgba(\"+font_color+\",\"+major_opacity+\")\";\n\
   corr =  ctx.measureText(xaxislabel).width;\n\
   ctx.fillText(xaxislabel,xsize - 1.5*corr,ysize - 2*font_size);\n\
   ctx.restore();\n\
  };\n\
  if( typeof yaxislabel !== 'undefined' ){\
   ctx.save();\n\
   ctx.font = \"italic \"+font_size+\"px Ariel\";\n\
   ctx.fillStyle = \"rgba(\"+font_color+\",\"+major_opacity+\")\";\n\
   corr = ctx.measureText(yaxislabel).width;\n\
   ctx.translate(xmarge+font_size,corr+font_size);\n\
   ctx.rotate(-0.5*Math.PI);\n\
   if( use_axis_numbering == 1){\
    xtxt = (px2x(x)).toFixed(prec);\
    corr = 0.5*(ctx.measureText(xtxt).width);\
    if(flip == 0 ){flip = 1;ctx.fillText( xtxt,x - corr ,ysize - 0.2*font_size );}else{\
    flip = 0;ctx.fillText( xtxt,x - corr ,ysize - 1.2*font_size );};\
   };\
   for(var dx = 1 ; dx < xminor ; dx++){\
    ctx.strokeStyle=\"rgba(\"+minor_color+\",\"+minor_opacity+\")\";\
    ctx.lineWidth = 0.2*line_width;\n\
    ctx.beginPath();\n\
    ctx.moveTo(x+dx*minor_step,ysize - ymarge);\
         *comment="#",
         *end="end",
         *ellipse="ellipse",
         *fellipse="fellipse",
         *rotate="rotate",
+        *affine="affine",
+        *killaffine="killaffine",
         *fontfamily="fontfamily",
         *fillcolor="fillcolor",
         *clicktile="clicktile",
         *clicktile_colors="clicktile_colors",
         *translation="translation",
         snprintf(input_type,sizeof(temp),"%s",temp);
         if( strcmp(input_type, size) == 0 ){
         free(input_type);
         return SIZE;
         }
         if( strcmp(input_type, xrange) == 0 ){
         free(input_type);
         return XRANGE;
+        }
         if( strcmp(input_type, rangex) == 0 ){
         if( strcmp(input_type, ranget) == 0 ){
         free(input_type);
         return TRANGE;
+        }
         if( strcmp(input_type, yrange) == 0 ){
         free(input_type);
         return YRANGE;
+        }
         if( strcmp(input_type, rangey) == 0 ){
         free(input_type);
         return YRANGE;
         return DASHED;
+        }
         if( strcmp(input_type, dashtype) == 0 ){
         free(input_type);
         return DASHTYPE;
         }
         if( strcmp(input_type, axisnumbering) == 0 ){
         free(input_type);
         return AXIS_NUMBERING;
         }
         if( strcmp(input_type, axisnumbers) == 0 ){
         free(input_type);
         return AXIS_NUMBERING;
+        }
         if( strcmp(input_type, axis) == 0 ){
         free(input_type);
         return AXIS;
+        }
         if( strcmp(input_type, grid) == 0 ){
         free(input_type);
         return GRID;
         return HLINE;
+        }
         if( strcmp(input_type, vline) == 0 ||  strcmp(input_type, verticalline) == 0 ){
         free(input_type);
         return VLINE;
         }
         if( strcmp(input_type, line) == 0 ){
         free(input_type);
         return LINE;
         }
         if( strcmp(input_type, seg) == 0 ||  strcmp(input_type, segment) == 0 ){
         free(input_type);
         return SEGMENT;
+        }
         if( strcmp(input_type, dsegment) == 0 ){
         free(input_type);
         use_dashed = TRUE;
         return SEGMENT;
         }
         if( strcmp(input_type, crosshairsize) == 0 ){
         free(input_type);
         return CROSSHAIRSIZE;
+        }
         if( strcmp(input_type, arrowhead) == 0 ){
         free(input_type);
         return ARROWHEAD;
         }
         if( strcmp(input_type, crosshairs) == 0 ){
         free(input_type);
         return CROSSHAIRS;
+        }
         if( strcmp(input_type, crosshair) == 0 ){
         return STYLE;
+        }
         if( strcmp(input_type, fillcolor) == 0 ){
         free(input_type);
         return FILLCOLOR;
         }
         if( strcmp(input_type, strokecolor) == 0 ){
         free(input_type);
         return STROKECOLOR;
         }
         if( strcmp(input_type, filled) == 0  ){
         free(input_type);
         return FILLED;
+        }
         if( strcmp(input_type, http) == 0 ){
         free(input_type);
         return HTTP;
+        }
         if( strcmp(input_type, rays) == 0 ){
         free(input_type);
         return RAYS;
         if( strcmp(input_type, text) == 0 ){
         free(input_type);
         return FLY_TEXT;
+        }
         if( strcmp(input_type, textup) == 0 ){
         free(input_type);
         return FLY_TEXTUP;
+        }
         if( strcmp(input_type, mouse) == 0 ){
         free(input_type);
         return MOUSE;
         return KILLTRANSLATION;
+        }
         if( strcmp(input_type, rotate) == 0){
         free(input_type);
         return ROTATE;
+        }
+        if( strcmp(input_type, affine) == 0){
+        free(input_type);
+        return AFFINE;
+        }
+        if( strcmp(input_type, killaffine) == 0){
+        free(input_type);
+        return KILLAFFINE;
+        }
         if( strcmp(input_type, audio) == 0 ){
         free(input_type);
         return AUDIO;
+        }

Subversion Repositories wimsdev

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