Changeset 94 in pacpusframework
- Timestamp:
- May 22, 2013, 3:25:24 PM (11 years ago)
- Location:
- branches/2.0-beta1
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.0-beta1/include/Pacpus/kernel/PacpusEvent.h
r89 r94 4 4 #include <QEvent> 5 5 #include "Pacpus/kernel/road_time.h" 6 #include <Pacpus/kernel/pacpus.h> 6 7 7 8 namespace pacpus { … … 32 33 }; 33 34 34 class P acpusEvent : public QEvent35 class PACPUSLIB_API PacpusEvent : public QEvent 35 36 { 36 37 public: … … 50 51 }; 51 52 52 class P acpusGenericEvent : public PacpusEvent53 class PACPUSLIB_API PacpusGenericEvent : public PacpusEvent 53 54 { 54 55 public: -
branches/2.0-beta1/include/Pacpus/kernel/inputOutputBase.h
r89 r94 3 3 4 4 #include <Pacpus/kernel/ConnectionBase.h> 5 #include <Pacpus/kernel/pacpus.h> 5 6 6 7 #include <typeinfo> … … 13 14 class ComponentBase; 14 15 15 class AbstractInterface : public QObject16 class PACPUSLIB_API AbstractInterface : public QObject 16 17 { 17 18 Q_OBJECT … … 30 31 }; 31 32 32 class InputInterfaceBase : public AbstractInterface33 class PACPUSLIB_API InputInterfaceBase : public AbstractInterface 33 34 { 34 35 Q_OBJECT … … 41 42 }; 42 43 43 class OutputInterfaceBase: public AbstractInterface44 class PACPUSLIB_API OutputInterfaceBase: public AbstractInterface 44 45 { 45 46 Q_OBJECT -
branches/2.0-beta1/include/Pacpus/kernel/inputOutputInterface.h
r89 r94 2 2 #define IN_OUT_INTERFACE_H 3 3 4 #include <Pacpus/kernel/pacpus.h> 4 5 #include <Pacpus/kernel/inputOutputBase.h> 5 6 #include <Pacpus/kernel/Log.h> -
branches/2.0-beta1/include/Pacpus/structure/genericLidarStructures.h
r89 r94 51 51 }*/ 52 52 nbLayer = layerCount; 53 for ( typenameQVector<LidarLayer>::iterator it = layers.begin(), itend = layers.end(); it != itend; ++it)53 for (/*typename*/ QVector<LidarLayer>::iterator it = layers.begin(), itend = layers.end(); it != itend; ++it) 54 54 it->points.reserve(pointsPerLayer); 55 55 -
branches/2.0-beta1/include/PacpusCityVIP/Video/sensor/Camera1394.h
r89 r94 70 70 #include "kernel/ComponentBase.h" 71 71 #include "kernel/DbiteFile.h" 72 #include "../DbtPlyPluginVision/ImageViewer.h"72 //#include "../DbtPlyPluginVision/ImageViewer.h" 73 73 74 74 #ifdef WIN32 75 # define NOMINMAX 75 76 # include <windows.h> 76 77 # include "C1394Camera/1394Camera.h" … … 154 155 pacpus::DbiteFile file_; 155 156 156 ImageViewer * viewer_;157 // ImageViewer * viewer_; 157 158 158 159 }; -
branches/2.0-beta1/src/FileLib/CMakeLists.txt
r89 r94 44 44 target_link_libraries( 45 45 ${PROJECT_NAME} 46 PacpusLib 46 47 ) 47 48 -
branches/2.0-beta1/src/PacpusLib/CMakeLists.txt
r89 r94 95 95 ${QT_LIBRARIES} 96 96 ${PACPUS_DEPENDENCIES_LIB} 97 FileLib97 #FileLib 98 98 ) 99 99 -
branches/2.0-beta1/src/PacpusSensor/src/main.cpp
r89 r94 13 13 #include <QThread> 14 14 #ifdef WIN32 15 # define NOMINMAX 15 16 # include <windows.h> 16 17 #endif -
branches/2.0-beta1/src/TestComponents/CMakeLists.txt
r92 r94 11 11 # ======================================== 12 12 add_subdirectory(Lidar) 13 add_subdirectory(Video)13 #add_subdirectory(Video) 14 14 add_subdirectory(CPT) 15 15 add_subdirectory(CPT/NMEA0183) 16 16 add_subdirectory(test) 17 add_subdirectory(ShMem)17 #add_subdirectory(ShMem) -
branches/2.0-beta1/src/TestComponents/CPT/NMEA0183/CMakeLists.txt
r89 r94 6 6 #link_directories (${QT_LIBRARIES}) 7 7 add_definitions(${QT_DEFINITIONS} 8 -fPIC) 8 -fPIC 9 -DNOMINMAX) 9 10 10 11 include_directories(include) -
branches/2.0-beta1/src/TestComponents/Lidar/CMakeLists.txt
r90 r94 15 15 ${QT_DEFINITIONS} 16 16 -DLIDAR_EXPORTS 17 -DALASCAXT_EXPORTS 18 -DDBTPLYALASCA_EXPORTS 17 19 ) 18 20 … … 100 102 ${QT_LIBRARIES} 101 103 ${PACPUS_DEPENDENCIES_LIB} 104 road_time 102 105 ) 103 106 -
branches/2.0-beta1/src/TestComponents/Video/CMakeLists.txt
r90 r94 15 15 ${QT_DEFINITIONS} 16 16 -DVIDEO_EXPORTS 17 -DDBTPLYVISION_EXPORTS 17 18 ) 18 19 -
branches/2.0-beta1/src/TestComponents/Video/sensor/Camera1394.cpp
r89 r94 79 79 imageMutex_ = new QMutex; 80 80 81 if (displaying_)81 /* if (displaying_) 82 82 { 83 83 viewer_ = new ImageViewer; … … 86 86 viewer_->setWindowTitle(componentName); 87 87 connect(this, SIGNAL( newImage(QImage*) ), viewer_, SLOT( display(QImage*) ) ); 88 } 88 }*/ 89 89 90 90 return ComponentBase::CONFIGURED_OK; … … 282 282 // send image in shared memory 283 283 if (firstTime) { 284 shMem = new ShMem("IMAGE", qimage_->numBytes());284 // shMem = new ShMem("IMAGE", qimage_->numBytes()); 285 285 firstTime = false; 286 286 } 287 287 assert(shMem); 288 shMem->write(qimage_->bits(), qimage_->numBytes());288 // shMem->write(qimage_->bits(), qimage_->numBytes()); 289 289 290 290 #ifdef MEASURE_TIME -
branches/2.0-beta1/src/TestComponents/test/CMakeLists.txt
r90 r94 102 102 ${QT_LIBRARIES} 103 103 ${OpenCV_LIBRARIES} 104 road_time 104 105 ) 105 106 -
branches/2.0-beta1/src/TestComponents/test/testComponent1.cpp
r89 r94 97 97 98 98 LOG_INFO("Send data " << i << " time " << get_timestamp()); 99 fprintf(fp,"%u %lld \n",i, get_timestamp());99 // fprintf(fp,"%u %lld \n",i, get_timestamp()); 100 100 usleep(waitTime); 101 101 i++; -
branches/2.0-beta1/src/TestComponents/test/testComponent1.h
r89 r94 5 5 @date created 2010-06-03 16:13 6 6 @author Julien Moras 7 @author Sergio Rodriguez8 7 @version $Id: $ 9 8 */ … … 22 21 #include "Pacpus/structure/genericStructures.h" 23 22 24 namespace pacpus { 25 26 typedef unsigned long long timestamp_t; 27 28 static timestamp_t get_timestamp () 29 { 30 struct timeval now; 31 gettimeofday (&now, NULL); 32 return now.tv_usec + (timestamp_t)now.tv_sec * 1000000; 33 } 34 35 //class PacpusImage : public PacpusTimeStampedData { 36 //public : 37 // QImage image; 38 //}; 39 23 namespace pacpus { 40 24 41 25 class TestComponent2; -
branches/2.0-beta1/src/TestComponents/test/testComponent2.cpp
r89 r94 95 95 // } 96 96 // } 97 fprintf(fp,"%u %lld \n",i++, get_timestamp());97 // fprintf(fp,"%u %lld \n",i++, get_timestamp()); 98 98 99 99 setState(MONITOR_OK);
Note:
See TracChangeset
for help on using the changeset viewer.