From: Clarisse Genrault Date: Wed, 15 Feb 2017 15:23:58 +0000 (+0100) Subject: Removed white spaces (Google Style). X-Git-Tag: V_2.7.0~281 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=671694a86b66efcc54948341cf06d717d782c581;p=modules%2Fshaper.git Removed white spaces (Google Style). --- diff --git a/src/FeaturesAPI/FeaturesAPI_MultiTranslation.cpp b/src/FeaturesAPI/FeaturesAPI_MultiTranslation.cpp index 6754b0f48..f32a4dc60 100644 --- a/src/FeaturesAPI/FeaturesAPI_MultiTranslation.cpp +++ b/src/FeaturesAPI/FeaturesAPI_MultiTranslation.cpp @@ -120,7 +120,7 @@ void FeaturesAPI_MultiTranslation::dump(ModelHighAPI_Dumper& theDumper) const AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_MultiTranslation::OBJECTS_LIST_ID()); theDumper << aBase << " = model.addMultiTranslation(" << aDocName << ", " << anAttrObjects; - + AttributeSelectionPtr anAttrFirstAxis = aBase->selection(FeaturesPlugin_MultiTranslation::AXIS_FIRST_DIR_ID()); AttributeDoublePtr anAttrFirstStep = @@ -129,7 +129,7 @@ void FeaturesAPI_MultiTranslation::dump(ModelHighAPI_Dumper& theDumper) const aBase->integer(FeaturesPlugin_MultiTranslation::NB_COPIES_FIRST_DIR_ID()); theDumper << ", " << anAttrFirstAxis << ", " << anAttrFirstStep; theDumper << ", " << anAttrFirstNumber; - + if (aBase->string(FeaturesPlugin_MultiTranslation::USE_SECOND_DIR_ID())->isInitialized() && !aBase->string(FeaturesPlugin_MultiTranslation::USE_SECOND_DIR_ID())->value().empty()) { AttributeSelectionPtr anAttrSecondAxis = diff --git a/src/FeaturesAPI/FeaturesAPI_MultiTranslation.h b/src/FeaturesAPI/FeaturesAPI_MultiTranslation.h index a06c71f2f..09e75f9c1 100644 --- a/src/FeaturesAPI/FeaturesAPI_MultiTranslation.h +++ b/src/FeaturesAPI/FeaturesAPI_MultiTranslation.h @@ -84,7 +84,7 @@ public: FEATURESAPI_EXPORT void setSecondAxisAndDistance(const ModelHighAPI_Selection& theAxisObject, const ModelHighAPI_Double& theDistance); - + /// Modify CreationMethod, nb_first_dir attribute of the feature. FEATURESAPI_EXPORT void setFirstNumber(const ModelHighAPI_Integer& theFirstNumber); diff --git a/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp index d92efbab6..5ef6bba71 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp @@ -39,7 +39,7 @@ void FeaturesPlugin_MultiTranslation::initAttributes() ModelAPI_AttributeDouble::typeId()); data()->addAttribute(FeaturesPlugin_MultiTranslation::NB_COPIES_FIRST_DIR_ID(), ModelAPI_AttributeInteger::typeId()); - + data()->addAttribute(FeaturesPlugin_MultiTranslation::USE_SECOND_DIR_ID(), ModelAPI_AttributeString::typeId()); data()->addAttribute(FeaturesPlugin_MultiTranslation::AXIS_SECOND_DIR_ID(), @@ -102,33 +102,32 @@ void FeaturesPlugin_MultiTranslation::performOneDirection() // Getting step. double aStep = real(FeaturesPlugin_MultiTranslation::STEP_FIRST_DIR_ID())->value(); - + // Getting number of copies. - int nbCopies = + int nbCopies = integer(FeaturesPlugin_MultiTranslation::NB_COPIES_FIRST_DIR_ID())->value(); - + // Moving each object. - int aResultIndex = 0; std::list::iterator aContext = aContextes.begin(); for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++, aContext++) { std::shared_ptr aBaseShape = *anObjectsIt; - + ListOfShape aListOfShape; std::list > aListOfTranslationAlgo; - + for (int i=0; i aTranslationAlgo( new GeomAlgoAPI_Translation(aBaseShape, anAxis, i*aStep)); - + if (!aTranslationAlgo->check()) { setError(aTranslationAlgo->getError()); break; } - + aTranslationAlgo->build(); - + // Checking that the algorithm worked properly. if (!aTranslationAlgo->isDone()) { static const std::string aFeatureError = "Error : Multitranslation algorithm failed."; @@ -152,7 +151,7 @@ void FeaturesPlugin_MultiTranslation::performOneDirection() ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); aResultBody->storeModified(aBaseShape, aCompound); loadNamingDS(aListOfTranslationAlgo, aResultBody, aBaseShape); - + setResult(aResultBody, aResultIndex); aResultIndex++; } @@ -163,7 +162,7 @@ void FeaturesPlugin_MultiTranslation::performOneDirection() //================================================================================================= void FeaturesPlugin_MultiTranslation::performTwoDirection() -{ +{ // Getting objects. ListOfShape anObjects; std::list aContextes; @@ -215,35 +214,35 @@ void FeaturesPlugin_MultiTranslation::performTwoDirection() // Getting step. double aFirstStep = real(FeaturesPlugin_MultiTranslation::STEP_FIRST_DIR_ID())->value(); double aSecondStep = real(FeaturesPlugin_MultiTranslation::STEP_SECOND_DIR_ID())->value(); - + // Getting number of copies. - int aFirstNbCopies = + int aFirstNbCopies = integer(FeaturesPlugin_MultiTranslation::NB_COPIES_FIRST_DIR_ID())->value(); - int aSecondNbCopies = + int aSecondNbCopies = integer(FeaturesPlugin_MultiTranslation::NB_COPIES_SECOND_DIR_ID())->value(); - + // Coord aFirstAxis double x1 = aFirstAxis->dir()->x(); double y1 = aFirstAxis->dir()->y(); double z1 = aFirstAxis->dir()->z(); double norm1 = sqrt(x1*x1 + y1*y1 + z1*z1); - + // Coord aSecondAxis double x2 = aSecondAxis->dir()->x(); double y2 = aSecondAxis->dir()->y(); double z2 = aSecondAxis->dir()->z(); double norm2 = sqrt(x2*x2 + y2*y2 + z2*z2); - + // Moving each object. int aResultIndex = 0; std::list::iterator aContext = aContextes.begin(); for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++, aContext++) { std::shared_ptr aBaseShape = *anObjectsIt; - + ListOfShape aListOfShape; std::list > aListOfTranslationAlgo; - + for (int j=0; j aTranslationAlgo( new GeomAlgoAPI_Translation(aBaseShape, dx, dy, dz)); - + if (!aTranslationAlgo->check()) { setError(aTranslationAlgo->getError()); break; } - + aTranslationAlgo->build(); - + // Checking that the algorithm worked properly. if (!aTranslationAlgo->isDone()) { static const std::string aFeatureError = "Error : Multitranslation algorithm failed."; @@ -300,7 +299,7 @@ void FeaturesPlugin_MultiTranslation::loadNamingDS( int aTag = 1; int anIndex = 1; std::string aTranslatedName; - + for (std::list >::const_iterator anIt = theListOfTranslationAlgo.begin(); anIt != theListOfTranslationAlgo.cend(); ++anIt) { std::shared_ptr aSubShapes = (*anIt)->mapOfSubShapes(); @@ -322,7 +321,7 @@ void FeaturesPlugin_MultiTranslation::loadNamingDS( theResultBody->loadAndOrientModifiedShapes((*anIt).get(), theBaseShape, GeomAPI_Shape::VERTEX, aTag++, aTranslatedName, *aSubShapes.get(), false, true); - + ++anIndex; } -} \ No newline at end of file +}