Subversion Repositories seema-scanner

Rev

Rev 1 | Rev 159 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1 Rev 18
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){
 41 
Camera* Camera::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;
47 
    if(interfaceNum == 0)
 47 
    if(interfaceNum == 0)
48 
        return new CameraIIDC(camNum);
 48 
        return new CameraIIDC(camNum, triggerMode);
49 
#endif
 49 
#endif
50 
#ifdef WITH_CAMERAXIMEA
 50 
#ifdef WITH_CAMERAXIMEA
51 
    interfaceNum -= 1;
 51 
    interfaceNum -= 1;
52 
    if(interfaceNum == 0)
 52 
    if(interfaceNum == 0)
53 
        return new CameraXIMEA(camNum);
 53 
        return new CameraXIMEA(camNum, triggerMode);
54 
#endif
 54 
#endif
55 
#ifdef WITH_CAMERAIDSIMAGING
 55 
#ifdef WITH_CAMERAIDSIMAGING
56 
    interfaceNum -= 1;
 56 
    interfaceNum -= 1;
57 
    if(interfaceNum == 0)
 57 
    if(interfaceNum == 0)
58 
        return new CameraIDSImaging(camNum);
 58 
        return new CameraIDSImaging(camNum, triggerMode);
59 
#endif
 59 
#endif
60 
#ifdef WITH_CAMERAPOINTGREY
 60 
#ifdef WITH_CAMERAPOINTGREY
61 
    interfaceNum -= 1;
 61 
    interfaceNum -= 1;
62 
    if(interfaceNum == 0)
 62 
    if(interfaceNum == 0)
63 
        return new CameraPointGrey(camNum);
 63 
        return new CameraPointGrey(camNum, triggerMode);
64 
#endif
 64 
#endif
65 
 
 65 
 
66 
    return (Camera*)NULL;
 66 
    return (Camera*)NULL;
67 
}
 67 
}