Subversion Repositories seema-scanner

Rev

Rev 18 | Rev 167 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 18 Rev 159
Line 12... Line 12...
12 
#ifdef WITH_CAMERAPOINTGREY
 12 
#ifdef WITH_CAMERAPOINTGREY
13 
    #include "CameraPointGrey.h"
 13 
    #include "CameraPointGrey.h"
14 
#endif
 14 
#endif
15 
 
 15 
 
16 
// Global camera enumerator
 16 
// Global camera enumerator
17 
std::vector< std::vector<CameraInfo> > Camera::GetInterfaceCameraList(){
 17 
std::vector< std::vector<CameraInfo> > CameraFactory::GetInterfaceCameraList(){
18 
    std::vector< std::vector<CameraInfo> > ret;
 18 
    std::vector< std::vector<CameraInfo> > ret;
19 
 
 19 
 
20 
#ifdef WITH_CAMERAIIDC
 20 
#ifdef WITH_CAMERAIIDC
21 
    std::vector<CameraInfo> iidccameras = CameraIIDC::getCameraList();
 21 
    std::vector<CameraInfo> iidccameras = CameraIIDC::getCameraList();
22 
    ret.push_back(iidccameras);
 22 
    ret.push_back(iidccameras);
Line 36... Line 36...
36 
 
 36 
 
37 
    return ret;
 37 
    return ret;
38 
}
 38 
}
39 
 
 39 
 
40 
// Camera factory
 40 
// Camera factory
41 
Camera* Camera::NewCamera(unsigned int interfaceNum, unsigned int camNum, CameraTriggerMode triggerMode){
 41 
Camera* CameraFactory::NewCamera(unsigned int interfaceNum, unsigned int camNum, CameraTriggerMode triggerMode){
42 
 
 42 
 
43 
    interfaceNum += 1;
 43 
    interfaceNum += 1;
44 
 
 44 
 
45 
#ifdef WITH_CAMERAIIDC
 45 
#ifdef WITH_CAMERAIIDC
46 
    interfaceNum -= 1;
 46 
    interfaceNum -= 1;