Commit 8db2fa3a authored by Nicolas Philipps's avatar Nicolas Philipps
Browse files

Fixed icc compilation

--HG--
branch : fw4spl_0.8.3
parent 7ae16db3
......@@ -248,7 +248,8 @@ void SField::addField( const FieldNameType& fieldName, ::fwData::Object::sptr fi
OSLM_ASSERT("FieldType "<<fieldType<<" does not match ObjectType in Object "<<field->getClassname(),
fieldType == field->getClassname());
SubServicesVecType subVecSrv;
BOOST_FOREACH( ConfigurationType cfg, conf->find("service"))
std::vector< ConfigurationType > services = conf->find("service");
BOOST_FOREACH( ConfigurationType cfg, services)
{
::fwServices::IService::sptr srv = this->add( field, cfg );
OSLM_ASSERT("Instantiation Service failed on field "<<fieldName, srv);
......@@ -293,7 +294,8 @@ void SField::swapField(const FieldNameType& fieldName, ::fwData::Object::sptr fi
{
if(m_fieldsSubServices.find(fieldName) != m_fieldsSubServices.end())
{
BOOST_FOREACH( ConfigurationType cfg, m_managerConfiguration->find("field", "id", fieldName))
std::vector< ConfigurationType > fields = m_managerConfiguration->find("field", "id", fieldName);
BOOST_FOREACH( ConfigurationType cfg, fields)
{
SubServicesVecType subServices = m_fieldsSubServices[fieldName];
BOOST_FOREACH( SPTR(SubService) subSrv, subServices )
......@@ -402,7 +404,8 @@ void SField::initOnDummyObject( const FieldNameType& fieldName )
::fwData::Object::sptr dummyObj;
dummyObj = ::fwData::Object::dynamicCast(::fwTools::Factory::New(fieldType));
SubServicesVecType subVecSrv;
BOOST_FOREACH( ConfigurationType cfg, conf->find("service"))
std::vector< ConfigurationType > services = conf->find("service");
BOOST_FOREACH( ConfigurationType cfg, services)
{
::fwServices::IService::sptr srv = this->add( dummyObj, cfg );
OSLM_ASSERT("Instantiation Service failed ofieldct "<<fieldName, srv);
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -12,16 +12,22 @@
#include <QGraphicsView>
#include <QResizeEvent>
#include <fwRender/IRender.hpp>
#include <fwServices/ComChannelService.hpp>
#include <scene2D/data/Axis.hpp>
#include <scene2D/data/Viewport.hpp>
#include <fwData/Composite.hpp>
#include "scene2D/config.hpp"
#include "scene2D/data/Event.hpp"
#include "scene2D/data/Coord.hpp"
namespace fwData
{
class Composite;
} //namespace fwData
namespace scene2D
{
// Not declared in the #include because of mutual inclusion.
......
......@@ -4,6 +4,7 @@
* published by the Free Software Foundation.
* ****** END LICENSE BLOCK ****** */
#include <fwData/Composite.hpp>
#include "scene2D/data/Size.hpp"
#include "scene2D/Scene2DGraphicsView.hpp"
......@@ -22,12 +23,12 @@ Scene2DGraphicsView::Scene2DGraphicsView(QGraphicsScene* scene, QWidget* widget)
{
this->setMouseTracking( true );
}
/* Change the method usedn by the scene to index its items:
* 'NoIndex' is better than the default method 'BspTreeIndex' (Binary Space Partioning)
* 'NoIndex' is better than the default method 'BspTreeIndex' (Binary Space Partioning)
* which consists in dividing the scene into multiple parts and store them into a tree.
* With 'NoIndex', searching an item is faster, especially for scenes with a lot of items
* (Histogram for instance) and for scenes which manage moves (ViewportRangeSelector and
* (Histogram for instance) and for scenes which manage moves (ViewportRangeSelector and
* ViewportUpdater for instance).
*/
scene->setItemIndexMethod( QGraphicsScene::NoIndex );
......@@ -36,11 +37,11 @@ Scene2DGraphicsView::Scene2DGraphicsView(QGraphicsScene* scene, QWidget* widget)
this->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
this->setViewportUpdateMode( QGraphicsView::BoundingRectViewportUpdate );
this->setOptimizationFlags( QGraphicsView::DontSavePainterState //
this->setOptimizationFlags( QGraphicsView::DontSavePainterState //
| QGraphicsView::DontAdjustForAntialiasing ); // Prevent from rendering artifacts
this->setCacheMode( QGraphicsView::CacheBackground ); // Activates background cache
this->setAttribute( Qt::WA_TranslucentBackground, false );
this->setFrameStyle( 0 );
this->setFrameStyle( 0 );
}
//-----------------------------------------------------------------------------
......@@ -85,7 +86,7 @@ void Scene2DGraphicsView::resizeEvent(QResizeEvent *_event)
::scene2D::data::Event::NewSptr sceneEvent;
sceneEvent->setType( ::scene2D::data::Event::Resize);
sceneEvent->setButton( ::scene2D::data::Event::NoButton);
sceneEvent->setModifier( ::scene2D::data::Event::NoModifier);
sceneEvent->setModifier( ::scene2D::data::Event::NoModifier);
sceneEvent->setSize( ::scene2D::data::Size( _event->size().width(), _event->size().height() ) );
sceneEvent->setOldSize( ::scene2D::data::Size( _event->oldSize().width(), _event->oldSize().height() ) );
......@@ -121,7 +122,7 @@ void Scene2DGraphicsView::mousePressEvent ( QMouseEvent * _event )
}
else if(_event->modifiers() == Qt::AltModifier)
{
modifier = ::scene2D::data::Event::AltModifier;
modifier = ::scene2D::data::Event::AltModifier;
}
else if(_event->modifiers() == Qt::ShiftModifier)
{
......
......@@ -10,18 +10,27 @@
#include <map>
#include <boost/shared_ptr.hpp>
#include <boost/version.hpp>
// boost 1.47 issue with FOREACH
#if ( defined(__clang__) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) ) && BOOST_VERSION == 104700
#include <boost/foreach.hpp>
#endif
#include "fwData/config.hpp"
#include "fwData/Object.hpp"
#include "fwData/Factory.hpp"
// boost 1.47 issue with FOREACH
#include <boost/version.hpp>
#if BOOST_VERSION == 104700
#include <boost/foreach.hpp>
namespace fwData
{ class Composite; }
inline boost::mpl::true_ * boost_foreach_is_noncopyable( ::fwData::Composite *&, BOOST_FOREACH_TAG_DEFAULT )
{ return 0; }
#endif //BOOST_VERSION == 104700
namespace fwData
{
......@@ -138,18 +147,6 @@ protected:
} //namespace fwData
// boost 1.47 issue with FOREACH
#if ( defined(__clang__) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) ) && BOOST_VERSION == 104700
namespace boost { namespace foreach
{
template<>
struct is_noncopyable<
::fwData::Composite
> : mpl::true_
{};
}}
#endif
#endif /* _FWDATA_COMPOSITE_HPP_ */
......@@ -7,6 +7,7 @@
#include <boost/filesystem/convenience.hpp>
#include <fwData/Vector.hpp>
#include <fwData/Composite.hpp>
#include "fwXML/Serializer.hpp"
#include "fwXML/XML/XMLParser.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