ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-15 22:21:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

This commit was generated by cvs2git to create tag

Browse Source 
'BR-D5-38-2003_D2005-12-19'.

Sprout from master 2005-10-18 14:52:45 UTC smh <smh@opencascade.com> 'Preparation of 3.1.0a2: version ID. compilation with new HEAD and new MED (with polyhedres)'
Cherrypick from BR-D5-38-2003 2005-10-18 06:23:49 UTC apo <apo@opencascade.com> 'Minor changes':
    src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
    src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
    src/OBJECT/SMESH_Actor.cxx
    src/SMESHFiltersSelection/Makefile.in
    src/SMESHGUI/SMESHGUI.cxx
    src/SMESHGUI/SMESHGUI_FilterDlg.cxx
    src/SMESHGUI/SMESHGUI_GroupDlg.cxx
    src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
    src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
    src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
    src/SMESHGUI/SMESHGUI_Selection.cxx
    src/SMESHGUI/SMESHGUI_VTKUtils.cxx
    src/SMESHGUI/SMESHGUI_VTKUtils.h
This commit is contained in:
admin 2005-10-18 14:52:46 +00:00
parent 5b66adc250
commit aad151600a
12 changed files with 396 additions and 531 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

317
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
View File

@ -34,6 +34,7 @@
#include "SMESHDS_Group.hxx" #include "SMESHDS_Group.hxx"
#include "MED_Factory.hxx" #include "MED_Factory.hxx"
#include "MED_CoordUtils.hxx"
#include "MED_Utilities.hxx" #include "MED_Utilities.hxx"
#include <stdlib.h> #include <stdlib.h>
@ -48,7 +49,9 @@ static int MYDEBUG = 0;
using namespace MED; using namespace MED;
void DriverMED_R_SMESHDS_Mesh::SetMeshName(string theMeshName) void
DriverMED_R_SMESHDS_Mesh
::SetMeshName(string theMeshName)
{ {
myMeshName = theMeshName; myMeshName = theMeshName;
} }
@ -61,83 +64,9 @@ FindNode(const SMDS_Mesh* theMesh, TInt theId){
} }
enum ECoordName{eX, eY, eZ, eNone}; Driver_Mesh::Status
typedef TFloat (*TGetCoord)(MED::PNodeInfo&, TInt); DriverMED_R_SMESHDS_Mesh
::Perform()
template<ECoordName TheCoordId>
TFloat GetCoord(MED::PNodeInfo& thePNodeInfo, TInt theElemId){
return thePNodeInfo->GetNodeCoord(theElemId,TheCoordId);
}
template<>
TFloat GetCoord<eNone>(MED::PNodeInfo& thePNodeInfo, TInt theElemId){
return 0.0;
}
static TGetCoord aXYZGetCoord[3] = {
&GetCoord<eX>,
&GetCoord<eY>,
&GetCoord<eZ>
};
static TGetCoord aXYGetCoord[3] = {
&GetCoord<eX>,
&GetCoord<eY>,
&GetCoord<eNone>
};
static TGetCoord aYZGetCoord[3] = {
&GetCoord<eNone>,
&GetCoord<eX>,
&GetCoord<eY>
};
static TGetCoord aXZGetCoord[3] = {
&GetCoord<eX>,
&GetCoord<eNone>,
&GetCoord<eY>
};
static TGetCoord aXGetCoord[3] = {
&GetCoord<eX>,
&GetCoord<eNone>,
&GetCoord<eNone>
};
static TGetCoord aYGetCoord[3] = {
&GetCoord<eNone>,
&GetCoord<eX>,
&GetCoord<eNone>
};
static TGetCoord aZGetCoord[3] = {
&GetCoord<eNone>,
&GetCoord<eNone>,
&GetCoord<eX>
};
class TCoordHelper{
MED::PNodeInfo myPNodeInfo;
TGetCoord* myGetCoord;
public:
TCoordHelper(const MED::PNodeInfo& thePNodeInfo,
TGetCoord* theGetCoord):
myPNodeInfo(thePNodeInfo),
myGetCoord(theGetCoord)
{}
virtual ~TCoordHelper(){}
TFloat GetCoord(TInt theElemId, TInt theCoodId){
return (*myGetCoord[theCoodId])(myPNodeInfo,theElemId);
}
};
typedef boost::shared_ptr<TCoordHelper> TCoordHelperPtr;
Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
{ {
Status aResult = DRS_FAIL; Status aResult = DRS_FAIL;
try{ try{
@ -193,50 +122,17 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
//------------------------------------------------------ //------------------------------------------------------
PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo); PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo);
TCoordHelperPtr aCoordHelperPtr; PCoordHelper aCoordHelper = GetCoordHelper(aNodeInfo);
{
TInt aMeshDimension = aMeshInfo->GetDim();
bool anIsDimPresent[3] = {false, false, false};
for(TInt iDim = 0; iDim < aMeshDimension; iDim++){
string aDimName = aNodeInfo->GetCoordName(iDim);
if(aDimName == "x" || aDimName == "X")
anIsDimPresent[eX] = true;
else if(aDimName == "y" || aDimName == "Y")
anIsDimPresent[eY] = true;
else if(aDimName == "z" || aDimName == "Z")
anIsDimPresent[eZ] = true;
}
switch(aMeshDimension){
case 3:
aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aXYZGetCoord));
break;
case 2:
if(anIsDimPresent[eY] && anIsDimPresent[eZ])
aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aYZGetCoord));
else if(anIsDimPresent[eX] && anIsDimPresent[eZ])
aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aXZGetCoord));
else
aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aXYGetCoord));
break;
case 1:
if(anIsDimPresent[eY])
aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aYGetCoord));
else if(anIsDimPresent[eZ])
aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aZGetCoord));
else
aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aXGetCoord));
break;
}
}
EBooleen anIsNodeNum = aNodeInfo->IsElemNum(); EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
TInt aNbElems = aNodeInfo->GetNbElem(); TInt aNbElems = aNodeInfo->GetNbElem();
if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum); if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
DriverMED_FamilyPtr aFamily; DriverMED_FamilyPtr aFamily = myFamilies.begin()->second;
for(TInt iElem = 0; iElem < aNbElems; iElem++){ for(TInt iElem = 0; iElem < aNbElems; iElem++){
TCCoordSlice aCoordSlice = aNodeInfo->GetCoordSlice(iElem);
double aCoords[3] = {0.0, 0.0, 0.0}; double aCoords[3] = {0.0, 0.0, 0.0};
for(TInt iDim = 0; iDim < 3; iDim++) for(TInt iDim = 0; iDim < 3; iDim++)
aCoords[iDim] = aCoordHelperPtr->GetCoord(iElem,iDim); aCoords[iDim] = aCoordHelper->GetCoord(aCoordSlice,iDim);
const SMDS_MeshNode* aNode; const SMDS_MeshNode* aNode;
if(anIsNodeNum) { if(anIsNodeNum) {
aNode = myMesh->AddNodeWithID aNode = myMesh->AddNodeWithID
@ -258,6 +154,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
// Reading pre information about all MED cells // Reading pre information about all MED cells
//-------------------------------------------- //--------------------------------------------
typedef std::vector<int> TNodeIds;
bool takeNumbers = true; // initially we trust the numbers from file bool takeNumbers = true; // initially we trust the numbers from file
MED::TEntityInfo aEntityInfo = aMed->GetEntityInfo(aMeshInfo); MED::TEntityInfo aEntityInfo = aMed->GetEntityInfo(aMeshInfo);
MED::TEntityInfo::iterator anEntityIter = aEntityInfo.begin(); MED::TEntityInfo::iterator anEntityIter = aEntityInfo.begin();
@ -266,62 +163,48 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
if(anEntity == eNOEUD) continue; if(anEntity == eNOEUD) continue;
// Reading MED cells to the corresponding SMDS structure // Reading MED cells to the corresponding SMDS structure
//------------------------------------------------------ //------------------------------------------------------
const MED::TGeom& aTGeom = anEntityIter->second; const MED::TGeom2Size& aGeom2Size = anEntityIter->second;
MED::TGeom::const_iterator anTGeomIter = aTGeom.begin(); MED::TGeom2Size::const_iterator aGeom2SizeIter = aGeom2Size.begin();
for(; anTGeomIter != aTGeom.end(); anTGeomIter++){ for(; aGeom2SizeIter != aGeom2Size.end(); aGeom2SizeIter++){
const EGeometrieElement& aGeom = anTGeomIter->first; const EGeometrieElement& aGeom = aGeom2SizeIter->first;
if (aGeom == ePOINT1) { switch(aGeom){
continue; case ePOINT1:
break;
} else if (aGeom == ePOLYGONE) { case ePOLYGONE: {
PPolygoneInfo aPolygoneInfo = aMed->GetPPolygoneInfo(aMeshInfo,anEntity,aGeom); PPolygoneInfo aPolygoneInfo = aMed->GetPPolygoneInfo(aMeshInfo,anEntity,aGeom);
EBooleen anIsElemNum = takeNumbers ? aPolygoneInfo->IsElemNum() : eFAUX; EBooleen anIsElemNum = takeNumbers ? aPolygoneInfo->IsElemNum() : eFAUX;
TElemNum aConn = aPolygoneInfo->GetConnectivite(); TInt aNbElem = aPolygoneInfo->GetNbElem();
TElemNum aIndex = aPolygoneInfo->GetIndex(); for(TInt iElem = 0; iElem < aNbElem; iElem++){
MED::TCConnSlice aConnSlice = aPolygoneInfo->GetConnSlice(iElem);
TInt nbPolygons = aPolygoneInfo->GetNbElem(); TInt aNbConn = aPolygoneInfo->GetNbConn(iElem);
TNodeIds aNodeIds(aNbConn);
for (TInt iPG = 0; iPG < nbPolygons; iPG++) {
// get nodes
TInt aCurrPG_FirstNodeIndex = aIndex[iPG] - 1;
int nbNodes = aPolygoneInfo->GetNbConn(iPG);
std::vector<int> nodes_ids (nbNodes);
//for (TInt inode = 0; inode < nbNodes; inode++) {
// nodes_ids[inode] = aConn[aCurrPG_FirstNodeIndex + inode];
//}
#ifdef _EDF_NODE_IDS_ #ifdef _EDF_NODE_IDS_
if (anIsNodeNum) { if(anIsNodeNum)
for (TInt inode = 0; inode < nbNodes; inode++) { for(TInt iConn = 0; iConn < aNbConn; iConn++)
nodes_ids[inode] = aNodeInfo->GetElemNum(aConn[aCurrPG_FirstNodeIndex + inode] - 1); aNodeIds[iConn] = aNodeInfo->GetElemNum(aConnSlice[iConn] - 1);
} else
} else { for(TInt iConn = 0; iConn < aNbConn; iConn++)
for (TInt inode = 0; inode < nbNodes; inode++) { aNodeIds[iConn] = aConnSlice[iConn];
nodes_ids[inode] = aConn[aCurrPG_FirstNodeIndex + inode];
}
}
#else #else
for (TInt inode = 0; inode < nbNodes; inode++) { for(TInt iConn = 0; iConn < aNbConn; iConn++)
nodes_ids[inode] = aConn[aCurrPG_FirstNodeIndex + inode]; aNodeIds[iConn] = aConnSlice[iConn];
}
#endif #endif
bool isRenum = false; bool isRenum = false;
SMDS_MeshElement* anElement = NULL; SMDS_MeshElement* anElement = NULL;
TInt aFamNum = aPolygoneInfo->GetFamNum(iPG); TInt aFamNum = aPolygoneInfo->GetFamNum(iElem);
try{ try{
if(anIsElemNum){ if(anIsElemNum){
anElement = myMesh->AddPolygonalFaceWithID TInt anElemId = aPolygoneInfo->GetElemNum(iElem);
(nodes_ids, aPolygoneInfo->GetElemNum(iPG)); anElement = myMesh->AddPolygonalFaceWithID(aNodeIds,anElemId);
} }
if(!anElement){ if(!anElement){
std::vector<const SMDS_MeshNode*> nodes (nbNodes); std::vector<const SMDS_MeshNode*> aNodes(aNbConn);
for (int inode = 0; inode < nbNodes; inode++) { for(TInt iConn = 0; iConn < aNbConn; iConn++)
nodes[inode] = FindNode(myMesh, nodes_ids[inode]); aNodes[iConn] = FindNode(myMesh,aNodeIds[iConn]);
} anElement = myMesh->AddPolygonalFace(aNodes);
anElement = myMesh->AddPolygonalFace(nodes);
isRenum = anIsElemNum; isRenum = anIsElemNum;
} }
}catch(const std::exception& exc){ }catch(const std::exception& exc){
@ -347,70 +230,51 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
} }
} }
} // for (TInt iPG = 0; iPG < nbPolygons; iPG++) } // for (TInt iPG = 0; iPG < nbPolygons; iPG++)
continue; break;
}
} else if (aGeom == ePOLYEDRE) { case ePOLYEDRE: {
PPolyedreInfo aPolyedreInfo = aMed->GetPPolyedreInfo(aMeshInfo,anEntity,aGeom); PPolyedreInfo aPolyedreInfo = aMed->GetPPolyedreInfo(aMeshInfo,anEntity,aGeom);
EBooleen anIsElemNum = takeNumbers ? aPolyedreInfo->IsElemNum() : eFAUX; EBooleen anIsElemNum = takeNumbers ? aPolyedreInfo->IsElemNum() : eFAUX;
TElemNum aConn = aPolyedreInfo->GetConnectivite(); TInt aNbElem = aPolyedreInfo->GetNbElem();
TElemNum aFacesIndex = aPolyedreInfo->GetFacesIndex(); for(TInt iElem = 0; iElem < aNbElem; iElem++){
TElemNum aIndex = aPolyedreInfo->GetIndex(); MED::TCConnSliceArr aConnSliceArr = aPolyedreInfo->GetConnSliceArr(iElem);
TInt aNbFaces = aConnSliceArr.size();
TInt nbPolyedres = aPolyedreInfo->GetNbElem(); typedef std::vector<int> TQuantities;
TQuantities aQuantities(aNbFaces);
for (int iPE = 0; iPE < nbPolyedres; iPE++) { TInt aNbNodes = aPolyedreInfo->GetNbNodes(iElem);
// get faces TNodeIds aNodeIds(aNbNodes);
int aCurrPE_FirstFaceIndex = aIndex[iPE] - 1; for(TInt iFace = 0, iNode = 0; iFace < aNbFaces; iFace++){
int aNextPE_FirstFaceIndex = aIndex[iPE + 1] - 1; MED::TCConnSlice aConnSlice = aConnSliceArr[iFace];
int nbFaces = aNextPE_FirstFaceIndex - aCurrPE_FirstFaceIndex; TInt aNbConn = aConnSlice.size();
std::vector<int> quantities (nbFaces); aQuantities[iFace] = aNbConn;
for (int iFa = 0; iFa < nbFaces; iFa++) {
int aCurrFace_FirstNodeIndex = aFacesIndex[aCurrPE_FirstFaceIndex + iFa] - 1;
int aNextFace_FirstNodeIndex = aFacesIndex[aCurrPE_FirstFaceIndex + iFa + 1] - 1;
int nbNodes = aNextFace_FirstNodeIndex - aCurrFace_FirstNodeIndex;
quantities[iFa] = nbNodes;
}
// get nodes
int aCurrPE_FirstNodeIndex = aFacesIndex[aCurrPE_FirstFaceIndex] - 1;
int nbPENodes = aPolyedreInfo->GetNbConn(iPE);
std::vector<int> nodes_ids (nbPENodes);
//for (int inode = 0; inode < nbPENodes; inode++) {
// nodes_ids[inode] = aConn[aCurrPE_FirstNodeIndex + inode];
//}
#ifdef _EDF_NODE_IDS_ #ifdef _EDF_NODE_IDS_
if (anIsNodeNum) { if(anIsNodeNum)
for (int inode = 0; inode < nbPENodes; inode++) { for(TInt iConn = 0; iConn < aNbConn; iConn++)
nodes_ids[inode] = aNodeInfo->GetElemNum(aConn[aCurrPE_FirstNodeIndex + inode] - 1); aNodeIds[iNode++] = aNodeInfo->GetElemNum(aConnSlice[iConn] - 1);
} else
} else { for(TInt iConn = 0; iConn < aNbConn; iConn++)
for (int inode = 0; inode < nbPENodes; inode++) { aNodeIds[iNode++] = aConnSlice[iConn];
nodes_ids[inode] = aConn[aCurrPE_FirstNodeIndex + inode];
}
}
#else #else
for (int inode = 0; inode < nbPENodes; inode++) { for(TInt iConn = 0; iConn < aNbConn; iConn++)
nodes_ids[inode] = aConn[aCurrPE_FirstNodeIndex + inode]; aNodeIds[iNode++] = aConnSlice[iConn];
}
#endif #endif
}
bool isRenum = false; bool isRenum = false;
SMDS_MeshElement* anElement = NULL; SMDS_MeshElement* anElement = NULL;
TInt aFamNum = aPolyedreInfo->GetFamNum(iPE); TInt aFamNum = aPolyedreInfo->GetFamNum(iElem);
try{ try{
if(anIsElemNum){ if(anIsElemNum){
anElement = myMesh->AddPolyhedralVolumeWithID TInt anElemId = aPolyedreInfo->GetElemNum(iElem);
(nodes_ids, quantities, aPolyedreInfo->GetElemNum(iPE)); anElement = myMesh->AddPolyhedralVolumeWithID(aNodeIds,aQuantities,anElemId);
} }
if(!anElement){ if(!anElement){
std::vector<const SMDS_MeshNode*> nodes (nbPENodes); std::vector<const SMDS_MeshNode*> aNodes(aNbNodes);
for (int inode = 0; inode < nbPENodes; inode++) { for(TInt iConn = 0; iConn < aNbNodes; iConn++)
nodes[inode] = FindNode(myMesh, nodes_ids[inode]); aNodes[iConn] = FindNode(myMesh,aNodeIds[iConn]);
} anElement = myMesh->AddPolyhedralVolume(aNodes,aQuantities);
anElement = myMesh->AddPolyhedralVolume(nodes, quantities);
isRenum = anIsElemNum; isRenum = anIsElemNum;
} }
}catch(const std::exception& exc){ }catch(const std::exception& exc){
@ -436,11 +300,9 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
} }
} }
} // for (int iPE = 0; iPE < nbPolyedres; iPE++) } // for (int iPE = 0; iPE < nbPolyedres; iPE++)
continue; break;
} else {
} }
default: {
PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom); PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom);
EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX; EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX;
TInt aNbElems = aCellInfo->GetNbElem(); TInt aNbElems = aCellInfo->GetNbElem();
@ -480,24 +342,20 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
aNbNodes = 8; aNbNodes = 8;
break; break;
} }
vector<TInt> aNodeIds(aNbNodes); TNodeIds aNodeIds(aNbNodes);
bool anIsValidConnect = false; bool anIsValidConnect = false;
TCConnSlice aConnSlice = aCellInfo->GetConnSlice(iElem);
try{ try{
#ifdef _EDF_NODE_IDS_ #ifdef _EDF_NODE_IDS_
if(anIsNodeNum) { if(anIsNodeNum)
for(int i = 0; i < aNbNodes; i++){ for(int iNode = 0; iNode < aNbNodes; iNode++)
aNodeIds[i] = aNodeInfo->GetElemNum(aCellInfo->GetConn(iElem,i)-1); aNodeIds[iNode] = aNodeInfo->GetElemNum(aConnSlice[iNode] - 1);
} else
}else{ for(int iNode = 0; iNode < aNbNodes; iNode++)
for(int i = 0; i < aNbNodes; i++){ aNodeIds[iNode] = aConnSlice[iNode];
aNodeIds[i] = aCellInfo->GetConn(iElem,i);
}
}
#else #else
for(int i = 0; i < aNbNodes; i++){ for(int iNode = 0; iNode < aNbNodes; iNode++)
aNodeIds[i] = aCellInfo->GetConn(iElem,i); aNodeIds[iNode] = aConnSlice[iNode];
}
#endif #endif
anIsValidConnect = true; anIsValidConnect = true;
}catch(const std::exception& exc){ }catch(const std::exception& exc){
@ -665,17 +523,16 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
if (aResult < DRS_WARN_RENUMBER) if (aResult < DRS_WARN_RENUMBER)
aResult = DRS_WARN_RENUMBER; aResult = DRS_WARN_RENUMBER;
} }
if ( checkFamilyID ( aFamily, aFamNum )) if ( checkFamilyID ( aFamily, aFamNum )) {
{
// Save reference to this element from its family // Save reference to this element from its family
aFamily->AddElement(anElement); myFamilies[aFamNum]->AddElement(anElement);
aFamily->SetType(anElement->GetType()); myFamilies[aFamNum]->SetType(anElement->GetType());
} }
} }
} }
}}
} }
} }
break;
} }
} }
}catch(const std::exception& exc){ }catch(const std::exception& exc){

26
src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
View File

@ -326,7 +326,6 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
{ {
anElemFamMap[*anElemsIter] = aFamId; anElemFamMap[*anElemsIter] = aFamId;
} }
// delete (*aFamsIter);
} }
// Storing SMDS nodes to the MED file for the MED mesh // Storing SMDS nodes to the MED file for the MED mesh
@ -365,8 +364,9 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
const ERepere SMDS_COORDINATE_SYSTEM = eCART; const ERepere SMDS_COORDINATE_SYSTEM = eCART;
PNodeInfo aNodeInfo = myMed->CrNodeInfo(aMeshInfo, PNodeInfo aNodeInfo = myMed->CrNodeInfo(aMeshInfo,
SMDS_COORDINATE_SYSTEM,
aCoordinates, aCoordinates,
eFULL_INTERLACE,
SMDS_COORDINATE_SYSTEM,
aCoordNames, aCoordNames,
aCoordUnits, aCoordUnits,
aFamilyNums, aFamilyNums,
@ -413,8 +413,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo, PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
SMDS_MED_ENTITY, SMDS_MED_ENTITY,
eSEG2, eSEG2,
SMDS_MED_CONNECTIVITY,
aConnectivity, aConnectivity,
SMDS_MED_CONNECTIVITY,
aFamilyNums, aFamilyNums,
anElemNums); anElemNums);
myMed->SetCellInfo(aCellInfo); myMed->SetCellInfo(aCellInfo);
@ -524,8 +524,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo, PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
SMDS_MED_ENTITY, SMDS_MED_ENTITY,
eTRIA3, eTRIA3,
SMDS_MED_CONNECTIVITY,
aTriaConn, aTriaConn,
SMDS_MED_CONNECTIVITY,
aTriaFamilyNums, aTriaFamilyNums,
anTriaElemNums); anTriaElemNums);
MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eTRIA3<<"; aNbElems = "<<aNbElems); MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eTRIA3<<"; aNbElems = "<<aNbElems);
@ -535,8 +535,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo, PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
SMDS_MED_ENTITY, SMDS_MED_ENTITY,
eQUAD4, eQUAD4,
SMDS_MED_CONNECTIVITY,
aQuadConn, aQuadConn,
SMDS_MED_CONNECTIVITY,
aQuadFamilyNums, aQuadFamilyNums,
aQuadElemNums); aQuadElemNums);
MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eQUAD4<<"; aNbElems = "<<aNbElems); MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eQUAD4<<"; aNbElems = "<<aNbElems);
@ -550,9 +550,9 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
PPolygoneInfo aCellInfo = myMed->CrPolygoneInfo(aMeshInfo, PPolygoneInfo aCellInfo = myMed->CrPolygoneInfo(aMeshInfo,
SMDS_MED_ENTITY, SMDS_MED_ENTITY,
ePOLYGONE, ePOLYGONE,
SMDS_MED_CONNECTIVITY,
aPolygoneConn, aPolygoneConn,
aPolygoneInds, aPolygoneInds,
SMDS_MED_CONNECTIVITY,
aPolygoneFamilyNums, aPolygoneFamilyNums,
aPolygoneElemNums); aPolygoneElemNums);
MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePOLYGONE<<"; aNbElems = "<<aNbElems); MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePOLYGONE<<"; aNbElems = "<<aNbElems);
@ -714,8 +714,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo, PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
SMDS_MED_ENTITY, SMDS_MED_ENTITY,
eTETRA4, eTETRA4,
SMDS_MED_CONNECTIVITY,
aTetraConn, aTetraConn,
SMDS_MED_CONNECTIVITY,
aTetraFamilyNums, aTetraFamilyNums,
anTetraElemNums); anTetraElemNums);
MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eTETRA4<<"; aNbElems = "<<aNbElems); MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eTETRA4<<"; aNbElems = "<<aNbElems);
@ -725,8 +725,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo, PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
SMDS_MED_ENTITY, SMDS_MED_ENTITY,
ePYRA5, ePYRA5,
SMDS_MED_CONNECTIVITY,
aPyraConn, aPyraConn,
SMDS_MED_CONNECTIVITY,
aPyraFamilyNums, aPyraFamilyNums,
anPyraElemNums); anPyraElemNums);
MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePYRA5<<"; aNbElems = "<<aNbElems); MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePYRA5<<"; aNbElems = "<<aNbElems);
@ -736,8 +736,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo, PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
SMDS_MED_ENTITY, SMDS_MED_ENTITY,
ePENTA6, ePENTA6,
SMDS_MED_CONNECTIVITY,
aPentaConn, aPentaConn,
SMDS_MED_CONNECTIVITY,
aPentaFamilyNums, aPentaFamilyNums,
anPentaElemNums); anPentaElemNums);
MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePENTA6<<"; aNbElems = "<<aNbElems); MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePENTA6<<"; aNbElems = "<<aNbElems);
@ -747,8 +747,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo, PCellInfo aCellInfo = myMed->CrCellInfo(aMeshInfo,
SMDS_MED_ENTITY, SMDS_MED_ENTITY,
eHEXA8, eHEXA8,
SMDS_MED_CONNECTIVITY,
aHexaConn, aHexaConn,
SMDS_MED_CONNECTIVITY,
aHexaFamilyNums, aHexaFamilyNums,
aHexaElemNums); aHexaElemNums);
MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eHEXA8<<"; aNbElems = "<<aNbElems); MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<eHEXA8<<"; aNbElems = "<<aNbElems);
@ -762,10 +762,10 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
PPolyedreInfo aCellInfo = myMed->CrPolyedreInfo(aMeshInfo, PPolyedreInfo aCellInfo = myMed->CrPolyedreInfo(aMeshInfo,
SMDS_MED_ENTITY, SMDS_MED_ENTITY,
ePOLYEDRE, ePOLYEDRE,
SMDS_MED_CONNECTIVITY,
aPolyedreConn,
aPolyedreFaces,
aPolyedreInds, aPolyedreInds,
aPolyedreFaces,
aPolyedreConn,
SMDS_MED_CONNECTIVITY,
aPolyedreFamilyNums, aPolyedreFamilyNums,
aPolyedreElemNums); aPolyedreElemNums);
MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePOLYEDRE<<"; aNbElems = "<<aNbElems); MESSAGE("Perform - anEntity = "<<SMDS_MED_ENTITY<<"; aGeom = "<<ePOLYEDRE<<"; aNbElems = "<<aNbElems);

