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

             if(strstr(temp,"affine") != 0 ){use_affine = FALSE;affine_matrix[0] = 1.0;affine_matrix[1] = 0.0;affine_matrix[2] = 0.0;affine_matrix[3] = 1.0;affine_matrix[4] = 0.0;affine_matrix[5] = 0.0;}
             if(strstr(temp,"linear") != 0 ){affine_matrix[0] = 1.0;affine_matrix[1] = 0.0;affine_matrix[2] = 0.0;affine_matrix[3] = 1.0;}
             if(strstr(temp,"translation") != 0 || strstr(temp,"translate") != 0 ){affine_matrix[4] = 0.0;affine_matrix[5] = 0.0;}
             if(strstr(temp,"rotation") != 0 || strstr(temp,"rotate") != 0 ){use_rotate = FALSE;angle = 0.0;rotation_center="null";}
             if(strstr(temp,"slider") != 0 ){slider_type = "0";my_sliders = "[-1]";last_slider = use_slider+1;}
+            if(strstr(temp,"group") != 0 ){onclick = 0;drag_type = -1;slider_type = "0";my_sliders = "[-1]";last_slider = use_slider+1;use_slider = -1;reset();}
             if(strstr(temp,"reset") != 0 ){if(no_reset == FALSE){no_reset = TRUE;}else{no_reset = FALSE;reset();}}
             if(strstr(temp,"offset") != 0 ){use_offset = 0;}
             break;
         case KILLAFFINE:
         /*
              int_data[c] = i; c++;
+            }
             my_sliders = data2js_array(int_data,use_slider - last_slider+1);
         break;
-        case SLIDER_X:
+        case GROUP:
+            use_slider++;
-        /* TEMPORARILY REMOVED
+            add_slider(2);
+            int c = 0;
+            for(i=last_slider;i<=use_slider;i++){ int_data[c] = i; c++; }
+            my_sliders = data2js_array(int_data,use_slider - last_slider+1);
-         # sliderfunction_x some_function_in_x
+            if( precision == 0 ){precision = 100;}
+            onclick = 2;
-         # default value "x"
+            use_dragstuff = 2;
+            js_function[INTERACTIVE] = 1;
-         # the x-value of the slider object will be calculated with this function.
+            fprintf(js_include_file,"move_group(%d);dragdrop_precision = %d;use_dragdrop_reply = true;",use_slider,precision);
-         # default is the x-slider value itself
+            fprintf(js_include_file,"var slider%d;",use_slider);
+        /*
+         @ group
+         @ keyword
+         @ all objects after the command and until <a href="#kill">kill group</a> or <a href="#killslider">killslider</a> may be moved together with mouse moverments
-         # only used by command ''slider``
+         @ may be combined with slider driven movements or drag & drop
-         # define before a slider command !
+         @%group%%size 400,400%xrange -10,10%yrange -10,10%axis%axisnumbering%precision 1%grid 2,2,grey,2,2,5,grey%precision 100%linewidth 4%rotationcenter 0,0%slider -2*pi,2*pi,300,40,angle active,rotate%snaptogrid%ftriangle 0,-4,-2,-2,4,--5,blue%fillcolor red%fcircle -4.4,4.4,40,blue%kill slider%slider -20,20,300,40,x active,x-slide%ftriangle -2,0,0,4,2,0,green%fcircle 4.4,4.5,40,red%kill slider%slider -20,20,300,40,y active,y-slide%fcircle 4,-4,40,green%linewidth 4%fcircle -4,-4,40,orange%kill slider%group%fcircle -4.4,4.5,10,blue%fcircle -5.4,4.5,10,blue%fcircle -6.4,4.5,10,blue%fcircle -4.4,8,16,green%fcircle -5.4,8,16,green%fcircle -6.4,8,16,green%mouse red,22%zoom red
         */
