ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-12 15:57:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation warnings

Browse Source
This commit is contained in:
jfa 2005-08-11 08:04:31 +00:00
parent 60528ce326
commit aa376b221a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
View File

@ -127,7 +127,7 @@ SMESHGUI_MeshPatternDlg::SMESHGUI_MeshPatternDlg( SMESHGUI* theModule,
myCreationDlg = 0; myCreationDlg = 0;
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector(); mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
Init(); Init();
} }
@ -415,7 +415,6 @@ bool SMESHGUI_MeshPatternDlg::onApply()
bool toCreatePolyedrs = myCreatePolyedrsChk->isChecked(); bool toCreatePolyedrs = myCreatePolyedrsChk->isChecked();
if ( myPattern->MakeMesh( myMesh, toCreatePolygons, toCreatePolyedrs ) ) { if ( myPattern->MakeMesh( myMesh, toCreatePolygons, toCreatePolyedrs ) ) {
mySelectionMgr->clearSelected(); mySelectionMgr->clearSelected();
SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI );
bool autoUpdate = SMESHGUI::automaticUpdate(); bool autoUpdate = SMESHGUI::automaticUpdate();
if (!isRefine() && autoUpdate) { if (!isRefine() && autoUpdate) {
_PTR(SObject) aSO = SMESH::FindSObject(myMesh.in()); _PTR(SObject) aSO = SMESH::FindSObject(myMesh.in());
@ -429,7 +428,7 @@ bool SMESHGUI_MeshPatternDlg::onApply()
} }
} }
SMESH::UpdateView(); SMESH::UpdateView();
mySMESHGUI->updateObjBrowser(true); mySMESHGUI->updateObjBrowser(true);
return true; return true;
} else { } else {
@ -1265,9 +1264,9 @@ void SMESHGUI_MeshPatternDlg::onTextChanged (const QString& theNewText)
if (aMesh) { if (aMesh) {
QStringList aListId = QStringList::split(" ", theNewText, false); QStringList aListId = QStringList::split(" ", theNewText, false);
TColStd_MapOfInteger newIndices; TColStd_MapOfInteger newIndices;
for (int i = 0; i < aListId.count(); i++) { for (int i = 0; i < aListId.count(); i++) {
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt()); const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
if (e && e->GetType() == (myType == Type_2d ? SMDSAbs_Face : SMDSAbs_Volume)) if (e && e->GetType() == (myType == Type_2d ? SMDSAbs_Face : SMDSAbs_Volume))

23
src/SMESHGUI/SMESHGUI_VTKUtils.cxx
View File

@ -93,7 +93,7 @@ namespace SMESH{
if(!aMesh->_is_nil()){ if(!aMesh->_is_nil()){
aVisualObj.reset(new SMESH_MeshObj(aMesh)); aVisualObj.reset(new SMESH_MeshObj(aMesh));
aVisualObj->Update(); aVisualObj->Update();
TVisualObjCont::value_type aValue(aKey,aVisualObj); TVisualObjCont::value_type aValue(aKey,aVisualObj);
VISUAL_OBJ_CONT.insert(aValue); VISUAL_OBJ_CONT.insert(aValue);
return aVisualObj; return aVisualObj;
} }
@ -145,8 +145,9 @@ namespace SMESH{
SVTK_ViewWindow* SVTK_ViewWindow*
GetViewWindow(const SalomeApp_Module* theModule) GetViewWindow(const SalomeApp_Module* theModule)
{ {
if(SalomeApp_Application* anApp = theModule->getApp()) if (SalomeApp_Application* anApp = theModule->getApp())
return dynamic_cast<SVTK_ViewWindow*>(anApp->desktop()->activeWindow()); return dynamic_cast<SVTK_ViewWindow*>(anApp->desktop()->activeWindow());
return NULL;
} }
SVTK_ViewWindow* FindVtkViewWindow( SUIT_ViewManager* theMgr, SVTK_ViewWindow* FindVtkViewWindow( SUIT_ViewManager* theMgr,
@ -568,8 +569,8 @@ namespace SMESH{
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
int GetNameOfSelectedNodes(SVTK_Selector* theSelector, int GetNameOfSelectedNodes(SVTK_Selector* theSelector,
const Handle(SALOME_InteractiveObject)& theIO, const Handle(SALOME_InteractiveObject)& theIO,
QString& theName) QString& theName)
{ {
theName = ""; theName = "";
@ -582,8 +583,8 @@ namespace SMESH{
return aMapIndex.Extent(); return aMapIndex.Extent();
} }
int GetNameOfSelectedElements(SVTK_Selector* theSelector, int GetNameOfSelectedElements(SVTK_Selector* theSelector,
const Handle(SALOME_InteractiveObject)& theIO, const Handle(SALOME_InteractiveObject)& theIO,
QString& theName) QString& theName)
{ {
theName = ""; theName = "";
@ -603,12 +604,12 @@ namespace SMESH{
} }
int GetEdgeNodes(SVTK_Selector* theSelector, int GetEdgeNodes(SVTK_Selector* theSelector,
const TVisualObjPtr& theVisualObject, const TVisualObjPtr& theVisualObject,
int& theId1, int& theId1,
int& theId2) int& theId2)
{ {
const SALOME_ListIO& selected = theSelector->StoredIObjects(); const SALOME_ListIO& selected = theSelector->StoredIObjects();
if ( selected.Extent() != 1 ) if ( selected.Extent() != 1 )
return -1; return -1;
@ -665,7 +666,7 @@ namespace SMESH{
} }
return -1; return -1;
} }
int GetNameOfSelectedElements(SalomeApp_SelectionMgr *theMgr, int GetNameOfSelectedElements(SalomeApp_SelectionMgr *theMgr,
const Handle(SALOME_InteractiveObject)& theIO, const Handle(SALOME_InteractiveObject)& theIO,
@ -763,7 +764,7 @@ namespace SMESH{
vtkRenderer *aRenderer = aWnd->getRenderer(); vtkRenderer *aRenderer = aWnd->getRenderer();
vtkActorCollection *aCollection = aRenderer->GetActors(); vtkActorCollection *aCollection = aRenderer->GetActors();
aCollection->InitTraversal(); aCollection->InitTraversal();
while ( vtkActor *anAct = aCollection->GetNextActor()) while ( vtkActor *anAct = aCollection->GetNextActor())
{ {
if ( SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>( anAct ) ) if ( SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>( anAct ) )