From 05b36100907f5422250b7b0bb62de52b28bad3f4 Mon Sep 17 00:00:00 2001 From: OTB Bot <otbbot@orfeo-toolbox.org> Date: Mon, 19 Mar 2012 19:56:04 +0100 Subject: [PATCH] STYLE --- Code/Common/otbDataNode.txx | 2 +- .../otbVectorDataEditVertexActionHandler.h | 2 +- Code/Visualization/otbVectorDataEditionModel.cxx | 12 ++++++------ Code/Visualization/otbVectorDataEditionModel.h | 6 +++--- .../otbVectorDataTranslateGeometryActionHandler.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Code/Common/otbDataNode.txx b/Code/Common/otbDataNode.txx index d7878caf66..4cbf90948a 100644 --- a/Code/Common/otbDataNode.txx +++ b/Code/Common/otbDataNode.txx @@ -602,7 +602,7 @@ DataNode<TPrecision, VDimension, TValuePrecision> break; } - return NULL; + return NULL; } template <class TPrecision, unsigned int VDimension, class TValuePrecision> diff --git a/Code/Visualization/otbVectorDataEditVertexActionHandler.h b/Code/Visualization/otbVectorDataEditVertexActionHandler.h index ffd0addeba..4bf2567b67 100644 --- a/Code/Visualization/otbVectorDataEditVertexActionHandler.h +++ b/Code/Visualization/otbVectorDataEditVertexActionHandler.h @@ -112,7 +112,7 @@ public: return true; } } - } + } } return false; } diff --git a/Code/Visualization/otbVectorDataEditionModel.cxx b/Code/Visualization/otbVectorDataEditionModel.cxx index 6467440562..028670a14b 100644 --- a/Code/Visualization/otbVectorDataEditionModel.cxx +++ b/Code/Visualization/otbVectorDataEditionModel.cxx @@ -32,7 +32,7 @@ VectorDataEditionModel::VectorDataEditionModel() : void VectorDataEditionModel::UpdatePoint( PointType srcPoint, PointType dstPoint) -{ +{ srcPoint[0] = this->GetOrigin()[0] + srcPoint[0] / this->GetSpacing()[0]; srcPoint[1] = this->GetOrigin()[1] + srcPoint[1] / this->GetSpacing()[1]; @@ -124,7 +124,7 @@ VectorDataEditionModel::UpdateGeometryPosition(double tx, double ty) break; case FEATURE_POLYGON: { - newVertexList + newVertexList = const_cast< VertexListType*>(GetSelectedGeometry()->GetPolygonExteriorRing()->GetVertexList()); this->ProcessVertexListTranslation(newVertexList, tx, ty); @@ -141,9 +141,9 @@ VectorDataEditionModel::UpdateGeometryPosition(double tx, double ty) } } - chrono.Stop(); + chrono.Stop(); // std::cout<< "\tVectorDataEditionModel::UpdateGeometyPosition index " - // << m_SearchIndex <<" with tx: " << tx << " ty: "<< ty + // << m_SearchIndex <<" with tx: " << tx << " ty: "<< ty // <<" took " << chrono.GetMeanTime() << " seconds." // <<std::endl; } @@ -160,7 +160,7 @@ VectorDataEditionModel::SearchDataNodeIndexFromPoint( PointType srcPoint) chrono.Start(); // Initialize the search index - m_SearchIndex = -1; + m_SearchIndex = -1; // Search wich geometry the src point belong to itk::PreOrderTreeIterator<VectorDataType::DataTreeType> it(this->GetVectorData()->GetDataTree()); @@ -183,7 +183,7 @@ VectorDataEditionModel::SearchDataNodeIndexFromPoint( PointType srcPoint) ++it; } - chrono.Stop(); + chrono.Stop(); //std::cout<< "\tVectorDataEditionModel::SearchDataNodeIndexFromPoint " //<< " -> m_SearchIndex "<< m_SearchIndex <<" found in " << chrono.GetMeanTime() << " seconds." //<<std::endl; diff --git a/Code/Visualization/otbVectorDataEditionModel.h b/Code/Visualization/otbVectorDataEditionModel.h index b342e85e6e..86a45f0cca 100644 --- a/Code/Visualization/otbVectorDataEditionModel.h +++ b/Code/Visualization/otbVectorDataEditionModel.h @@ -30,7 +30,7 @@ namespace otb { /** \class VectorDataEditionModel * \brief Model to handle vector data (point, line, polygons) vertex - * edition and geometry position + * edition and geometry position * * \sa VectorDataEditVertexActionHandler, VectorDataTranslateGeometryActionHandler * @@ -80,8 +80,8 @@ protected: /** Destructor */ virtual ~VectorDataEditionModel(){} - void ProcessVertexListTranslation(VertexListType* vertexList, - double tx, + void ProcessVertexListTranslation(VertexListType* vertexList, + double tx, double ty); private: diff --git a/Code/Visualization/otbVectorDataTranslateGeometryActionHandler.h b/Code/Visualization/otbVectorDataTranslateGeometryActionHandler.h index bb6ed95190..25d93b94b8 100644 --- a/Code/Visualization/otbVectorDataTranslateGeometryActionHandler.h +++ b/Code/Visualization/otbVectorDataTranslateGeometryActionHandler.h @@ -112,7 +112,7 @@ public: return false; } } - } + } } return false; } -- GitLab