Changeset 574

Timestamp:

07/27/11 13:33:21 (10 months ago)

Author:

ddangelo

Message:

Define switch for windows dependent time functions added.
Obsolete qualifier removed.

Location:

trunk/avango-display

Files:

• include/avango/display/mt/MultitouchDevice.h (modified) (2 diffs)
• python/avango/display/setups/Monitor.py (modified) (4 diffs)
• src/avango/display/mt/MultitouchDevice.cpp (modified) (6 diffs)
• src/avango/display/mt/multitouch/FingerClient.h (modified) (1 diff)

trunk/avango-display/include/avango/display/mt/MultitouchDevice.h

@@ -36 +36 @@
 
 #include "FingerClient.h"
+
+#ifdef __linux__
+#include <sys/time.h>
+#endif
+
+
+
 
 namespace av
@@ -83 +90 @@
                 void processMessages(std::queue< std::pair< FingerClient::MyMessage, int > > &messages);
 
+#ifdef _WIN32
+                inline long getMilliseconds() const{
+                  timeGetTime();
+    };
+#else
+                inline long getMilliseconds() const{
+      struct timeval start;
+      long mtime, seconds, useconds;
+      gettimeofday(&start, NULL);
+      seconds  = start.tv_sec;
+      useconds = start.tv_usec;
+      mtime = ((seconds) * 1000 + useconds/1000.0) + 0.5;
+      return mtime;
+    };
+#endif
+
         FingerClient *mFingerClient;
         struct FingerAction

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

@@ -27 +27 @@
 import avango.utils
 import os
-    
+
 
 class Monitor(avango.display.Display):
@@ -77 +77 @@
             window_translation = avango.osg.make_trans_mat(0, 1.7, -0.6)
             current_user = 0
-            
         
             eye_offset = 0.0
@@ -173 +172 @@
             self._subdisplay_view[subdisplay] = view
             
-            
-            
     def get_camera(self, subdisplay):
         if self._subdisplay_camera.has_key(subdisplay):
@@ -184 +181 @@
             return self._subdisplay_view[subdisplay]
         return None
-        
-
+    
+    def get_window(self, subdisplay):
+        if self._subdisplay_window.has_key(subdisplay):
+            return self._subdisplay_window[subdisplay]
+        return None
 
     def make_dominant_user_device(self, user, interface, subdisplay):

trunk/avango-display/src/avango/display/mt/MultitouchDevice.cpp

@@ -25 +25 @@
 
 #include <iostream>
+#include <sys/time.h>
 
 #include <avango/Logger.h>
@@ -39 +40 @@
 AV_FC_DEFINE(av::display::mt::MultitouchDevice);
 
-av::display::mt::MultitouchDevice::MultitouchDevice() : mOriginalPort(3333), mReceivedPort(mOriginalPort), mReceivedPortTime(timeGetTime())
+av::display::mt::MultitouchDevice::MultitouchDevice() : mOriginalPort(3333), mReceivedPort(mOriginalPort)
 {
   AV_FC_ADD_FIELD(Added, MFMultitouchFinger::ContainerType());
@@ -53 +54 @@
   {
     mFingerClient->registerFingerListener(this);
-        mFingerClient->registerUserListener(this);
+    mFingerClient->registerUserListener(this);
 
     alwaysEvaluate(true);
   }
+
+  mReceivedPortTime = getMilliseconds();
 }
 
@@ -86 +89 @@
                 case FingerClient::MYMESS_SET_PORT:
                         mReceivedPort = message.second;
-                        mReceivedPortTime = timeGetTime();
+                        //mReceivedPortTime = timeGetTime();
+                        mReceivedPortTime = getMilliseconds();
                     break;
                 default:
@@ -219 +223 @@
   processMessages(mFingerClient->getMessages());
 
-  if(mFingerClient->getPort() != mOriginalPort && (timeGetTime() - mReceivedPortTime) > 500.0)
-        mReceivedPort = mOriginalPort;
+//  if(mFingerClient->getPort() != mOriginalPort && (timeGetTime() - mReceivedPortTime) > 500.0) {
+  if(mFingerClient->getPort() != mOriginalPort && (getMilliseconds() - mReceivedPortTime) > 500.0) {
+    mReceivedPort = mOriginalPort;
+  }
 
   if(mReceivedPort != mFingerClient->getPort())
@@ -232 +238 @@
                 mFingerClient->registerUserListener(this);
           }
-  } 
+  }
 
   handleFingers();

trunk/avango-display/src/avango/display/mt/multitouch/FingerClient.h

@@ -45 +45 @@
   void ProcessMessage(const osc::ReceivedMessage &message, const IpEndpointName &remoteEndpoint);
 
-  int FingerClient::getPort() const { return mPort; }
+  int getPort() const { return mPort; }
   std::queue< std::pair< MyMessage, int > > &getMessages() { return mMessages; }