2
src/OBJECT/SMESH_Actor.cxx
View File

@ -786,6 +786,8 @@ vtkDataSet* SMESH_ActorDef::GetInput(){
void SMESH_ActorDef::SetTransform(VTKViewer_Transform* theTransform){ void SMESH_ActorDef::SetTransform(VTKViewer_Transform* theTransform){
Superclass::SetTransform(theTransform);
myNodeActor->SetTransform(theTransform); myNodeActor->SetTransform(theTransform);
myBaseActor->SetTransform(theTransform); myBaseActor->SetTransform(theTransform);

2
src/SMESHFiltersSelection/Makefile.in
View File

@ -64,7 +64,7 @@ EXPORT_HEADERS= SMESH_Type.h \
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \ CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \
-I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome -I${BOOSTDIR} -I${GEOM_ROOT_DIR}/include/salome ${BOOST_CPPFLAGS}
CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
-I${GEOM_ROOT_DIR}/include/salome -I${BOOSTDIR} -I${GEOM_ROOT_DIR}/include/salome -I${BOOSTDIR}
LDFLAGS += $(OCC_KERNEL_LIBS) -L${GUI_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeApp -lsuit LDFLAGS += $(OCC_KERNEL_LIBS) -L${GUI_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeApp -lsuit

7
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -1314,7 +1314,6 @@ const QMap<int, QString>& SMESHGUI_FilterTable::getCriteria (const int theType)
aCriteria[ SMESH::FT_BelongToGeom ] = tr("BELONG_TO_GEOM"); aCriteria[ SMESH::FT_BelongToGeom ] = tr("BELONG_TO_GEOM");
aCriteria[ SMESH::FT_LyingOnGeom ] = tr("LYING_ON_GEOM"); aCriteria[ SMESH::FT_LyingOnGeom ] = tr("LYING_ON_GEOM");
aCriteria[ SMESH::FT_BadOrientedVolume ] = tr("BAD_ORIENTED_VOLUME"); aCriteria[ SMESH::FT_BadOrientedVolume ] = tr("BAD_ORIENTED_VOLUME");
aCriteria[ SMESH::FT_Volume3D ] = tr("VOLUME_3D");
} }
return aCriteria; return aCriteria;
} }
@ -2217,17 +2216,17 @@ bool SMESHGUI_FilterDlg::createFilter (const int theType)
//======================================================================= //=======================================================================
void SMESHGUI_FilterDlg::insertFilterInViewer() void SMESHGUI_FilterDlg::insertFilterInViewer()
{ {
if (SVTK_InteractorStyle* aStyle = SMESH::GetInteractorStyle()) { if (SVTK_Selector* aSelector = SMESH::GetSelector()) {
SMESH::ElementType anEntType = (SMESH::ElementType)myTable->GetType(); SMESH::ElementType anEntType = (SMESH::ElementType)myTable->GetType();
if (myFilter[ myTable->GetType() ]->_is_nil() || if (myFilter[ myTable->GetType() ]->_is_nil() ||
myFilter[ myTable->GetType() ]->GetPredicate()->_is_nil() || myFilter[ myTable->GetType() ]->GetPredicate()->_is_nil() ||
!mySetInViewer->isChecked()) { !mySetInViewer->isChecked()) {
SMESH::RemoveFilter(getFilterId(anEntType), aStyle); SMESH::RemoveFilter(getFilterId(anEntType), aSelector);
} else { } else {
Handle(SMESHGUI_PredicateFilter) aFilter = new SMESHGUI_PredicateFilter(); Handle(SMESHGUI_PredicateFilter) aFilter = new SMESHGUI_PredicateFilter();
aFilter->SetPredicate(myFilter[ myTable->GetType() ]->GetPredicate()); aFilter->SetPredicate(myFilter[ myTable->GetType() ]->GetPredicate());
SMESH::SetFilter(aFilter, aStyle); SMESH::SetFilter(aFilter, aSelector);
} }
} }
} }

25
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
View File

@ -716,8 +716,6 @@ void SMESHGUI_GroupDlg::onListSelectionChanged()
SALOME_ListIO aList; SALOME_ListIO aList;
aList.Append(myActor->getIO()); aList.Append(myActor->getIO());
mySelectionMgr->setSelectedObjects(aList,false); mySelectionMgr->setSelectedObjects(aList,false);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->highlight( myActor->getIO(), true, true );
} }
myIsBusy = false; myIsBusy = false;
} }
@ -1096,12 +1094,27 @@ void SMESHGUI_GroupDlg::onAdd()
SMESH::ElementType aType = SMESH::ALL; SMESH::ElementType aType = SMESH::ALL;
switch(myTypeId) { switch(myTypeId) {
case 0: aType = SMESH::NODE; break; case 0:
case 1: aType = SMESH::EDGE; break; aType = SMESH::NODE;
case 2: aType = SMESH::FACE; break; mySelector->SetSelectionMode(NodeSelection);
case 3: aType = SMESH::VOLUME; break; break;
case 1:
aType = SMESH::EDGE;
mySelector->SetSelectionMode(EdgeSelection);
break;
case 2:
aType = SMESH::FACE;
mySelector->SetSelectionMode(FaceSelection);
break;
case 3:
aType = SMESH::VOLUME;
mySelector->SetSelectionMode(VolumeSelection);
break;
default:
mySelector->SetSelectionMode(ActorSelection);
} }
if (myCurrentLineEdit == 0) { if (myCurrentLineEdit == 0) {
//if (aNbSel != 1) { myIsBusy = false; return; } //if (aNbSel != 1) { myIsBusy = false; return; }
QString aListStr = ""; QString aListStr = "";

9
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
View File

@ -51,7 +51,6 @@
#include "SVTK_Selector.h" #include "SVTK_Selector.h"
#include "SVTK_ViewModel.h" #include "SVTK_ViewModel.h"
#include "SVTK_ViewWindow.h" #include "SVTK_ViewWindow.h"
#include "SVTK_InteractorStyle.h"
// OCCT Includes // OCCT Includes
#include <Precision.hxx> #include <Precision.hxx>
@ -504,8 +503,8 @@ void SMESHGUI_MultiEditDlg::onSelectionDone()
myActor = SMESH::FindActorByEntry(aList.First()->getEntry()); myActor = SMESH::FindActorByEntry(aList.First()->getEntry());
if (!myActor) if (!myActor)
myActor = SMESH::FindActorByObject(myMesh); myActor = SMESH::FindActorByObject(myMesh);
SVTK_InteractorStyle* aStyle = SMESH::GetInteractorStyle(); SVTK_Selector* aSelector = SMESH::GetSelector();
Handle(VTKViewer_Filter) aFilter = aStyle->GetFilter(myFilterType); Handle(VTKViewer_Filter) aFilter = aSelector->GetFilter(myFilterType);
if (!aFilter.IsNull()) if (!aFilter.IsNull())
aFilter->SetActor(myActor); aFilter->SetActor(myActor);
} }
@ -605,9 +604,9 @@ void SMESHGUI_MultiEditDlg::onFilterAccepted()
//======================================================================= //=======================================================================
bool SMESHGUI_MultiEditDlg::isIdValid (const int theId) const bool SMESHGUI_MultiEditDlg::isIdValid (const int theId) const
{ {
SVTK_InteractorStyle* aStyle = SMESH::GetInteractorStyle(); SVTK_Selector* aSelector = SMESH::GetSelector();
Handle(SMESHGUI_Filter) aFilter = Handle(SMESHGUI_Filter) aFilter =
Handle(SMESHGUI_Filter)::DownCast(aStyle->GetFilter(myFilterType)); Handle(SMESHGUI_Filter)::DownCast(aSelector->GetFilter(myFilterType));
return (!aFilter.IsNull() && aFilter->IsObjValid(theId)); return (!aFilter.IsNull() && aFilter->IsObjValid(theId));
} }

