Changeset 185

Timestamp:

05/19/09 14:56:40 (3 years ago)

Author:

rkuck

Message:

Corrected avango-display for new event handling in avango-osg

File:

• trunk/avango-display/python/avango/display/_display.py (modified) (2 diffs)

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

@@ -216 +216 @@
     if (_display_type == "TouchscreenEmulator" or _display_type == "TwoviewTouchscreenEmulator") and subdisplay == "Touchscreen":
         device.Matrix.connect_from(_touchscreen_camera.MouseNearTransform)
-        device.Button1.connect_from(_touchscreen_camera.Window.value.MouseButtons_OnlyLeft)
+        device.Button1.connect_from(_touchscreen_event.MouseButtons_OnlyLeft)
     elif _display_type == "TwoView":
         pda_sensor = avango.daemon.nodes.DeviceSensor(DeviceService = _device_service,
@@ -397 +397 @@
         _composite_viewer.Views.value.append(osg_view)
 
-        global _touchscreen_camera
+        global _touchscreen_camera, _touchscreen_event
         _touchscreen_camera = camera
+        _touchscreen_event = avango.osg.viewer.nodes.EventFields(View = osg_view) 
+        _touchscreen_window.DragEvent.connect_from(_touchscreen_event.DragEvent) 
+        _touchscreen_window.MoveEvent.connect_from(_touchscreen_event.MoveEvent) 
 
     return display_view