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

Port to VC12

Browse Source
This commit is contained in:
jriegel 2014-11-15 14:07:02 +01:00
parent f2d990d9ca
commit 8c1b1aa86b
16 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,13 +211,13 @@ istream & NETGENPlugin_Hypothesis::LoadFrom(istream & load)
int is; int is;
double val; double val;
isOK = (load >> val); isOK = !(load >> val).bad();
if (isOK) if (isOK)
_maxSize = val; _maxSize = val;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> is); isOK = !(load >> is).bad();
if (isOK) if (isOK)
SetFineness((Fineness) is); SetFineness((Fineness) is);
else else
@ -225,32 +225,32 @@ istream & NETGENPlugin_Hypothesis::LoadFrom(istream & load)
if (_fineness == UserDefined) if (_fineness == UserDefined)
{ {
isOK = (load >> val); isOK = !(load >> val).bad();
if (isOK) if (isOK)
_growthRate = val; _growthRate = val;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> val); isOK = !(load >> val).bad();
if (isOK) if (isOK)
_nbSegPerEdge = val; _nbSegPerEdge = val;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> val); isOK = !(load >> val).bad();
if (isOK) if (isOK)
_nbSegPerRadius = val; _nbSegPerRadius = val;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
} }
isOK = (load >> is); isOK = !(load >> is).bad();
if (isOK) if (isOK)
_secondOrder = (bool) is; _secondOrder = (bool) is;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> is); isOK = !(load >> is).bad();
if (isOK) if (isOK)
_optimize = (bool) is; _optimize = (bool) is;
else else

2
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cpp vendored
View File

@ -96,7 +96,7 @@ istream & NETGENPlugin_Hypothesis_2D::LoadFrom(istream & load)
bool isOK = true; bool isOK = true;
int is; int is;
isOK = (load >> is); isOK = !(load >> is).bad();
if (isOK) if (isOK)
_quadAllowed = (bool) is; _quadAllowed = (bool) is;
else else

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

@ -142,19 +142,19 @@ istream & NETGENPlugin_SimpleHypothesis_2D::LoadFrom(istream & load)
bool isOK = true; bool isOK = true;
double val; double val;
isOK = (load >> val); isOK = !(load >> val).bad();
if (isOK) if (isOK)
_nbSegments = (int) val; _nbSegments = (int) val;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> val); isOK = !(load >> val).bad();
if (isOK) if (isOK)
_segmentLength = val; _segmentLength = val;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> val); isOK = !(load >> val).bad();
if (isOK) if (isOK)
_area = val; _area = val;
else else

2
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cpp vendored
View File

@ -108,7 +108,7 @@ istream & NETGENPlugin_SimpleHypothesis_3D::LoadFrom(istream & load)
bool isOK = true; bool isOK = true;
double val; double val;
isOK = (load >> val); isOK = !(load >> val).bad();
if (isOK) if (isOK)
_volume = val; _volume = val;
else else

4
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Arithmetic1D.cpp vendored
View File