1
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
View File

@ -262,6 +262,7 @@ void SMESHGUI_RemoveElementsDlg::ClickOnApply()
if (aResult) { if (aResult) {
myEditCurrentArgument->clear(); myEditCurrentArgument->clear();
mySelector->ClearIndex();
SMESH::UpdateView(); SMESH::UpdateView();
} }
} }

1
src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
View File

@ -265,6 +265,7 @@ void SMESHGUI_RemoveNodesDlg::ClickOnApply()
if (aResult) { if (aResult) {
myEditCurrentArgument->clear(); myEditCurrentArgument->clear();
mySelector->ClearIndex();
SMESH::UpdateView(); SMESH::UpdateView();
} }

5
src/SMESHGUI/SMESHGUI_Selection.cxx
View File

@ -218,7 +218,6 @@ QString SMESHGUI_Selection::controlMode( int ind ) const
case SMESH_Actor::eMultiConnection: return "eMultiConnection"; case SMESH_Actor::eMultiConnection: return "eMultiConnection";
case SMESH_Actor::eMultiConnection2D: return "eMultiConnection2D"; case SMESH_Actor::eMultiConnection2D: return "eMultiConnection2D";
case SMESH_Actor::eArea: return "eArea"; case SMESH_Actor::eArea: return "eArea";
case SMESH_Actor::eVolume3D: return "eVolume3D";
case SMESH_Actor::eTaper: return "eTaper"; case SMESH_Actor::eTaper: return "eTaper";
case SMESH_Actor::eAspectRatio: return "eAspectRatio"; case SMESH_Actor::eAspectRatio: return "eAspectRatio";
case SMESH_Actor::eAspectRatio3D: return "eAspectRatio3D"; case SMESH_Actor::eAspectRatio3D: return "eAspectRatio3D";
@ -313,8 +312,8 @@ QVariant SMESHGUI_Selection::isVisible( int ind ) const
QString entry = static_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].get() )->entry(); QString entry = static_cast<SalomeApp_DataOwner*>( myDataOwners[ ind ].get() )->entry();
SMESH_Actor* actor = SMESH::FindActorByEntry( entry.latin1() ); SMESH_Actor* actor = SMESH::FindActorByEntry( entry.latin1() );
if ( actor && actor->hasIO() ) { if ( actor && actor->hasIO() ) {
SVTK_RenderWindowInteractor* renderInter = SMESH::GetCurrentVtkView()->getRWInteractor(); if(SVTK_ViewWindow* aViewWindow = SMESH::GetCurrentVtkView())
return QVariant( renderInter->isVisible( actor->getIO() ), 0 ); return QVariant( aViewWindow->isVisible( actor->getIO() ), 0 );
} }
} }
return QVariant( false, 0 ); return QVariant( false, 0 );

