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

             arrow_head = (int) (get_real(infile,1));
             break;
         case CROSSHAIRSIZE:
         /*
         @ crosshairsize int
-        @ default 10 (px)
+        @ default 8 (px)
         */
             crosshair_size = (int) (get_real(infile,1));
             break;
         case CROSSHAIR:
         /*
         @ arrows color,head (px),x1,y1,x2,y2...x_n,y_n
         @ draw single headed arrows / vectors from (x1:y1) to (x2:y2) ... (x3:y3) to (x4:y4) etc ... in color 'color'
         @ use command 'linewidth int' to adjust thickness of the arrow
         @ may be set draggable / onclick individually
         */
-        fprintf(js_include_file,"\n<!-- FOUND ARROWS --> \n");
             stroke_color=get_color(infile,0); /* how nice: now the color comes first...*/
             fill_color = stroke_color;
             arrow_head = (int) get_real(infile,0);/* h */
             i=0;
             while( ! done ){     /* get next item until EOL*/
                         click_cnt++;reset();
                         break;
+                }
+            }
             break;
+        case ARROWS2:
+        /*
+        @ arrows2 color,head (px),x1,y1,x2,y2...x_n,y_n
+        @ draw double headed arrows / vectors from (x1:y1) to (x2:y2) ... (x3:y3) to (x4:y4) etc ... in color 'color'
+        @ use command 'linewidth int' to adjust thickness of the arrows
+        @ may be set draggable / onclick individually
+        */
+            stroke_color=get_color(infile,0); /* how nice: now the color comes first...*/
+            fill_color = stroke_color;
+            arrow_head = (int) get_real(infile,0);/* h */
+            i=0;
+            while( ! done ){     /* get next item until EOL*/
+                if(i > MAX_INT - 1){canvas_error("to 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++;
+            }
+            decimals = find_number_of_digits(precision);
+            for(c = 0 ; c < i-1 ; c = c+4){
+                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,%d,%d));\n",click_cnt,onclick,drag_type,decimals,double_data[c],decimals,double_data[c+2],decimals,double_data[c+1],decimals,double_data[c+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,slider,slider_cnt);
+                click_cnt++;
+            }
+            reset();
+            break;
         case PARALLEL:
         /*
          @ parallel x1,y1,x2,y2,dx,dy,n,[colorname or #hexcolor]
          @ can not be set "onclick" or "drag xy"
         */
         @ use together with commands xlogscale / xylogscale
         */
             fprintf(js_include_file,"xlogbase=%d;",(int)(get_real(infile,1)));
             break;
         case YLOGBASE:
         /*
         @ ylogbase number
         @ sets the logbase number for the y-axis
         @ default value 10
         @ use together with commands ylogscale / xylogscale
         */
 /* end main() */
 /******************************************************************************
 **
 **  sync_input
 **
 **  synchronises input line - reads to end of line, leaving file pointer
 **  at first character of next line.
 **
 **  Used by:
 **  main program - error handling.
 **
 ******************************************************************************/
 void sync_input(FILE *infile)
+{
         int c = 0;
         if( c == '\n' || c == ';' ) return;
         while( ( (c=getc(infile)) != EOF ) && (c != '\n') && (c != '\r') && (c != ';')) ;
         if( c == EOF ) finished = 1;
         if( c == '\n' || c == '\r' || c == ';') line_number++;
         return;
     size_t newlen = strlen(new);
     if (oldlen != newlen){
         for (count = 0, p = str; (q = strstr(p, old)) != NULL; p = q + oldlen){
             count++;
             retlen = p - str + strlen(p) + count * (newlen - oldlen);
         }
+    }
     else
+    {
         retlen = strlen(str);
+    }
+        }
         strcpy(r, p);
+    }
     return ret;
