Changeset 351:5e9032fa3f65

Timestamp:

03/24/10 16:12:39 (3 years ago)

Author:

ddangelo

Branch:

default

Convert:

svn:76c98907-0e80-4c83-94c7-b346fc2aefc2/trunk@357

Message:

Monitor setup now supports a keyboard and mouse device, which can be created per subdisplay.

Location:

avango-display/python/avango/display

Files:

• _device.py (modified) (1 diff)
• _display.py (modified) (3 diffs)
• setups/Monitor.py (modified) (3 diffs)

avango-display/python/avango/display/_device.py

@@ -60 +60 @@
         self.super(KeyboardDevice).__init__()
         
-def create_and_connect_keyboard(eventfields):
-    keyboard = KeyboardDevice()
+    def connect(self, eventfields):
+        
+        self.KeysPressed.connect_from(eventfields.KeysPressed)
     
-    keyboard.KeysPressed.connect_from(eventfields.KeysPressed)
+        self.KeyRight.connect_from(eventfields.KeyRight)
+        self.KeyLeft.connect_from(eventfields.KeyLeft)
+        self.KeyUp.connect_from(eventfields.KeyUp)
+        self.KeyDown.connect_from(eventfields.KeyDown)
+        self.PageUp.connect_from(eventfields.KeyPageUp)
+        self.PageDown.connect_from(eventfields.KeyPageDown)
+        self.Shift.connect_from(eventfields.KeyShift)
+        self.Ctrl.connect_from(eventfields.KeyCtrl) 
+        self.KeyAlt.connect_from(eventfields.KeyAlt)
+        self.Insert.connect_from(eventfields.KeyInsert)
+        self.Delete.connect_from(eventfields.KeyDelete)
+        self.Home.connect_from(eventfields.KeyHome)
+        self.End.connect_from(eventfields.KeyEnd)
+        self.KeyEsc.connect_from(eventfields.KeyEsc)
+        self.KeySpace.connect_from(eventfields.KeySpace)
+        self.KeyEnter.connect_from(eventfields.KeyEnter)
+        self.AltReturn.connect_from(eventfields.KeyAltReturn)
+        self.KeyF1.connect_from(eventfields.KeyF1)
+        self.KeyF2.connect_from(eventfields.KeyF2)
+        self.KeyF3.connect_from(eventfields.KeyF3)
+        self.KeyF4.connect_from(eventfields.KeyF4)
+        self.KeyF5.connect_from(eventfields.KeyF5)
+        self.KeyF6.connect_from(eventfields.KeyF6)
+        self.KeyF7.connect_from(eventfields.KeyF7)
+        self.KeyF8.connect_from(eventfields.KeyF8)
+        self.KeyF9.connect_from(eventfields.KeyF9)
+        self.KeyF10.connect_from(eventfields.KeyF10)
+        self.KeyF11.connect_from(eventfields.KeyF11)
+        self.KeyF12.connect_from(eventfields.KeyF12)
+        
+
+class MouseDevice(avango.script.Script):
+    Matrix = avango.osg.SFMatrix()
+    MousePosNorm = avango.osg.SFVec2()
+    MousePos = avango.osg.SFVec2()
+    MouseMovementNorm = avango.osg.SFVec2()
+    MouseButtonLeft = avango.SFBool()
+    MouseButtonRight = avango.SFBool()
+    MouseButtonMiddle = avango.SFBool()
+    MouseScrollUp = avango.SFBool()
+    MouseScrollDown = avango.SFBool()   
+    MouseLeftDoubleClick = avango.SFBool()
+    MouseLeftAndRight = avango.SFBool()
     
-    keyboard.KeyRight.connect_from(eventfields.KeyRight)
-    keyboard.KeyLeft.connect_from(eventfields.KeyLeft)
-    keyboard.KeyUp.connect_from(eventfields.KeyUp)
-    keyboard.KeyDown.connect_from(eventfields.KeyDown)
-    keyboard.PageUp.connect_from(eventfields.KeyPageUp)
-    keyboard.PageDown.connect_from(eventfields.KeyPageDown)
-    keyboard.Shift.connect_from(eventfields.KeyShift)
-    keyboard.Ctrl.connect_from(eventfields.KeyCtrl) 
-    keyboard.KeyAlt.connect_from(eventfields.KeyAlt)
-    keyboard.Insert.connect_from(eventfields.KeyInsert)
-    keyboard.Delete.connect_from(eventfields.KeyDelete)
-    keyboard.Home.connect_from(eventfields.KeyHome)
-    keyboard.End.connect_from(eventfields.KeyEnd)
-    keyboard.KeyEsc.connect_from(eventfields.KeyEsc)
-    keyboard.KeySpace.connect_from(eventfields.KeySpace)
-    keyboard.KeyEnter.connect_from(eventfields.KeyEnter)
-    keyboard.AltReturn.connect_from(eventfields.KeyAltReturn)
-    keyboard.KeyF1.connect_from(eventfields.KeyF1)
-    keyboard.KeyF2.connect_from(eventfields.KeyF2)
-    keyboard.KeyF3.connect_from(eventfields.KeyF3)
-    keyboard.KeyF4.connect_from(eventfields.KeyF4)
-    keyboard.KeyF5.connect_from(eventfields.KeyF5)
-    keyboard.KeyF6.connect_from(eventfields.KeyF6)
-    keyboard.KeyF7.connect_from(eventfields.KeyF7)
-    keyboard.KeyF8.connect_from(eventfields.KeyF8)
-    keyboard.KeyF9.connect_from(eventfields.KeyF9)
-    keyboard.KeyF10.connect_from(eventfields.KeyF10)
-    keyboard.KeyF11.connect_from(eventfields.KeyF11)
-    keyboard.KeyF12.connect_from(eventfields.KeyF12)
+    def __init__(self):
+        self.super(MouseDevice).__init__()
+        
+    def connect(self, eventfields, camera, window):
+        self.Matrix.connect_from(camera.MouseNearTransform)
     
