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
INT PAL 0052864: Assigned algorithms are not shown in Edit Mesh dialog
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ActorUtils.cxx
diff --git
a/src/OBJECT/SMESH_ActorUtils.cxx
b/src/OBJECT/SMESH_ActorUtils.cxx
index bb9fd64b185324fea24f498371bd67a37bedc711..98a104e1d8430e062a62558ce0d91cedaff516ae 100644
(file)
--- a/
src/OBJECT/SMESH_ActorUtils.cxx
+++ b/
src/OBJECT/SMESH_ActorUtils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-55,12
+55,12
@@
namespace SMESH
{
namespace SMESH
{
-
vtkFloatingPointTyp
e
+
doubl
e
GetFloat( const QString& theValue,
GetFloat( const QString& theValue,
-
vtkFloatingPointTyp
e theDefault )
+
doubl
e theDefault )
{
int pos = theValue.indexOf( ":" );
{
int pos = theValue.indexOf( ":" );
-
vtkFloatingPointTyp
e val = theDefault;
+
doubl
e val = theDefault;
if( pos>=0 )
{
QString name = theValue.right( theValue.length()-pos-1 ),
if( pos>=0 )
{
QString name = theValue.right( theValue.length()-pos-1 ),
@@
-71,15
+71,15
@@
namespace SMESH
return val;
}
return val;
}
-
vtkFloatingPointTyp
e
+
doubl
e
GetFloat( const QString& theValue,
const QString& theSection,
GetFloat( const QString& theValue,
const QString& theSection,
-
vtkFloatingPointTyp
e theDefault )
+
doubl
e theDefault )
{
{
-
vtkFloatingPointTyp
e val = theDefault;
+
doubl
e val = theDefault;
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
if( mgr )
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
if( mgr )
- val = (
vtkFloatingPointTyp
e) mgr->doubleValue( theSection, theValue, theDefault );
+ val = (
doubl
e) mgr->doubleValue( theSection, theValue, theDefault );
return val;
}
return val;
}
@@
-90,7
+90,7
@@
namespace SMESH
{
vtkXMLUnstructuredGridWriter* aWriter = vtkXMLUnstructuredGridWriter::New();
aWriter->SetFileName(theFileName);
{
vtkXMLUnstructuredGridWriter* aWriter = vtkXMLUnstructuredGridWriter::New();
aWriter->SetFileName(theFileName);
- aWriter->SetInput(theGrid);
+ aWriter->SetInput
Data
(theGrid);
aWriter->SetDataModeToAscii();
if(theGrid->GetNumberOfCells()){
aWriter->Write();
aWriter->SetDataModeToAscii();
if(theGrid->GetNumberOfCells()){
aWriter->Write();
@@
-129,9
+129,9
@@
namespace SMESH
void
GetColor( const QString& theSect,
const QString& theName,
void
GetColor( const QString& theSect,
const QString& theName,
-
vtkFloatingPointTyp
e& r,
-
vtkFloatingPointTyp
e& g,
-
vtkFloatingPointTyp
e& b,
+
doubl
e& r,
+
doubl
e& g,
+
doubl
e& b,
const QColor& def )
{
int ir( 0 ), ig( 0 ), ib( 0 );
const QColor& def )
{
int ir( 0 ), ig( 0 ), ib( 0 );
@@
-144,10
+144,10
@@
namespace SMESH
void
GetColor( const QString& theSect,
void
GetColor( const QString& theSect,
- const QString& theName,
- QColor& color,
- int& delta,
- QString def)
+
const QString& theName,
+
QColor& color,
+
int& delta,
+
QString def)
{
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
{
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
@@
-160,15
+160,15
@@
namespace SMESH
std::map<SMDSAbs_ElementType,int> GetEntitiesFromObject(SMESH_VisualObj *theObject) {
std::map<SMDSAbs_ElementType,int> entities;
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_0DElement,
std::map<SMDSAbs_ElementType,int> GetEntitiesFromObject(SMESH_VisualObj *theObject) {
std::map<SMDSAbs_ElementType,int> entities;
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_0DElement,
- theObject ? theObject->GetNbEntities(SMDSAbs_0DElement) : 0));
+
theObject ? theObject->GetNbEntities(SMDSAbs_0DElement) : 0));
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_Ball,
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_Ball,
- theObject ? theObject->GetNbEntities(SMDSAbs_Ball) : 0));
+
theObject ? theObject->GetNbEntities(SMDSAbs_Ball) : 0));
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_Edge,
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_Edge,
- theObject ? theObject->GetNbEntities(SMDSAbs_Edge) : 0));
+
theObject ? theObject->GetNbEntities(SMDSAbs_Edge) : 0));
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_Face,
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_Face,
- theObject ? theObject->GetNbEntities(SMDSAbs_Face) : 0));
+
theObject ? theObject->GetNbEntities(SMDSAbs_Face) : 0));
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_Volume,
entities.insert(std::pair<SMDSAbs_ElementType,int>(SMDSAbs_Volume,
- theObject ? theObject->GetNbEntities(SMDSAbs_Volume) : 0));
+
theObject ? theObject->GetNbEntities(SMDSAbs_Volume) : 0));
return entities;
}
return entities;
}