add another vnstati test with file output, fix imperfections visible in some elements

diff --git a/.gitignore b/.gitignore
index 71a2b66f99d750760d6c5f6ac35448451fd8ed53..c4bd3129489b40b2c9dad5ba5ddc3f48acdb9e7a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ vnstati
 *.trs
 coverage
 vnstat_tests
-vnstati_check.png
+vnstati_*check.png
 check_vnstat
 testdir
 Makefile

diff --git a/CHANGES b/CHANGES
index 79efe9d008297e116145058f39f579477c3c6830..b8531daba5d554ee2ea9acfe2e0f071840246570 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,10 +10,10 @@
    - User configurable data retention durations for all resolutions with
      following changed defaults:
                    v1.18     v2.0
-       5 minutes     n/a      576
-       hours          24       96
-       days           30       62
-       months         12       25
+       5 minutes     n/a      576   (48 hours)
+       hours          24       96   (4 days)
+       days           30       62   (2 full months)
+       months         12       25   (2 full years)
        years         n/a      all
        top days       10       20
    - Option to select units to use SI decimal prefixes using calculations
@@ -25,6 +25,7 @@
    - Hourly list output replaces the hourly graph when the -h parameter is used
    - Hourly graph is accessible with -hg / --hoursgraph parameter
    - Options -b / --begin and -e / --end for specifying query time range
+   - Configuration comes with ISO 8601 date formats as new defaults
  - Removed
    - Weekly output
    - Merge of data from multiple interfaces to one output

diff --git a/src/image.c b/src/image.c
index 268e499bbbe1a7736bcaef7a2e1bf92e9752887d..ef4883fa4faf4a3612920ff30058a923d18dabbf 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -201,8 +201,10 @@ void drawbar(IMAGECONTENT *ic, const int x, const int y, const int len, const ui
        if (tx > rx) {
                l=(int)(rintf((rx/(float)(rx+tx)*width)));
 
-               gdImageFilledRectangle(ic->im, x, y+YBEGINOFFSET, x+l, y+YENDOFFSET, ic->crx);
-               gdImageRectangle(ic->im, x, y+YBEGINOFFSET, x+l, y+YENDOFFSET, ic->crxd);
+               if (l > 0) {
+                       gdImageFilledRectangle(ic->im, x, y+YBEGINOFFSET, x+l, y+YENDOFFSET, ic->crx);
+                       gdImageRectangle(ic->im, x, y+YBEGINOFFSET, x+l, y+YENDOFFSET, ic->crxd);
+               }
 
                gdImageFilledRectangle(ic->im, x+l, y+YBEGINOFFSET, x+width, y+YENDOFFSET, ic->ctx);
                gdImageRectangle(ic->im, x+l, y+YBEGINOFFSET, x+width, y+YENDOFFSET, ic->ctxd);
@@ -213,8 +215,10 @@ void drawbar(IMAGECONTENT *ic, const int x, const int y, const int len, const ui
                gdImageFilledRectangle(ic->im, x, y+YBEGINOFFSET, x+(width-l), y+YENDOFFSET, ic->crx);
                gdImageRectangle(ic->im, x, y+YBEGINOFFSET, x+(width-l), y+YENDOFFSET, ic->crxd);
 
-               gdImageFilledRectangle(ic->im, x+(width-l), y+YBEGINOFFSET, x+width, y+YENDOFFSET, ic->ctx);
-               gdImageRectangle(ic->im, x+(width-l), y+YBEGINOFFSET, x+width, y+YENDOFFSET, ic->ctxd);
+               if (l > 0) {
+                       gdImageFilledRectangle(ic->im, x+(width-l), y+YBEGINOFFSET, x+width, y+YENDOFFSET, ic->ctx);
+                       gdImageRectangle(ic->im, x+(width-l), y+YBEGINOFFSET, x+width, y+YENDOFFSET, ic->ctxd);
+               }
        }
 }
 
@@ -223,10 +227,14 @@ void drawpole(IMAGECONTENT *ic, const int x, const int y, const int len, const u
        int l;
 
        l = (int)((rx/(float)max)*len);
-       gdImageFilledRectangle(ic->im, x, y+(len-l), x+7, y+len, ic->crx);
+       if (l > 0) {
+               gdImageFilledRectangle(ic->im, x, y+(len-l), x+7, y+len, ic->crx);
+       }
 
        l = (int)((tx/(float)max)*len);
-       gdImageFilledRectangle(ic->im, x+5, y+(len-l), x+12, y+len, ic->ctx);
+       if (l > 0) {
+               gdImageFilledRectangle(ic->im, x+5, y+(len-l), x+12, y+len, ic->ctx);
+       }
 }
 
 void drawdonut(IMAGECONTENT *ic, const int x, const int y, const float rxp, const float txp)

diff --git a/tests/image_tests.c b/tests/image_tests.c
index 4bbe3ced9430ce4a8a03cc73c053ea08a7d91e9c..91e6ef70ef8bc93ae8f5414505d0db721a43e989 100644 (file)
--- a/tests/image_tests.c
+++ b/tests/image_tests.c
@@ -400,7 +400,7 @@ START_TEST(hourly_imagescaling_rate_1000)
 }
 END_TEST
 
