Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-frelon
Commits
5b28d833
Commit
5b28d833
authored
Jan 06, 2015
by
Sebastien Petitdemange
Browse files
Add processlib and lima include namespace in source file
parent
df8d04cc
Changes
12
Hide whitespace changes
Inline
Side-by-side
include/FrelonCamera.h
View file @
5b28d833
...
...
@@ -25,7 +25,7 @@
#include "FrelonSerialLine.h"
#include "FrelonModel.h"
#include "FrelonTimingCtrl.h"
#include "HwMaxImageSizeCallback.h"
#include "
lima/
HwMaxImageSizeCallback.h"
namespace
lima
{
...
...
include/FrelonCorrection.h
View file @
5b28d833
...
...
@@ -22,8 +22,8 @@
#ifndef FRELONCORRECTION_H
#define FRELONCORRECTION_H
#include "LinkTask.h"
#include "SizeUtils.h"
#include "
processlib/
LinkTask.h"
#include "
lima/
SizeUtils.h"
namespace
lima
{
...
...
include/FrelonInterface.h
View file @
5b28d833
...
...
@@ -22,7 +22,7 @@
#ifndef FRELONINTERFACE_H
#define FRELONINTERFACE_H
#include "HwInterface.h"
#include "
lima/
HwInterface.h"
#include "EspiaBufferMgr.h"
#include "FrelonCamera.h"
...
...
include/FrelonSerialLine.h
View file @
5b28d833
...
...
@@ -23,7 +23,7 @@
#define FRELONSERIALLINE_H
#include "Frelon.h"
#include "ThreadUtils.h"
#include "
lima/
ThreadUtils.h"
namespace
lima
{
...
...
sip/Frelon.sip
View file @
5b28d833
...
...
@@ -25,7 +25,7 @@ namespace Frelon
%TypeHeaderCode
#include "Frelon.h"
#include "MiscUtils.h"
#include "
lima/
MiscUtils.h"
#ifndef LIMA_SIP_FRELON_GLOBAL_DEFINED
#define LIMA_SIP_FRELON_GLOBAL_DEFINED
namespace lima { namespace Frelon { class Global {}; } }
...
...
src/Frelon.cpp
View file @
5b28d833
...
...
@@ -20,7 +20,7 @@
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#include "Frelon.h"
#include "MiscUtils.h"
#include "
lima/
MiscUtils.h"
using
namespace
lima
;
using
namespace
lima
::
Frelon
;
...
...
src/FrelonCamera.cpp
View file @
5b28d833
...
...
@@ -20,7 +20,7 @@
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#include "FrelonCamera.h"
#include "MiscUtils.h"
#include "
lima/
MiscUtils.h"
#include <sstream>
using
namespace
lima
;
...
...
src/FrelonModel.cpp
View file @
5b28d833
...
...
@@ -20,7 +20,7 @@
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#include "FrelonModel.h"
#include "RegExUtils.h"
#include "
lima/
RegExUtils.h"
using
namespace
lima
;
using
namespace
lima
::
Frelon
;
...
...
src/FrelonSerialLine.cpp
View file @
5b28d833
...
...
@@ -20,8 +20,8 @@
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#include "FrelonSerialLine.h"
#include "RegExUtils.h"
#include "MiscUtils.h"
#include "
lima/
RegExUtils.h"
#include "
lima/
MiscUtils.h"
#include <sstream>
using
namespace
lima
;
...
...
test/test_frelon_control.cpp
View file @
5b28d833
...
...
@@ -20,12 +20,12 @@
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#include "FrelonInterface.h"
#include "CtControl.h"
#include "CtAcquisition.h"
#include "CtImage.h"
#include "CtSaving.h"
#include "CtSpsImage.h"
#include "AcqState.h"
#include "
lima/
CtControl.h"
#include "
lima/
CtAcquisition.h"
#include "
lima/
CtImage.h"
#include "
lima/
CtSaving.h"
#include "
lima/
CtSpsImage.h"
#include "
lima/
AcqState.h"
using
namespace
lima
;
using
namespace
std
;
...
...
test/test_frelon_interface.cpp
View file @
5b28d833
...
...
@@ -20,16 +20,16 @@
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#include "FrelonInterface.h"
#include "PoolThreadMgr.h"
#include "HwBufferSave.h"
#include "Data.h"
#include "TaskMgr.h"
#include "TaskEventCallback.h"
#include "SoftRoi.h"
#include "
processlib/
PoolThreadMgr.h"
#include "
lima/
HwBufferSave.h"
#include "
processlib/
Data.h"
#include "
processlib/
TaskMgr.h"
#include "
processlib/
TaskEventCallback.h"
#include "
processlib/
SoftRoi.h"
#ifdef WITH_SPS_IMAGE
#include "CtSpsImage.h"
#include "
lima/
CtSpsImage.h"
#endif
#include "AcqState.h"
#include "
lima/
AcqState.h"
#include <iostream>
...
...
test/test_frelon_spectroscopy.cpp
View file @
5b28d833
...
...
@@ -20,9 +20,9 @@
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#include "FrelonInterface.h"
#include "HwBufferSave.h"
#include "AcqState.h"
#include "PoolThreadMgr.h"
#include "
lima/
HwBufferSave.h"
#include "
lima/
AcqState.h"
#include "
processlib/
PoolThreadMgr.h"
using
namespace
lima
;
using
namespace
std
;
...
...
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