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

 int     x2px(double x);
 int     y2px(double y);
 double  px2x(int x);
 double  px2y(int y);
 double  get_real(FILE *infile,int last); /* read a values; calculation and symbols allowed */
-double  get_double(FILE *infile , int orientation , int last); /*the same as get_real(): but for an unknown amount of data args*/
 char    *str_replace ( const char *word, const char *sub_word, const char *rep_word );
 char    *get_color(FILE *infile,int last); /* read hex-color or colorname -> hex */
 char    *get_string(FILE *infile,int last); /* get the string at theend of a command */
 char    *get_string_argument(FILE *infile,int last); /* the same, but with "comma" as  separator */
 char    *convert_hex2rgb(char *hexcolor);
             break;
         case RAYS:
         /*
          @ rays color,xc,yc,x1,y1,x2,y2,x3,y3...x_n,y_n
          @ draw rays in color 'color' and center (xc:yc)
-         @ may be set draggable or onclick (the complete object, not an indiviual ray !)
+         @ may be set draggable or onclick (every individual ray)
         */
             stroke_color=get_color(infile,0);
+            fill_color = stroke_color;
+            double_data[0] = get_real(infile,0);/* xc */
+            double_data[1] = get_real(infile,0);/* yc */
-            i=0;
+            i=2;
-            while( ! done ){     /* get next until EOL*/
+            while( ! done ){     /* get next item until EOL*/
-                if(i > MAX_INT - 1){canvas_error("to much rays in argument: repeat command multiple times to fit");}
+                if(i > MAX_INT - 1){canvas_error("in command rays to many points / rays in argument: repeat command multiple times to fit");}
-                if( i > 3){
+                if(i%2 == 0 ){
-                    double_data[i++] = double_data[0];
-                    double_data[i++] = double_data[1];
-                }
-                for(c=0; c<=1 ;c++){ /* switch x2px / y2px */
-                    double_data[i++]= get_double(infile,c,1);
+                    double_data[i] = get_real(infile,0); /* x */
+                }
+                else
+                {
+                    double_data[i] = get_real(infile,1); /* y */
+                }
+            fprintf(js_include_file,"/* double_data[%d] = %f */\n",i,double_data[i]);
+                i++;
+            }
+            if( i%2 != 0 ){canvas_error("in command rays: unpaired x or y value");}
             decimals = find_number_of_digits(precision);
-            for(c=0; c<i;c = c+4){
+            for(c=2; c<i;c = c+2){
                 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\",%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);
+                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],decimals,double_data[1],decimals,double_data[c+1],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:
         /*
          @ 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 !
+         @ tx: Moves the drawings horizontally in pixels !
-         @ ty: Moves the the drawings vertically in pixels !
+         @ ty: Moves 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;
         @ gridfill x0,y0,dx,dy,color
         @ x0,y0 in xrange / yrange
         @ distances dx,dy in pixels
         */
             if( js_function[DRAW_GRIDFILL] != 1 ){ js_function[DRAW_GRIDFILL] = 1;}
             for(i=0;i<5;i++){
                 switch(i){
                     case 0: int_data[0] = x2px(get_real(infile,0)); break; /* x */
                     case 1: int_data[1] = y2px(get_real(infile,0)); break; /* y  */
                     case 2: int_data[2] = (int) (get_real(infile,0)); break; /* dx pixel */
                     case 3: int_data[3] = (int) (get_real(infile,0)); break; /* dy pixel*/
                     case 4: stroke_color = get_color(infile,1);
                     /* draw_gridfill(ctx,x0,y0,dx,dy,linewidth,color,opacity,xsize,ysize) */
                     string_length = snprintf(NULL,0,  "draw_gridfill(%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_gridfill(%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);
     else
+    {
      y = atof(tmp);
+    }
     return y;
-}
-double get_double(FILE *infile , int orientation , int last){  /* last = 0 : more arguments ; last=1 final argument */
-/* orientation=0 : x-values ...  orientation=1 :y-values */
-    int c;
-    int i = 0;
-    int found_calc = 0; /* signal user input like : 2*pi/3 */
-    char tmp[MAX_INT];
-    double dx;
-    while(( (c=getc(infile)) != EOF ) && ( c != ',') && (c != '\n') && ( c != ';')){
-        if( c != ' '){/* no spaces in numbers */
-            if(canvas_iscalculation(c) != 0 ){
-                found_calc = 1;
-                c = tolower(c);
-            }
-            tmp[i]=c;
-            i++;
-            if( i > MAX_INT-1){canvas_error("number too large");}
-        }
-    }
-    if( c == '\n' || c == EOF || c == ';' ){
-        if( last == 0 ){canvas_error("expecting more arguments");}
-        if( c == EOF ){finished = TRUE;}
-        done = TRUE;
-        /*return 0; */
-    }
-    tmp[i]='\0';
-    if( strlen(tmp) == 0 || i == 0){
-        if( orientation == 0 ){
-            canvas_error("expected a x-value \n e.g. a number in x-range / y-range coordinate system\nbut found nothing !!");
-        }
-        else
-        {
-            canvas_error("expected a y-value \n e.g. a number in x-range / y-range coordinate system\nbut found nothing !!");
-        }
-    }
-    if( found_calc == 1 ){ /* use libmatheval to calculate 2*pi/3 */
-        void *f = evaluator_create(tmp);
-        assert(f);
-        if( f == NULL ){canvas_error("I'm having trouble parsing your \"expression\" ");}
-        dx = evaluator_evaluate_x(f, 1);
-        evaluator_destroy(f);
-    }
-    else
-    {
-        dx = atof(tmp); /* no pi/e/sin(2*pi/3) found : will use atof to convert inputstring  to float */
-    }
-    if( c == '\n' || c == ';') { line_number++; }
-    if( c != EOF ) {
-        if( c == '\n' || c ==';') {
-            done = TRUE;
-        }
-    }
-    else
-    {
-        finished = TRUE;
-    }
-    if( (done == TRUE || finished == TRUE) && last != 1 ){ canvas_error("expected more arguments");}
-    if(orientation == 0){
-        return x2px( dx ); /* convert to pixels according xrange */
-    }
-    else
-    {
-        return y2px( dx );/* convert to pixels according yrange */
-    }
+}
 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);
  ctx.moveTo(zero_x,0);\
  ctx.lineTo(zero_x,ysize);\
  ctx.stroke();\
  ctx.closePath();\
  ctx.lineWidth = line_width+0.5;\
  ctx.beginPath();\
  for(var p = zero_x ; p < xsize; p = p + xstep){\
   ctx.moveTo(p,zero_y-tics_length);\
   ctx.lineTo(p,zero_y+tics_length);\
  };\
  for(var p = zero_x ; p > 0; p = p - xstep){\
   try{ line_name = eval('linegraph_'+i); }catch(e){ break; }\
  };\
 };\
 var barcolor = new Array();\
 if( typeof barchart%d  !== 'undefined' ){\
  ctx.restore();\
  ctx.save();\
  ctx.globalAlpha = 1.0;\
  var bar_x = new Array();\
  var bar_y = new Array();\
  var lb = barchart%d.length;\
  var idx = 0;\
  clock_ctx.closePath();\
  clock_ctx.stroke();\
  break;\
  };\
  angle = (this.H - 3 + this.M/60 ) * 2 * Math.PI / 12;\
  clock_ctx.rotate(angle);\
  clock_ctx.beginPath();\
  clock_ctx.moveTo(-3, -2);\
  clock_ctx.lineTo(-3, 2);\
  clock_ctx.lineTo(this.radius * 0.7, 1);\
  clock_ctx.lineTo(this.radius  * 0.7, -1);\
     break;
 case DRAW_XLOGSCALE:
 fprintf(js_include_file,"\n<!-- draw xlogscale -->\n\
 draw_grid%d = function(canvas_type,line_width,major_color,minor_color,major_opacity,minor_opacity,font_size,font_family,font_color,use_axis_numbering,ymajor,yminor,precision){\n\
  var obj;\n\
  if( document.getElementById(\"wims_canvas%d\"+canvas_type) ){\n\
   obj = document.getElementById(\"wims_canvas%d\"+canvas_type);\n\
  }\n\
  else\n\
  {\n\
   obj = create_canvas%d(canvas_type,xsize,ysize);\n\
  };\n\
  var ctx = obj.getContext(\"2d\");\n\
  ctx.clearRect(0,0,xsize,ysize);\
  ctx.save();\n\
  ctx.lineWidth = line_width;\n\
         *arrow2="arrow2",
         *darrow2="darrow2",
         *zoom="zoom",
         *grid="grid",
         *hline="hline",
+        *dhline="dhline",
         *drag="drag",
         *horizontalline="horizontalline",
         *vline="vline",
+        *dvline="dvline",
         *verticalline="verticalline",
         *triangle="triangle",
         *ftriangle="ftriangle",
         *mathml="mathml",
         *html="html",
         if( strcmp(input_type, yrange) == 0 ){
         free(input_type);
         return YRANGE;
+        }
         if( strcmp(input_type, rangey) == 0 ){
         free(input_type);
         return YRANGE;
+        }
         if( strcmp(input_type, linewidth) == 0 ){
         free(input_type);
         return LINEWIDTH;
+        }
         if( strcmp(input_type, dline) == 0 ){
         use_dashed = TRUE;
         free(input_type);
         return LINE;
+        }
+        if( strcmp(input_type, dvline) == 0 ){
+        use_dashed = TRUE;
+        free(input_type);
+        return VLINE;
+        }
+        if( strcmp(input_type, dhline) == 0 ){
+        use_dashed = TRUE;
+        free(input_type);
+        return HLINE;
+        }
         if( strcmp(input_type, frect) == 0 || strcmp(input_type, frectangle) == 0 ){
         use_filled = TRUE;
         free(input_type);
         return RECT;

Subversion Repositories wimsdev

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