@ -120,10 +120,10 @@ ostream & StdMeshers_Arithmetic1D::SaveTo(ostream & save)
istream & StdMeshers_Arithmetic1D::LoadFrom(istream & load) istream & StdMeshers_Arithmetic1D::LoadFrom(istream & load)
{ {
bool isOK = true; bool isOK = true;
isOK = (load >> _begLength); isOK = !(load >> _begLength).bad();
if (!isOK) if (!isOK)
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> _endLength); isOK = !(load >> _endLength).bad();
if (!isOK) if (!isOK)
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
return load; return load;

2
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Deflection1D.cpp vendored
View File

@ -119,7 +119,7 @@ ostream & StdMeshers_Deflection1D::SaveTo(ostream & save)
istream & StdMeshers_Deflection1D::LoadFrom(istream & load) istream & StdMeshers_Deflection1D::LoadFrom(istream & load)
{ {
bool isOK = (load >> _value); bool isOK = !(load >> _value).bad();
if (!isOK) if (!isOK)
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
return load; return load;

2
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LengthFromEdges.cpp vendored
View File

@ -106,7 +106,7 @@ istream & StdMeshers_LengthFromEdges::LoadFrom(istream & load)
{ {
bool isOK = true; bool isOK = true;
int a; int a;
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
this->_mode = a; this->_mode = a;
else else

4
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_LocalLength.cpp vendored
View File

@ -148,13 +148,13 @@ istream & StdMeshers_LocalLength::LoadFrom(istream & load)
bool isOK = true; bool isOK = true;
double a; double a;
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
this->_length = a; this->_length = a;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
this->_precision = a; this->_precision = a;
else else

2
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementArea.cpp vendored
View File

@ -114,7 +114,7 @@ istream & StdMeshers_MaxElementArea::LoadFrom(istream & load)
{ {
bool isOK = true; bool isOK = true;
double a; double a;
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
this->_maxArea = a; this->_maxArea = a;
else else

2
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxElementVolume.cpp vendored
View File

@ -116,7 +116,7 @@ istream & StdMeshers_MaxElementVolume::LoadFrom(istream & load)
{ {
bool isOK = true; bool isOK = true;
double a; double a;
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
this->_maxVolume = a; this->_maxVolume = a;
else else

6
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_MaxLength.cpp vendored
View File

@ -159,20 +159,20 @@ istream & StdMeshers_MaxLength::LoadFrom(istream & load)
bool isOK = true; bool isOK = true;
double a; double a;
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
_length = a; _length = a;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
_preestimated = a; _preestimated = a;
else else
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
bool pre; bool pre;
isOK = (load >> pre); isOK = !(load >> pre).bad();
if ( isOK ) if ( isOK )
_preestimation = pre; _preestimation = pre;
else else

2
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_NumberOfLayers.cpp vendored
View File

@ -118,7 +118,7 @@ ostream & StdMeshers_NumberOfLayers::SaveTo(ostream & save)
istream & StdMeshers_NumberOfLayers::LoadFrom(istream & load) istream & StdMeshers_NumberOfLayers::LoadFrom(istream & load)
{ {
bool isOK = true; bool isOK = true;
isOK = (load >> _nbLayers); isOK = !(load >> _nbLayers).bad();
if (!isOK) if (!isOK)
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
return load; return load;

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

@ -520,7 +520,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
int a; int a;
// read number of segments // read number of segments
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
_numberOfSegments = a; _numberOfSegments = a;
else else
@ -533,7 +533,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
// (nb.segments, distr.type, some other params.), // (nb.segments, distr.type, some other params.),
// we wait here the ditribution type, which is integer // we wait here the ditribution type, which is integer
double scale_factor; double scale_factor;
isOK = (load >> scale_factor); isOK = !(load >> scale_factor).bad();
a = (int)scale_factor; a = (int)scale_factor;
// try to interprete ditribution type, // try to interprete ditribution type,
@ -554,7 +554,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
{ {
case DT_Scale: case DT_Scale:
{ {
isOK = (load >> b); isOK = !(load >> b).bad();
if (isOK) if (isOK)
_scaleFactor = b; _scaleFactor = b;
else else
@ -568,14 +568,14 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
break; break;
case DT_TabFunc: case DT_TabFunc:
{ {
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
{ {
_table.resize(a, 0.); _table.resize(a, 0.);
int i; int i;
for (i=0; i < _table.size(); i++) for (i=0; i < _table.size(); i++)
{ {
isOK = (load >> b); isOK = !(load >> b).bad();
if (isOK) if (isOK)
_table[i] = b; _table[i] = b;
else else
@ -594,7 +594,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
case DT_ExprFunc: case DT_ExprFunc:
{ {
string str; string str;
isOK = (load >> str); isOK = !(load >> str).bad();
if (isOK) if (isOK)
_func = str; _func = str;
else else
@ -613,7 +613,7 @@ istream & StdMeshers_NumberOfSegments::LoadFrom(istream & load)
if (_distrType == DT_TabFunc || _distrType == DT_ExprFunc) if (_distrType == DT_TabFunc || _distrType == DT_ExprFunc)
{ {
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
_convMode = a; _convMode = a;
else else

2
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cpp vendored
View File

@ -117,7 +117,7 @@ istream & StdMeshers_SegmentLengthAroundVertex::LoadFrom(istream & load)
{ {
bool isOK = true; bool isOK = true;
double a; double a;
isOK = (load >> a); isOK = !(load >> a).bad();
if (isOK) if (isOK)
this->_length = a; this->_length = a;
else else

4
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_StartEndLength.cpp vendored
View File

@ -121,10 +121,10 @@ ostream & StdMeshers_StartEndLength::SaveTo(ostream & save)
istream & StdMeshers_StartEndLength::LoadFrom(istream & load) istream & StdMeshers_StartEndLength::LoadFrom(istream & load)
{ {
bool isOK = true; bool isOK = true;
isOK = (load >> _begLength); isOK = !(load >> _begLength).bad();
if (!isOK) if (!isOK)
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
isOK = (load >> _endLength); isOK = !(load >> _endLength).bad();
if (!isOK) if (!isOK)
load.clear(ios::badbit | load.rdstate()); load.clear(ios::badbit | load.rdstate());
return load; return load;

1
src/Mod/Sketcher/App/freegcs/Constraints.cpp
View File

@ -22,6 +22,7 @@
#include <cmath> #include <cmath>
#include "Constraints.h" #include "Constraints.h"
#include <algorithm>
namespace GCS namespace GCS
{ {