Changeset 94 in pacpusframework for branches/2.0-beta1/src/TestComponents

Timestamp:

05/22/13 15:25:24 (11 years ago)

Author:

DHERBOMEZ Gérald

Message:

fix windows

Location:

branches/2.0-beta1/src/TestComponents

Files:

• CMakeLists.txt (modified) (1 diff)
• CPT/NMEA0183/CMakeLists.txt (modified) (1 diff)
• Lidar/CMakeLists.txt (modified) (2 diffs)
• Video/CMakeLists.txt (modified) (1 diff)
• Video/sensor/Camera1394.cpp (modified) (3 diffs)
• test/CMakeLists.txt (modified) (1 diff)
• test/testComponent1.cpp (modified) (1 diff)
• test/testComponent1.h (modified) (2 diffs)
• test/testComponent2.cpp (modified) (1 diff)

branches/2.0-beta1/src/TestComponents/CMakeLists.txt

@@ -11 +11 @@
 # ========================================
 add_subdirectory(Lidar)
-add_subdirectory(Video)
+#add_subdirectory(Video)
 add_subdirectory(CPT)
 add_subdirectory(CPT/NMEA0183)
 add_subdirectory(test)
-add_subdirectory(ShMem)
+#add_subdirectory(ShMem)

branches/2.0-beta1/src/TestComponents/CPT/NMEA0183/CMakeLists.txt

@@ -6 +6 @@
 #link_directories (${QT_LIBRARIES})
 add_definitions(${QT_DEFINITIONS}
--fPIC)
+-fPIC
+-DNOMINMAX)
 
 include_directories(include)

branches/2.0-beta1/src/TestComponents/Lidar/CMakeLists.txt

@@ -15 +15 @@
   ${QT_DEFINITIONS}
   -DLIDAR_EXPORTS
+  -DALASCAXT_EXPORTS
+  -DDBTPLYALASCA_EXPORTS
 )
 
@@ -100 +102 @@
     ${QT_LIBRARIES}
     ${PACPUS_DEPENDENCIES_LIB}
+        road_time
 )
 

branches/2.0-beta1/src/TestComponents/Video/CMakeLists.txt

@@ -15 +15 @@
   ${QT_DEFINITIONS}
   -DVIDEO_EXPORTS
+  -DDBTPLYVISION_EXPORTS
 )
 

branches/2.0-beta1/src/TestComponents/Video/sensor/Camera1394.cpp

@@ -79 +79 @@
   imageMutex_ = new QMutex;
 
-  if (displaying_)
+/*  if (displaying_)
   {
     viewer_ = new ImageViewer;
@@ -86 +86 @@
     viewer_->setWindowTitle(componentName);
     connect(this, SIGNAL( newImage(QImage*) ), viewer_, SLOT( display(QImage*) ) );
-  }
+  }*/
 
   return ComponentBase::CONFIGURED_OK;
@@ -282 +282 @@
     // send image in shared memory
     if (firstTime) {
-      shMem = new ShMem("IMAGE", qimage_->numBytes());
+//      shMem = new ShMem("IMAGE", qimage_->numBytes());
       firstTime = false;
     }
     assert(shMem);
-    shMem->write(qimage_->bits(), qimage_->numBytes());
+//    shMem->write(qimage_->bits(), qimage_->numBytes());
 
 #ifdef MEASURE_TIME

branches/2.0-beta1/src/TestComponents/test/CMakeLists.txt

@@ -102 +102 @@
     ${QT_LIBRARIES}
     ${OpenCV_LIBRARIES}
+        road_time
 )
 

branches/2.0-beta1/src/TestComponents/test/testComponent1.cpp

@@ -97 +97 @@
 
         LOG_INFO("Send data " << i << " time " << get_timestamp());
-        fprintf(fp,"%u %lld \n",i, get_timestamp());
+//        fprintf(fp,"%u %lld \n",i, get_timestamp());
         usleep(waitTime);
         i++;

branches/2.0-beta1/src/TestComponents/test/testComponent1.h

@@ -5 +5 @@
 @date created 2010-06-03 16:13
 @author Julien Moras
-@author Sergio Rodriguez
 @version $Id: $
 */
@@ -22 +21 @@
 #include "Pacpus/structure/genericStructures.h"
 
-namespace pacpus {
-
-typedef unsigned long long timestamp_t;
-
-static timestamp_t get_timestamp ()
-{
-  struct timeval now;
-  gettimeofday (&now, NULL);
-  return  now.tv_usec + (timestamp_t)now.tv_sec * 1000000;
-}
-
-//class PacpusImage : public PacpusTimeStampedData {
-//public :
-//    QImage image;
-//};
-
+namespace pacpus {                                                                              
 
 class TestComponent2;

branches/2.0-beta1/src/TestComponents/test/testComponent2.cpp

@@ -95 +95 @@
 //        }
 //    }
-        fprintf(fp,"%u %lld \n",i++, get_timestamp());
+//        fprintf(fp,"%u %lld \n",i++, get_timestamp());
 
     setState(MONITOR_OK);