+}
 /******************************************************************************/
 char *get_color(FILE *infile , int last){
     int c,i = 0,is_hex = 0;
     char temp[MAX_COLOR_STRING], *string;
     const char *not_allowed = "0123456789";
     while(( (c=getc(infile)) != EOF ) && ( c != '\n') && ( c != ',' ) && ( c != ';' ) ){
         if( i > MAX_COLOR_STRING ){ canvas_error("colour string is too big ... ? ");}
         if( c == '#' ){
             is_hex = 1;
         }
         if( c != ' '){
             if( is_hex == 0 ){if(strchr(not_allowed,c) != 0){canvas_error("found something like a number...but is should have been a colour or #hex color number...<br />Do not use R,G,B !!! ");}}
             temp[i]=tolower(c);
             i++;
+        }
         int g = (int) strtol(green, NULL, 16);
         int b = (int) strtol(blue,  NULL, 16);
         string = (char *)my_newmem(12);
         snprintf(string,11,"%d,%d,%d",r,g,b);
         return string;
     }
     else
+    {
         string = (char *)my_newmem(sizeof(temp));
         snprintf(string,sizeof(temp),"%s",temp);
         for( i = 0; i < NUMBER_OF_COLORNAMES ; i++ ){
             if( strcmp( colors[i].name , string ) == 0 ){
+            }
+        }
         canvas_error("I was expecting a color name or hexnumber...but found nothing.");
+    }
     return "0,0,255";
 }
 char *get_string(FILE *infile,int last){ /* last = 0 : more arguments ; last=1 final argument */
     int c,i=0;
     char  temp[MAX_BUFFER], *string;
     while(( (c=getc(infile)) != EOF ) && ( c != '\n') ){
     const char *not_allowed = "#bdfghjkmquvwxyz";/* avoid segmentation faults in a "atof()" and "wims eval" */
     while(( (c=getc(infile)) != EOF ) && ( c != ',') && (c != '\n') && ( c != ';')){
      if( c != ' ' ){
       if( i == 0 &&  c == '+' ){
        continue;
       }
       else
+      {
        c = tolower(c);
        if( strchr(not_allowed,c) != 0 ){canvas_error("found a character not associated with a number...");}
        if( strchr(allowed,c) != 0 ){found_calc = 1;}/* hand the string over to wims eval() */
      void *f = eval_create(tmp);
      assert(f);if( f == NULL ){canvas_error("I'm having trouble parsing your \"expression\" ") ;}
      y = eval_x(f, 1);
      /* if function is bogus; y = 1 : so no core dumps */
      eval_destroy(f);
     }
     else
+    {
      y = atof(tmp);
+    }
     return y;
  };\
  len = userdraw_radius.length;\
  if( len > 0 ){\
   for(var p = 0 ; p < len ; p++ ){\
    userdraw_radius[p] = (Math.round(prec*userdraw_radius[p]))/prec;\
   };\
  };\
 };",reply_precision);
 switch(type_reply){
 /*
  var p = 0;\
  var reply = \"\";\
  for(p = 0; p < userdraw_x.length;p++){\
   if(userdraw_x[p] != null ){\
    reply = reply + userdraw_x[p]+\"\\n\"+userdraw_y[p]+\"\\n\";\
   };\
  };\
  if(p == 0){alert(\"nothing drawn...\");return;};\
  userdraw_x = [];userdraw_y = [];\
  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 5 read_canvas%d() -->",canvas_root_id,canvas_root_id,canvas_root_id);
     break;
     /*
         attention: we reset userdraw_x / userdraw_y  : because  userdraw_x = [][] userdraw_y = [][]
         used for userdraw multiple paths
      ctx.save();\
      ctx.translate(x1,y1);\
      ctx.rotate(Math.atan2(-dy,-dx));\
      ctx.beginPath();\
      ctx.moveTo(0,0);\
-     ctx.lineTo(-1*arrow_head,-0.5*arrow_head);\
+     ctx.lineTo(-1*arrow_head,-0.4*arrow_head);\
-     ctx.lineTo(-1*arrow_head, 0.5*arrow_head);\
+     ctx.lineTo(-1*arrow_head, 0.4*arrow_head);\
      ctx.closePath();\
      ctx.stroke();\
      ctx.fill();\
      ctx.restore();\
    }\
         *arrow="arrow",
         *darrow="darrow",
         *arrow2="arrow2",
         *darrow2="darrow2",
         *arrows="arrows",
+        *arrows2="arrows2",
         *zoom="zoom",
         *grid="grid",
         *hline="hline",
         *dhline="dhline",
         *drag="drag",
+        }
         if( strcmp(input_type, darrow2) == 0 ){
         free(input_type);
         use_dashed = TRUE;
         return ARROW2;
+        }
+        if( strcmp(input_type, arrows2) == 0 ){
+        free(input_type);
+        return ARROWS2;
+        }
         if( strcmp(input_type, arrows) == 0 ){
         free(input_type);
         return ARROWS;
+        }

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 8322 → 8347