-         /* slider_function_x = get_string(infile,1);*/
-        break;
-        case SLIDER_Y:
-         /*slider_function_y = get_string(infile,1);*/
-         /* TEMPORARILY REMOVED
-         # sliderfunction_y some_function_in_y
-         # default value "y"
-         # the y-value of the slider object(s) will be calculated with this function.
-         # only used by command ''slider``
-         # define before a slider command !
-         */
         break;
         case SGRAPH:
         /*
          @ sgraph xstart,ystart,xmajor,ymajor,xminor,yminor,majorgrid_color,minorgrid_color
          @ primitive implementation of a ''broken scale`` graph...
         @ a userdraw object will snap to these points.
         @ the array size (e.g. the number of points) of command ''snaptopoints`` is limited by constant MAX_INT (canvasdraw.h)
         @ a draggable object (use command ''drag x|y|xy``) will snap to the closed of these points when dragged (mouseup)
         @ other options: use keyword ''snaptogrid``, ''xsnaptogrid`` or ''ysnaptogrid``
         @%snaptopoints%size 400,400%xrange -5,5%yrange -5,5%snaptopoints -1,-3,-1,-2,-1,0,-1,1,-1,2,-1,3,1,-3,1,-2,1,-1,1,0,1,1,1,2,1,3%linewidth 2%points red,-1,-3,-1,-2,-1,0,-1,1,-1,2,-1,3,1,-3,1,-2,1,-1,1,0,1,1,1,2,1,3%userdraw arrows,red
+        @%snaptopoints%size 400,400%xrange -5,5%yrange -5,5%snaptopoints -1,-3,-1,-2,-1,0,-1,1,-1,2,-1,3,1,-3,1,-2,1,-1,1,0,1,1,1,2,1,3%linewidth 3%%points blue,-1,-3,-1,-2,-1,0,-1,1,-1,2,-1,3,1,-3,1,-2,1,-1,1,0,1,1,1,2,1,3%drag xy%ftriangle -4,0,-2,3,0,0,red
         */
             i = 0;
             use_snap = 4;
             while( ! done ){     /* get next item until EOL*/
                 if(i > MAX_INT - 1){canvas_error("too many points in argument: repeat command multiple times to fit");}
                     case 1: fill_color = get_color(infile,1);
                         string_length = 1 + snprintf(NULL,0,"draw_grid%d(%d,%d,\"%s\",\"%s\",%.2f,%.2f,%d,\"%s\",\"%s\",%d,%d); ",canvas_root_id,GRID_CANVAS,line_width,stroke_color,fill_color,stroke_opacity,fill_opacity,font_size,font_family,font_color,use_axis_numbering,precision);
                         tmp_buffer = my_newmem(string_length);
                         snprintf(tmp_buffer,string_length,"draw_grid%d(%d,%d,\"%s\",\"%s\",%.2f,%.2f,%d,\"%s\",\"%s\",%d,%d); ",canvas_root_id,GRID_CANVAS,line_width,stroke_color,fill_color,stroke_opacity,fill_opacity,font_size,font_family,font_color,use_axis_numbering,precision);
                         fprintf(js_include_file,"use_xlogscale=1;use_ylogscale=1;snap_x = xlogbase;snap_y = ylogbase;");
                         add_to_buffer(tmp_buffer);
                         break;
                     default:break;
                 }
             }
         break;
         case Y_AXIS_STRINGS:
         /*
          @ yaxis num1:string1:num2:string2:num3:string3:num4:string4:....num_n:string_n
     temp[0] = '[';/* start js-array */
     for(i = 0; i < len;i = i + 2){ /*  x_points[] */
         if(i == len - 2){sprintf(tmp, "%.*f",decimals, xy[i]);}else{sprintf(tmp, "%.*f,",decimals,xy[i]);}
         space_left = (int) (sizeof(temp) - strlen(temp) - strlen(tmp) - 1);
         if( space_left > 0 ){ strncat(temp,tmp,space_left - 1);}else{canvas_error("can not parse integer to js-array:\nYour curve plotting produces too many data \nreduce your image size or plotsteps ");}
     }
     strncat(temp,"],[",4); /* close js x_values array and start new */
     for(i = 1; i < len;i = i + 2){ /* y_points */
         if(i == len - 1){ sprintf(tmp, "%.*f",decimals,xy[i]);}else{sprintf(tmp, "%.*f,",decimals,xy[i]);}
         space_left = (int) (sizeof(temp) - strlen(temp) - strlen(tmp) - 1);
         if( space_left > 0 ){ strncat(temp,tmp,space_left - 1);}else{canvas_error("can not parse integer to js-array:\nYour curve plotting produces too many data \nreduce your image size or plotsteps");}
         *centerstring="centerstring",
         *xunit="xunit",
         *yunit="yunit",
         *slider="slider",
         *killslider="killslider",
+        *killgroup="killgroup",
         *angle="angle",
         *halflines="halflines",
         *demilines="demilines",
         *halfline="halfline",
         *demiline="demiline",
         *hlines="hlines",
         *vlines="vlines",
         *bezier="bezier",
         *functionlabel="functionlabel",
         *functionlabels="functionlabels",
-        *sliderfunction_x="sliderfunction_x",
-        *sliderfunction_y="sliderfunction_y",
+        *group="group",
         *multidraw="multidraw",
         *multilinewidth="multilinewidth",
         *linewidths="linewidths",
         *multistrokecolors="multistrokecolors",
         *multicolors="multicolors",
+        }
         if( strcmp(input_type, slider) == 0 ){
         free(input_type);
         return SLIDER;
+        }
-        if( strcmp(input_type, killslider) == 0 ){
+        if( strcmp(input_type, killslider) == 0 || strcmp(input_type, killgroup) == 0 ){
         free(input_type);
         return KILLSLIDER;
+        }
         if( strcmp(input_type, copy) == 0 ){
         free(input_type);
+        }
         if( strcmp(input_type, functionlabel) == 0 ||  strcmp(input_type, functionlabels) == 0 ){
         free(input_type);
         return FUNCTION_LABEL;
+        }
-        if( strcmp(input_type, sliderfunction_x) == 0 ){
+        if( strcmp(input_type, group) == 0 ){
-        free(input_type);
-        return SLIDER_X;
-        }
-        if( strcmp(input_type, sliderfunction_y) == 0 ){
         free(input_type);
-        return SLIDER_Y;
+        return GROUP;
+        }
         if( strcmp(input_type, multidraw) == 0 ){
         free(input_type);
         return MULTIDRAW;
+        }

Subversion Repositories wimsdev

(root)/trunk/wims/src/Misc/canvasdraw/canvasdraw.c – Rev 16847 → 16872