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 08:09:07 +00:00
parent 51f8c3d1a1
commit b8c608207b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SMESHGUI/SMESHGUI.cxx
View File

@ -151,7 +151,7 @@
int theCommandID) int theCommandID)
{ {
QStringList filter; QStringList filter;
string myExtension; std::string myExtension;
if(theCommandID == 113){ if(theCommandID == 113){
filter.append(QObject::tr("MED files (*.med)")); filter.append(QObject::tr("MED files (*.med)"));
@ -889,9 +889,9 @@
// put the whole hierarchy of sub-objects of the selected SO into a list and // put the whole hierarchy of sub-objects of the selected SO into a list and
// then treat them all starting from the deepest objects (at list back) // then treat them all starting from the deepest objects (at list back)
list< _PTR(SObject) > listSO; std::list< _PTR(SObject) > listSO;
listSO.push_back( aSO ); listSO.push_back( aSO );
list< _PTR(SObject) >::iterator itSO = listSO.begin(); std::list< _PTR(SObject) >::iterator itSO = listSO.begin();
for ( ; itSO != listSO.end(); ++itSO ) { for ( ; itSO != listSO.end(); ++itSO ) {
_PTR(ChildIterator) it = aStudy->NewChildIterator( *itSO ); _PTR(ChildIterator) it = aStudy->NewChildIterator( *itSO );
for (it->InitEx(false); it->More(); it->Next()) for (it->InitEx(false); it->More(); it->Next())
@ -900,11 +900,11 @@
// treat SO's in the list starting from the back // treat SO's in the list starting from the back
list< _PTR(SObject) >::reverse_iterator ritSO = listSO.rbegin(); std::list< _PTR(SObject) >::reverse_iterator ritSO = listSO.rbegin();
for ( ; ritSO != listSO.rend(); ++ritSO ) { for ( ; ritSO != listSO.rend(); ++ritSO ) {
_PTR(SObject) SO = *ritSO; _PTR(SObject) SO = *ritSO;
if ( !SO ) continue; if ( !SO ) continue;
string anEntry = SO->GetID(); std::string anEntry = SO->GetID();
/** Erase graphical object **/ /** Erase graphical object **/
if(SO->FindAttribute(anAttr, "AttributeIOR")){ if(SO->FindAttribute(anAttr, "AttributeIOR")){

10
src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
View File

@ -108,7 +108,7 @@ namespace SMESH
bool myIsPointsLabeled; bool myIsPointsLabeled;
vtkActor2D* myPointLabels; vtkActor2D* myPointLabels;
vector<int> myIDs; std::vector<int> myIDs;
public: public:
TIdPreview(SVTK_ViewWindow* theViewWindow): TIdPreview(SVTK_ViewWindow* theViewWindow):
@ -189,7 +189,7 @@ namespace SMESH
} }
void SetElemsData( TColStd_MapOfInteger & theElemsIdMap, void SetElemsData( TColStd_MapOfInteger & theElemsIdMap,
list<gp_XYZ> & aGrCentersXYZ ) std::list<gp_XYZ> & aGrCentersXYZ )
{ {
vtkPoints* aPoints = vtkPoints::New(); vtkPoints* aPoints = vtkPoints::New();
aPoints->SetNumberOfPoints(theElemsIdMap.Extent()); aPoints->SetNumberOfPoints(theElemsIdMap.Extent());
@ -201,7 +201,7 @@ namespace SMESH
} }
gp_XYZ aXYZ; gp_XYZ aXYZ;
list<gp_XYZ>::iterator coordIt = aGrCentersXYZ.begin(); std::list<gp_XYZ>::iterator coordIt = aGrCentersXYZ.begin();
for( int i = 0; coordIt != aGrCentersXYZ.end(); coordIt++, i++ ) { for( int i = 0; coordIt != aGrCentersXYZ.end(); coordIt++, i++ ) {
aXYZ = *coordIt; aXYZ = *coordIt;
aPoints->SetPoint( i, aXYZ.X(), aXYZ.Y(), aXYZ.Z() ); aPoints->SetPoint( i, aXYZ.X(), aXYZ.Y(), aXYZ.Z() );
@ -790,7 +790,7 @@ void SMESHGUI_EditMeshDlg::onSelectGroup()
myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility()); myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
} }
else { else {
list< gp_XYZ > aGrCentersXYZ; std::list< gp_XYZ > aGrCentersXYZ;
FindGravityCenter(anIndices, aGrCentersXYZ); FindGravityCenter(anIndices, aGrCentersXYZ);
myIdPreview->SetElemsData( anIndices, aGrCentersXYZ); myIdPreview->SetElemsData( anIndices, aGrCentersXYZ);
myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility()); myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
@ -839,7 +839,7 @@ void SMESHGUI_EditMeshDlg::onSelectElementFromGroup()
myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility()); myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());
} }
else { else {
list< gp_XYZ > aGrCentersXYZ; std::list< gp_XYZ > aGrCentersXYZ;
FindGravityCenter(anIndices, aGrCentersXYZ); FindGravityCenter(anIndices, aGrCentersXYZ);
myIdPreview->SetElemsData(anIndices, aGrCentersXYZ); myIdPreview->SetElemsData(anIndices, aGrCentersXYZ);
myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility()); myIdPreview->SetPointsLabeled(!anIndices.IsEmpty(), myActor->GetVisibility());

2
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
View File

@ -310,7 +310,7 @@ static bool findTriangles (const SMDS_MeshNode * theNode1,
theTria1 = theTria2 = 0; theTria1 = theTria2 = 0;
set< const SMDS_MeshElement* > emap; std::set< const SMDS_MeshElement* > emap;
SMDS_ElemIteratorPtr it = theNode1->GetInverseElementIterator(); SMDS_ElemIteratorPtr it = theNode1->GetInverseElementIterator();
while (it->more()) { while (it->more()) {
const SMDS_MeshElement* elem = it->next(); const SMDS_MeshElement* elem = it->next();