March 2013 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 9bb885ab0d280b9cb36180fe21147f24ace5b672
by metan 01 Apr '13

01 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 9bb885ab0d280b9cb36180fe21147f24ace5b672 (commit) via a9ef97b9ae8b46b1fb805c55c09c0c14b554e235 (commit) from 285bcbbe9881cbaa844b7bb0184ad794717c538c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/9bb885ab0d280b9cb36180fe21147f24ace5… commit 9bb885ab0d280b9cb36180fe21147f24ace5b672 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 00:49:00 2013 +0200 build: Update list of exported symbols. diff --git a/build/syms/Backend_symbols.txt b/build/syms/Backend_symbols.txt index 580f390..322c627 100644 --- a/build/syms/Backend_symbols.txt +++ b/build/syms/Backend_symbols.txt @@ -15,3 +15,7 @@ GP_ContextFromSurface GP_BackendResize GP_BackendResizeAck GP_BackendUpdateRectXYXY +GP_BackendFlip +GP_BackendWaitEvent +GP_BackendPollEvent + diff --git a/build/syms/Core_symbols.txt b/build/syms/Core_symbols.txt index 72ee71f..0dfdb17 100644 --- a/build/syms/Core_symbols.txt +++ b/build/syms/Core_symbols.txt @@ -23,6 +23,7 @@ GP_GammaPrint GP_DebugPrint GP_SetDebugLevel GP_GetDebugLevel +GP_SetDebugHandler GP_PrintAbortInfo diff --git a/build/syms/Filters_symbols.txt b/build/syms/Filters_symbols.txt index 25a3696..8343ae0 100644 --- a/build/syms/Filters_symbols.txt +++ b/build/syms/Filters_symbols.txt @@ -41,6 +41,7 @@ GP_FilterFloydSteinberg_RGB888_to_xRGB14666_Raw GP_FilterFloydSteinberg_RGB888_to_xRGB2222_Raw GP_FilterFloydSteinberg_RGB888_to_xRGB7333_Raw GP_FilterFloydSteinberg_RGB888_to_xRGB8888_Raw +GP_FilterFloydSteinberg_RGB888_to_G16_Raw GP_FilterHilbertPeano_RGB888 GP_FilterHilbertPeano_RGB888_Alloc @@ -57,6 +58,7 @@ GP_FilterHilbertPeano_RGB888_to_xRGB14666_Raw GP_FilterHilbertPeano_RGB888_to_xRGB2222_Raw GP_FilterHilbertPeano_RGB888_to_xRGB7333_Raw GP_FilterHilbertPeano_RGB888_to_xRGB8888_Raw +GP_FilterHilbertPeano_RGB888_to_G16_Raw GP_FilterGaussianBlurEx GP_FilterGaussianBlurExAlloc @@ -98,11 +100,11 @@ GP_FilterMinAlloc GP_FilterMin_Raw GP_FilterMirrorH -GP_FilterMirrorH_Alloc +GP_FilterMirrorHAlloc GP_FilterMirrorH_Raw GP_FilterMirrorV -GP_FilterMirrorV_Alloc +GP_FilterMirrorVAlloc GP_FilterMirrorV_Raw GP_FilterMultiply @@ -148,15 +150,15 @@ GP_FilterResizeNNAlloc GP_FilterResizeNN_Raw GP_FilterRotate180 -GP_FilterRotate180_Alloc +GP_FilterRotate180Alloc GP_FilterRotate180_Raw GP_FilterRotate270 -GP_FilterRotate270_Alloc +GP_FilterRotate270Alloc GP_FilterRotate270_Raw GP_FilterRotate90 -GP_FilterRotate90_Alloc +GP_FilterRotate90Alloc GP_FilterRotate90_Raw GP_FilterSigmaEx @@ -165,7 +167,7 @@ GP_FilterSigmaExAlloc GP_FilterSymmetry GP_FilterSymmetryByName GP_FilterSymmetryNames -GP_FilterSymmetry_Alloc +GP_FilterSymmetryAlloc GP_FilterVConvolutionMP_Raw GP_FilterVHLinearConvolution_Raw http://repo.or.cz/w/gfxprim.git/commit/a9ef97b9ae8b46b1fb805c55c09c0c14b554… commit a9ef97b9ae8b46b1fb805c55c09c0c14b554e235 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 00:44:51 2013 +0200 backends: X11: Declare internal functions static. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/backends/GP_X11_Win.h b/libs/backends/GP_X11_Win.h index 11786a8..eb6905b 100644 --- a/libs/backends/GP_X11_Win.h +++ b/libs/backends/GP_X11_Win.h @@ -78,7 +78,7 @@ static void win_list_rem(struct x11_win *win) win_list = win->next; } -struct x11_win *win_list_lookup(Window win) +static struct x11_win *win_list_lookup(Window win) { struct x11_win *i; @@ -382,7 +382,7 @@ static int x11_win_open(struct x11_wreq *wreq) return 0; } -void x11_win_close(struct x11_win *win) +static void x11_win_close(struct x11_win *win) { XLockDisplay(win->dpy); ----------------------------------------------------------------------- Summary of changes: build/syms/Backend_symbols.txt | 4 ++++ build/syms/Core_symbols.txt | 1 + build/syms/Filters_symbols.txt | 14 ++++++++------ libs/backends/GP_X11_Win.h | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 285bcbbe9881cbaa844b7bb0184ad794717c538c
by metan 01 Apr '13

