From 65fabda84bcbe9e675ea0ce3c34c1c822255c01d Mon Sep 17 00:00:00 2001 From: azv Date: Wed, 20 Nov 2019 11:20:28 +0300 Subject: [PATCH] Meet the coding style (split too long lines) --- src/BuildPlugin/BuildPlugin_Vertex.cpp | 18 ++++++++++++------ .../FeaturesPlugin_ExtrusionFuse.cpp | 6 ++++-- src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp | 12 ++++++++---- src/ModuleBase/ModuleBase_IModule.h | 3 ++- src/PartSet/PartSet_Module.cpp | 3 ++- src/SketchPlugin/SketchPlugin_SketchEntity.h | 3 ++- 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/BuildPlugin/BuildPlugin_Vertex.cpp b/src/BuildPlugin/BuildPlugin_Vertex.cpp index cd14766ed..f2b206177 100644 --- a/src/BuildPlugin/BuildPlugin_Vertex.cpp +++ b/src/BuildPlugin/BuildPlugin_Vertex.cpp @@ -77,7 +77,8 @@ bool BuildPlugin_Vertex::buildVertices(GeomShapePtr theShape, GeomAPI_DataMapOfShapeShape alreadyProcessed; // 1. Explode on Vertices - for (GeomAPI_ShapeExplorer anExp (theShape, GeomAPI_Shape::VERTEX); anExp.more(); anExp.next()) { + for (GeomAPI_ShapeExplorer anExp (theShape, GeomAPI_Shape::VERTEX); + anExp.more(); anExp.next()) { GeomShapePtr aSubShape = anExp.current(); if (alreadyProcessed.bind(aSubShape, aSubShape)) { @@ -94,7 +95,8 @@ bool BuildPlugin_Vertex::buildVertices(GeomShapePtr theShape, // Partition ListOfShape anObjList, aTools; anObjList.push_back(theShape); - std::shared_ptr aPartitionAlgo (new GeomAlgoAPI_Partition(anObjList, aTools)); + std::shared_ptr aPartitionAlgo ( + new GeomAlgoAPI_Partition(anObjList, aTools)); std::string anError; if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aPartitionAlgo, getKind(), anError)) { @@ -104,7 +106,8 @@ bool BuildPlugin_Vertex::buildVertices(GeomShapePtr theShape, GeomShapePtr aSplittedSketch = aPartitionAlgo->shape(); // Explode on Vertices, skip vertices of initial sketch - for (GeomAPI_ShapeExplorer anExp (aSplittedSketch, GeomAPI_Shape::VERTEX); anExp.more(); anExp.next()) { + for (GeomAPI_ShapeExplorer anExp (aSplittedSketch, GeomAPI_Shape::VERTEX); + anExp.more(); anExp.next()) { GeomShapePtr aSubShape = anExp.current(); //if (!theShape->isSubShape(aSubShape)) { // skip vertices of initial sketch @@ -160,7 +163,8 @@ bool BuildPlugin_Vertex::buildVertices(FeaturePtr theFeature, // Partition ListOfShape anObjList, aTools; anObjList.push_back(theShape); - std::shared_ptr aPartitionAlgo (new GeomAlgoAPI_Partition(anObjList, aTools)); + std::shared_ptr aPartitionAlgo ( + new GeomAlgoAPI_Partition(anObjList, aTools)); std::string anError; if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aPartitionAlgo, getKind(), anError)) { @@ -170,7 +174,8 @@ bool BuildPlugin_Vertex::buildVertices(FeaturePtr theFeature, GeomShapePtr aSplittedSketch = aPartitionAlgo->shape(); // Explode on Vertices, skip vertices of initial sketch - for (GeomAPI_ShapeExplorer anExp (aSplittedSketch, GeomAPI_Shape::VERTEX); anExp.more(); anExp.next()) { + for (GeomAPI_ShapeExplorer anExp (aSplittedSketch, GeomAPI_Shape::VERTEX); + anExp.more(); anExp.next()) { GeomShapePtr aSubShape = anExp.current(); //if (!theShape->isSubShape(aSubShape)) { // skip vertices of initial sketch @@ -196,7 +201,8 @@ bool BuildPlugin_Vertex::buildVertices(FeaturePtr theFeature, // Sub-result i GeomShapePtr aSubResShape = aRes->shape(); - for (GeomAPI_ShapeExplorer anExp (aSubResShape, GeomAPI_Shape::VERTEX); anExp.more(); anExp.next()) { + for (GeomAPI_ShapeExplorer anExp (aSubResShape, GeomAPI_Shape::VERTEX); + anExp.more(); anExp.next()) { GeomShapePtr aSubShape = anExp.current(); if (alreadyProcessed.bind(aSubShape, aSubShape)) { diff --git a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.cpp b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.cpp index a50ec3768..849e1cd45 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.cpp @@ -73,10 +73,12 @@ void FeaturesPlugin_ExtrusionFuse::executeFuseThroughAll() for (ListOfMakeShape::const_iterator anIt = aGenMakeShapes.cbegin(); anIt != aGenMakeShapes.cend(); ++anIt) { GeomMakeShapePtr anAlgo = (*anIt); - std::shared_ptr aPrismAlgo = std::dynamic_pointer_cast(anAlgo); + std::shared_ptr aPrismAlgo = + std::dynamic_pointer_cast(anAlgo); // Cut the prism by all objects and throw away end pieces - std::shared_ptr aToolAlgo (new GeomAlgoAPI_ThroughAll(aPrismAlgo, anObjects)); + std::shared_ptr aToolAlgo ( + new GeomAlgoAPI_ThroughAll(aPrismAlgo, anObjects)); // Checking that the algorithm worked properly if (!aToolAlgo->isDone() || aToolAlgo->shape()->isNull() || !aToolAlgo->isValid()) { diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp index 71426779d..77aeaad15 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp @@ -1154,7 +1154,8 @@ void GeomAlgoAPI_ShapeTools::computeThroughAll(const ListOfShape& theObjects, double& theToSize, double& theFromSize) { // Bounding box of objects - std::list > aBndObjs = GeomAlgoAPI_ShapeTools::getBoundingBox(theObjects); + std::list > aBndObjs = + GeomAlgoAPI_ShapeTools::getBoundingBox(theObjects); if (aBndObjs.size() != 8) { return; } @@ -1165,7 +1166,8 @@ void GeomAlgoAPI_ShapeTools::computeThroughAll(const ListOfShape& theObjects, gp_Dir aDir = theDir->impl(); // Bounding box of the base - std::list > aBndBases = GeomAlgoAPI_ShapeTools::getBoundingBox(theBaseShapes); + std::list > aBndBases = + GeomAlgoAPI_ShapeTools::getBoundingBox(theBaseShapes); if (aBndBases.size() != 8) { return; } @@ -1189,13 +1191,15 @@ void GeomAlgoAPI_ShapeTools::computeThroughAll(const ListOfShape& theObjects, theToSize = 0.0; theFromSize = 0.0; - for (ListOfShape::const_iterator anIt = theBaseShapes.begin(); anIt != theBaseShapes.end(); ++anIt) { + for (ListOfShape::const_iterator anIt = theBaseShapes.begin(); + anIt != theBaseShapes.end(); ++anIt) { const GeomShapePtr& aBaseShape_i = (*anIt); ListOfShape aBaseShapes_i; aBaseShapes_i.push_back(aBaseShape_i); // Bounding box of the base - std::list > aBndBases = GeomAlgoAPI_ShapeTools::getBoundingBox(aBaseShapes_i); + std::list > aBndBases = + GeomAlgoAPI_ShapeTools::getBoundingBox(aBaseShapes_i); if (aBndBases.size() != 8) { return; } diff --git a/src/ModuleBase/ModuleBase_IModule.h b/src/ModuleBase/ModuleBase_IModule.h index d2ce9c4a9..a2c250dbf 100644 --- a/src/ModuleBase/ModuleBase_IModule.h +++ b/src/ModuleBase/ModuleBase_IModule.h @@ -323,7 +323,8 @@ class MODULEBASE_EXPORT ModuleBase_IModule : public QObject /// Customize presentation according to objects attributes /// \param theObject an object for presentation /// \param thePrs a presentation object - virtual void customizePresentation(const ObjectPtr& theObject, const AISObjectPtr& thePrs) const {} + virtual void customizePresentation(const ObjectPtr& theObject, const AISObjectPtr& thePrs) const + {} //! Returns data object by AIS virtual ObjectPtr findPresentedObject(const AISObjectPtr& theAIS) const = 0; diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 5245438e5..352428460 100644 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -1359,7 +1359,8 @@ double getResultTransparency(const ResultPtr& theResult) //****************************************************** -void PartSet_Module::customizePresentation(const ObjectPtr& theObject, const AISObjectPtr& thePrs) const +void PartSet_Module::customizePresentation(const ObjectPtr& theObject, + const AISObjectPtr& thePrs) const { if (mySketchMgr->isSketchStarted()) { mySketchMgr->customizeSketchPresentation(theObject, thePrs); diff --git a/src/SketchPlugin/SketchPlugin_SketchEntity.h b/src/SketchPlugin/SketchPlugin_SketchEntity.h index b181565a7..4d85894e5 100644 --- a/src/SketchPlugin/SketchPlugin_SketchEntity.h +++ b/src/SketchPlugin/SketchPlugin_SketchEntity.h @@ -179,7 +179,8 @@ class SketchPlugin_SketchEntity : public SketchPlugin_Feature //, public GeomAPI // } // if (!aColor.empty()) { // if (theResult.get() && ModelAPI_Session::get()->isOperation()) { - // AttributeIntArrayPtr aColorAttr = theResult->data()->intArray(ModelAPI_Result::COLOR_ID()); + // AttributeIntArrayPtr aColorAttr = + // theResult->data()->intArray(ModelAPI_Result::COLOR_ID()); // aColorAttr->setSize(3); // // Set the color attribute in order do not use default colors in the presentation object // for (int i = 0; i < 3; i++) -- 2.30.2