From: sbh Date: Tue, 18 Nov 2014 08:53:39 +0000 (+0300) Subject: Boost has been removed from CMake (linux environment) X-Git-Tag: V_0.5.2~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1900b8b0454badbccacab9645dc15b225f68600a;p=modules%2Fshaper.git Boost has been removed from CMake (linux environment) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ac61b73e9..7f94b0fab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,6 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH}) INCLUDE(FindEclipse) INCLUDE(Common) INCLUDE(FindQt) -INCLUDE(FindBoost) INCLUDE(FindPython) INCLUDE(FindSalome) INCLUDE(FindSolveSpace) diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt index a5866c282..53489c8fd 100644 --- a/src/ConstructionPlugin/CMakeLists.txt +++ b/src/ConstructionPlugin/CMakeLists.txt @@ -25,7 +25,7 @@ SET(PROJECT_LIBRARIES ${CAS_SHAPE} ) -ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS ${BOOST_DEFINITIONS}) +ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS) ADD_LIBRARY(ConstructionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) TARGET_LINK_LIBRARIES(ConstructionPlugin ${PROJECT_LIBRARIES}) diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index a0886cbb1..5b8f1c075 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -36,7 +36,7 @@ SET(PROJECT_LIBRARIES GeomAlgoAPI ) -ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS ${BOOST_DEFINITIONS}) +ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS) ADD_LIBRARY(FeaturesPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) TARGET_LINK_LIBRARIES(FeaturesPlugin ${PROJECT_LIBRARIES}) diff --git a/src/GeomData/CMakeLists.txt b/src/GeomData/CMakeLists.txt index af7aa575a..c63c256c7 100644 --- a/src/GeomData/CMakeLists.txt +++ b/src/GeomData/CMakeLists.txt @@ -21,7 +21,7 @@ SET(PROJECT_LIBRARIES ${CAS_SHAPE} ) -ADD_DEFINITIONS(-DGEOMDATA_EXPORTS ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS}) +ADD_DEFINITIONS(-DGEOMDATA_EXPORTS ${CAS_DEFINITIONS}) ADD_LIBRARY(GeomData SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) TARGET_LINK_LIBRARIES(GeomData ${PROJECT_LIBRARIES}) diff --git a/src/GeomValidators/CMakeLists.txt b/src/GeomValidators/CMakeLists.txt index efb0b10e7..9a1b97c13 100644 --- a/src/GeomValidators/CMakeLists.txt +++ b/src/GeomValidators/CMakeLists.txt @@ -16,7 +16,7 @@ SET(PROJECT_LIBRARIES -ADD_DEFINITIONS(-DGEOMVALIDATORS_EXPORTS ${BOOST_DEFINITIONS}) +ADD_DEFINITIONS(-DGEOMVALIDATORS_EXPORTS) ADD_LIBRARY(GeomValidators SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) TARGET_LINK_LIBRARIES(GeomValidators ${PROJECT_LIBRARIES}) diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt index 3d7716827..c5cf96007 100644 --- a/src/Model/CMakeLists.txt +++ b/src/Model/CMakeLists.txt @@ -66,7 +66,7 @@ SET(PROJECT_LIBRARIES -ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS}) +ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS}) ADD_LIBRARY(Model MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS}) TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES}) diff --git a/src/PartSetPlugin/CMakeLists.txt b/src/PartSetPlugin/CMakeLists.txt index 2988a3b26..0d2a88d31 100644 --- a/src/PartSetPlugin/CMakeLists.txt +++ b/src/PartSetPlugin/CMakeLists.txt @@ -15,7 +15,7 @@ SET(PROJECT_SOURCES PartSetPlugin_Remove.cpp ) -ADD_DEFINITIONS(-DPARTSETPLUGIN_EXPORTS ${BOOST_DEFINITIONS}) +ADD_DEFINITIONS(-DPARTSETPLUGIN_EXPORTS) ADD_LIBRARY(PartSetPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS}) TARGET_LINK_LIBRARIES(PartSetPlugin ${PROJECT_LIBRARIES} ModelAPI) diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index 4d4097d12..4d46a6271 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -56,7 +56,7 @@ SET(XML_RESOURCES plugin-Sketch.xml ) -ADD_DEFINITIONS(-DSKETCHPLUGIN_EXPORTS ${BOOST_DEFINITIONS}) +ADD_DEFINITIONS(-DSKETCHPLUGIN_EXPORTS) ADD_LIBRARY(SketchPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) TARGET_LINK_LIBRARIES(SketchPlugin ${PROJECT_LIBRARIES}) diff --git a/src/SketchSolver/CMakeLists.txt b/src/SketchSolver/CMakeLists.txt index 46ffb3d91..6a57baa74 100644 --- a/src/SketchSolver/CMakeLists.txt +++ b/src/SketchSolver/CMakeLists.txt @@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/Events ) -ADD_DEFINITIONS(-DSKETCHSOLVER_EXPORTS ${BOOST_DEFINITIONS}) +ADD_DEFINITIONS(-DSKETCHSOLVER_EXPORTS) ADD_LIBRARY(SketchSolver MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ) diff --git a/src/SketchSolver/SketchSolver_ConstraintGroup.cpp b/src/SketchSolver/SketchSolver_ConstraintGroup.cpp index 050c262b5..46caaa45d 100644 --- a/src/SketchSolver/SketchSolver_ConstraintGroup.cpp +++ b/src/SketchSolver/SketchSolver_ConstraintGroup.cpp @@ -287,7 +287,7 @@ bool SketchSolver_ConstraintGroup::changeConstraint( // For the length constraint the start and end points of the line should be added to the entities list instead of line if (aConstrType == SLVS_C_PT_PT_DISTANCE && theConstraint->getKind().compare(SketchPlugin_ConstraintLength::ID()) == 0) { - Slvs_hEntity aLineEnt = changeEntity(aFeature); + Slvs_hEntity aLineEnt = changeEntityFeature(aFeature); int aEntPos = Search(aLineEnt, myEntities); aConstrEnt[indAttr++] = myEntities[aEntPos].point[0]; aConstrEnt[indAttr++] = myEntities[aEntPos].point[1]; @@ -295,7 +295,7 @@ bool SketchSolver_ConstraintGroup::changeConstraint( aConstrEnt[indAttr++] = 0; break; // there should be no other entities } else if (aConstrAttr->isObject()) - aConstrEnt[indAttr] = changeEntity(aFeature); + aConstrEnt[indAttr] = changeEntityFeature(aFeature); else aConstrEnt[indAttr] = changeEntity(aConstrAttr->attr()); } @@ -432,7 +432,7 @@ bool SketchSolver_ConstraintGroup::changeRigidConstraint( aFeature = aDoc->feature(aRC); } - aConstrEnt = aConstrAttr->isObject() ? changeEntity(aFeature) : changeEntity(aConstrAttr->attr()); + aConstrEnt = aConstrAttr->isObject() ? changeEntityFeature(aFeature) : changeEntity(aConstrAttr->attr()); if (aConstrMapIter == myConstraintMap.end()) { // Add new constraint // Check the fixed entity is not a point. @@ -646,7 +646,7 @@ Slvs_hEntity SketchSolver_ConstraintGroup::changeEntity( // Class: SketchSolver_ConstraintGroup // Purpose: create/update the element defined by the feature affected by any constraint // ============================================================================ -Slvs_hEntity SketchSolver_ConstraintGroup::changeEntity(FeaturePtr theEntity) +Slvs_hEntity SketchSolver_ConstraintGroup::changeEntityFeature(FeaturePtr theEntity) { if (!theEntity->data()->isValid()) return SLVS_E_UNKNOWN; @@ -1527,7 +1527,7 @@ void SketchSolver_ConstraintGroup::updateRelatedConstraints( } } -void SketchSolver_ConstraintGroup::updateRelatedConstraints( +void SketchSolver_ConstraintGroup::updateRelatedConstraintsFeature( std::shared_ptr theFeature) const { ConstraintMap::const_iterator aConstrIter = myConstraintMap.begin(); diff --git a/src/SketchSolver/SketchSolver_ConstraintGroup.h b/src/SketchSolver/SketchSolver_ConstraintGroup.h index 46dbd9e0e..4d9a2d769 100644 --- a/src/SketchSolver/SketchSolver_ConstraintGroup.h +++ b/src/SketchSolver/SketchSolver_ConstraintGroup.h @@ -10,7 +10,10 @@ #include #include +#include + +#include #include #include #include @@ -110,7 +113,7 @@ class SketchSolver_ConstraintGroup * \param[in] theEntity attribute of the constraint */ void updateRelatedConstraints(std::shared_ptr theEntity) const; - void updateRelatedConstraints(std::shared_ptr theFeature) const; + void updateRelatedConstraintsFeature(std::shared_ptr theFeature) const; /** \brief Adds or updates an entity in the group * @@ -121,7 +124,7 @@ class SketchSolver_ConstraintGroup * \return identifier of changed entity or 0 if entity could not be changed */ Slvs_hEntity changeEntity(std::shared_ptr theEntity); - Slvs_hEntity changeEntity(FeaturePtr theEntity); + Slvs_hEntity changeEntityFeature(std::shared_ptr theEntity); protected: /** \brief Adds or updates a normal in the group diff --git a/src/SketchSolver/SketchSolver_ConstraintManager.cpp b/src/SketchSolver/SketchSolver_ConstraintManager.cpp index 6cad183e4..24c6572c4 100644 --- a/src/SketchSolver/SketchSolver_ConstraintManager.cpp +++ b/src/SketchSolver/SketchSolver_ConstraintManager.cpp @@ -3,6 +3,7 @@ // Author: Artem ZHIDKOV #include "SketchSolver_ConstraintManager.h" +#include #include #include @@ -11,6 +12,7 @@ #include #include #include +#include #include @@ -19,8 +21,11 @@ #include #include #include +#include #include +#include +#include // Initialization of constraint manager self pointer SketchSolver_ConstraintManager* SketchSolver_ConstraintManager::_self = 0; @@ -210,7 +215,7 @@ bool SketchSolver_ConstraintManager::changeConstraintOrEntity( if ((*aGroupIter)->getId() == aGroupId) { // If the group is empty, the feature is not added (the constraint only) if (!aConstraint && !(*aGroupIter)->isEmpty()) - return (*aGroupIter)->changeEntity(theFeature) != SLVS_E_UNKNOWN; + return (*aGroupIter)->changeEntityFeature(theFeature) != SLVS_E_UNKNOWN; return (*aGroupIter)->changeConstraint(aConstraint); } } else if (aGroups.size() > 1) { // Several groups applicable for this feature => need to merge them @@ -246,7 +251,7 @@ bool SketchSolver_ConstraintManager::changeConstraintOrEntity( if (aConstraint) return (*aFirstGroupIter)->changeConstraint(aConstraint); - return (*aFirstGroupIter)->changeEntity(theFeature) != SLVS_E_UNKNOWN; + return (*aFirstGroupIter)->changeEntityFeature(theFeature) != SLVS_E_UNKNOWN; } // Something goes wrong @@ -301,7 +306,7 @@ void SketchSolver_ConstraintManager::updateEntity( std::vector::iterator aGroupIter; for (aGroupIter = myGroups.begin(); aGroupIter != myGroups.end(); aGroupIter++) if (!(*aGroupIter)->isEmpty()) - (*aGroupIter)->updateRelatedConstraints(theFeature); + (*aGroupIter)->updateRelatedConstraintsFeature(theFeature); } // ============================================================================ @@ -335,8 +340,8 @@ void SketchSolver_ConstraintManager::findGroups( // Class: SketchSolver_Session // Purpose: search workplane containing given feature // ============================================================================ -std::shared_ptr SketchSolver_ConstraintManager::findWorkplane( - std::shared_ptr theFeature) const +std::shared_ptr SketchSolver_ConstraintManager +::findWorkplane(std::shared_ptr theFeature) const { // Already verified workplanes std::set > aVerified; diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp index a37d228eb..0d0f6e384 100644 --- a/src/XGUI/XGUI_Displayer.cpp +++ b/src/XGUI/XGUI_Displayer.cpp @@ -394,7 +394,7 @@ Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const return myWorkshop->viewer()->AISContext(); } -void XGUI_Displayer::display(AISObjectPtr theAIS, bool isUpdate) +void XGUI_Displayer::displayAIS(AISObjectPtr theAIS, bool isUpdate) { Handle(AIS_InteractiveContext) aContext = AISContext(); Handle(AIS_InteractiveObject) anAISIO = theAIS->impl(); @@ -414,7 +414,7 @@ void XGUI_Displayer::display(AISObjectPtr theAIS, bool isUpdate) } } -void XGUI_Displayer::erase(AISObjectPtr theAIS, const bool isUpdate) +void XGUI_Displayer::eraseAIS(AISObjectPtr theAIS, const bool isUpdate) { Handle(AIS_InteractiveContext) aContext = AISContext(); Handle(AIS_InteractiveObject) anAISIO = theAIS->impl(); diff --git a/src/XGUI/XGUI_Displayer.h b/src/XGUI/XGUI_Displayer.h index 575dba31f..5d770e85e 100644 --- a/src/XGUI/XGUI_Displayer.h +++ b/src/XGUI/XGUI_Displayer.h @@ -56,7 +56,7 @@ class XGUI_EXPORT XGUI_Displayer void display(ObjectPtr theObject, bool isUpdateViewer = true); /// Display the given AIS object. To hide this object use corresponde erase method - void display(AISObjectPtr theAIS, bool isUpdate = true); + void displayAIS(AISObjectPtr theAIS, bool isUpdate = true); /// Stop the current selection and color the given features to the selection color /// \param theFeatures a list of features to be disabled @@ -82,7 +82,7 @@ class XGUI_EXPORT XGUI_Displayer void erase(ObjectPtr theObject, const bool isUpdateViewer = true); /// Erase the given AIS object displayed by corresponded display method - void erase(AISObjectPtr theAIS, const bool isUpdate = true); + void eraseAIS(AISObjectPtr theAIS, const bool isUpdate = true); /// Erase all presentations /// \param isUpdateViewer the parameter whether the viewer should be update immediatelly