Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
35
Issues
35
List
Boards
Labels
Milestones
JIRA
JIRA
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima
Commits
a17ab7a8
Commit
a17ab7a8
authored
Aug 25, 2015
by
Alejandro Homs Puron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Fixed bug crashing when SyncCtrlObj is deleted before CtAcquisition
parent
02fcc740
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
6 deletions
+23
-6
control/src/CtAcquisition.cpp
control/src/CtAcquisition.cpp
+0
-1
hardware/include/lima/HwSyncCtrlObj.h
hardware/include/lima/HwSyncCtrlObj.h
+5
-3
hardware/sip/HwSyncCtrlObj.sip
hardware/sip/HwSyncCtrlObj.sip
+1
-0
hardware/src/HwSyncCtrlObj.cpp
hardware/src/HwSyncCtrlObj.cpp
+17
-2
No files found.
control/src/CtAcquisition.cpp
View file @
a17ab7a8
...
...
@@ -144,7 +144,6 @@ CtAcquisition::CtAcquisition(HwInterface *hw) :
CtAcquisition
::~
CtAcquisition
()
{
DEB_DESTRUCTOR
();
m_hw_sync
->
unregisterValidRangesCallback
(
m_valid_ranges_cb
);
delete
m_valid_ranges_cb
;
}
...
...
hardware/include/lima/HwSyncCtrlObj.h
View file @
a17ab7a8
...
...
@@ -70,12 +70,14 @@ public:
class
ValidRangesCallback
{
DEB_CLASS
(
DebModHardware
,
"HwSyncCtrlObj::ValidRangesCallback"
);
friend
class
HwSyncCtrlObj
;
public:
virtual
~
ValidRangesCallback
()
{};
ValidRangesCallback
();
virtual
~
ValidRangesCallback
();
protected:
virtual
void
validRangesChanged
(
const
HwSyncCtrlObj
::
ValidRangesType
&
)
=
0
;
private:
friend
class
HwSyncCtrlObj
;
HwSyncCtrlObj
*
m_hw_sync
;
};
HwSyncCtrlObj
();
...
...
hardware/sip/HwSyncCtrlObj.sip
View file @
a17ab7a8
...
...
@@ -54,6 +54,7 @@ sipRes = tmpString.c_str();
class ValidRangesCallback
{
public:
ValidRangesCallback();
virtual ~ValidRangesCallback();
protected:
virtual void validRangesChanged(const HwSyncCtrlObj::ValidRangesType&) = 0;
...
...
hardware/src/HwSyncCtrlObj.cpp
View file @
a17ab7a8
...
...
@@ -24,16 +24,29 @@
using
namespace
lima
;
HwSyncCtrlObj
::
ValidRangesCallback
::
ValidRangesCallback
()
:
m_hw_sync
(
NULL
)
{
}
HwSyncCtrlObj
::
ValidRangesCallback
::~
ValidRangesCallback
()
{
if
(
m_hw_sync
)
m_hw_sync
->
unregisterValidRangesCallback
(
this
);
}
HwSyncCtrlObj
::
HwSyncCtrlObj
()
:
m_acq_mode
(
Single
),
m_valid_ranges_cb
(
NULL
)
{
DEB_CONSTRUCTOR
();
DEB_CONSTRUCTOR
();
}
HwSyncCtrlObj
::~
HwSyncCtrlObj
()
{
DEB_DESTRUCTOR
();
DEB_DESTRUCTOR
();
if
(
m_valid_ranges_cb
)
unregisterValidRangesCallback
(
m_valid_ranges_cb
);
}
bool
HwSyncCtrlObj
::
checkAutoExposureMode
(
AutoExposureMode
mode
)
const
...
...
@@ -92,6 +105,7 @@ void HwSyncCtrlObj::registerValidRangesCallback(ValidRangesCallback *cb)
throw
LIMA_CTL_EXC
(
InvalidValue
,
"ValidRangesCallback already registered"
);
}
cb
->
m_hw_sync
=
this
;
m_valid_ranges_cb
=
cb
;
}
...
...
@@ -107,6 +121,7 @@ void HwSyncCtrlObj::unregisterValidRangesCallback(ValidRangesCallback *cb)
}
m_valid_ranges_cb
=
NULL
;
cb
->
m_hw_sync
=
NULL
;
}
std
::
ostream
&
lima
::
operator
<<
(
std
::
ostream
&
os
,
const
HwSyncCtrlObj
::
ValidRangesType
&
range
)
...
...
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