Updated parameters for drawing functions, added height and width parameters

include/libdraw.h

@@ -29,8 +29,8 @@ BEGIN_C_DECLS
 void libhqr_writeheader(FILE *tree);
 void libhqr_writecss();
 void libhqr_writeend(FILE *tree);
-void libhqr_drawTT(int x, int y, int k, FILE *tree);
-void libhqr_drawTS(int x, int y, int x2, int y2, FILE *tree);
+void libhqr_drawTT(int x, int y, int w, int h, FILE *tree);
+void libhqr_drawTS(int x, int y, int w, int h, FILE *tree);
 void libhqr_drawline(int x1, int y1, int x2, int y2, FILE *tree);
 
 END_C_DECLS

src/treedraw.c

@@ -30,13 +30,17 @@ void libhqr_writeheader(FILE *tree){
 
 void libhqr_writecss();
 
-void libhqr_drawTT(int x, int y, int k, FILE *tree){
-    if(fprintf(tree,"<rect x=\"%d\" y=\"%d\" width=\"50\" height=\"50\" fill=\"red\" /> \n", x, y) < 0 ) return;
+void libhqr_drawTT(int x, int y, int w, int h, FILE *tree){
+    if(fprintf(tree,"<rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" fill=\"red\" /> \n", x, y, w, h) < 0 ) return;
 }
 
-void libhqr_drawTS(int x, int y, int x2, int y2, FILE *tree){
-    if(fprintf(tree,"<rect x=\"%d\" y=\"%d\" width=\"50\" height=\"50\" fill =\"red\" /> \n", x, y) < 0 ) return;
-    if(fprintf(tree,"<rect x=\"%d\" y=\"%d\" width=\"25\" height=\"25\" fill =\"white\"/> \n", x2, y2) < 0 ) return;
+void libhqr_drawTS(int x, int y, int w, int h, FILE *tree){
+    if(fprintf(tree,"<rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" fill =\"red\" /> \n", x, y, w, h) < 0 ) return;
+    int x2 = x + (w / 4);
+    int y2 = y + (h / 4);
+    int w2 = (w / 2);
+    int h2 = (h / 2);
+    if(fprintf(tree,"<rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" fill =\"white\"/> \n", x2, y2, w2, h2) < 0 ) return;
 }
 
 void libhqr_drawline(int x1, int y1, int x2, int y2, FILE *tree){

testings/testing_treedraw.c

@@ -19,21 +19,20 @@
 #include <string.h>
 #include "libdraw.h"
 
-
-
 int
 main(int argc, char ** argv)
 {
   FILE *tree = fopen("tree.svg","w+");
-  int x,y,x2,y2,i,j;
+  int x,y,w,h,i,j;
+  w = 50;
+  h = 50;
   libhqr_writeheader(tree);
   for (i = 1; i < 5; i++){
       for (j = 1; j < 9; j++){
           x = 100*i;
           y = 100*j;
-          x2 = 10 + x;
-          y2 = 10 + y;
-          libhqr_drawTS(x,y,x2,y2,tree);
+          libhqr_drawline(x,y,w,h,tree);
+          libhqr_drawTS(x,y,w,h,tree);
       }
   }
   libhqr_writeend(tree);