01 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 285bcbbe9881cbaa844b7bb0184ad794717c538c (commit) via 4b6af799b2564c6bad521bfd37affaaffbe22e9c (commit) from 9f976bc10006bdd76c3c4709fa6baeb1dda15f3f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/285bcbbe9881cbaa844b7bb0184ad794717c… commit 285bcbbe9881cbaa844b7bb0184ad794717c538c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 00:38:17 2013 +0200 pywrap: Add grabbers bindings + example. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile index afcad67..a2b9700 100644 --- a/pylib/gfxprim/Makefile +++ b/pylib/gfxprim/Makefile @@ -1,4 +1,4 @@ TOPDIR=../.. -SUBDIRS=core loaders backends gfx filters text input +SUBDIRS=core loaders backends gfx filters text input grabbers CLEAN+=*.pyc include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/grabbers/Makefile b/pylib/gfxprim/grabbers/Makefile new file mode 100644 index 0000000..b001822 --- /dev/null +++ b/pylib/gfxprim/grabbers/Makefile @@ -0,0 +1,11 @@ +TOPDIR=../../.. +LIBNAME=grabbers +INCLUDE=core + +LDFLAGS+=$(shell $(TOPDIR)/gfxprim-config --libs-grabbers) + +include $(TOPDIR)/pre.mk +include $(TOPDIR)/pywrap.mk +include $(TOPDIR)/post.mk + +include ../silence_swig_warnings.mk diff --git a/pylib/gfxprim/grabbers/__init__.py b/pylib/gfxprim/grabbers/__init__.py new file mode 100644 index 0000000..a36f214 --- /dev/null +++ b/pylib/gfxprim/grabbers/__init__.py @@ -0,0 +1,50 @@ +""" +Module for GFXprim grabbers. +""" + +# Import the SWIG wrapper +from . import c_grabbers +from ..utils import extend + +def extend_grabber(_Grabber): + """ + Extends _grabber class with convenience methods. + Called once on module initialization. + """ + @extend(_Grabber) + def Start(self): + "Starts frame capture." + c_grabbers.GP_GrabberStart(self) + + @extend(_Grabber) + def Stop(self): + "Stops frame capture." + c_grabbers.GP_GrabberStop(self) + + @extend(_Grabber) + def Poll(self): + "Polls for a frame." + return c_grabbers.GP_GrabberPoll(self) + +# Pull GP_Grabber +Grabber = c_grabbers.GP_Grabber + +def _init(module): + # Extend GP_Grabber with convenience methods + extend_grabber(Grabber) + + # Imports from the SWIG module + import re + def strip_GP(s): + return re.sub('^GP_', '', s) + + # Import some members from the SWIG module + from ..utils import import_members + import_members(c_grabbers, module, sub=strip_GP, + exclude=[ + '^gfxprim$', + '^w+_swigregister$', + '^_w+$']) + +_init(locals()) +del _init diff --git a/pylib/gfxprim/grabbers/grabbers.i b/pylib/gfxprim/grabbers/grabbers.i new file mode 100644 index 0000000..a6f1d13 --- /dev/null +++ b/pylib/gfxprim/grabbers/grabbers.i @@ -0,0 +1,36 @@ +%include "../common.i" +%module(package="gfxprim.grabbers") c_grabbers + +%{ +#include "GP_Grabbers.h" +#include "core/GP_Debug.h" +%} + +/* %import ../core/core.i */ + +/* + * General grabber structure handling + */ +%extend GP_Grabber { + ~GP_Grabber() { + GP_DEBUG(2, "[wrapper] GP_GrabberExit (%p)", $self); + GP_GrabberExit($self); + } +}; + +%ignore GP_Grabber::priv; +%ignore GP_Grabber::fd; + +%ignore GP_Grabber::Start; +%ignore GP_Grabber::Stop; +%ignore GP_Grabber::Exit; +%ignore GP_Grabber::Poll; + +%include "GP_Grabber.h" + +/* + * Particular grabbers. + */ +ERROR_ON_NULL(GP_GrabberV4L2Init); +%newobject GP_GrabberV4L2Init; +%include "GP_V4L2.h" http://repo.or.cz/w/gfxprim.git/commit/4b6af799b2564c6bad521bfd37affaaffbe2… commit 4b6af799b2564c6bad521bfd37affaaffbe22e9c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Apr 1 00:25:50 2013 +0200 pywrap: backends: Fix typo. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/backends/_extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py index d2f22b5..b1fab72 100644 --- a/pylib/gfxprim/backends/_extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -5,7 +5,7 @@ from ..input import c_input def extend_backend(_backend): """ Extends _backend class with convenience methods. - Called once on module inicialization. + Called once on module initialization. """ @extend(_backend, name='__str__') ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/Makefile | 2 +- pylib/gfxprim/backends/_extend_backend.py | 2 +- pylib/gfxprim/{backends => grabbers}/Makefile | 4 +- pylib/gfxprim/grabbers/__init__.py | 50 +++++++++++++++++++++++++ pylib/gfxprim/grabbers/grabbers.i | 36 ++++++++++++++++++ 5 files changed, 90 insertions(+), 4 deletions(-) copy pylib/gfxprim/{backends => grabbers}/Makefile (65%) create mode 100644 pylib/gfxprim/grabbers/__init__.py create mode 100644 pylib/gfxprim/grabbers/grabbers.i repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 9f976bc10006bdd76c3c4709fa6baeb1dda15f3f
by metan 31 Mar '13

