g15tools-commits Mailing List for g15tools (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 295
          http://g15tools.svn.sourceforge.net/g15tools/?rev=295&view=rev
Author:   aneurysm9
Date:     2009-02-01 00:39:35 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
Convert testlibg15render from C++ to C

Modified Paths:
--------------
    trunk/testlibg15render/Makefile

Added Paths:
-----------
    trunk/testlibg15render/testlibg15render.c

Removed Paths:
-------------
    trunk/testlibg15render/testlibg15render.cpp

Modified: trunk/testlibg15render/Makefile
===================================================================

--- trunk/testlibg15render/Makefile	2009-01-31 03:44:14 UTC (rev 294)
+++ trunk/testlibg15render/Makefile	2009-02-01 00:39:35 UTC (rev 295)
@@ -15,8 +15,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 all:
-	g++ -I/usr/include/freetype2 -O2 -fpic -Wall -pedantic -c testlibg15render.cpp 
-	g++ testlibg15render.o -lg15daemon_client -lg15render -o testlibg15render
+	gcc -I/usr/include/freetype2 -O2 -fpic -Wall -pedantic -c testlibg15render.c 
+	gcc testlibg15render.o -lg15daemon_client -lg15render -o testlibg15render
 	
 clean:
 	rm -f *.o

Copied: trunk/testlibg15render/testlibg15render.c (from rev 294, trunk/testlibg15render/testlibg15render.cpp)
===================================================================
--- trunk/testlibg15render/testlibg15render.c	                        (rev 0)
+++ trunk/testlibg15render/testlibg15render.c	2009-02-01 00:39:35 UTC (rev 295)
@@ -0,0 +1,185 @@
+#define TTF_SUPPORT 1
+#include <stdio.h>
+#include <unistd.h>
+#include <libg15.h>
+#include <g15daemon_client.h>
+#include <libg15render.h>
+#include "g15logo.h"
+
+int const NUM_BYTES = G15_LCD_WIDTH * G15_LCD_HEIGHT / 8;
+unsigned char test_data[G15_LCD_WIDTH * G15_LCD_HEIGHT / 8];
+extern short logo_data[];
+int g15screen_fd = 0;
+g15canvas *canvas;
+
+void
+updateScreen (void)
+{
+  if (!canvas->mode_cache)
+    g15_send (g15screen_fd, (char *) canvas->buffer, 1048);
+}
+
+void
+connectToScreen (void)
+{
+  if ((g15screen_fd = new_g15_screen (G15_G15RBUF)) < 0)
+    {
+      printf("Sorry, cant connect to the G15daemon\n");
+      exit (-1);
+    }
+
+  canvas = (g15canvas *) malloc (sizeof (g15canvas));
+
+  g15r_initCanvas (canvas);
+}
+
+int
+main (int argc, char *argv[])
+{
+  int ret, width, height;
+  int i = 0, x = 0, y = 0;
+  unsigned char character = 0;
+  char *buf;
+
+  connectToScreen ();
+
+  g15r_setPixel (canvas, 20, 20, 1);
+  ret = g15r_getPixel (canvas, 20, 20);
+  printf("g15r_getPixel(20, 20) returns %d which should be 1\n", ret);
+  ret = g15r_getPixel (canvas, 21, 20);
+  printf("g15r_getPixel(21, 20) returns %d which should be 0\n", ret);
+
+  g15r_setPixel (canvas, 20, 20, 0);
+  ret = g15r_getPixel (canvas, 20, 20);
+  printf("g15r_getPixel(20, 20) returns %d which should be 0\n", ret);
+  ret = g15r_getPixel (canvas, 21, 20);
+  printf("g15r_getPixel(21, 20) returns %d which should be 0\n", ret);
+
+  g15r_clearScreen (canvas, 0);
+
+  for (i = 0; i < 3;)
+    {
+      for (y = 0; y < 5; y++)
+	{
+	  for (x = 0; x < 20; x++)
+	    {
+	      g15r_renderCharacterLarge (canvas, x, y, character, 0, 0);
+	      character++;
+	    }
+	}
+      updateScreen ();
+      i++;
+      character = 100 * i;
+      sleep (3);
+    }
+
+  g15r_clearScreen (canvas, 0);
+  character = 0;
+
+  for (i = 0; i < 3;)
+    {
+      for (y = 0; y < 6; y++)
+	{
+	  for (x = 0; x < 32; x++)
+	    {
+	      g15r_renderCharacterMedium (canvas, x, y, character, 0, 0);
+	      character++;
+	    }
+	}
+      updateScreen ();
+      i++;
+      character = 192 * i;
+      sleep (3);
+    }
+
+  g15r_clearScreen (canvas, 0);
+  character = 0;
+
+  for (y = 0; y < 7; y++)
+    {
+      for (x = 0; x < 42; x++)
+	{
+	  g15r_renderCharacterSmall (canvas, x, y, character, 0, 0);
+	  character++;
+	}
+    }
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+
+  g15r_pixelBox (canvas, 40, 20, 90, 40, 1, 1, 1);
+  g15r_pixelBox (canvas, 10, 10, 50, 30, 1, 3, 0);
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+
+  g15r_drawCircle (canvas, 10, 21, 5, 0, 1);
+  g15r_drawCircle (canvas, 110, 21, 15, 1, 1);
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+
+  g15r_drawRoundBox (canvas, 10, 21, 50, 40, 0, 1);
+  g15r_drawRoundBox (canvas, 80, 15, 140, 30, 1, 1);
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+
+  g15r_drawBar (canvas, 10, 10, 150, 20, 1, 50, 100, 1);
+  g15r_drawBar (canvas, 10, 22, 150, 32, 1, 75, 100, 2);
+  g15r_drawBar (canvas, 10, 34, 150, 42, 1, 315, 900, 3);
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+
+  g15r_ttfLoad (canvas, "/usr/share/fonts/ttf-bitstream-vera/Vera.ttf", 16,
+		1);
+  g15r_ttfPrint (canvas, 0, 0, 16, 1, 1, 0, "This   is a     test");
+  g15r_pixelBox (canvas, 0, 22, 159, 42, 1, 1, 1);
+  g15r_ttfPrint (canvas, 0, 25, 16, 1, 0, 1, "This   is a     test");
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+  g15r_loadWbmpSplash (canvas, "./splash.wbmp");
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+  buf = g15r_loadWbmpToBuf ("./splash.wbmp", &width, &height);
+  g15r_drawSprite (canvas, buf, 30, 10, 43, 20, 30, 10, width);
+  g15r_drawSprite (canvas, buf, 10, 20, 15, 20, 10, 20, width);
+  g15r_drawSprite (canvas, buf, 100, 20, 25, 20, 100, 20, width);
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+  g15r_pixelOverlay (canvas, 0, 0, 160, 43, logo_data);
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+  g15r_drawIcon (canvas, buf, 0, 0, width, height);
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 0);
+  g15r_drawBigNum (canvas, 0, 0, 20, 22, G15_COLOR_BLACK, 3);
+  g15r_drawBigNum (canvas, 25, 0, 45, 42, G15_COLOR_BLACK, 0);
+  updateScreen ();
+  sleep (3);
+
+  g15r_clearScreen (canvas, 1);
+  g15r_drawBigNum (canvas, 0, 0, 20, 22, G15_COLOR_WHITE, 4);
+  g15r_drawBigNum (canvas, 25, 0, 45, 42, G15_COLOR_WHITE, 7);
+  updateScreen ();
+  sleep (3);
+
+
+  return 0;
+}


