Commit db16eb90 authored by Laurent Claustre's avatar Laurent Claustre

VS C++ porting

parent 69e206fa
Pipeline #7355 passed with stages
in 7 minutes and 5 seconds
......@@ -19,11 +19,15 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#pragma once
#ifndef METADETINFOCTRLOBJ_H
#define METADETINFOCTRLOBJ_H
#include <meta_export.h>
#include "lima/HwDetInfoCtrlObj.h"
#include "lima/Debug.h"
namespace lima
{
......@@ -31,14 +35,14 @@ namespace lima
namespace Meta
{
class Interface;
class DetInfoCtrlObj : public HwDetInfoCtrlObj, public HwMaxImageSizeCallbackGen
class META_EXPORT DetInfoCtrlObj : public HwDetInfoCtrlObj, public HwMaxImageSizeCallbackGen
{
DEB_CLASS_NAMESPC(DebModCamera, "DetInfoCtrlObj","Meta");
class _MaxImageSizeCallback;
friend class _MaxImageSizeCallback;
friend class Interface;
public:
DetInfoCtrlObj(Interface&);
DetInfoCtrlObj(Interface& inter);
virtual ~DetInfoCtrlObj();
virtual void getMaxImageSize(Size& max_image_size);
......
......@@ -19,10 +19,15 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#pragma once
#ifndef METAINTERFACE_H
#define METAINTERFACE_H
#include <map>
#include <meta_export.h>
#include "lima/HwInterface.h"
#include "processlib/Data.h"
......@@ -33,7 +38,7 @@ namespace lima
{
class DetInfoCtrlObj;
class SyncCtrlObj;
class Interface : public HwInterface
class META_EXPORT Interface : public HwInterface
{
DEB_CLASS_NAMESPC(DebModCamera, "MetaInterface", "Meta");
friend class DetInfoCtrlObj;
......@@ -60,7 +65,7 @@ namespace lima
typedef std::pair<int,int> ColumnRow;
struct ltColumnRow
{
bool operator()(const ColumnRow& a,const ColumnRow& b)
bool operator()(const ColumnRow& a,const ColumnRow& b) const
{
return a.second == b.second ?
a.first < b.first : a.second < b.second;
......
......@@ -19,9 +19,14 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################
#pragma once
#ifndef METASYNCCTRLOBJ_H
#define METASYNCCTRLOBJ_H
#include <meta_export.h>
#include "lima/HwSyncCtrlObj.h"
#include "lima/HwInterface.h"
......@@ -31,7 +36,7 @@ namespace lima
{
class Interface;
class SyncCtrlObj : public HwSyncCtrlObj
class META_EXPORT SyncCtrlObj : public HwSyncCtrlObj
{
DEB_CLASS_NAMESPC(DebModCamera,"SyncCtrlObj","Meta");
public:
......
......@@ -47,8 +47,8 @@ private:
DetInfoCtrlObj& m_det;
};
DetInfoCtrlObj::DetInfoCtrlObj(Interface& interface):
m_interface(interface)
DetInfoCtrlObj::DetInfoCtrlObj(Interface& inter):
m_interface(inter)
{
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment