- Gfxprim - ucw.cz

[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

[repo.or.cz] gfxprim.git branch master updated: 0489beeb9e8eb9c66e5700a6d998003440219087
by metan 22 Mar '13

22 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 0489beeb9e8eb9c66e5700a6d998003440219087 (commit) via cb9fe9ad6b062ca96ea2c4a78204290094bfa0dd (commit) from 7c3141632bc5d4d508aa12073383ac071add934f (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/0489beeb9e8eb9c66e5700a6d99800344021… commit 0489beeb9e8eb9c66e5700a6d998003440219087 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Mar 22 15:50:26 2013 +0100 doc: pywrap: Add brief core wrap description. diff --git a/doc/Makefile b/doc/Makefile index 907bebd..cb892bf 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -5,6 +5,8 @@ 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 + EXAMPLE_SOURCES=$(wildcard example_*.txt) ASCIIDOC_PARAMS=--conf-file asciidoc.conf diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index 4294c56..72418b7 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -55,6 +55,11 @@ endif::disable-javascript[] <li><a href="backends.html">Backends</a></li> <li><a href="input.html">Input</a></li> </ul> + + <h4>Python bindings</h4> + <ul> + <li><a href="core_python.html">Core</a></li> + </ul> </div> # Rest of the content diff --git a/doc/core_python.txt b/doc/core_python.txt new file mode 100644 index 0000000..57a51e6 --- /dev/null +++ b/doc/core_python.txt @@ -0,0 +1,143 @@ +Python Core module +------------------ + +The python binding maps mostly to the C API with the 'GP_' prefix stripped. + +Structures like 'GP_Context' are not created by the 'GP_ContextAlloc()' +function but have proper constructor and destructor to keep the Python +reference counting happy. + +There there are more complicated problems like 'GP_ProgressCallback' which +needs a proxy function to call the python callback from the C code. + +Context +~~~~~~~ + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core + + # Create 100x100 RGB888 context + c = core.Context(100, 100, core.C.PIXEL_RGB888) + + print("w={} h={} bpp={}".format(c.w, c.h, c.bpp)) + +------------------------------------------------------------------------------- + +Creates a context of a particular size and pixel type. + +First two parameters are 'width' and 'height' third is pixel type which is an +enumeration + +May raise 'OSError' with 'ENOMEM' errno if allocation has failed. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core + + pixel = context.GetPixel(x, y) + +------------------------------------------------------------------------------- + +Returns a pixel value at x and y. If coordinates are outside the image zero is +returned. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core + + context.PutPixel(x, y, pixel) + +------------------------------------------------------------------------------- + +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. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core + + grayscale = context.Convert(core.C.PIXEL_G8) + +------------------------------------------------------------------------------- + +Returns context converted into the desired pixel format. + +The conversion is naive i.e. the values are just divided/multiplied. + +//TODO: link to dithering filters etc. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core + +Blit(self, sx, sy, target, tx, ty, w=None, h=None, sx2=None, sy2=None, + tx2=None, ty2=None) + +------------------------------------------------------------------------------- + +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. + +Colors and Pixels +~~~~~~~~~~~~~~~~~ + +Pixel in gfxprim is a number large enough to store a pixel value. Pixel is +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 +type from color. + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core + + # You can create a pixel from RGB and pixel type + black = core.RGBToPixel(0, 0, 0, core.C.PIXEL_G1) + + # Or using shortcut from context + black = context.RGBToPixel(0, 0, 0) + +------------------------------------------------------------------------------- + +These functions creates a pixel suitable for drawing into a bitmap with +particular pixel type. + + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core + + # Print all supported pixel types + for i in core.PixelTypes: + print("Pixel type '{}' size {}".format(i.name, i.size)) + +------------------------------------------------------------------------------- + +The PixelTypes array stores all supported pixel types + +Debug Functions +~~~~~~~~~~~~~~~ + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core + + core.GP_SetDebugLevel(10) + + level = core.GP_GetDebugLevel() +------------------------------------------------------------------------------- + +Sets and gets the GFXprim debug level. See link:debug.html[debug messages] +description for more details. + + http://repo.or.cz/w/gfxprim.git/commit/cb9fe9ad6b062ca96ea2c4a78204290094bf… commit cb9fe9ad6b062ca96ea2c4a78204290094bfa0dd Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Mar 22 15:49:30 2013 +0100 pywrap: common.i: Change the exception to OSError. Which is more suitable for errno related errors. diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i index 09dee68..e9242d7 100644 --- a/pylib/gfxprim/common.i +++ b/pylib/gfxprim/common.i @@ -24,7 +24,7 @@ %exception funcname { $action if (result == NULL) - return PyErr_SetFromErrno(PyExc_RuntimeError); + return PyErr_SetFromErrno(PyExc_OSError); } %enddef @@ -37,6 +37,6 @@ %exception funcname { $action if (result != 0) - return PyErr_SetFromErrno(PyExc_RuntimeError); + return PyErr_SetFromErrno(PyExc_OSError); } %enddef ----------------------------------------------------------------------- Summary of changes: doc/Makefile | 2 + doc/asciidoc.conf | 5 ++ doc/core_python.txt | 143 ++++++++++++++++++++++++++++++++++++++++++++++++ pylib/gfxprim/common.i | 4 +- 4 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 doc/core_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: 7c3141632bc5d4d508aa12073383ac071add934f
by metan 21 Mar '13

21 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 7c3141632bc5d4d508aa12073383ac071add934f (commit) from 02150e7e23c559f9378d189e7435c2497284a4e9 (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/7c3141632bc5d4d508aa12073383ac071add… commit 7c3141632bc5d4d508aa12073383ac071add934f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Mar 21 21:45:39 2013 +0100 pylib: common.i: Simplify error wrappers. Make use of PyErr_SetFromErrno(). diff --git a/demos/py_simple/progress_callback.py b/demos/py_simple/progress_callback.py index 707f0ca..d743c23 100755 --- a/demos/py_simple/progress_callback.py +++ b/demos/py_simple/progress_callback.py @@ -17,11 +17,18 @@ def main(): callback = core.c_core.GP_ProgressCallback(progress_callback) - img = loaders.Load(sys.argv[1], callback) - print() - - img = filters.FilterGaussianBlurAlloc(img, 50, 50, callback) - print() + try: + img = loaders.Load(sys.argv[1], callback) + print() + except RuntimeError as detail: + print("Failed to load image '{}': {}".format(sys.argv[1], detail)) + exit(1) + + try: + img = filters.FilterGaussianBlurAlloc(img, 50, 50, callback) + print() + except RuntimeError: + print("Filter Aborted") if __name__ == '__main__': main() diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i index 2d17c0f..09dee68 100644 --- a/pylib/gfxprim/common.i +++ b/pylib/gfxprim/common.i @@ -23,12 +23,8 @@ %define ERROR_ON_NULL(funcname) %exception funcname { $action - if (result == NULL) { - char errbuf[128]; - char *errmsg = strerror_r(errno, errbuf, sizeof(errbuf)); - PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errmsg); - return NULL; - } + if (result == NULL) + return PyErr_SetFromErrno(PyExc_RuntimeError); } %enddef @@ -40,11 +36,7 @@ %define ERROR_ON_NONZERO(funcname) %exception funcname { $action - if (result != 0) { - char errbuf[128]; - char *errmsg = strerror_r(errno, errbuf, sizeof(errbuf)); - PyErr_Format(PyExc_RuntimeError, "Error in function %s: %s", "$name", errmsg); - return NULL; - } + if (result != 0) + return PyErr_SetFromErrno(PyExc_RuntimeError); } %enddef ----------------------------------------------------------------------- Summary of changes: demos/py_simple/progress_callback.py | 17 ++++++++++++----- pylib/gfxprim/common.i | 16 ++++------------ 2 files changed, 16 insertions(+), 17 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: 02150e7e23c559f9378d189e7435c2497284a4e9
by metan 21 Mar '13

21 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 02150e7e23c559f9378d189e7435c2497284a4e9 (commit) via 04b114db0cc700aa394c5ef91dfc4b34ac55a654 (commit) from d5c09d5b8cd72e73f0e0df4110a3981f943d44f9 (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/02150e7e23c559f9378d189e7435c2497284… commit 02150e7e23c559f9378d189e7435c2497284a4e9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Mar 21 20:04:46 2013 +0100 pywrap: core: Implement progress callback. This is first working version of progress callback. Beware the python API will change. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/progress_callback.py b/demos/py_simple/progress_callback.py new file mode 100755 index 0000000..707f0ca --- /dev/null +++ b/demos/py_simple/progress_callback.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python + +import sys + +import gfxprim.core as core +import gfxprim.loaders as loaders +import gfxprim.filters as filters + +def progress_callback(callback): + sys.stdout.write("rLoading {:3.2f}%".format(callback)) + return 0 + +def main(): + if len(sys.argv) != 2: + print("Takes an image as an argument") + sys.exit(1) + + callback = core.c_core.GP_ProgressCallback(progress_callback) + + img = loaders.Load(sys.argv[1], callback) + print() + + img = filters.FilterGaussianBlurAlloc(img, 50, 50, callback) + print() + +if __name__ == '__main__': + main() diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index 6e616a1..2657327 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -15,12 +15,10 @@ %include "GP_Transform.h" %include "GP_GetSetBits.h" %include "GP_Transform.h" -%include "GP_ProgressCallback.h" /* * Make members of GP_DebugMsg structure immutable */ - %immutable GP_DebugMsg::level; %immutable GP_DebugMsg::file; %immutable GP_DebugMsg::fn; @@ -30,6 +28,76 @@ %include "GP_Debug.h" /* + * Callback proxy, calls the python callback from C source + */ +%{ +static int GP_ProgressCallbackProxy(GP_ProgressCallback *self) +{ + PyObject *obj = self->priv; + PyObject *res, *args; + int ret; + + GP_DEBUG(2, "[wrapper] Proxy Callback called"); + + args = Py_BuildValue("(f)", self->percentage); + + res = PyEval_CallObject(obj, args); + + /* Parse Error */ + if (res == NULL) { + GP_WARN("Parse error while calling callback, aborting"); + return 1; + } + + if (PyInt_Check(res)) { + ret = PyInt_AsLong(res); + } else { + GP_WARN("Wrong type returned from callback, aborting"); + return 1; + } + + Py_DECREF(res); + + return ret; +} +%} + +%include "GP_ProgressCallback.h" + +/* + * Progress callback constructor, desctructor and proxy function. + */ +%extend GP_ProgressCallback { + ~GP_ProgressCallback() { + GP_DEBUG(2, "[wrapper] freeing Proxy Callback"); + free($self); + Py_XDECREF($self->priv); + } + GP_ProgressCallback(PyObject* obj) { + GP_ProgressCallback *res; + + if (!PyCallable_Check(obj)) { + GP_WARN("Callback must be callable python object"); + return NULL; + } + + Py_XINCREF(obj); + + res = malloc(sizeof(GP_ProgressCallback)); + + if (res == NULL) + return NULL; + + res->priv = obj; + res->callback = GP_ProgressCallbackProxy; + + GP_DEBUG(2, "[wrapper] creating Proxy Callback"); + + return res; + } +}; + +/* * Color and pixel types */ http://repo.or.cz/w/gfxprim.git/commit/04b114db0cc700aa394c5ef91dfc4b34ac55… commit 04b114db0cc700aa394c5ef91dfc4b34ac55a654 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Mar 21 20:03:32 2013 +0100 loaders: GP_Loader: Fix signature warning. Do not print signature warning when operation was canceled by callback. diff --git a/libs/loaders/GP_Loader.c b/libs/loaders/GP_Loader.c index 0cce654..9f4f4ad 100644 --- a/libs/loaders/GP_Loader.c +++ b/libs/loaders/GP_Loader.c @@ -279,9 +279,9 @@ GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) /* * Avoid further work if signature was correct but the loader issued - * ENOSYS. + * ENOSYS or ECANCELED. */ - if (ext_load != NULL && errno == ENOSYS) + if (ext_load != NULL && (errno == ENOSYS || errno == ECANCELED)) return NULL; sig_load = loader_by_signature(src_path); ----------------------------------------------------------------------- Summary of changes: demos/py_simple/progress_callback.py | 27 +++++++++++++ libs/loaders/GP_Loader.c | 4 +- pylib/gfxprim/core/core.i | 72 +++++++++++++++++++++++++++++++++- 3 files changed, 99 insertions(+), 4 deletions(-) create mode 100755 demos/py_simple/progress_callback.py 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: d5c09d5b8cd72e73f0e0df4110a3981f943d44f9
by metan 19 Mar '13

19 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 d5c09d5b8cd72e73f0e0df4110a3981f943d44f9 (commit) from 81cfb3c3c3d08268a25747d38e05274c8b335300 (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/d5c09d5b8cd72e73f0e0df4110a3981f943d… commit d5c09d5b8cd72e73f0e0df4110a3981f943d44f9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 23:36:12 2013 +0100 pywrap: backends: The Wait and Poll returns events directly. diff --git a/demos/py_simple/showimage.py b/demos/py_simple/showimage.py index b952078..c61f5ff 100755 --- a/demos/py_simple/showimage.py +++ b/demos/py_simple/showimage.py @@ -14,15 +14,16 @@ def main(): # Load Image img = loaders.Load(sys.argv[1]) - + + # Create X11 window bk = backends.BackendX11Init(None, 0, 0, img.w, img.h, sys.argv[1], 0) assert(bk) img.Blit(0, 0, bk.context, 0, 0, img.w, img.h) bk.Flip() + # Event loop while True: - bk.Wait() - ev = bk.GetEvent() + ev = bk.Wait() input.EventDump(ev) diff --git a/pylib/gfxprim/backends/_extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py index 97975a7..53e1700 100644 --- a/pylib/gfxprim/backends/_extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -27,12 +27,32 @@ def extend_backend(_backend): @extend(_backend) def Poll(self): "Poll the backend for events." - return c_backends.GP_BackendPoll(self) + 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: + return ev + + return None @extend(_backend) def Wait(self): "Waits for backend event" - return c_backends.GP_BackendWait(self) + 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) + + return ev @extend(_backend) def SetCaption(self, caption): @@ -43,13 +63,3 @@ def extend_backend(_backend): def Resize(self, w, h): "Resize backend window (if possible)" return c_backends.GP_BackendResize(self, w, h) - - @extend(_backend) - def GetEvent(self): - "Removes and returns event from the top of the event queue" - if c_backends.GP_BackendEventsQueued(self) == 0: - return None - ev = c_input.GP_Event(); - if c_backends.GP_BackendGetEvent(self, ev) != 0: - return ev - return None ----------------------------------------------------------------------- Summary of changes: demos/py_simple/showimage.py | 7 +++-- pylib/gfxprim/backends/_extend_backend.py | 34 ++++++++++++++++++---------- 2 files changed, 26 insertions(+), 15 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