-    return keyboard
+        self.MousePosNorm.connect_from(window.MousePositionNorm)
+        self.MousePos.connect_from(window.MousePosition)
+        self.MouseMovementNorm.connect_from(window.MouseMovementNorm)
+        
+        self.MouseButtonLeft.connect_from(eventfields.MouseButtonLeft)
+        self.MouseButtonRight.connect_from(eventfields.MouseButtonRight)
+        self.MouseScrollUp.connect_from(eventfields.MouseScrollUp)
+        self.MouseScrollDown.connect_from(eventfields.MouseScrollDown)
+        self.MouseButtonMiddle.connect_from(eventfields.MouseButtonMiddle)
+        self.MouseLeftDoubleClick.connect_from(eventfields.MouseButtonLeftDoubleClick)
+        self.MouseLeftAndRight.connect_from(eventfields.MouseButtons_LeftAndRight)

avango-display/python/avango/display/_display.py

@@ -26 +26 @@
         self._composite_viewer.Views.connect_from(self._merge_viewer.ViewsOut)
         
-        #the device service will be created as soon as it is needed
+        #the device service will be created as soon as it is used.
         self._device_service = None
         
@@ -62 +62 @@
             self.connect_view_field(user_selector.ViewOut)
             
-            #call template function
             self.view_created(camera,view)
 
@@ -174 +173 @@
 
     def add_window(self, window, transform, user):
+#        import traceback
+#        traceback.print_stack()
         self._windows.append((window, transform, user))
 

avango-display/python/avango/display/setups/Monitor.py

@@ -31 +31 @@
         super(Monitor, self).__init__("Monitor", inspector)
 
+        self._subdisplay_window = {}
         self._subdisplay_window_events = {}
         self._subdisplay_camera = {}
@@ -38 +39 @@
         window.Decoration.value = True
         window.AutoHeight.value = True
+        window.ShowCursor.value = True
         self.add_window(window, avango.osg.make_trans_mat(0, 1.7, -0.6), 0)
-
+        self._subdisplay_window[""]=window
+        
         user = avango.display.nodes.User()
         user.Matrix.value = avango.osg.make_trans_mat(avango.osg.Vec3(0., 1.7, 0.))
         self.add_user(user)
 
-    def make_dominant_user_device(self, user, interface, subdisplay):
-        device = avango.display.nodes.Device()
-        if subdisplay == "":
-            return device
-
-        device.Matrix.connect_from(self._subdisplay_camera[subdisplay].MouseNearTransform)
-        device.Button1.connect_from(self._subdisplay_window_events[subdisplay].MouseButtons_OnlyLeft)
-
-        return device
 
     def make_view(self, subdisplay):
@@ -78 +72 @@
         window.MoveEvent.connect_from(window_event.MoveEvent)
         self._subdisplay_camera[subdisplay] = camera
+        self._subdisplay_window[subdisplay] = window
+        return display_view
+    
+    
+    def view_created(self, camera, view):
+        window_event = avango.osg.viewer.nodes.EventFields(View = view)
+        self._subdisplay_window_events[""] = window_event
+        self._subdisplay_window[""].DragEvent.connect_from(window_event.DragEvent)
+        self._subdisplay_window[""].MoveEvent.connect_from(window_event.MoveEvent)
+        self._subdisplay_camera[""] = camera
+        
 
-        return display_view
+    def make_dominant_user_device(self, user, interface, subdisplay):
+        if subdisplay not in self._subdisplay_camera:
+            return avango.display.nodes.Device()
+        
+        if interface == "Keyboard":
+            keyboard = avango.display.KeyboardDevice()
+            keyboard.connect(self._subdisplay_window_events[subdisplay])
+            return keyboard
+        
+        elif interface == "Mouse":
+            mouse = avango.display.MouseDevice()
+            mouse.connect(self._subdisplay_window_events[subdisplay],
+                          self._subdisplay_camera[subdisplay],
+                          self._subdisplay_window[subdisplay]
+                          )
+            return mouse
+        
+        else:
+            device = avango.display.nodes.Device()
+            device.Matrix.connect_from(self._subdisplay_camera[subdisplay].MouseNearTransform)
+            device.Button1.connect_from(self._subdisplay_window_events[subdisplay].MouseButtons_OnlyLeft)
+            return device
+        
 
     def make_device(self, device, interface):