Commit 21f2efdc authored by fw4splbot's avatar fw4splbot
Browse files

merge(dev): release 16.0.0

parents 6ee4605b cfff1dce
......@@ -185,12 +185,12 @@
<!-- Reader services -->
<!-- *************************************************************************************************** -->
<service uid="modelSeriesWriter" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="modelSeriesId" />
<inout key="data" uid="modelSeriesId" />
<type mode="writer" />
</service>
<service uid="imageReader" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="imageId" />
<inout key="data" uid="imageId" />
<type mode="reader" />
</service>
......
......@@ -128,7 +128,7 @@
</service>
<service uid="readerPathFile" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="mesh" />
<inout key="data" uid="mesh" />
<type mode="reader" />
</service>
......
......@@ -77,7 +77,7 @@
</service>
<service uid="myReaderPathFile" type="::uiIO::editor::SIOSelector" >
<in key="image" uid="imageUid" />
<inout key="data" uid="imageUid" />
</service>
<service uid="mainView" type="::vtkSimpleNegato::SRenderer" autoConnect="yes" >
<in key="image" uid="imageUid" />
......
......@@ -122,14 +122,14 @@
<service uid="pointView" type="::uiVisuQt::PointEditor" autoConnect="yes" />
<service uid="meshReader" type="::uiIO::editor::SIOSelector">
<in key="target" uid="mesh" />
<inout key="data" uid="mesh" />
<type mode="reader" />
<selection mode="exclude" />
<addSelection service="::ioXML::FwXMLGenericReaderService" />
</service>
<service uid="imageReader" type="::uiIO::editor::SIOSelector">
<in key="image" uid="image" />
<inout key="data" uid="image" />
<type mode="reader" />
<selection mode="exclude" />
<addSelection service="::ioXML::FwXMLGenericReaderService" />
......
......@@ -130,14 +130,14 @@
<service uid="action_quit" type="::gui::action::SQuit" />
<service uid="myReaderMesh" type="::uiIO::editor::SIOSelector">
<in key="target" uid="myMesh" />
<inout key="data" uid="myMesh" />
<type mode="reader" />
<selection mode="exclude" />
<addSelection service="::ioXML::FwXMLGenericReaderService" />
</service>
<service uid="myWriterMesh" type="::uiIO::editor::SIOSelector">
<in key="target" uid="myMesh" />
<inout key="data" uid="myMesh" />
<type mode="writer" />
</service>
......
......@@ -95,7 +95,7 @@
</service>
<service uid="reader" type="::uiIO::editor::SIOSelector">
<inout key="target" uid="mesh" />
<inout key="data" uid="mesh" />
<type mode="reader" />
</service>
......
......@@ -92,11 +92,12 @@
<!-- ***************************************** End layouts declaration ***************************************** -->
<!-- ***************************************** Begin services declarations ************************************ -->
<service uid="readerPathFile" type="::uiIO::editor::SIOSelector">
<in key="image" uid="image" />
<inout key="data" uid="image" />
<type mode="reader" />
</service>
<service uid="writerPathFile" type="::uiIO::editor::SIOSelector">
<inout key="data" uid="image" />
<type mode="writer" />
</service>
......
/* ***** BEGIN LICENSE BLOCK *****
* FW4SPL - Copyright (C) IRCAD, 2009-2017.
* FW4SPL - Copyright (C) IRCAD, 2009-2018.
* Distributed under the terms of the GNU Lesser General Public License (LGPL) as
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
#ifndef __FWCORE_MACROS_HPP__
#define __FWCORE_MACROS_HPP__
/**
* @file fwCore/macros.hpp
* @brief This file defines fwCore base macros.
*/
#pragma once
#include "fwCore/Demangler.hpp"
#include <boost/preprocessor/cat.hpp>
......@@ -292,8 +292,14 @@
#define fwCorePredeclare( _cls_ ) \
BOOST_PP_SEQ_FOLD_RIGHT( __FWCORE_PREDECLARE, BOOST_PP_SEQ_NIL, _cls_)
#define __FWCORE_STATIC_CACHE( _type_, value ) \
static const _type_ __cache__(value); return __cache__;
#define __FWCORE_STATIC_CACHE( value ) \
static const std::string __cache__(value); return __cache__;
#ifdef __GNUC__
#define FW_NOINLINE __attribute__((noinline))
#else
#define FW_NOINLINE
#endif
/**
* @brief Generate virtual methods that return classname/namespace strings
......@@ -305,16 +311,16 @@
#define __FWCORECLASSNAMEMACRO(_qualifier) \
/** @name Demangling methods */ \
/** @{ */ \
/** @brief return object's classnam without its namespacee, i.e. BaseObject */ \
virtual const std::string& getLeafClassname() const _qualifier \
{ __FWCORE_STATIC_CACHE(std::string, ::fwCore::Demangler(*this).getLeafClassname()); } \
static const std::string& leafClassname() \
{ __FWCORE_STATIC_CACHE(std::string, ::fwCore::getLeafClassname<SelfType>()); } \
/** @brief return object's classname without its namespace, i.e. BaseObject */ \
FW_NOINLINE virtual const std::string& getLeafClassname() const _qualifier \
{ __FWCORE_STATIC_CACHE(::fwCore::Demangler(*this).getLeafClassname()); } \
FW_NOINLINE static const std::string& leafClassname() \
{ __FWCORE_STATIC_CACHE(::fwCore::getLeafClassname<SelfType>()); } \
/** @brief return full object's classname with its namespace, i.e. ::fwCore::BaseObject */ \
virtual const std::string& getClassname() const _qualifier \
{ __FWCORE_STATIC_CACHE(std::string, ::fwCore::getClassname<SelfType>()); } \
static const std::string& classname() \
{ __FWCORE_STATIC_CACHE(std::string, ::fwCore::getClassname<SelfType>()); } \
FW_NOINLINE virtual const std::string& getClassname() const _qualifier \
{ __FWCORE_STATIC_CACHE(::fwCore::getClassname<SelfType>()); } \
FW_NOINLINE static const std::string& classname() \
{ __FWCORE_STATIC_CACHE(::fwCore::getClassname<SelfType>()); } \
/** @} */
#define fwCoreInterfaceMacro() __FWCORECLASSNAMEMACRO()
......@@ -330,7 +336,7 @@
*
*/
#define __FWCOREISTYPEOFMACRO(_classinfo_) \
static bool isTypeOf(const std::string &type) \
static bool isTypeOf(const std::string& type) \
{ \
if (__FWCORE_TYPEDEF_SELF_NAME::classname() == type) \
{ \
......@@ -341,9 +347,9 @@
}
#define __FWCOREISAMACRO(_qualifier) \
virtual bool isA(const std::string &type) const _qualifier \
virtual bool isA(const std::string& type) const _qualifier \
{ \
return this->__FWCORE_TYPEDEF_SELF_NAME::isTypeOf(type); \
return __FWCORE_TYPEDEF_SELF_NAME::isTypeOf(type); \
}
#define fwCoreIsTypeOfMacro(_classinfo_) \
......@@ -523,5 +529,3 @@ struct pointer_holder;
fwCoreInterfaceIsTypeOfMacro(_classinfo_)
/** @} */
#endif // __FWCORE_MACROS_HPP__
Supports Markdown
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