suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ improve whitespaces

Browse Source
This commit is contained in:
wmayer 2014-12-01 11:36:33 +01:00
parent 73859191f3
commit dd3412b159
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis.cpp vendored
View File

@ -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

10
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfSegments.cpp vendored
View File

@ -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

2
src/App/Application.cpp
View File

@ -912,7 +912,7 @@ void Application::destructObserver(void)
if ( _pConsoleObserverStd ) {
Console().DetachObserver(_pConsoleObserverStd);
delete _pConsoleObserverStd;
_pConsoleObserverStd = 0;
_pConsoleObserverStd = 0;
}
}

18
src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
View File

@ -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<const SoPointDetail*>(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<const SoPointDetail*>(detail);
int idx = point_detail->getCoordinateIndex();
if (idx < vNodeElementIdx.size()) {
int vertex = vNodeElementIdx[point_detail->getCoordinateIndex()];
str << "Node" << vertex;
}
else {
return std::string();
}
}
}