-START_TEST(output_check)
+START_TEST(libgd_output_comparison)
 {
        int ret, x, y;
        IMAGECONTENT ic;
@@ -414,9 +414,9 @@ START_TEST(output_check)
        ic.im = gdImageCreate(x, y);
        colorinit(&ic);
        ic.interface.updated = (time_t)get_timestamp(2001, 2, 3, 4, 5);
-       layoutinit(&ic, "vnstati output reference test", x, y);
+       layoutinit(&ic, "vnstati libgd output comparison", x, y);
 
-       pngout = fopen("vnstati_check.png", "w");
+       pngout = fopen("vnstati_libgd_comparison_check.png", "w");
        ck_assert_ptr_ne(pngout, NULL);
 
        drawlegend(&ic, 40, 30);
@@ -592,6 +592,100 @@ START_TEST(output_check)
        gdImageString(ic.im, gdFontGetSmall(), x-20, y+30, (unsigned char*)"1.0/0.1 - 0.1/1.0", ic.ctext);
 
 
+       gdImagePng(ic.im, pngout);
+       ret = fclose(pngout);
+       ck_assert_int_eq(ret, 0);
+       gdImageDestroy(ic.im);
+}
+END_TEST
+
+START_TEST(element_output_check)
+{
+       int ret, x, y;
+       float i;
+       char buffer[6];
+       IMAGECONTENT ic;
+       FILE *pngout;
+
+       x = 1500;
+       y = 900;
+
+       defaultcfg();
+       initimagecontent(&ic);
+       ic.im = gdImageCreate(x, y);
+       colorinit(&ic);
+       ic.interface.updated = (time_t)get_timestamp(2012, 3, 4, 5, 6);
+       layoutinit(&ic, "donut with 0.2% input steps and other elements", x, y);
+
+       pngout = fopen("vnstati_element_check.png", "w");
+       ck_assert_ptr_ne(pngout, NULL);
+
+       x = 40;
+       y = 70;
+
+       gdImageStringUp(ic.im, gdFontGetSmall(), 1, y+15, (unsigned char*)"50.0%", ic.ctext);
+
+       for (i=50.0; i>=0; i-=0.2) {
+
+               drawdonut(&ic, x, y, i, i);
+               x += 55;
+
+               if (x>1000) {
+                       x = 40;
+                       y += 60;
+
+                       snprintf(buffer, 6, "%3.1f%%", (double)i-0.2);
+                       gdImageStringUp(ic.im, gdFontGetSmall(), 1, y+15, (unsigned char*)buffer, ic.ctext);
+               }
+       }
+
+       gdImageString(ic.im, gdFontGetGiant(), 1020, 40, (unsigned char*)"Giant - The quick brown fox jumps over the lazy dog", ic.ctext);
+       gdImageString(ic.im, gdFontGetLarge(), 1020, 60, (unsigned char*)"Large - The quick brown fox jumps over the lazy dog", ic.ctext);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1020, 80, (unsigned char*)"MediumBold - The quick brown fox jumps over the lazy dog", ic.ctext);
+       gdImageString(ic.im, gdFontGetSmall(), 1020, 100, (unsigned char*)"Small - The quick brown fox jumps over the lazy dog", ic.ctext);
+       gdImageString(ic.im, gdFontGetTiny(), 1020, 120, (unsigned char*)"Tiny - The quick brown fox jumps over the lazy dog", ic.ctext);
+
+       drawlegend(&ic, 1230, 140);
+
+       drawbar(&ic, 1050, 160, 400, 50, 50, 100);
+       drawbar(&ic, 1050, 180, 400, 25, 75, 100);
+       drawbar(&ic, 1050, 200, 400, 75, 25, 100);
+       drawbar(&ic, 1050, 220, 400, 0, 100, 100);
+       drawbar(&ic, 1050, 240, 400, 100, 0, 100);
+
+       drawbar(&ic, 1050, 260, 400, 50, 50, 130);
+       drawbar(&ic, 1050, 280, 400, 25, 75, 130);
+       drawbar(&ic, 1050, 300, 400, 75, 25, 130);
+       drawbar(&ic, 1050, 320, 400, 0, 100, 130);
+       drawbar(&ic, 1050, 340, 400, 100, 0, 130);
+
+       drawpole(&ic, 1050, 360, 400, 50, 50, 100);
+       drawpole(&ic, 1070, 360, 400, 25, 75, 100);
+       drawpole(&ic, 1090, 360, 400, 75, 25, 100);
+       drawpole(&ic, 1110, 360, 400, 0, 100, 100);
+       drawpole(&ic, 1130, 360, 400, 100, 0, 100);
+
+       drawpole(&ic, 1150, 360, 400, 50, 50, 130);
+       drawpole(&ic, 1170, 360, 400, 25, 75, 130);
+       drawpole(&ic, 1190, 360, 400, 75, 25, 130);
+       drawpole(&ic, 1210, 360, 400, 0, 100, 130);
+       drawpole(&ic, 1230, 360, 400, 100, 0, 130);
+
+
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 400, (unsigned char*)"Color: ctext", ic.ctext);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 420, (unsigned char*)"Color: cedge", ic.cedge);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 440, (unsigned char*)"Color: cheader", ic.cheader);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 460, (unsigned char*)"Color: cheadertitle", ic.cheadertitle);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 480, (unsigned char*)"Color: cheaderdate", ic.cheaderdate);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 500, (unsigned char*)"Color: cline", ic.cline);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 520, (unsigned char*)"Color: clinel", ic.clinel);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 540, (unsigned char*)"Color: cbackground", ic.cbackground);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 560, (unsigned char*)"Color: cvnstat", ic.cvnstat);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 580, (unsigned char*)"Color: cbgoffset", ic.cbgoffset);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 600, (unsigned char*)"Color: crx", ic.crx);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 620, (unsigned char*)"Color: crxd", ic.crxd);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 640, (unsigned char*)"Color: ctx", ic.ctx);
+       gdImageString(ic.im, gdFontGetMediumBold(), 1280, 660, (unsigned char*)"Color: ctxd", ic.ctxd);
 
        gdImagePng(ic.im, pngout);
        ret = fclose(pngout);
@@ -619,6 +713,7 @@ void add_image_tests(Suite *s)
        tcase_add_test(tc_image, hourly_imagescaling_normal);
        tcase_add_test(tc_image, hourly_imagescaling_rate_1024);
        tcase_add_test(tc_image, hourly_imagescaling_rate_1000);
-       tcase_add_test(tc_image, output_check);
+       tcase_add_test(tc_image, libgd_output_comparison);
+       tcase_add_test(tc_image, element_output_check);
        suite_add_tcase(s, tc_image);
 }