Subversion Repositories seema-scanner

Rev

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

Rev 128 Rev 134
Line 90... Line 90...
90 
    format7Settings.width = 3376;
 90 
    format7Settings.width = 3376;
91 
    format7Settings.height = 2704;
 91 
    format7Settings.height = 2704;
92 
    format7Settings.offsetX = 0;
 92 
    format7Settings.offsetX = 0;
93 
    format7Settings.offsetY = 0;
 93 
    format7Settings.offsetY = 0;
94 
 
 94 
 
- 
 
 95 
//    format7Settings.width = 2496;
- 
 
 96 
//    format7Settings.height = 1888;
- 
 
 97 
//    format7Settings.offsetX = (3376-2496)/2;
- 
 
 98 
//    format7Settings.offsetY = (2704-1888)/2;
- 
 
 99 
 
95 
    // Validate and set mode
 100 
    // Validate and set mode
96 
    FlyCapture2::Format7PacketInfo packetInfo;
 101 
    FlyCapture2::Format7PacketInfo packetInfo;
97 
    bool valid;
 102 
    bool valid;
98 
    error = cam.ValidateFormat7Settings(&format7Settings, &valid, &packetInfo);
 103 
    error = cam.ValidateFormat7Settings(&format7Settings, &valid, &packetInfo);
99 
    if (error != FlyCapture2::PGRERROR_OK)
 104 
    if (error != FlyCapture2::PGRERROR_OK)
Line 299... Line 304...
299 
    CameraFrame frame;
 304 
    CameraFrame frame;
300 
 
 305 
 
301 
    frame.timeStamp = rawImage.GetTimeStamp().cycleCount;
 306 
    frame.timeStamp = rawImage.GetTimeStamp().cycleCount;
302 
    frame.height = rawImage.GetRows();
 307 
    frame.height = rawImage.GetRows();
303 
    frame.width = rawImage.GetCols();
 308 
    frame.width = rawImage.GetCols();
304 
    frame.bitDepth = 16;
 309 
    frame.bitDepth = 8;
305 
    frame.channels = 1;
 310 
    frame.channels = 1;
306 
    frame.memory = rawImage.GetData();
 311 
    frame.memory = rawImage.GetData();
307 
 
 312 
 
308 
    return frame;
 313 
    return frame;
309 
}
 314 
}