Property changes on: trunk/testlibg15render/testlibg15render.c
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: trunk/testlibg15render/testlibg15render.cpp
===================================================================
--- trunk/testlibg15render/testlibg15render.cpp	2009-01-31 03:44:14 UTC (rev 294)
+++ trunk/testlibg15render/testlibg15render.cpp	2009-02-01 00:39:35 UTC (rev 295)
@@ -1,190 +0,0 @@
-#define TTF_SUPPORT 1
-#include <iostream>
-#include <stdlib.h>
-#include <libg15.h>
-#include <g15daemon_client.h>
-#include <libg15render.h>
-#include "g15logo.h"
-
-using namespace std;
-
-int const NUM_BYTES = G15_LCD_WIDTH * G15_LCD_HEIGHT / 8;
-unsigned char test_data[NUM_BYTES];
-extern short logo_data[];
-int g15screen_fd = 0;
-g15canvas *canvas;
-
-void
-updateScreen (void)
-{
-  if (!canvas->mode_cache)
-    g15_send (g15screen_fd, (char *) canvas->buffer, 1048);
-}
-
-void
-connectToScreen (void)
-{
-  if ((g15screen_fd = new_g15_screen (G15_G15RBUF)) < 0)
-    {
-      cout << "Sorry, cant connect to the G15daemon" << endl;
-      exit (-1);
-    }
-
-  canvas = (g15canvas *) malloc (sizeof (g15canvas));
-
-  g15r_initCanvas (canvas);
-}
-
-int
-main (int argc, char *argv[])
-{
-  connectToScreen ();
-
-  g15r_setPixel (canvas, 20, 20, 1);
-  int ret = g15r_getPixel (canvas, 20, 20);
-  cout << "g15r_getPixel(20, 20) returns " << ret << " which should be 1" <<
-    endl;
-  ret = g15r_getPixel (canvas, 21, 20);
-  cout << "g15r_getPixel(21, 20) returns " << ret << " which should be 0" <<
-    endl;
-
-  g15r_setPixel (canvas, 20, 20, 0);
-  ret = g15r_getPixel (canvas, 20, 20);
-  cout << "g15r_getPixel(20, 20) returns " << ret << " which should be 0" <<
-    endl;
-  ret = g15r_getPixel (canvas, 21, 20);
-  cout << "g15r_getPixel(21, 20) returns " << ret << " which should be 0" <<
-    endl;
-
-  int i = 0, x = 0, y = 0;
-  unsigned char character = 0;
-
-  g15r_clearScreen (canvas, 0);
-
-  for (i = 0; i < 3;)
-    {
-      for (y = 0; y < 5; y++)
-	{
-	  for (x = 0; x < 20; x++)
-	    {
-	      g15r_renderCharacterLarge (canvas, x, y, character, 0, 0);
-	      character++;
-	    }
-	}
-      updateScreen ();
-      i++;
-      character = 100 * i;
-      sleep (3);
-    }
-
-  g15r_clearScreen (canvas, 0);
-  character = 0;
-
-  for (i = 0; i < 3;)
-    {
-      for (y = 0; y < 6; y++)
-	{
-	  for (x = 0; x < 32; x++)
-	    {
-	      g15r_renderCharacterMedium (canvas, x, y, character, 0, 0);
-	      character++;
-	    }
-	}
-      updateScreen ();
-      i++;
-      character = 192 * i;
-      sleep (3);
-    }
-
-  g15r_clearScreen (canvas, 0);
-  character = 0;
-
-  for (y = 0; y < 7; y++)
-    {
-      for (x = 0; x < 42; x++)
-	{
-	  g15r_renderCharacterSmall (canvas, x, y, character, 0, 0);
-	  character++;
-	}
-    }
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-
-  g15r_pixelBox (canvas, 40, 20, 90, 40, 1, 1, 1);
-  g15r_pixelBox (canvas, 10, 10, 50, 30, 1, 3, 0);
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-
-  g15r_drawCircle (canvas, 10, 21, 5, 0, 1);
-  g15r_drawCircle (canvas, 110, 21, 15, 1, 1);
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-
-  g15r_drawRoundBox (canvas, 10, 21, 50, 40, 0, 1);
-  g15r_drawRoundBox (canvas, 80, 15, 140, 30, 1, 1);
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-
-  g15r_drawBar (canvas, 10, 10, 150, 20, 1, 50, 100, 1);
-  g15r_drawBar (canvas, 10, 22, 150, 32, 1, 75, 100, 2);
-  g15r_drawBar (canvas, 10, 34, 150, 42, 1, 315, 900, 3);
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-
-  g15r_ttfLoad (canvas, "/usr/share/fonts/ttf-bitstream-vera/Vera.ttf", 16,
-		1);
-  g15r_ttfPrint (canvas, 0, 0, 16, 1, 1, 0, "This   is a     test");
-  g15r_pixelBox (canvas, 0, 22, 159, 42, 1, 1, 1);
-  g15r_ttfPrint (canvas, 0, 25, 16, 1, 0, 1, "This   is a     test");
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-  g15r_loadWbmpSplash (canvas, "./splash.wbmp");
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-  int width, height;
-  char *buf = g15r_loadWbmpToBuf ("./splash.wbmp", &width, &height);
-  g15r_drawSprite (canvas, buf, 30, 10, 43, 20, 30, 10, width);
-  g15r_drawSprite (canvas, buf, 10, 20, 15, 20, 10, 20, width);
-  g15r_drawSprite (canvas, buf, 100, 20, 25, 20, 100, 20, width);
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-  g15r_pixelOverlay (canvas, 0, 0, 160, 43, logo_data);
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-  g15r_drawIcon (canvas, buf, 0, 0, width, height);
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 0);
-  g15r_drawBigNum (canvas, 0, 0, 20, 22, G15_COLOR_BLACK, 3);
-  g15r_drawBigNum (canvas, 25, 0, 45, 42, G15_COLOR_BLACK, 0);
-  updateScreen ();
-  sleep (3);
-
-  g15r_clearScreen (canvas, 1);
-  g15r_drawBigNum (canvas, 0, 0, 20, 22, G15_COLOR_WHITE, 4);
-  g15r_drawBigNum (canvas, 25, 0, 45, 42, G15_COLOR_WHITE, 7);
-  updateScreen ();
-  sleep (3);
-
-
-  return 0;
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (23)	Dec (26)
2007	Jan (2)	Feb (7)	Mar (5)	Apr	May	Jun	Jul (2)	Aug (7)	Sep (8)	Oct (5)	Nov (11)	Dec (2)
2008	Jan (8)	Feb (2)	Mar	Apr	May	Jun	Jul (3)	Aug	Sep	Oct	Nov (4)	Dec
2009	Jan (1)	Feb (2)	Mar (1)	Apr (16)	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb (3)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan (2)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

g15tools-commits Mailing List for g15tools (Page 2)

g15tools-commits — Commit messages for g15tools-svn