ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 18:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
vsr 2008-03-21 09:35:03 +00:00
parent b8c608207b
commit 7b613d2b8b
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -182,7 +182,7 @@ namespace SMESH
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
bool HasReadyActorsFor (int subShapeID, GEOM::GEOM_Object_var aMainShape ) bool HasReadyActorsFor (int subShapeID, GEOM::GEOM_Object_var aMainShape )
{ {
string mainEntry; std::string mainEntry;
if ( !aMainShape->_is_nil() ) if ( !aMainShape->_is_nil() )
mainEntry = aMainShape->GetStudyEntry(); mainEntry = aMainShape->GetStudyEntry();
return ( myMainEntry == mainEntry && return ( myMainEntry == mainEntry &&
@ -192,7 +192,7 @@ namespace SMESH
void Show( int subShapeID, GEOM::GEOM_Object_var aMainShape, bool only = false) void Show( int subShapeID, GEOM::GEOM_Object_var aMainShape, bool only = false)
{ {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() ); SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() );
string mainEntry; std::string mainEntry;
if ( !aMainShape->_is_nil() ) if ( !aMainShape->_is_nil() )
mainEntry = aMainShape->GetStudyEntry(); mainEntry = aMainShape->GetStudyEntry();
if ( myMainEntry != mainEntry || aViewWindow != myViewWindow ) { // remove actors if ( myMainEntry != mainEntry || aViewWindow != myViewWindow ) { // remove actors
@ -243,7 +243,7 @@ namespace SMESH
TActorVec myActors; TActorVec myActors;
TActorVec myShownActors; TActorVec myShownActors;
TopTools_IndexedMapOfShape myIndexToShape; TopTools_IndexedMapOfShape myIndexToShape;
string myMainEntry; std::string myMainEntry;
SVTK_ViewWindow* myViewWindow; SVTK_ViewWindow* myViewWindow;
vtkProperty* myProperty; vtkProperty* myProperty;
std::set<int> myBuiltSubs; std::set<int> myBuiltSubs;

4
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
View File

@ -239,7 +239,7 @@ namespace SMESH
// Init list of available hypotheses, if needed // Init list of available hypotheses, if needed
InitAvailableHypotheses(); InitAvailableHypotheses();
list<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin(); std::list<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin();
for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet ) for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet )
{ {
HypothesesSet* aSet = *hypoSet; HypothesesSet* aSet = *hypoSet;
@ -253,7 +253,7 @@ namespace SMESH
HypothesesSet* GetHypothesesSet(const QString& theSetName) HypothesesSet* GetHypothesesSet(const QString& theSetName)
{ {
list<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin(); std::list<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin();
for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet ) for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet )
{ {
HypothesesSet* aSet = *hypoSet; HypothesesSet* aSet = *hypoSet;

2
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -321,7 +321,7 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const
while(1) { while(1) {
if (mainObj->_is_nil()) if (mainObj->_is_nil())
return false; return false;
if (string(mainObj->GetEntry()) == string(mainGeom->GetEntry())) if (std::string(mainObj->GetEntry()) == std::string(mainGeom->GetEntry()))
return true; return true;
mainObj = op->GetMainShape(mainObj); mainObj = op->GetMainShape(mainObj);
} }

4
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
View File

@ -239,13 +239,13 @@ void SMESHGUI_ShapeByMeshOp::SetMesh (SMESH::SMESH_Mesh_ptr thePtr)
myGeomObj = GEOM::GEOM_Object::_nil(); myGeomObj = GEOM::GEOM_Object::_nil();
myHasSolids = false; myHasSolids = false;
vector< bool > hasElement (myDlg->myElemTypeGroup->buttons().count(), false); std::vector< bool > hasElement (myDlg->myElemTypeGroup->buttons().count(), false);
if (!myMesh->_is_nil() ) if (!myMesh->_is_nil() )
{ {
// _PTR(SObject) aSobj = SMESH::FindSObject(myMesh.in()); // _PTR(SObject) aSobj = SMESH::FindSObject(myMesh.in());
// SUIT_DataOwnerPtr anIObj (new LightApp_DataOwner(aSobj->GetID().c_str())); // SUIT_DataOwnerPtr anIObj (new LightApp_DataOwner(aSobj->GetID().c_str()));
vector< int > nbShapes( TopAbs_SHAPE, 0 ); std::vector< int > nbShapes( TopAbs_SHAPE, 0 );
int shapeDim = 0; // max dim with several shapes int shapeDim = 0; // max dim with several shapes
//if ( /*mySelectionMgr*/ selectionMgr()->isOk(anIObj) ) // check that the mesh has a valid shape //if ( /*mySelectionMgr*/ selectionMgr()->isOk(anIObj) ) // check that the mesh has a valid shape
{ {

2
src/SMESHGUI/SMESHGUI_VTKUtils.cxx
View File

@ -1041,7 +1041,7 @@ namespace SMESH
if(FindActorByEntry(theIO->getEntry())){ if(FindActorByEntry(theIO->getEntry())){
TColStd_IndexedMapOfInteger aMapIndex; TColStd_IndexedMapOfInteger aMapIndex;
theMgr->GetIndexes(theIO,aMapIndex); theMgr->GetIndexes(theIO,aMapIndex);
typedef set<int> TIdContainer; typedef std::set<int> TIdContainer;
TIdContainer anIdContainer; TIdContainer anIdContainer;
for( int i = 1; i <= aMapIndex.Extent(); i++) for( int i = 1; i <= aMapIndex.Extent(); i++)
anIdContainer.insert(aMapIndex(i)); anIdContainer.insert(aMapIndex(i));

2
src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
View File

@ -252,7 +252,7 @@ void StdMeshersGUI_DistrPreview::update()
} }
setAxisScale( myDensity->xAxis(), min_x, max_x ); setAxisScale( myDensity->xAxis(), min_x, max_x );
setAxisScale( myDensity->yAxis(), min( 0.0, min_y ), max( 0.0, max_y ) ); setAxisScale( myDensity->yAxis(), std::min( 0.0, min_y ), std::max( 0.0, max_y ) );
myDensity->setData( x, y, size ); myDensity->setData( x, y, size );
if( x ) if( x )
delete[] x; delete[] x;

2
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
View File

@ -190,7 +190,7 @@ void StdMeshersGUI_ObjectReferenceParamWdg::SetObject(CORBA::Object_ptr obj)
if ( !CORBA::is_nil( obj )) if ( !CORBA::is_nil( obj ))
sobj = SMESH::FindSObject (obj); sobj = SMESH::FindSObject (obj);
if ( sobj ) { if ( sobj ) {
string name = sobj->GetName(); std::string name = sobj->GetName();
myObjNameLineEdit->setText( name.c_str() ); myObjNameLineEdit->setText( name.c_str() );
myObject = CORBA::Object::_duplicate( obj ); myObject = CORBA::Object::_duplicate( obj );
myParamValue = sobj->GetID().c_str(); myParamValue = sobj->GetID().c_str();