31 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 9f976bc10006bdd76c3c4709fa6baeb1dda15f3f (commit) from 5cd86d45da74ebf34224157f12d693e82b59f4b2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/9f976bc10006bdd76c3c4709fa6baeb1dda1… commit 9f976bc10006bdd76c3c4709fa6baeb1dda15f3f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 31 23:56:57 2013 +0200 demos:c_simple: Make use of BackendWaitEvent(). Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/c_simple/backend_example.c b/demos/c_simple/backend_example.c index c711f41..b0faf84 100644 --- a/demos/c_simple/backend_example.c +++ b/demos/c_simple/backend_example.c @@ -28,11 +28,25 @@ #include <GP.h> +static void redraw(GP_Backend *self) +{ + GP_Context *context = self->context; + GP_Pixel white_pixel, black_pixel; + + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, context); + white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, context); + + GP_Fill(context, black_pixel); + GP_Line(context, 0, 0, context->w - 1, context->h - 1, white_pixel); + GP_Line(context, 0, context->h - 1, context->w - 1, 0, white_pixel); + + /* Update the backend screen */ + GP_BackendFlip(self); +} + int main(int argc, char *argv[]) { GP_Backend *backend; - GP_Context *context; - GP_Pixel white_pixel, black_pixel; const char *backend_opts = "X11:100x100"; int opt; @@ -56,51 +70,43 @@ int main(int argc, char *argv[]) backend = GP_BackendInit(backend_opts, "Backend Example", stderr); - context = backend->context; - - black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, context); - white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, context); - - GP_Fill(context, black_pixel); - GP_Line(context, 0, 0, context->w - 1, context->h - 1, white_pixel); - GP_Line(context, 0, context->h - 1, context->w - 1, 0, white_pixel); + if (backend == NULL) { + fprintf(stderr, "Failed to initialize backendn"); + return 1; + } - /* Update the backend screen */ - GP_BackendFlip(backend); + redraw(backend); + /* Handle events */ for (;;) { - /* Wait for backend event */ - GP_BackendWait(backend); - - /* Read and parse events */ GP_Event ev; - while (GP_BackendGetEvent(backend, &ev)) { - - GP_EventDump(&ev); - - switch (ev.type) { - case GP_EV_KEY: - switch (ev.val.val) { - case GP_KEY_ESC: - case GP_KEY_Q: - GP_BackendExit(backend); - return 0; - break; - } + GP_BackendWaitEvent(backend, &ev); + + GP_EventDump(&ev); + + switch (ev.type) { + case GP_EV_KEY: + switch (ev.val.val) { + case GP_KEY_ESC: + case GP_KEY_Q: + GP_BackendExit(backend); + return 0; break; - case GP_EV_SYS: - switch (ev.code) { - case GP_EV_SYS_RESIZE: - GP_BackendResizeAck(backend); - break; - case GP_EV_SYS_QUIT: - GP_BackendExit(backend); - return 0; - break; - } + } + break; + case GP_EV_SYS: + switch (ev.code) { + case GP_EV_SYS_RESIZE: + GP_BackendResizeAck(backend); + redraw(backend); + break; + case GP_EV_SYS_QUIT: + GP_BackendExit(backend); + return 0; break; } + break; } } diff --git a/demos/c_simple/fileview.c b/demos/c_simple/fileview.c index aa6ff0b..26ae4e0 100644 --- a/demos/c_simple/fileview.c +++ b/demos/c_simple/fileview.c @@ -122,7 +122,9 @@ void event_loop(void) { GP_Event ev; - while (GP_BackendGetEvent(backend, &ev)) { + for (;;) { + GP_BackendWaitEvent(backend, &ev); + switch (ev.type) { case GP_EV_KEY: if (ev.code != GP_EV_KEY_DOWN) @@ -268,10 +270,7 @@ int main(int argc, char *argv[]) redraw_screen(); GP_BackendFlip(backend); - for (;;) { - GP_BackendWait(backend); - event_loop(); - } + event_loop(); return 0; } diff --git a/demos/c_simple/fonttest.c b/demos/c_simple/fonttest.c index e374ec9..f6516cb 100644 --- a/demos/c_simple/fonttest.c +++ b/demos/c_simple/fonttest.c @@ -190,7 +190,9 @@ void event_loop(void) { GP_Event ev; - while (GP_BackendGetEvent(win, &ev)) { + for (;;) { + GP_BackendWaitEvent(win, &ev); + switch (ev.type) { case GP_EV_KEY: if (ev.code != GP_EV_KEY_DOWN) @@ -284,8 +286,7 @@ int main(int argc, char *argv[]) redraw_screen(); GP_BackendFlip(win); - for (;;) { - GP_BackendWait(win); - event_loop(); - } + event_loop(); + + return 0; } diff --git a/demos/c_simple/shapetest.c b/demos/c_simple/shapetest.c index 0edfce1..9cebdd3 100644 --- a/demos/c_simple/shapetest.c +++ b/demos/c_simple/shapetest.c @@ -337,7 +337,9 @@ void event_loop(void) GP_Event ev; - while (GP_BackendGetEvent(backend, &ev)) { + for (;;) { + GP_BackendWaitEvent(backend, &ev); + GP_EventDump(&ev); shift_pressed = GP_EventGetKey(&ev, GP_KEY_LEFT_SHIFT) || @@ -498,11 +500,8 @@ int main(void) darkgray = GP_ColorToContextPixel(GP_COL_GRAY_DARK, win); print_instructions(); - redraw_screen(); + event_loop(); - for (;;) { - GP_BackendWait(backend); - event_loop(); - } + return 0; } diff --git a/demos/c_simple/showimage.c b/demos/c_simple/showimage.c index 8903515..3394230 100644 --- a/demos/c_simple/showimage.c +++ b/demos/c_simple/showimage.c @@ -66,15 +66,13 @@ int main(int argc, char *argv[]) /* Wait for events */ for (;;) { - GP_BackendWait(backend); - GP_Event ev; - while (GP_BackendGetEvent(backend, &ev)) { - if (ev.type == GP_EV_KEY && ev.val.val == GP_KEY_Q) { - GP_BackendExit(backend); - return 0; - } + GP_BackendWaitEvent(backend, &ev); + + if (ev.type == GP_EV_KEY && ev.val.val == GP_KEY_Q) { + GP_BackendExit(backend); + return 0; } } diff --git a/demos/c_simple/textaligntest.c b/demos/c_simple/textaligntest.c index 5ae84ab..39391b4 100644 --- a/demos/c_simple/textaligntest.c +++ b/demos/c_simple/textaligntest.c @@ -73,7 +73,9 @@ static void event_loop(void) { GP_Event ev; - while (GP_BackendGetEvent(win, &ev)) { + for (;;) { + GP_BackendWaitEvent(win, &ev); + switch (ev.type) { case GP_EV_KEY: if (ev.code != GP_EV_KEY_DOWN) @@ -156,12 +158,9 @@ int main(int argc, char *argv[]) darkgray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_DARK, win->context); redraw_screen(); - GP_BackendFlip(win); + event_loop(); - for (;;) { - GP_BackendWait(win); - event_loop(); - } + return 0; } ----------------------------------------------------------------------- Summary of changes: demos/c_simple/backend_example.c | 84 ++++++++++++++++++++----------------- demos/c_simple/fileview.c | 9 ++-- demos/c_simple/fonttest.c | 11 +++-- demos/c_simple/shapetest.c | 11 ++--- demos/c_simple/showimage.c | 12 ++--- demos/c_simple/textaligntest.c | 11 ++--- 6 files changed, 70 insertions(+), 68 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 5cd86d45da74ebf34224157f12d693e82b59f4b2
by metan 31 Mar '13