75
src/SMESHGUI/SMESHGUI_VTKUtils.cxx
View File

@ -36,9 +36,6 @@
#include "SVTK_Selector.h" #include "SVTK_Selector.h"
#include "SVTK_ViewModel.h" #include "SVTK_ViewModel.h"
#include "SVTK_ViewWindow.h" #include "SVTK_ViewWindow.h"
#include "SVTK_RenderWindow.h"
#include "SVTK_InteractorStyle.h"
#include "SVTK_RenderWindowInteractor.h"
#include "utilities.h" #include "utilities.h"
@ -449,84 +446,82 @@ namespace SMESH{
SP2 = mgr->doubleValue( "SMESH", "selection_precision_element", 0.001 ); SP2 = mgr->doubleValue( "SMESH", "selection_precision_element", 0.001 );
for ( int i=0, n=views.count(); i<n; i++ ){ for ( int i=0, n=views.count(); i<n; i++ ){
SVTK_ViewWindow* aVtkView = GetVtkViewWindow( views[i] );
if (!aVtkView) continue;
// update VTK viewer properties // update VTK viewer properties
SVTK_RenderWindowInteractor* anInteractor = aVtkView->getRWInteractor(); if(SVTK_ViewWindow* aVtkView = GetVtkViewWindow( views[i] )){
if (anInteractor) {
// mesh element selection // mesh element selection
anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., aVtkView->SetSelectionProp(aSelColor.red()/255.,
aSelColor.blue()/255., SW ); aSelColor.green()/255.,
aSelColor.blue()/255.,
SW );
// tolerances // tolerances
anInteractor->SetSelectionTolerance(SP1, SP2); aVtkView->SetSelectionTolerance(SP1, SP2);
// pre-selection // pre-selection
SVTK_InteractorStyle* aStyle = aVtkView->SetPreselectionProp(aPreColor.red()/255.,
dynamic_cast<SVTK_InteractorStyle*>( anInteractor->GetInteractorStyle() ); aPreColor.green()/255.,
if (aStyle) { aPreColor.blue()/255.,
aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255., PW);
aPreColor.blue()/255., PW);
}
}
// update actors // update actors
vtkRenderer* aRenderer = aVtkView->getRenderer(); vtkRenderer* aRenderer = aVtkView->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)){
anActor->SetHighlightColor(aHiColor.red()/255., aHiColor.green()/255., anActor->SetHighlightColor(aHiColor.red()/255.,
aHiColor.green()/255.,
aHiColor.blue()/255.); aHiColor.blue()/255.);
anActor->SetPreHighlightColor(aPreColor.red()/255., aPreColor.green()/255., anActor->SetPreHighlightColor(aPreColor.red()/255.,
aPreColor.green()/255.,
aPreColor.blue()/255.); aPreColor.blue()/255.);
} }
} }
} }
} }
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
SVTK_InteractorStyle* GetInteractorStyle(SUIT_ViewWindow *theWindow){ SVTK_Selector*
if(SVTK_ViewWindow* aWnd = GetVtkViewWindow(theWindow)){ GetSelector(SUIT_ViewWindow *theWindow)
if(SVTK_RenderWindowInteractor* anInteractor = aWnd->getRWInteractor()){ {
return dynamic_cast<SVTK_InteractorStyle*>( anInteractor->GetInteractorStyle() ); if(SVTK_ViewWindow* aWnd = GetVtkViewWindow(theWindow))
} return aWnd->GetSelector();
}
return NULL; return NULL;
} }
void SetFilter(const Handle(VTKViewer_Filter)& theFilter, void SetFilter(const Handle(VTKViewer_Filter)& theFilter,
SVTK_InteractorStyle* theStyle) SVTK_Selector* theSelector)
{ {
if (theStyle) if (theSelector)
theStyle->SetFilter(theFilter); theSelector->SetFilter(theFilter);
} }
Handle(VTKViewer_Filter) GetFilter(int theId, SVTK_InteractorStyle* theStyle) Handle(VTKViewer_Filter) GetFilter(int theId, SVTK_Selector* theSelector)
{ {
return theStyle->GetFilter(theId); return theSelector->GetFilter(theId);
} }
bool IsFilterPresent(int theId, SVTK_InteractorStyle* theStyle) bool IsFilterPresent(int theId, SVTK_Selector* theSelector)
{ {
return theStyle->IsFilterPresent(theId); return theSelector->IsFilterPresent(theId);
} }
void RemoveFilter(int theId, SVTK_InteractorStyle* theStyle) void RemoveFilter(int theId, SVTK_Selector* theSelector)
{ {
theStyle->RemoveFilter(theId); theSelector->RemoveFilter(theId);
} }
void RemoveFilters(SVTK_InteractorStyle* theStyle) void RemoveFilters(SVTK_Selector* theSelector)
{ {
for ( int id = SMESHGUI_NodeFilter; theStyle && id < SMESHGUI_LastFilter; id++ ) for ( int id = SMESHGUI_NodeFilter; theSelector && id < SMESHGUI_LastFilter; id++ )
theStyle->RemoveFilter( id ); theSelector->RemoveFilter( id );
} }
bool IsValid(SALOME_Actor* theActor, int theCellId, bool IsValid(SALOME_Actor* theActor, int theCellId,
SVTK_InteractorStyle* theStyle) SVTK_Selector* theSelector)
{ {
return theStyle->IsValid(theActor,theCellId); return theSelector->IsValid(theActor,theCellId);
} }

