[glumpy] 4 new revisions pushed by Nicolas.Rougier@gmail.com on 2013-09-30 08:00 GMT

[glu...@googlecode.com]

master moved from bfe0cd3fcd15 to 96260708dec4

4 new revisions:

Revision: 86657ed4c06f
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Mon Sep 30 07:11:18 2013 UTC
Log: Removed alternative glut specific code
http://code.google.com/p/glumpy/source/detail?r=86657ed4c06f

Revision: 72effde0f5f2
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Mon Sep 30 07:11:52 2013 UTC
Log: Bugfix, issue #33
http://code.google.com/p/glumpy/source/detail?r=72effde0f5f2

Revision: 24cfe8e62a2f
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Mon Sep 30 07:17:18 2013 UTC
Log: Removed mouse y inversion
http://code.google.com/p/glumpy/source/detail?r=24cfe8e62a2f

Revision: 96260708dec4
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Mon Sep 30 07:19:22 2013 UTC
Log: Put back mouse y inversion
http://code.google.com/p/glumpy/source/detail?r=96260708dec4

==============================================================================
Revision: 86657ed4c06f
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Mon Sep 30 07:11:18 2013 UTC
Log: Removed alternative glut specific code

http://code.google.com/p/glumpy/source/detail?r=86657ed4c06f

Modified:
/glumpy/window/backend_glut.py

=======================================
--- /glumpy/window/backend_glut.py Mon Jul 8 06:45:20 2013 UTC
+++ /glumpy/window/backend_glut.py Mon Sep 30 07:11:18 2013 UTC
@@ -41,16 +41,16 @@

_window = None

-# For OSX, see https://github.com/nanoant/osxglut
-# GLUT for Mac OS X fork with Core Profile and scroll wheel support
-OSX_glutScrollFunc = None
+# # For OSX, see https://github.com/nanoant/osxglut
+# # GLUT for Mac OS X fork with Core Profile and scroll wheel support
+# OSX_glutScrollFunc = None

-if sys.platform == 'darwin':
- try:
- OSX_glutScrollFunc = GLUTCallback(
- 'Scroll', (c_float,c_float), ('delta_x','delta_y'),)
- except:
- pass
+# if sys.platform == 'darwin':
+# try:
+# OSX_glutScrollFunc = GLUTCallback(
+# 'Scroll', (c_float,c_float), ('delta_x','delta_y'),)
+# except:
+# pass

def show():
''' Show all windows and enters the main loop. '''
@@ -145,10 +145,10 @@
glut.glutEntryFunc( self._entry )
glut.glutSpecialFunc( self._special )
glut.glutSpecialUpFunc( self._special_up )
- if OSX_glutScrollFunc is not None:
- OSX_glutScrollFunc( self._scroll)
- elif bool(glut.glutMouseWheelFunc):
- glut.glutMouseWheelFunc( self._wheel)
+# if OSX_glutScrollFunc is not None:
+# OSX_glutScrollFunc( self._scroll)
+# elif bool(glut.glutMouseWheelFunc):
+# glut.glutMouseWheelFunc( self._wheel)
if size is not None:
width, height = size
glut.glutReshapeWindow( width, height )

==============================================================================
Revision: 72effde0f5f2
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Mon Sep 30 07:11:52 2013 UTC
Log: Bugfix, issue #33

http://code.google.com/p/glumpy/source/detail?r=72effde0f5f2

Modified:
/glumpy/figure.py

=======================================
--- /glumpy/figure.py Fri Aug 17 08:02:09 2012 UTC
+++ /glumpy/figure.py Mon Sep 30 07:11:52 2013 UTC
@@ -85,6 +85,9 @@
self._size = size
self._position = position

+ self._x, self._y = 0, 0
+ self._width, self._height = size
+
if parent is None:
w,h = size[0], size[1]
self._window = Window( size=(w,h), position=position,
title='Figure')

==============================================================================
Revision: 24cfe8e62a2f
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Mon Sep 30 07:17:18 2013 UTC
Log: Removed mouse y inversion

http://code.google.com/p/glumpy/source/detail?r=24cfe8e62a2f

Modified:
/glumpy/window/backend_glut.py

=======================================
--- /glumpy/window/backend_glut.py Mon Sep 30 07:11:18 2013 UTC
+++ /glumpy/window/backend_glut.py Mon Sep 30 07:17:18 2013 UTC
@@ -321,7 +321,7 @@


def _mouse(self, button, state, x, y):
- y = self._height - y
+ # y = self._height - y
if button == glut.GLUT_LEFT_BUTTON:
button = mouse.LEFT
elif button == glut.GLUT_MIDDLE_BUTTON:
@@ -358,7 +358,7 @@


def _motion(self, x, y):
- y = self._height - y
+ # y = self._height - y

dx = x - self._mouse_x
dy = y - self._mouse_y
@@ -368,7 +368,7 @@


def _passive_motion(self, x, y):
- y = self._height - y
+ # y = self._height - y

dx = x - self._mouse_x
dy = y - self._mouse_y

==============================================================================
Revision: 96260708dec4
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Mon Sep 30 07:19:22 2013 UTC
Log: Put back mouse y inversion

http://code.google.com/p/glumpy/source/detail?r=96260708dec4

Modified:
/glumpy/window/backend_glut.py

=======================================
--- /glumpy/window/backend_glut.py Mon Sep 30 07:17:18 2013 UTC
+++ /glumpy/window/backend_glut.py Mon Sep 30 07:19:22 2013 UTC
@@ -321,7 +321,7 @@


def _mouse(self, button, state, x, y):
- # y = self._height - y
+ y = self._height - y
if button == glut.GLUT_LEFT_BUTTON:
button = mouse.LEFT
elif button == glut.GLUT_MIDDLE_BUTTON:
@@ -358,7 +358,7 @@


def _motion(self, x, y):
- # y = self._height - y
+ y = self._height - y

dx = x - self._mouse_x
dy = y - self._mouse_y
@@ -368,7 +368,7 @@


def _passive_motion(self, x, y):
- # y = self._height - y
+ y = self._height - y

dx = x - self._mouse_x
dy = y - self._mouse_y