Changeset 570 for trunk

Timestamp:

05/18/11 15:22:39 (12 months ago)

Author:

ddangelo

Message:

get viewer functionality added

Location:

trunk/avango-display/python/avango/display

Files:

• __init__.py (modified) (1 diff)
• _display.py (modified) (1 diff)
• setups/Monitor.py (modified) (5 diffs)

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

@@ -114 +114 @@
     return _selected_display.get_camera(subdisplay)
 
+def get_viewer():
+    """
+    Get the av::osg::viewer of the used display. Currently, all displays use a
+    CompositeViewer
+    """
+    return _selected_display.get_viewer()
+
+def get_view(subdisplay):
+    """
+    Get the osg.viewer.View object of the selected subdisplay. If no view for the
+    given subdisplay is found, None is returned
+    """
+    return _selected_display.get_view(subdisplay)
+
 def make_user(user=0, interface="", subdisplay=""):
     """Create a field container that represents the user position.

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

@@ -99 +99 @@
 
         return display_view
+    
+    def get_viewer(self):
+        return self._composite_viewer
+    
+    def get_view(self, subdisplay):
+        return None
 
     def get_camera(self, subdisplay):

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

@@ -38 +38 @@
         self._subdisplay_keyboard = {}
         self._subdisplay_camera = {}
+        self._subdisplay_view = {}
 
         self._screen_identifier = os.environ.get('DISPLAY', '')
@@ -99 +100 @@
         
         #configure trackball
-        display_view.EnableTrackball.value = self._enable_trackball
+#        display_view.EnableTrackball.value = self._enable_trackball
+        toggle_field = avango.utils.make_key_toggle_trigger_alternate(
+                        avango.utils.make_bool2_and(self._subdisplay_keyboard[subdisplay].KeyShift,
+                                                    self._subdisplay_keyboard[subdisplay].KeyF1),
+                       self._enable_trackball)
+        display_view.EnableTrackball.connect_from(toggle_field)
+        
         time_sensor = avango.nodes.TimeSensor()
         self.keep_alive(time_sensor)
@@ -122 +129 @@
         #TODO Enable the osg auto near/far plane computation
         display_view.Near.value = 0.1 
-        display_view.Far.value = 100000
+        display_view.Far.value = 10000
         
         #add some default actions
@@ -164 +171 @@
             self._subdisplay_window[subdisplay].MoveEvent.connect_from(window_event.MoveEvent)
             self._subdisplay_camera[subdisplay] = camera
+            self._subdisplay_view[subdisplay] = view
+            
             
             
@@ -169 +178 @@
         if self._subdisplay_camera.has_key(subdisplay):
             return self._subdisplay_camera[subdisplay]
+        return None
+    
+    def get_view(self, subdisplay):
+        if self._subdisplay_view.has_key(subdisplay):
+            return self._subdisplay_view[subdisplay]
         return None