17
src/SMESHGUI/SMESHGUI_VTKUtils.h
View File

@ -34,7 +34,6 @@ class SUIT_Study;
class SUIT_ViewWindow; class SUIT_ViewWindow;
class SUIT_ViewManager; class SUIT_ViewManager;
class SVTK_InteractorStyle;
class SVTK_ViewWindow; class SVTK_ViewWindow;
class SVTK_Selector; class SVTK_Selector;
@ -119,25 +118,25 @@ namespace SMESH{
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
SVTK_InteractorStyle* SVTK_Selector*
GetInteractorStyle (SUIT_ViewWindow* = GetActiveWindow()); GetSelector(SUIT_ViewWindow* = GetActiveWindow());
void SetFilter (const Handle(VTKViewer_Filter)& theFilter, void SetFilter (const Handle(VTKViewer_Filter)& theFilter,
SVTK_InteractorStyle* theStyle = GetInteractorStyle()); SVTK_Selector* theSelector = GetSelector());
Handle(VTKViewer_Filter) Handle(VTKViewer_Filter)
GetFilter (int theId, SVTK_InteractorStyle* theStyle = GetInteractorStyle()); GetFilter (int theId, SVTK_Selector* theSelector = GetSelector());
bool IsFilterPresent (int theId, bool IsFilterPresent (int theId,
SVTK_InteractorStyle* theStyle = GetInteractorStyle()); SVTK_Selector* theSelector = GetSelector());
void RemoveFilter (int theId, void RemoveFilter (int theId,
SVTK_InteractorStyle* theStyle = GetInteractorStyle()); SVTK_Selector* theSelector = GetSelector());
void RemoveFilters (SVTK_InteractorStyle* theStyle = GetInteractorStyle()); void RemoveFilters (SVTK_Selector* theSelector = GetSelector());
bool IsValid (SALOME_Actor* theActor, int theCellId, bool IsValid (SALOME_Actor* theActor, int theCellId,
SVTK_InteractorStyle* theStyle = GetInteractorStyle()); SVTK_Selector* theSelector = GetSelector());
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
int GetNameOfSelectedNodes(SVTK_Selector* theSelector, int GetNameOfSelectedNodes(SVTK_Selector* theSelector,