31 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 5cd86d45da74ebf34224157f12d693e82b59f4b2 (commit) via 0e4c5008405449803a027e648fdf868ac56cc831 (commit) from 09bc0dca7b0d23abbeb091baea61573a9cc0411d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/5cd86d45da74ebf34224157f12d693e82b59… commit 5cd86d45da74ebf34224157f12d693e82b59f4b2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 31 19:27:23 2013 +0200 pywrap: backends: Make use of WaitEvent and PollEvent. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/gfx.py b/demos/py_simple/gfx.py index 9c1ce13..2c9aef3 100755 --- a/demos/py_simple/gfx.py +++ b/demos/py_simple/gfx.py @@ -149,7 +149,7 @@ def main(): # Event loop while True: - ev = bk.Wait() + ev = bk.WaitEvent() input.EventDump(ev) diff --git a/demos/py_simple/showimage.py b/demos/py_simple/showimage.py index c61f5ff..6c5e97c 100755 --- a/demos/py_simple/showimage.py +++ b/demos/py_simple/showimage.py @@ -23,7 +23,7 @@ def main(): # Event loop while True: - ev = bk.Wait() + ev = bk.WaitEvent() input.EventDump(ev) diff --git a/pylib/gfxprim/backends/_extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py index 53e1700..d2f22b5 100644 --- a/pylib/gfxprim/backends/_extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -26,31 +26,31 @@ def extend_backend(_backend): @extend(_backend) def Poll(self): + "Poll the backend." + c_backends.GP_BackendPoll(self) + + @extend(_backend) + def PollEvent(self): "Poll the backend for events." ev = c_input.GP_Event(); - if c_backends.GP_BackendGetEvent(self, ev) != 0: - return ev - - c_backends.GP_BackendPoll(self) - - if c_backends.GP_BackendGetEvent(self, ev) != 0: + if c_backends.GP_BackendPollEvent(self, ev) != 0: return ev return None + @extend(_backend) def Wait(self): - "Waits for backend event" + "Waits for backend." + c_backends.GP_BackendWait(self) + + @extend(_backend) + def WaitEvent(self): + "Waits for backend event." ev = c_input.GP_Event(); - if c_backends.GP_BackendGetEvent(self, ev) != 0: - return ev - - while c_backends.GP_BackendGetEvent(self, ev) == 0: - c_backends.GP_BackendWait(self) - - c_backends.GP_BackendGetEvent(self, ev) + c_backends.GP_BackendWaitEvent(self, ev) return ev http://repo.or.cz/w/gfxprim.git/commit/0e4c5008405449803a027e648fdf868ac56c… commit 0e4c5008405449803a027e648fdf868ac56cc831 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 31 19:18:11 2013 +0200 backends: Add WaitEvent and PollEvent Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/include/backends/GP_Backend.h b/include/backends/GP_Backend.h index c1b89d6..02c5b29 100644 --- a/include/backends/GP_Backend.h +++ b/include/backends/GP_Backend.h @@ -185,6 +185,11 @@ static inline void GP_BackendPoll(GP_Backend *backend) } /* + * Poll and GetEvent combined. + */ +int GP_BackendPollEvent(GP_Backend *self, GP_Event *ev); + +/* * Waits for backend events. */ static inline void GP_BackendWait(GP_Backend *backend) @@ -193,6 +198,11 @@ static inline void GP_BackendWait(GP_Backend *backend) } /* + * Wait and GetEvent combined. + */ +int GP_BackendWaitEvent(GP_Backend *self, GP_Event *ev); + +/* * Sets backend caption, if supported. * * When setting caption is not possible/implemented non zero is returned. diff --git a/libs/backends/GP_Backend.c b/libs/backends/GP_Backend.c index 87959e3..c31f29e 100644 --- a/libs/backends/GP_Backend.c +++ b/libs/backends/GP_Backend.c @@ -102,3 +102,30 @@ int GP_BackendResizeAck(GP_Backend *self) return 0; } + +int GP_BackendWaitEvent(GP_Backend *self, GP_Event *ev) +{ + int ret; + + for (;;) { + if ((ret = GP_BackendGetEvent(self, ev))) + return ret; + + GP_BackendWait(self); + } +} + +int GP_BackendPollEvent(GP_Backend *self, GP_Event *ev) +{ + int ret; + + if ((ret = GP_BackendGetEvent(self, ev))) + return ret; + + GP_BackendPoll(self); + + if ((ret = GP_BackendGetEvent(self, ev))) + return ret; + + return 0; +} ----------------------------------------------------------------------- Summary of changes: demos/py_simple/gfx.py | 2 +- demos/py_simple/showimage.py | 2 +- include/backends/GP_Backend.h | 10 ++++++++++ libs/backends/GP_Backend.c | 27 +++++++++++++++++++++++++++ pylib/gfxprim/backends/_extend_backend.py | 28 ++++++++++++++-------------- 5 files changed, 53 insertions(+), 16 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 09bc0dca7b0d23abbeb091baea61573a9cc0411d
by metan 31 Mar '13

