Commit 0c556c88 authored by ledig's avatar ledig

[FIX] merge errors and win compile

parent 0786dae2
......@@ -35,11 +35,12 @@
#include "WColor.h"
#include "WHierarchicalTree.h"
#include "WExportCommon.h"
/**
* Class implements a hierarchical tree and provides helper functions for selection and navigation
*/
class WHierarchicalTreeVoxels : public WHierarchicalTree
class OWCOMMON_EXPORT WHierarchicalTreeVoxels : public WHierarchicalTree // NOLINT
{
public:
/**
......
......@@ -29,8 +29,8 @@ FILE( GLOB GE_SRC "*.cpp" "*.h" )
SET( LIB_NAME "${OWgeName}" )
SET( ${LIB_NAME}_COMBINER_SRC ${GE_EXCEPTIONS_SRC} ${GE_CALLBACKS_SRC} ${GE_ALGORITHMS_SRC} ${GE_PLATFORMDEPENDENT_SRC} ${GE_SRC} )
SET( ${LIB_NAME}_ALL_CPP ${GE_EXCEPTIONS_SRC} ${GE_CALLBACKS_SRC} ${GE_ALGORITHMS_SRC} ${GE_PLATFORMDEPENDENT_SRC} ${GE_SRC} )
SET( ${LIB_NAME}_COMBINER_SRC ${GE_EXCEPTIONS_SRC} ${GE_CALLBACKS_SRC} ${GE_ALGORITHMS_SRC} ${GE_PLATFORMDEPENDENT_SRC} ${GE_SRC} ${GE_GEODES_SRC} )
SET( ${LIB_NAME}_ALL_CPP ${GE_EXCEPTIONS_SRC} ${GE_CALLBACKS_SRC} ${GE_ALGORITHMS_SRC} ${GE_PLATFORMDEPENDENT_SRC} ${GE_SRC} ${GE_GEODES_SRC} )
FILE( GLOB_RECURSE ${LIB_NAME}_REMOVE_H "*.h" )
FILE( GLOB_RECURSE ${LIB_NAME}_REMOVE_PCH "*${LIB_NAME}_PCH.*" )
......
......@@ -34,16 +34,18 @@
#include "WOSGButtonLabel.h"
#include "WExportWGE.h"
/**
* Class implements an osgWidget::Box with a label that can be used as a button in the 3D scene
*/
class WOSGButton : public osgWidget::Box
class WGE_EXPORT WOSGButton : public osgWidget::Box // NOLINT
{
public:
/**
* constructor
*
* \param name name of the button, will also be displayed ont he label
* \param name name of the button, will also be displayed on the label
* \param type taken from the osgWidget::Box
* \param resize_hint
* \param pushable denotes if the button is pushable, i.e. keeps a pushed state or not
......
......@@ -143,3 +143,5 @@ void WROI::removeROIChangeNotifier( boost::shared_ptr< boost::function< void() >
{
m_changeNotifiers.erase( it );
}
lock.unlock();
}
......@@ -33,10 +33,12 @@
#include "../../common/WHierarchicalTreeFibers.h"
#include "../WExportWGE.h"
/**
* Class creates a dendrogram from a hierarchical clustering
*/
class WDendrogramGeode : public osg::Geode
class WGE_EXPORT WDendrogramGeode : public osg::Geode // NOLINT
{
public:
/**
......
......@@ -1061,3 +1061,4 @@ void WQtControlPanel::selectUpperMostEntry()
void WQtControlPanel::handleDragDrop()
{
WLogger::getLogger()->addLogMessage( "Drag and drop handler not implemented yet!", "ControlPanel", LL_DEBUG );
}
......@@ -156,3 +156,5 @@ void WRMBranch::removeChangeNotifier( boost::shared_ptr< boost::function< void()
{
m_changeNotifiers.erase( it );
}
lock.unlock();
}
......@@ -6,11 +6,11 @@ SET( MODULE_TARGET_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/modules/${MODULE_NAME}
SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MODULE_TARGET_DIR} )
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MODULE_TARGET_DIR} )
SET( MODULE_DIRNAME ${MODULE_NAME} )
SET( MODULE_NAME "OWmodule_${MODULE_NAME}" ) # prefix all module names with "OWmodule_" to separate them from other libs
SET( MODULE_NAME "${OWmodulesPrefix}_${MODULE_NAME}" ) # prefix all module names with "OWmodule_" to separate them from other libs
# Build module lib
ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel OWge )
TARGET_LINK_LIBRARIES( ${MODULE_NAME} ${OWKernelName} ${OWgeName} )
IF(MSVC_IDE)
SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")
......@@ -30,7 +30,7 @@ IF( OW_COMPILE_TESTS )
# This ensures that the test is copied to the module directory
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MODULE_TARGET_DIR} )
CXXTEST_ADD_TESTS_FROM_LIST( "${MODULES_SRC}"
"OWkernel;${MODULE_NAME}"
"${OWKernelName};${MODULE_NAME}"
)
# Copy fixtures if they exist
......
......@@ -539,7 +539,11 @@ void WMClusterDisplayVoxels::createMesh()
}
boost::shared_ptr< WValueSet< float > >newValueSet = boost::shared_ptr< WValueSet< float > >(
new WValueSet< float >( order, vDim, newVals, W_DT_FLOAT ) );
new WValueSet< float >( order, vDim,
boost::shared_ptr< std::vector< float > >(
new std::vector< float >( newVals )
),
W_DT_FLOAT ) );
WMarchingLegoAlgorithm mlAlgo;
m_triMeshes.push_back( mlAlgo.generateSurface( m_grid->getNbCoordsX(), m_grid->getNbCoordsY(), m_grid->getNbCoordsZ(),
m_grid->getTransformationMatrix(),
......
......@@ -637,7 +637,7 @@ void WMMarchingCubes::updateGraphicsCallback()
{
if( localTextureChangedFlag )
{
std::cout<<m_surfaceGeode->getNumDrawables()<<std::endl;
std::cout << m_surfaceGeode->getNumDrawables() << std::endl;
osg::ref_ptr< osg::Geometry > surfaceGeometry = m_surfaceGeode->getDrawable( 0 )->asGeometry();
osg::Vec3Array* texCoords = new osg::Vec3Array;
boost::shared_ptr< WGridRegular3D > grid = ( *iter )->getGrid();
......
......@@ -444,6 +444,7 @@ public:
// discriminate the right operation with the correct type. It would be nicer to use some kind of strategy pattern here, but the template
// character of the operators forbids it as template methods can't be virtual. Besides this, at some point in the module main the
// selector needs to be queried and its index mapped to a pointer. This is what we do here.
#ifndef _MSC_VER
boost::function< ResultT( ResultT ) > op;
switch ( m_opIdx )
{
......@@ -454,17 +455,23 @@ public:
op = &opAbs< ResultT >;
break;
}
#endif
// apply op to each value
const T* a = vsetA->rawData();
for ( size_t i = 0; i < vsetA->rawSize(); ++i )
{
#ifndef _MSC_VER
data[ i ] = op( a[ i ] );
#else
data[ i ] = static_cast< ResultT >( a[ i ] );
#endif
}
// create result value set
boost::shared_ptr< WValueSet< ResultT > > result = boost::shared_ptr< WValueSet< ResultT > >(
new WValueSet< ResultT >( order, dim, data, type )
new WValueSet< ResultT >( order, dim,
boost::shared_ptr< std::vector< ResultT > >( new std::vector< ResultT >( data ) ),
type )
);
return result;
}
......
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