ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-09-23 03:02:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

All modules must use SVTK package instead VTK

Browse Source
This commit is contained in:
asl 2005-10-05 06:32:47 +00:00
parent 36465d9d01
commit 63dec6763c
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SMESHGUI/SMESHGUI.cxx
View File

@ -95,8 +95,7 @@
#include <SVTK_ViewModel.h> #include <SVTK_ViewModel.h>
#include <SVTK_InteractorStyle.h> #include <SVTK_InteractorStyle.h>
#include <SVTK_RenderWindowInteractor.h> #include <SVTK_RenderWindowInteractor.h>
#include <SVTK_ViewManager.h>
#include <VTKViewer_ViewManager.h>
#include "OB_Browser.h" #include "OB_Browser.h"
@ -2755,7 +2754,7 @@ void SMESHGUI::initialize( CAM_Application* app )
// Display / Erase // Display / Erase
//------------------------------------------------- //-------------------------------------------------
aClient = "($client in {'VTKViewer' 'ObjectBrowser'})"; aClient = "($client in {'VTKViewer' 'ObjectBrowser'})";
QString anActiveVTK = QString("activeView = '%1'").arg(VTKViewer_Viewer::Type()); QString anActiveVTK = QString("activeView = '%1'").arg(SVTK_Viewer::Type());
QString aSelCount = QString( "%1 > 0" ).arg( QtxPopupMgr::Selection::defSelCountParam() ); QString aSelCount = QString( "%1 > 0" ).arg( QtxPopupMgr::Selection::defSelCountParam() );
QString aRule = "$component={'SMESH'} and ( type='Component' or (" + aClient + " and " + QString aRule = "$component={'SMESH'} and ( type='Component' or (" + aClient + " and " +
@ -2842,7 +2841,7 @@ void SMESHGUI::viewManagers( QStringList& list ) const
void SMESHGUI::onViewManagerAdded( SUIT_ViewManager* mgr ) void SMESHGUI::onViewManagerAdded( SUIT_ViewManager* mgr )
{ {
if ( dynamic_cast<VTKViewer_ViewManager*>( mgr ) ) if ( dynamic_cast<SVTK_ViewManager*>( mgr ) )
SMESH::UpdateSelectionProp( this ); SMESH::UpdateSelectionProp( this );
} }

2
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
View File

@ -39,8 +39,6 @@
#include "SMESH_TypeFilter.hxx" #include "SMESH_TypeFilter.hxx"
#include "SMDS_Mesh.hxx" #include "SMDS_Mesh.hxx"
#include "VTKViewer_ViewWindow.h"
#include "SUIT_ResourceMgr.h" #include "SUIT_ResourceMgr.h"
#include "SalomeApp_Application.h" #include "SalomeApp_Application.h"

20
src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
View File

@ -378,6 +378,7 @@ void SMESHGUI_SingleEditDlg::onTextChange (const QString& theNewText)
myOkBtn->setEnabled(true); myOkBtn->setEnabled(true);
myApplyBtn->setEnabled(true); myApplyBtn->setEnabled(true);
} }
SMESH::GetViewWindow(mySMESHGUI)->highlight( anIO, true, true );
} }
} }
} }
@ -407,19 +408,22 @@ void SMESHGUI_SingleEditDlg::onSelectionDone()
myActor = SMESH::FindActorByEntry(anIO->getEntry()); myActor = SMESH::FindActorByEntry(anIO->getEntry());
if(myActor){ if(myActor){
TVisualObjPtr aVisualObj = myActor->GetObject(); TVisualObjPtr aVisualObj = myActor->GetObject();
if(SMDS_Mesh* aMesh = aVisualObj->GetMesh()){ if(SMDS_Mesh* aMesh = aVisualObj->GetMesh())
if(SMESH::GetEdgeNodes(mySelector, aVisualObj, anId1, anId2) >= 1){ {
const SMDS_MeshElement* tria[2];
if( SMESH::GetEdgeNodes( mySelector, aVisualObj, anId1, anId2 ) >= 1 &&
findTriangles( aMesh->FindNode( anId1 ), aMesh->FindNode( anId2 ), tria[0],tria[1] ) )
{
QString aText = QString("%1-%2").arg(anId1).arg(anId2); QString aText = QString("%1-%2").arg(anId1).arg(anId2);
myBusy = true; myBusy = true;
myEdge->setText(aText); myEdge->setText(aText);
myBusy = false; myBusy = false;
const SMDS_MeshElement* tria[2]; myOkBtn->setEnabled(true);
if (findTriangles(aMesh->FindNode(anId1), aMesh->FindNode(anId2), tria[0],tria[1])) { myApplyBtn->setEnabled(true);
myOkBtn->setEnabled(true); }
myApplyBtn->setEnabled(true); else
} {
} else {
myEdge->clear(); myEdge->clear();
} }
} }