31 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 09bc0dca7b0d23abbeb091baea61573a9cc0411d (commit) via b82cb9ba7c65053b1fe49968096db5db8a808b48 (commit) from 85eda14c378b6a2acce26d19fa7073ac509ee386 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/09bc0dca7b0d23abbeb091baea61573a9cc0… commit 09bc0dca7b0d23abbeb091baea61573a9cc0411d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 31 15:42:42 2013 +0200 grabbers: v4l2: Fix segfault on unsupported protocol. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/grabbers/GP_V4L2.c b/libs/grabbers/GP_V4L2.c index 4a00e51..fc97e9b 100644 --- a/libs/grabbers/GP_V4L2.c +++ b/libs/grabbers/GP_V4L2.c @@ -298,9 +298,11 @@ struct GP_Grabber *GP_GrabberV4L2Init(const char *device, if (ioctl(fd, VIDIOC_S_CROP, &crop)) { /* error/cropping not supported */ } - } else { - /* errors ignored? */ + GP_WARN("ioctl VIDIOC_CROPCAP failed: %s", + strerror(errno)); + err = errno; + goto err0; } struct v4l2_format fmt; http://repo.or.cz/w/gfxprim.git/commit/b82cb9ba7c65053b1fe49968096db5db8a80… commit b82cb9ba7c65053b1fe49968096db5db8a808b48 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Mar 29 14:49:21 2013 +0100 doc: Add compilation how to. diff --git a/doc/Makefile b/doc/Makefile index 840ea66..3e17452 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,7 +3,7 @@ SOURCES=general.txt context.txt loaders.txt filters.txt basic_types.txt environment_variables.txt debug.txt core.txt api.txt input.txt gen.txt pixels.txt coordinate_system.txt coding_style.txt get_put_pixel.txt blits.txt progress_callback.txt text_api.txt - event_queue.txt + event_queue.txt compilation.txt SOURCES+=core_python.txt gfx_python.txt loaders_python.txt diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index af20f91..9c351e6 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -42,8 +42,7 @@ endif::disable-javascript[] <h4>Navigation</h4> <ul> <li><a href="general.html">Home</a></li> - <li><a href="api.html">API</a></li> - <li><a href="examples.html">Examples</a></li> + <li><a href="compilation.html">Compilation</a></li> </ul> <h4>API Pages</h4> diff --git a/doc/asciidoc.css b/doc/asciidoc.css index c663f2d..37a9d07 100644 --- a/doc/asciidoc.css +++ b/doc/asciidoc.css @@ -118,9 +118,9 @@ pre { div.left-menu { position: relative; top: 90pt; - left: -100pt; + left: -110pt; height: 0; - width: 100pt; + width: 110pt; } div.logo h1 { diff --git a/doc/compilation.txt b/doc/compilation.txt new file mode 100644 index 0000000..741b878 --- /dev/null +++ b/doc/compilation.txt @@ -0,0 +1,102 @@ +Compilation +----------- + +GFXprim needs following tools to compile: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +* C compiler (tested with 'gcc' or 'clang') +* GNU make +* Python (2.6 or newer) +* Jinja2 + +Additional dependencies: +~~~~~~~~~~~~~~~~~~~~~~~~ + +Image loaders +^^^^^^^^^^^^^ + +* libjpeg +* libpng +* giflib + +Text rendering +^^^^^^^^^^^^^^ + +* FreeType + +Backends +^^^^^^^^ + +* X11 +* SDL (not recomended, SDL is known to be slow and buggy) + +Python Bindings +^^^^^^^^^^^^^^^ + +* Swig + +Compilation +~~~~~~~~~~~ + +Once devel packages are installed the compilation is as simple as running +'configure' and 'make'. + +NOTE: The 'configure' script is written in 'Python'. + +.Compilation +------------------------------------------------------------------------------- +gfxprim # ./configure +... + +gfxprim # make +------------------------------------------------------------------------------- + +TIP: GFXprim supports proper parallel build, you most likely want to add + the '-j' with number of your processors + 1 as a parameter to the 'make'. + + +.Installation +------------------------------------------------------------------------------- +gfxprim # make install +------------------------------------------------------------------------------- + +The 'make install' command will install GFXprim libraries and devel headers +into your system. Python bindings are not installable at the moment. + +OpenSUSE +~~~~~~~~ + +Here are commands to install required packages on +link:http://www.opensuse.org/[OpenSUSE]. + +.Install basic tools +------------------------------------------------------------------------------- +zypper in gcc make python-Jinja2 +------------------------------------------------------------------------------- + +.Install jpeg and png devel libraries +------------------------------------------------------------------------------- +zypper in libjpeg-devel libpng-devel giflib-devel +------------------------------------------------------------------------------- + +.Install FreeType devel library +------------------------------------------------------------------------------- +zypper in freetype-devel +------------------------------------------------------------------------------- + +.Install X11 devel library +------------------------------------------------------------------------------- +zypper in libX11-devel libXext-devel +------------------------------------------------------------------------------- + +.Install swig +------------------------------------------------------------------------------- +zypper in swig python-devel +------------------------------------------------------------------------------- + +.All in the one for the lazy +------------------------------------------------------------------------------- +zypper in gcc make python-Jinja2 libjpeg-devel libpng-devel giflib-devel + freetype-devel libX11-devel libXext-devel swig python-devel +------------------------------------------------------------------------------- + ----------------------------------------------------------------------- Summary of changes: doc/Makefile | 2 +- doc/asciidoc.conf | 3 +- doc/asciidoc.css | 4 +- doc/compilation.txt | 102 +++++++++++++++++++++++++++++++++++++++++++++++ libs/grabbers/GP_V4L2.c | 6 ++- 5 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 doc/compilation.txt repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 85eda14c378b6a2acce26d19fa7073ac509ee386
by metan 29 Mar '13

29 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 85eda14c378b6a2acce26d19fa7073ac509ee386 (commit) from 14374d9981a9e1c76d6f83287ca3d71612c8d659 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/85eda14c378b6a2acce26d19fa7073ac509e… commit 85eda14c378b6a2acce26d19fa7073ac509ee386 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Mar 29 11:59:58 2013 +0100 backeds: Make use of GP_FATAL(). Use GP_FATAL() when backend in not compiled in. diff --git a/libs/backends/GP_SDL.c b/libs/backends/GP_SDL.c index c54bc19..2312564 100644 --- a/libs/backends/GP_SDL.c +++ b/libs/backends/GP_SDL.c @@ -251,7 +251,7 @@ GP_Backend *GP_BackendSDLInit(GP_Size w __attribute__((unused)), uint8_t flags __attribute__((unused)), const char *caption __attribute__((unused))) { - GP_WARN("SDL support not compiled in."); + GP_FATAL("SDL support not compiled in."); return NULL; } diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index 59b28ae..c81f0dd 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -609,7 +609,7 @@ GP_Backend *GP_BackendX11Init(const char *GP_UNUSED(display), unsigned int GP_UNUSED(h), const char *GP_UNUSED(caption)) { - GP_WARN("FATAL: X11 support not compiled in"); + GP_FATAL("X11 support not compiled in"); return NULL; } ----------------------------------------------------------------------- Summary of changes: libs/backends/GP_SDL.c | 2 +- libs/backends/GP_X11.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 14374d9981a9e1c76d6f83287ca3d71612c8d659
by metan 23 Mar '13

