Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation problem
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_Actor.cxx
diff --git
a/src/OBJECT/SMESH_Actor.cxx
b/src/OBJECT/SMESH_Actor.cxx
index 1c9af415d5b13b7b52435b590c1e1d92b1f71808..b0136d8e4f62a00ca5e9409bbc50b65eef3f6244 100644
(file)
--- a/
src/OBJECT/SMESH_Actor.cxx
+++ b/
src/OBJECT/SMESH_Actor.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-82,9
+82,9
@@
#include "utilities.h"
#ifdef _DEBUG_
#include "utilities.h"
#ifdef _DEBUG_
-static int MYDEBUG =
1
;
+static int MYDEBUG =
0
;
#else
#else
-static int MYDEBUG =
1
;
+static int MYDEBUG =
0
;
#endif
static int aLineWidthInc = 2;
#endif
static int aLineWidthInc = 2;
@@
-799,8
+799,7
@@
SetControlMode(eControl theMode)
void
SMESH_ActorDef::
void
SMESH_ActorDef::
-SetControlMode(eControl theMode,
- bool theCheckEntityMode)
+SetControlMode( eControl theMode, bool theCheckEntityMode )
{
vtkLookupTable* lookupTable = static_cast<vtkLookupTable*>(myScalarBarActor->GetLookupTable());
bool isLogarithmic = lookupTable->GetScale() == VTK_SCALE_LOG10;
{
vtkLookupTable* lookupTable = static_cast<vtkLookupTable*>(myScalarBarActor->GetLookupTable());
bool isLogarithmic = lookupTable->GetScale() == VTK_SCALE_LOG10;
@@
-1707,13
+1706,14
@@
void SMESH_ActorDef::SetRepresentation (int theMode)
my0DActor->SetRepresentation(aReperesent);
myBallActor->SetRepresentation(aReperesent);
my0DActor->SetRepresentation(aReperesent);
myBallActor->SetRepresentation(aReperesent);
- switch
(myControlMode)
{
+ switch
( myControlMode )
{
case eLength:
case eMultiConnection:
aProp = aBackProp = my1DProp;
if(myRepresentation != ePoint)
aReperesent = SMESH_DeviceActor::eInsideframe;
break;
case eLength:
case eMultiConnection:
aProp = aBackProp = my1DProp;
if(myRepresentation != ePoint)
aReperesent = SMESH_DeviceActor::eInsideframe;
break;
+ default:;
}
if(aQuadraticMode == SMESH_Actor::eLines)
}
if(aQuadraticMode == SMESH_Actor::eLines)
@@
-2253,7
+2253,7
@@
vtkPlane*
SMESH_ActorDef::
GetClippingPlane(vtkIdType theID)
{
SMESH_ActorDef::
GetClippingPlane(vtkIdType theID)
{
- if
(theID >= myCippingPlaneCont.size()
)
+ if
( theID >= (vtkIdType)myCippingPlaneCont.size()
)
return NULL;
return myCippingPlaneCont[theID].Get();
}
return NULL;
return myCippingPlaneCont[theID].Get();
}
@@
-2487,7
+2487,7
@@
SPlot2d_Histogram* SMESH_ActorDef::UpdatePlot2Histogram() {
bool isLogarithmic = lookupTable->GetScale() == VTK_SCALE_LOG10;
fun->GetHistogram(nbIntervals, nbEvents, funValues, elemIds, range, isLogarithmic);
bool isLogarithmic = lookupTable->GetScale() == VTK_SCALE_LOG10;
fun->GetHistogram(nbIntervals, nbEvents, funValues, elemIds, range, isLogarithmic);
- for (
in
t i = 0; i < std::min( nbEvents.size(), funValues.size() -1 ); i++ )
+ for (
size_
t i = 0; i < std::min( nbEvents.size(), funValues.size() -1 ); i++ )
my2dHistogram->addPoint(funValues[i] + (funValues[i+1] - funValues[i])/2.0, static_cast<double>(nbEvents[i]));
if(funValues.size() >= 2)
my2dHistogram->addPoint(funValues[i] + (funValues[i+1] - funValues[i])/2.0, static_cast<double>(nbEvents[i]));
if(funValues.size() >= 2)