From dd3412b15918e064a4ed4b4664130cbb5ce85acb Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 1 Dec 2014 11:36:33 +0100 Subject: [PATCH] + improve whitespaces --- .../NETGENPlugin/NETGENPlugin_Hypothesis.cpp | 6 +++--- .../StdMeshers/StdMeshers_NumberOfSegments.cpp | 10 +++++----- src/App/Application.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 18 ++++++++++-------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp index b57ff17ca..44553557c 100644 --- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp +++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp @@ -225,19 +225,19 @@ istream & NETGENPlugin_Hypothesis::LoadFrom(istream & load) if (_fineness == UserDefined) { - isOK = !(load >> val).bad(); + isOK = !(load >> val).bad(); if (isOK) _growthRate = val; else load.clear(ios::badbit | load.rdstate()); - isOK = !(load >> val).bad(); + isOK = !(load >> val).bad(); if (isOK) _nbSegPerEdge = val; else load.clear(ios::badbit | load.rdstate()); - isOK = !(load >> val).bad(); + isOK = !(load >> val).bad(); if (isOK) _nbSegPerRadius = val; else diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfSegments.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfSegments.cpp index 30af4fbd5..c1c1c7398 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfSegments.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfSegments.cpp @@ -554,7 +554,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load) { case DT_Scale: { - isOK = !(load >> b).bad(); + isOK = !(load >> b).bad(); if (isOK) _scaleFactor = b; else @@ -568,14 +568,14 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load) break; case DT_TabFunc: { - isOK = !(load >> a).bad(); + isOK = !(load >> a).bad(); if (isOK) { _table.resize(a, 0.); int i; for (i=0; i < _table.size(); i++) { - isOK = !(load >> b).bad(); + isOK = !(load >> b).bad(); if (isOK) _table[i] = b; else @@ -594,7 +594,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load) case DT_ExprFunc: { string str; - isOK = !(load >> str).bad(); + isOK = !(load >> str).bad(); if (isOK) _func = str; else @@ -613,7 +613,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load) if (_distrType == DT_TabFunc || _distrType == DT_ExprFunc) { - isOK = !(load >> a).bad(); + isOK = !(load >> a).bad(); if (isOK) _convMode = a; else diff --git a/src/App/Application.cpp b/src/App/Application.cpp index e7b9af325..6ed14d0a5 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -912,7 +912,7 @@ void Application::destructObserver(void) if ( _pConsoleObserverStd ) { Console().DetachObserver(_pConsoleObserverStd); delete _pConsoleObserverStd; - _pConsoleObserverStd = 0; + _pConsoleObserverStd = 0; } } diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index 04c2a42b2..4f0c21f92 100755 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -415,14 +415,16 @@ std::string ViewProviderFemMesh::getElement(const SoDetail* detail) const // int edge = line_detail->getLineIndex() + 1; // str << "Edge" << edge; //} - else if (detail->getTypeId() == SoPointDetail::getClassTypeId()) { - const SoPointDetail* point_detail = static_cast(detail); - int idx = point_detail->getCoordinateIndex(); - if (idx < vNodeElementIdx.size()) { - int vertex = vNodeElementIdx[point_detail->getCoordinateIndex()]; - str << "Node" << vertex; - }else - return ""; + else if (detail->getTypeId() == SoPointDetail::getClassTypeId()) { + const SoPointDetail* point_detail = static_cast(detail); + int idx = point_detail->getCoordinateIndex(); + if (idx < vNodeElementIdx.size()) { + int vertex = vNodeElementIdx[point_detail->getCoordinateIndex()]; + str << "Node" << vertex; + } + else { + return std::string(); + } } }