Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-andor3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-andor3
Commits
5d68dc47
Commit
5d68dc47
authored
Dec 02, 2014
by
Laurent Claustre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed pb with twice buffer allocation
parent
64a8fd18
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
133 additions
and
107 deletions
+133
-107
include/Andor3Camera.h
include/Andor3Camera.h
+4
-1
src/Andor3Camera.cpp
src/Andor3Camera.cpp
+129
-106
No files found.
include/Andor3Camera.h
View file @
5d68dc47
...
...
@@ -139,6 +139,8 @@ namespace lima
void
getPixelSize
(
double
&
sizex
,
double
&
sizey
);
void
getSdkFrameDim
(
FrameDim
&
frame_dim
);
void
getStatus
(
Camera
::
Status
&
status
);
// --- Acquisition interface
...
...
@@ -252,11 +254,12 @@ namespace lima
private:
class
_AcqThread
;
class
_BufferCtrlObj
;
friend
class
_AcqThread
;
// -- Members
// LIMA / Acquisition (thread) related :
SoftBufferCtrlObj
m_buffer_ctrl_obj
;
_BufferCtrlObj
*
m_buffer_ctrl_obj
;
// Pure thread and signals :
_AcqThread
*
m_acq_thread
;
// The thread retieving frame buffers from the SDK
Cond
m_cond
;
// Waiting condition for inter thread signaling
...
...
src/Andor3Camera.cpp
View file @
5d68dc47
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment