Changeset 512 for trunk

Timestamp:

08/17/10 16:31:51 (21 months ago)

Author:

ddangelo

Message:

Added 3 default parameters to the Monitor constructor.
1)A bool indicating if a window should be generated by default. This may not be useful in subclass. Default is set to: True
2)The initial window transformation. Is only used if a default window is created. Default is: (0, 1.7, -0.6)
3)The initial user transformation. Is always used. Default is: (0, 1.7, 0)

Location:

trunk/avango-display

Files:

• SConscript (modified) (1 diff)
• python/avango/display/setups/Monitor.py (modified) (3 diffs)
• python/avango/display/setups/__init__.py (added)

trunk/avango-display/SConscript

@@ -37 +37 @@
     """)
 av_display_setups_files = Split("""
+    python/avango/display/setups/__init__.py
     python/avango/display/setups/AutoStereoDisplay.py
     python/avango/display/setups/FakeTwoView.py
     python/avango/display/setups/iCone.py
-    python/avango/display/setups/Monitor.py
     python/avango/display/setups/Monitor.py
     python/avango/display/setups/TwoView.py

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

@@ -31 +31 @@
 class Monitor(avango.display.Display):
 
-    def __init__(self, inspector, options):
+    def __init__(self, inspector, options, generate_window=True, window_translation = avango.osg.make_trans_mat(0, 1.7, -0.6), user_translation = avango.osg.make_trans_mat(avango.osg.Vec3(0., 1.7, 0.))):
         super(Monitor, self).__init__("Monitor", inspector)
 
@@ -44 +44 @@
         if options.has_key(trackball_token) and self._bool_dict.has_key(options[trackball_token].lower()):
             self._enable_trackball=self._bool_dict[options[trackball_token].lower()]
-            
-        window = self.make_window(0, 0,  1024, 768, 0.4, 0.3, False, self._screen_identifier, 2)
-        window.Name.value = "AVANGO"
-        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
+        
+        if generate_window:
+            window = self.make_window(0, 0,  1024, 768, 0.4, 0.3, False, self._screen_identifier, 2)
+            window.Name.value = "AVANGO"
+            window.Decoration.value = True
+            window.AutoHeight.value = True
+            window.ShowCursor.value = True
+            
+            self.add_window(window, window_translation, 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.))
+        user.Matrix.value = user_translation
         self.add_user(user)
     
@@ -167 +169 @@
 
     def make_device(self, device, interface):
-        
         if device == "SpaceMouse" or interface == "Relative6DOF":