23 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 14374d9981a9e1c76d6f83287ca3d71612c8d659 (commit) via 58de8652bc7329e9307ddca14ea8e28775d328ec (commit) from 1c86bf51648b295323c49f14f63c14fee0f33dcf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/14374d9981a9e1c76d6f83287ca3d71612c8… commit 14374d9981a9e1c76d6f83287ca3d71612c8d659 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Mar 23 20:21:56 2013 +0100 doc: Update X11 backend docs. diff --git a/doc/backends.txt b/doc/backends.txt index 8cfb010..2d1398a 100644 --- a/doc/backends.txt +++ b/doc/backends.txt @@ -118,7 +118,12 @@ time). This backend feeds key events into global input queue. -TODO: X11 backend will be changed to support more windows at a time. +This backends supports multiple windows. Each time you call the initialization +rutine new backend structure is returned. All backend instances share the xlib +connection so you need to wait or poll only on one of them. Each backend, on +the other hand, has its own input queue. + +TIP: See mutliple windows link:example_x11_windows.html[example]. [source,c] ------------------------------------------------------------------------------- diff --git a/doc/example_x11_windows.txt b/doc/example_x11_windows.txt new file mode 100644 index 0000000..4e4bb31 --- /dev/null +++ b/doc/example_x11_windows.txt @@ -0,0 +1,8 @@ +Graphics Backend Example +------------------------ +.An example how to create and manage two windows using the X11 backend + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/x11_windows.c[] +------------------------------------------------------------------ http://repo.or.cz/w/gfxprim.git/commit/58de8652bc7329e9307ddca14ea8e28775d3… commit 58de8652bc7329e9307ddca14ea8e28775d328ec Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Mar 23 20:06:37 2013 +0100 doc: pywrap: Starts python loaders docs. diff --git a/doc/Makefile b/doc/Makefile index 4537bf9..840ea66 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -5,7 +5,7 @@ SOURCES=general.txt context.txt loaders.txt filters.txt basic_types.txt get_put_pixel.txt blits.txt progress_callback.txt text_api.txt event_queue.txt -SOURCES+=core_python.txt gfx_python.txt +SOURCES+=core_python.txt gfx_python.txt loaders_python.txt EXAMPLE_SOURCES=$(wildcard example_*.txt) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index 8ce8d85..af20f91 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -60,6 +60,7 @@ endif::disable-javascript[] <ul> <li><a href="core_python.html">Core</a></li> <li><a href="gfx_python.html">Gfx</a></li> + <li><a href="loaders_python.html">Loaders</a></li> </ul> </div> diff --git a/doc/loaders_python.txt b/doc/loaders_python.txt new file mode 100644 index 0000000..4ac158b --- /dev/null +++ b/doc/loaders_python.txt @@ -0,0 +1,28 @@ +Python Loaders module +--------------------- + +The python binding maps mostly to the C API with the 'GP_' prefix stripped. + +Loaders adds support for loading and storing contexts into/from various image +fomats. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.loaders as loaders + + img = loaders.Load(path, callback=None) + +------------------------------------------------------------------------------- + +Loads an image from a file. + +May raise 'OSError' with errno set to 'EPERM', 'EISDIR', 'ENOENT' or any other +'errno' set by 'open(2)', 'read(2)', 'seek(2)'. + +May raise 'OSError' with errno set to 'ENOSYS' on unsupported or not recognized +format. + +May raise 'OSError' with errno set to 'EIO' when file is damaged. + +May raise 'OSError' with errno set to 'ECANCELED' when action was interrupted +by callback. ----------------------------------------------------------------------- Summary of changes: doc/Makefile | 2 +- doc/asciidoc.conf | 1 + doc/backends.txt | 7 ++++- ...ogress_callback.txt => example_x11_windows.txt} | 3 +- doc/loaders_python.txt | 28 ++++++++++++++++++++ 5 files changed, 38 insertions(+), 3 deletions(-) copy doc/{example_loaders_progress_callback.txt => example_x11_windows.txt} (63%) create mode 100644 doc/loaders_python.txt repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 1c86bf51648b295323c49f14f63c14fee0f33dcf
by metan 23 Mar '13

