suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove loggin

Browse Source
This commit is contained in:
Stefan Tröger 2013-06-08 22:44:31 +02:00 committed by Stefan Tröger
parent 661e3bba8d
commit 8fc24fd824
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Assembly/App/CMakeLists.txt
View File

@ -4,7 +4,7 @@ else(MSVC)
add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
endif(MSVC) endif(MSVC)
add_definitions( -DUSE_LOGGING ) #add_definitions( -DUSE_LOGGING )
include_directories( include_directories(
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
@ -21,12 +21,12 @@ include_directories(
) )
set(Assembly_LIBS #set(Assembly_LIBS
${ODE_LIBRARIES} # ${ODE_LIBRARIES}
${OCC_LIBRARIES} # ${OCC_LIBRARIES}
Part # Part
FreeCADApp # FreeCADApp
) #)
generate_from_xml(ItemPy) generate_from_xml(ItemPy)
generate_from_xml(ItemAssemblyPy) generate_from_xml(ItemAssemblyPy)

4
src/Mod/Assembly/App/opendcm/core/geometry.hpp
View File

@ -439,7 +439,7 @@ void Geometry<Sys, Derived, GeometrieTypeList, Dim>::finishCalculation() {
//recalculate(1.); //remove scaling to get right global value //recalculate(1.); //remove scaling to get right global value
m_global = m_rotated; m_global = m_rotated;
#ifdef USE_LOGGING #ifdef USE_LOGGING
BOOST_LOG(log) << "Finish cluster calculation: "<<m_global.transpose(); BOOST_LOG(log) << "Finish cluster calculation";
#endif #endif
} }
//TODO:non cluster paramter scaling //TODO:non cluster paramter scaling
@ -447,7 +447,7 @@ void Geometry<Sys, Derived, GeometrieTypeList, Dim>::finishCalculation() {
m_global = m_parameter; m_global = m_parameter;
normalize(); normalize();
#ifdef USE_LOGGING #ifdef USE_LOGGING
BOOST_LOG(log) << "Finish calculation: "<<m_global.transpose(); BOOST_LOG(log) << "Finish calculation";
#endif #endif
}; };
apply_visitor v(m_global); apply_visitor v(m_global);

4
src/Mod/Assembly/App/opendcm/module3d/state.hpp
View File

@ -89,7 +89,7 @@ struct get_weight {
template<typename Vector, typename Weight> template<typename Vector, typename Weight>
struct getWeightType { struct getWeightType {
typedef typename mpl::find_if<Vector, boost::is_same<get_weight<mpl::_1>, Weight > >::type iter; typedef typename mpl::find_if<Vector, boost::is_same<get_weight<mpl::_1>, Weight > >::type iter;
typedef typename mpl::deref<iter>::type type; typedef typename mpl::if_< boost::is_same<iter, typename mpl::end<Vector>::type >, mpl::void_, typename mpl::deref<iter>::type>::type type;
}; };
typedef std::vector< fusion::vector2<std::string, std::string> > string_vec; typedef std::vector< fusion::vector2<std::string, std::string> > string_vec;
@ -217,7 +217,7 @@ struct inject_set {
}; };
//spezialisation if no type in the typelist has the right weight //spezialisation if no type in the typelist has the right weight
template<> template<>
struct inject_set<mpl_::void_> { struct inject_set<mpl::void_> {
template<typename Obj, typename Vec> template<typename Obj, typename Vec>
static void apply(Vec& v, Obj g) { static void apply(Vec& v, Obj g) {