23 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 1c86bf51648b295323c49f14f63c14fee0f33dcf (commit) from eef84fa42d26341f4dd66b35672957fa35e23b8e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/1c86bf51648b295323c49f14f63c14fee0f3… commit 1c86bf51648b295323c49f14f63c14fee0f33dcf Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Mar 23 19:49:13 2013 +0100 doc: pywrap: Finish gfx docs. diff --git a/doc/gfx_python.txt b/doc/gfx_python.txt index 3644358..941b1f8 100644 --- a/doc/gfx_python.txt +++ b/doc/gfx_python.txt @@ -21,15 +21,8 @@ WARNING: Drawing functions takes strictly integer coordinates, make sure that all divisions are integer divisions (i.e. use // instead of /) to ensure portability with Python 3.X. -[source,python] -------------------------------------------------------------------------------- -import gfxprim.gfx as gfx - - context.gfx.Fill(pixel) - -------------------------------------------------------------------------------- - -Fills context with particualr 'pixel' value. +Line Based Primitives +^^^^^^^^^^^^^^^^^^^^^ [source,python] ------------------------------------------------------------------------------- @@ -105,5 +98,120 @@ import gfxprim.gfx as gfx Draws a polygon defined by points, points can be either flat list of 2N integers or list of N tuples. +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Circle(x, y, r, pixel) + +------------------------------------------------------------------------------- + +Draws a circle. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Ellipse(x, y, a, b, pixel) + +------------------------------------------------------------------------------- + +Draws an ellipse. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Ring(x, y, r1, r2, pixel) + +------------------------------------------------------------------------------- + +Draws a ring. + +Filled Primitives +^^^^^^^^^^^^^^^^^ + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Fill(pixel) + +------------------------------------------------------------------------------- + +Fills context with particular 'pixel' value. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.FillRect(x0, y0, x1, y1, pixel) + +------------------------------------------------------------------------------- + +Fills a rectangle defined by two points. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.FillTriangle(x0, y0, x1, y1, x1, y2, pixel) + +------------------------------------------------------------------------------- + +Draws a filled triangle defined by three points. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.FillTetragon(x0, y0, x1, y1, x1, y2, x3, y3, pixel) + +------------------------------------------------------------------------------- + +Draws a filled tetragon defined by four points. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.FillPolygon([x0, y0, x1, y1, ...], pixel) + + context.gfx.FillPolygon([(x0, y0), (x1, y1), ...], pixel) + +------------------------------------------------------------------------------- + +Fills a polygon defined by points, points can be either flat list of 2N +integers or list of N tuples. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.FillCircle(x, y, r, pixel) + +------------------------------------------------------------------------------- + +Fills a circle. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.FillEllipse(x, y, a, b, pixel) + +------------------------------------------------------------------------------- + +Fills an ellipse. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.FillRing(x, y, r1, r2, pixel) + +------------------------------------------------------------------------------- + +Fills a ring, i.e. area enclosed between two circles. TIP: See gfx module link:example_py_gfx.html[example]. ----------------------------------------------------------------------- Summary of changes: doc/gfx_python.txt | 126 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 117 insertions(+), 9 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: eef84fa42d26341f4dd66b35672957fa35e23b8e
by metan 23 Mar '13

23 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via eef84fa42d26341f4dd66b35672957fa35e23b8e (commit) from 93aea6a4e0d920f60743fdb89fa102595d6b0d76 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/eef84fa42d26341f4dd66b35672957fa35e2… commit eef84fa42d26341f4dd66b35672957fa35e23b8e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Mar 23 17:22:57 2013 +0100 docs,demos: Add python gfx demo, continue docs. diff --git a/demos/py_simple/gfx.py b/demos/py_simple/gfx.py new file mode 100755 index 0000000..9c1ce13 --- /dev/null +++ b/demos/py_simple/gfx.py @@ -0,0 +1,168 @@ +#!/usr/bin/env python + +import sys + +import gfxprim.core as core +import gfxprim.gfx as gfx +import gfxprim.backends as backends +import gfxprim.input as input + +def fill(bk): + color = bk.context.RGBToPixel(0xee, 0xee, 0xee) + bk.context.gfx.Fill(color) + bk.Flip() + +def hline(bk): + fg = bk.context.RGBToPixel(0xee, 0xee, 0xee) + bg = bk.context.RGBToPixel(0, 0, 0); + + bk.context.gfx.Fill(bg) + for i in range(0, bk.context.h, 10): + bk.context.gfx.HLine(0, bk.context.w, i, fg) + bk.Flip() + +def vline(bk): + fg = bk.context.RGBToPixel(0xee, 0xee, 0xee) + bg = bk.context.RGBToPixel(0, 0, 0); + + bk.context.gfx.Fill(bg) + + for i in range(0, bk.context.w, 10): + bk.context.gfx.VLine(i, 0, bk.context.h, fg) + + bk.Flip() + +def line(bk): + fg = bk.context.RGBToPixel(0xee, 0xee, 0xee) + bg = bk.context.RGBToPixel(0, 0, 0); + + bk.context.gfx.Fill(bg) + + for i in range(0, 2 * max(bk.context.w, bk.context.h), 13): + bk.context.gfx.Line(0, i, i, 0, fg) + + bk.Flip() + +def rect(bk): + fg = bk.context.RGBToPixel(0xee, 0xee, 0xee) + bg = bk.context.RGBToPixel(0, 0, 0); + + bk.context.gfx.Fill(bg) + + for i in range(10, 130, 10): + bk.context.gfx.Rect(i, i, bk.context.w - i, bk.context.h - i, fg) + + bk.Flip() + +def triangle(bk): + fg = bk.context.RGBToPixel(0xee, 0xee, 0xee) + bg = bk.context.RGBToPixel(0, 0, 0); + + bk.context.gfx.Fill(bg) + + w = bk.context.w + h = bk.context.h + + for i in range(10, 90, 10): + bk.context.gfx.Triangle(2*i, i, w - 2*i, i, w//2, h - 2*i, fg) + + bk.Flip() + +def tetragon(bk): + fg = bk.context.RGBToPixel(0xee, 0xee, 0xee) + bg = bk.context.RGBToPixel(0, 0, 0); + + bk.context.gfx.Fill(bg) + + w = bk.context.w + h = bk.context.h + + for i in range(10, 70, 10): + bk.context.gfx.Tetragon(i, i, w-2*i, i, w-i, h-i, 2*i, h-i, fg) + + bk.Flip() + +def polygon(bk): + fg = bk.context.RGBToPixel(0xee, 0xee, 0xee) + bg = bk.context.RGBToPixel(0, 0, 0); + + bk.context.gfx.Fill(bg) + + w = bk.context.w + h = bk.context.h + + polygon = [(10, 10), (10, (h-10)//3), ((w-10)//3, (h-10)//2), + (10, 2*(h-10)//3), (10, h-10), ((w-10)//3, h-10), + ((w-10)//2, 2*(h-10)//3), (2*(w-10)//3, h-10), + (w-10, h-10), (w-10, 2*(h-10)//3), (2*(w-10)//3, (h-10)//2), + (w-10, (h-10)//3), (w-10, 10), (2*(w-10)//3, 10), + ((w-10)//2, (h-10)//3), ((w-10)//3, 10)] + + bk.context.gfx.Polygon(polygon, fg) + + bk.Flip() + +def next(bk, i): + + if (i == 0): + fill(bk) + + if (i == 1): + hline(bk) + + if (i == 2): + vline(bk) + + if (i == 3): + line(bk) + + if (i == 4): + rect(bk) + + if (i == 5): + triangle(bk) + + if (i == 6): + tetragon(bk) + + if (i == 7): + polygon(bk) + + i = i + 1; + + if (i >= 8): + i = 0 + + return i + +def main(): + print(dir(gfx)) + + # Create X11 window + bk = backends.BackendX11Init(None, 0, 0, 320, 240, "GFX demo", 0) + assert(bk) + print(dir(bk.context.gfx)) + + bk.Flip() + + i = 0 + + # Event loop + while True: + ev = bk.Wait() + + input.EventDump(ev) + + if (ev.type == input.EV_KEY and ev.code == input.EV_KEY_DOWN): + + if (ev.val.val == input.KEY_ESC): + sys.exit(0) + + i = next(bk, i) + + if (ev.type == input.EV_SYS): + if (ev.code == input.EV_SYS_QUIT): + sys.exit(0) + +if __name__ == '__main__': + main() diff --git a/doc/example_py_gfx.txt b/doc/example_py_gfx.txt new file mode 100644 index 0000000..2c8854d --- /dev/null +++ b/doc/example_py_gfx.txt @@ -0,0 +1,8 @@ +Gfx +--- +.A simple program to show how to use gfx + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/gfx.py[] +------------------------------------------------------------------ diff --git a/doc/gfx_python.txt b/doc/gfx_python.txt index 28f8899..3644358 100644 --- a/doc/gfx_python.txt +++ b/doc/gfx_python.txt @@ -17,6 +17,10 @@ pixel type (context), from a RGB triplet. All drawing functions are clipped. Drawing outside of a context is no-op. +WARNING: Drawing functions takes strictly integer coordinates, make sure that + all divisions are integer divisions (i.e. use // instead of /) to + ensure portability with Python 3.X. + [source,python] ------------------------------------------------------------------------------- import gfxprim.gfx as gfx @@ -32,6 +36,7 @@ Fills context with particualr 'pixel' value. import gfxprim.gfx as gfx context.gfx.HLine(x0, x1, y, pixel) + ------------------------------------------------------------------------------- Draws a horizontal line from 'x0' to 'x1' at 'y'. @@ -41,8 +46,64 @@ Draws a horizontal line from 'x0' to 'x1' at 'y'. import gfxprim.gfx as gfx context.gfx.VLine(x, y0, y1, pixel) + ------------------------------------------------------------------------------- Draws a vertical line from 'y0' to 'y1' at 'x'. +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Line(x0, y0, x1, y1, pixel) + +------------------------------------------------------------------------------- + +Draws a line from x0, y0 to x1, y1. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Rect(x0, y0, x1, y1, pixel) + +------------------------------------------------------------------------------- + +Draws a rectangle defined by two points. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Triangle(x0, y0, x1, y1, x1, y2, pixel) + +------------------------------------------------------------------------------- + +Draws a triangle defined by three points. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Tetragon(x0, y0, x1, y1, x1, y2, x3, y3, pixel) + +------------------------------------------------------------------------------- + +Draws a tetragon defined by four points. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Polygon([x0, y0, x1, y1, ...], pixel) + + context.gfx.Polygon([(x0, y0), (x1, y1), ...], pixel) + +------------------------------------------------------------------------------- + +Draws a polygon defined by points, points can be either flat list of 2N +integers or list of N tuples. + + +TIP: See gfx module link:example_py_gfx.html[example]. ----------------------------------------------------------------------- Summary of changes: demos/py_simple/gfx.py | 168 ++++++++++++++++++++ ...example_py_showimage.txt => example_py_gfx.txt} | 8 +- doc/gfx_python.txt | 61 +++++++ 3 files changed, 233 insertions(+), 4 deletions(-) create mode 100755 demos/py_simple/gfx.py copy doc/{example_py_showimage.txt => example_py_gfx.txt} (59%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 93aea6a4e0d920f60743fdb89fa102595d6b0d76
by metan 23 Mar '13

23 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 93aea6a4e0d920f60743fdb89fa102595d6b0d76 (commit) via c5d16d66f47d38078fefc539ed8d2b478ecb5039 (commit) from 0489beeb9e8eb9c66e5700a6d998003440219087 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/93aea6a4e0d920f60743fdb89fa102595d6b… commit 93aea6a4e0d920f60743fdb89fa102595d6b0d76 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Mar 23 13:47:28 2013 +0100 doc: pywrap: Start gfx documentation. diff --git a/doc/Makefile b/doc/Makefile index cb892bf..4537bf9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -5,7 +5,7 @@ SOURCES=general.txt context.txt loaders.txt filters.txt basic_types.txt get_put_pixel.txt blits.txt progress_callback.txt text_api.txt event_queue.txt -SOURCES+=core_python.txt +SOURCES+=core_python.txt gfx_python.txt EXAMPLE_SOURCES=$(wildcard example_*.txt) diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index 72418b7..8ce8d85 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -59,6 +59,7 @@ endif::disable-javascript[] <h4>Python bindings</h4> <ul> <li><a href="core_python.html">Core</a></li> + <li><a href="gfx_python.html">Gfx</a></li> </ul> </div> diff --git a/doc/core_python.txt b/doc/core_python.txt index fe295cb..3e7256f 100644 --- a/doc/core_python.txt +++ b/doc/core_python.txt @@ -95,6 +95,7 @@ Blit is clipped. TIP: See link:example_py_showimage.html[example] Blit usage. +[[Colors_and_Pixels]] Colors and Pixels ~~~~~~~~~~~~~~~~~ diff --git a/doc/gfx_python.txt b/doc/gfx_python.txt new file mode 100644 index 0000000..28f8899 --- /dev/null +++ b/doc/gfx_python.txt @@ -0,0 +1,48 @@ +Python GFX module +----------------- + +The python binding maps mostly to the C API with the 'GP_' prefix stripped. + +The gfx module adds methods to the gfx context submodule. + +NOTE: You may want to see the link:coordinate_system.html[coordinate system] + first. + +Drawing functions +~~~~~~~~~~~~~~~~~ + +All drawing functions takes a 'pixel' value (to describe color) which +link:core_python.html#Colors_and_Pixels[can be obtained], for a particular +pixel type (context), from a RGB triplet. + +All drawing functions are clipped. Drawing outside of a context is no-op. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.Fill(pixel) + +------------------------------------------------------------------------------- + +Fills context with particualr 'pixel' value. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.HLine(x0, x1, y, pixel) +------------------------------------------------------------------------------- + +Draws a horizontal line from 'x0' to 'x1' at 'y'. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.gfx as gfx + + context.gfx.VLine(x, y0, y1, pixel) +------------------------------------------------------------------------------- + +Draws a vertical line from 'y0' to 'y1' at 'x'. + + http://repo.or.cz/w/gfxprim.git/commit/c5d16d66f47d38078fefc539ed8d2b478ecb… commit c5d16d66f47d38078fefc539ed8d2b478ecb5039 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Mar 23 12:30:37 2013 +0100 doc: pywrap: More python docs. diff --git a/doc/core_python.txt b/doc/core_python.txt index 57a51e6..fe295cb 100644 --- a/doc/core_python.txt +++ b/doc/core_python.txt @@ -53,9 +53,6 @@ import gfxprim.core as core Puts a pixel at specified coordinates. If coordinates are outside of the image nothing is done. -These are basic 'Context' methods from core module. Importing other modules -will add some other (for example gfx module adds all drawing functions). - NOTE: You may want to see link:coordinate_system.html[coordinate system] description. @@ -77,14 +74,26 @@ The conversion is naive i.e. the values are just divided/multiplied. ------------------------------------------------------------------------------- import gfxprim.core as core -Blit(self, sx, sy, target, tx, ty, w=None, h=None, sx2=None, sy2=None, - tx2=None, ty2=None) + # Blits context to target starting at + # sx and sy in the source context + # tx and ty in in the target + context.Blit(sx, sy, target, tx, ty, w, h) + + # Alternatively the size can be described by + # coordinates in the source or target + context.Blit(sx, sy, target, tx, ty, sx2=, sy2=) + context.Blit(sx, sy, target, tx, ty, tx2=, ty2=) ------------------------------------------------------------------------------- -Copy a rectangle from self to target. (sx,sy) and (tx,ty) define upper-left -corners, rectangle size is given by (width, height), lower-right corner in -source or lower-right corner in the target. Blit is clipped. +Copy a rectangle from self to target. + +The blits can do simple conversions same as the 'Convert' functions however +such blits are slower. + +Blit is clipped. + +TIP: See link:example_py_showimage.html[example] Blit usage. Colors and Pixels ~~~~~~~~~~~~~~~~~ @@ -94,7 +103,7 @@ passed as a parameter to all drawing functions. Color is a more abstract representation for example RGB triplet. -There are several functions to create a pixel value for a particualr pixel +There are several functions to create a pixel value for a particular pixel type from color. [source,python] @@ -141,3 +150,7 @@ Sets and gets the GFXprim debug level. See link:debug.html[debug messages] description for more details. + + +These are basic 'Context' methods from core module. Importing other modules +will add some other (for example gfx module adds all drawing functions). diff --git a/doc/example_py_showimage.txt b/doc/example_py_showimage.txt new file mode 100644 index 0000000..10e6e51 --- /dev/null +++ b/doc/example_py_showimage.txt @@ -0,0 +1,8 @@ +Showimage +--------- +.A simple program to load and show image + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/showimage.py[] +------------------------------------------------------------------ ----------------------------------------------------------------------- Summary of changes: doc/Makefile | 2 +- doc/asciidoc.conf | 1 + doc/core_python.txt | 32 +++++++++---- ...{example_input.txt => example_py_showimage.txt} | 9 ++-- doc/gfx_python.txt | 48 ++++++++++++++++++++ 5 files changed, 78 insertions(+), 14 deletions(-) copy doc/{example_input.txt => example_py_showimage.txt} (52%) create mode 100644 doc/gfx_python.txt repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0