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

Join BR-D5-38-2003

Browse Source
This commit is contained in:
apo 2006-01-20 06:57:21 +00:00
parent c453758762
commit 5309d564cb
15 changed files with 388 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

705
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;
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,77 +163,63 @@ 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){
aResult = DRS_FAIL; aResult = DRS_FAIL;
} catch (...) { }catch (...){
aResult = DRS_FAIL; aResult = DRS_FAIL;
} }
if (!anElement) { if(!anElement){
aResult = DRS_WARN_SKIP_ELEM; aResult = DRS_WARN_SKIP_ELEM;
} else { }else{
if (isRenum) { if(isRenum){
anIsElemNum = eFAUX; anIsElemNum = eFAUX;
takeNumbers = false; takeNumbers = false;
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 ))
@ -347,82 +230,63 @@ 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){
aResult = DRS_FAIL; aResult = DRS_FAIL;
} catch (...) { }catch(...){
aResult = DRS_FAIL; aResult = DRS_FAIL;
} }
if (!anElement) { if(!anElement){
aResult = DRS_WARN_SKIP_ELEM; aResult = DRS_WARN_SKIP_ELEM;
} else { }else{
if (isRenum) { if(isRenum){
anIsElemNum = eFAUX; anIsElemNum = eFAUX;
takeNumbers = false; takeNumbers = false;
if (aResult < DRS_WARN_RENUMBER) if (aResult < DRS_WARN_RENUMBER)
@ -436,246 +300,239 @@ 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);
EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX;
TInt aNbElems = aCellInfo->GetNbElem();
if(MYDEBUG) MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
if(MYDEBUG) MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom); for(int iElem = 0; iElem < aNbElems; iElem++){
EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX; TInt aNbNodes = -1;
TInt aNbElems = aCellInfo->GetNbElem();
if(MYDEBUG) MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
if(MYDEBUG) MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
for(int iElem = 0; iElem < aNbElems; iElem++){
TInt aNbNodes = -1;
switch(aGeom){
case eSEG2:
case eSEG3:
aNbNodes = 2;
break;
case eTRIA3:
case eTRIA6:
aNbNodes = 3;
break;
break;
case eQUAD4:
case eQUAD8:
aNbNodes = 4;
break;
case eTETRA4:
case eTETRA10:
aNbNodes = 4;
break;
case ePYRA5:
case ePYRA13:
aNbNodes = 5;
break;
case ePENTA6:
case ePENTA15:
aNbNodes = 6;
break;
case eHEXA8:
case eHEXA20:
aNbNodes = 8;
break;
}
vector<TInt> aNodeIds(aNbNodes);
bool anIsValidConnect = false;
try{
#ifdef _EDF_NODE_IDS_
if(anIsNodeNum) {
for(int i = 0; i < aNbNodes; i++){
aNodeIds[i] = aNodeInfo->GetElemNum(aCellInfo->GetConn(iElem,i)-1);
}
}else{
for(int i = 0; i < aNbNodes; i++){
aNodeIds[i] = aCellInfo->GetConn(iElem,i);
}
}
#else
for(int i = 0; i < aNbNodes; i++){
aNodeIds[i] = aCellInfo->GetConn(iElem,i);
}
#endif
anIsValidConnect = true;
}catch(const std::exception& exc){
//INFOS("Follow exception was cought:\n\t"<<exc.what());
aResult = DRS_FAIL;
}catch(...){
//INFOS("Unknown exception was cought !!!");
aResult = DRS_FAIL;
}
if(!anIsValidConnect)
continue;
bool isRenum = false;
SMDS_MeshElement* anElement = NULL;
TInt aFamNum = aCellInfo->GetFamNum(iElem);
try{
//MESSAGE("Try to create element # " << iElem << " with id = "
// << aCellInfo->GetElemNum(iElem));
switch(aGeom){ switch(aGeom){
case eSEG2: case eSEG2:
case eSEG3: case eSEG3:
if(anIsElemNum) aNbNodes = 2;
anElement = myMesh->AddEdgeWithID(aNodeIds[0],
aNodeIds[1],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddEdge(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]));
isRenum = anIsElemNum;
}
break; break;
case eTRIA3: case eTRIA3:
case eTRIA6: case eTRIA6:
aNbNodes = 3; aNbNodes = 3;
if(anIsElemNum) break;
anElement = myMesh->AddFaceWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]));
isRenum = anIsElemNum;
}
break; break;
case eQUAD4: case eQUAD4:
case eQUAD8: case eQUAD8:
aNbNodes = 4; aNbNodes = 4;
// There is some differnce between SMDS and MED
if(anIsElemNum)
anElement = myMesh->AddFaceWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aNodeIds[3],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]),
FindNode(myMesh,aNodeIds[3]));
isRenum = anIsElemNum;
}
break; break;
case eTETRA4: case eTETRA4:
case eTETRA10: case eTETRA10:
aNbNodes = 4; aNbNodes = 4;
if(anIsElemNum)
anElement = myMesh->AddVolumeWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aNodeIds[3],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]),
FindNode(myMesh,aNodeIds[3]));
isRenum = anIsElemNum;
}
break; break;
case ePYRA5: case ePYRA5:
case ePYRA13: case ePYRA13:
aNbNodes = 5; aNbNodes = 5;
// There is some differnce between SMDS and MED
if(anIsElemNum)
anElement = myMesh->AddVolumeWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aNodeIds[3],
aNodeIds[4],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]),
FindNode(myMesh,aNodeIds[3]),
FindNode(myMesh,aNodeIds[4]));
isRenum = anIsElemNum;
}
break; break;
case ePENTA6: case ePENTA6:
case ePENTA15: case ePENTA15:
aNbNodes = 6; aNbNodes = 6;
if(anIsElemNum)
anElement = myMesh->AddVolumeWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aNodeIds[3],
aNodeIds[4],
aNodeIds[5],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]),
FindNode(myMesh,aNodeIds[3]),
FindNode(myMesh,aNodeIds[4]),
FindNode(myMesh,aNodeIds[5]));
isRenum = anIsElemNum;
}
break; break;
case eHEXA8: case eHEXA8:
case eHEXA20: case eHEXA20:
aNbNodes = 8; aNbNodes = 8;
if(anIsElemNum) break;
anElement = myMesh->AddVolumeWithID(aNodeIds[0], }
TNodeIds aNodeIds(aNbNodes);
bool anIsValidConnect = false;
TCConnSlice aConnSlice = aCellInfo->GetConnSlice(iElem);
try{
#ifdef _EDF_NODE_IDS_
if(anIsNodeNum)
for(int iNode = 0; iNode < aNbNodes; iNode++)
aNodeIds[iNode] = aNodeInfo->GetElemNum(aConnSlice[iNode] - 1);
else
for(int iNode = 0; iNode < aNbNodes; iNode++)
aNodeIds[iNode] = aConnSlice[iNode];
#else
for(int iNode = 0; iNode < aNbNodes; iNode++)
aNodeIds[iNode] = aConnSlice[iNode];
#endif
anIsValidConnect = true;
}catch(const std::exception& exc){
//INFOS("Follow exception was cought:\n\t"<<exc.what());
aResult = DRS_FAIL;
}catch(...){
//INFOS("Unknown exception was cought !!!");
aResult = DRS_FAIL;
}
if(!anIsValidConnect)
continue;
bool isRenum = false;
SMDS_MeshElement* anElement = NULL;
TInt aFamNum = aCellInfo->GetFamNum(iElem);
try{
//MESSAGE("Try to create element # " << iElem << " with id = "
// << aCellInfo->GetElemNum(iElem));
switch(aGeom){
case eSEG2:
case eSEG3:
if(anIsElemNum)
anElement = myMesh->AddEdgeWithID(aNodeIds[0],
aNodeIds[1],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddEdge(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]));
isRenum = anIsElemNum;
}
break;
case eTRIA3:
case eTRIA6:
aNbNodes = 3;
if(anIsElemNum)
anElement = myMesh->AddFaceWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]));
isRenum = anIsElemNum;
}
break;
case eQUAD4:
case eQUAD8:
aNbNodes = 4;
// There is some differnce between SMDS and MED
if(anIsElemNum)
anElement = myMesh->AddFaceWithID(aNodeIds[0],
aNodeIds[1], aNodeIds[1],
aNodeIds[2], aNodeIds[2],
aNodeIds[3], aNodeIds[3],
aNodeIds[4],
aNodeIds[5],
aNodeIds[6],
aNodeIds[7],
aCellInfo->GetElemNum(iElem)); aCellInfo->GetElemNum(iElem));
if (!anElement) { if (!anElement) {
anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]), anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]), FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]), FindNode(myMesh,aNodeIds[2]),
FindNode(myMesh,aNodeIds[3]), FindNode(myMesh,aNodeIds[3]));
FindNode(myMesh,aNodeIds[4]), isRenum = anIsElemNum;
FindNode(myMesh,aNodeIds[5]), }
FindNode(myMesh,aNodeIds[6]), break;
FindNode(myMesh,aNodeIds[7])); case eTETRA4:
isRenum = anIsElemNum; case eTETRA10:
aNbNodes = 4;
if(anIsElemNum)
anElement = myMesh->AddVolumeWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aNodeIds[3],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]),
FindNode(myMesh,aNodeIds[3]));
isRenum = anIsElemNum;
}
break;
case ePYRA5:
case ePYRA13:
aNbNodes = 5;
// There is some differnce between SMDS and MED
if(anIsElemNum)
anElement = myMesh->AddVolumeWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aNodeIds[3],
aNodeIds[4],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]),
FindNode(myMesh,aNodeIds[3]),
FindNode(myMesh,aNodeIds[4]));
isRenum = anIsElemNum;
}
break;
case ePENTA6:
case ePENTA15:
aNbNodes = 6;
if(anIsElemNum)
anElement = myMesh->AddVolumeWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aNodeIds[3],
aNodeIds[4],
aNodeIds[5],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]),
FindNode(myMesh,aNodeIds[3]),
FindNode(myMesh,aNodeIds[4]),
FindNode(myMesh,aNodeIds[5]));
isRenum = anIsElemNum;
}
break;
case eHEXA8:
case eHEXA20:
aNbNodes = 8;
if(anIsElemNum)
anElement = myMesh->AddVolumeWithID(aNodeIds[0],
aNodeIds[1],
aNodeIds[2],
aNodeIds[3],
aNodeIds[4],
aNodeIds[5],
aNodeIds[6],
aNodeIds[7],
aCellInfo->GetElemNum(iElem));
if (!anElement) {
anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
FindNode(myMesh,aNodeIds[1]),
FindNode(myMesh,aNodeIds[2]),
FindNode(myMesh,aNodeIds[3]),
FindNode(myMesh,aNodeIds[4]),
FindNode(myMesh,aNodeIds[5]),
FindNode(myMesh,aNodeIds[6]),
FindNode(myMesh,aNodeIds[7]));
isRenum = anIsElemNum;
}
break;
} }
break; }catch(const std::exception& exc){
//INFOS("Follow exception was cought:\n\t"<<exc.what());
aResult = DRS_FAIL;
}catch(...){
//INFOS("Unknown exception was cought !!!");
aResult = DRS_FAIL;
} }
}catch(const std::exception& exc){
//INFOS("Follow exception was cought:\n\t"<<exc.what());
aResult = DRS_FAIL;
}catch(...){
//INFOS("Unknown exception was cought !!!");
aResult = DRS_FAIL;
}
if (!anElement) { if (!anElement) {
aResult = DRS_WARN_SKIP_ELEM; aResult = DRS_WARN_SKIP_ELEM;
} }
else { else {
if (isRenum) { if (isRenum) {
anIsElemNum = eFAUX; anIsElemNum = eFAUX;
takeNumbers = false; takeNumbers = false;
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 myFamilies[aFamNum]->AddElement(anElement);
aFamily->AddElement(anElement); myFamilies[aFamNum]->SetType(anElement->GetType());
aFamily->SetType(anElement->GetType()); }
} }
} }
} }}
} }
} }
break;
} }
} }
}catch(const std::exception& exc){ }catch(const std::exception& exc){

28
src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
View File

@ -329,12 +329,11 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
int aFamId = (*aFamsIter)->GetId(); int aFamId = (*aFamsIter)->GetId();
const set<const SMDS_MeshElement *>& anElems = (*aFamsIter)->GetElements(); const set<const SMDS_MeshElement *>& anElems = (*aFamsIter)->GetElements();
set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElems.begin(); set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElems.begin();
for (; anElemsIter != anElems.end(); anElemsIter++) for (; anElemsIter != anElems.end(); anElemsIter++)
{ {
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
@ -373,8 +372,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,
@ -421,8 +421,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);
@ -532,8 +532,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);
@ -543,8 +543,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);
@ -558,9 +558,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);
@ -722,8 +722,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);
@ -733,8 +733,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);
@ -744,8 +744,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);
@ -755,8 +755,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);
@ -770,10 +770,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/DriverMED/Makefile.in
View File

@ -63,7 +63,7 @@ CPPFLAGS += $(OCC_INCLUDES) -I${MED_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
LDFLAGS += -lMeshDriver -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper LDFLAGS += -lMeshDriver -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper
LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace -lSALOMEBasics LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS -L${KERNEL_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lmed_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
@CONCLUDE@ @CONCLUDE@

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

4
src/SMESHGUI/SMESHGUI.cxx
View File

@ -1070,6 +1070,10 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
if( !mgr ) if( !mgr )
return false; return false;
if (CORBA::is_nil(GetSMESHGen()->GetCurrentStudy())) {
GetSMESHGen()->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy());
}
SUIT_ViewWindow* view = application()->desktop()->activeWindow(); SUIT_ViewWindow* view = application()->desktop()->activeWindow();
SVTK_ViewWindow* vtkwnd = dynamic_cast<SVTK_ViewWindow*>( view ); SVTK_ViewWindow* vtkwnd = dynamic_cast<SVTK_ViewWindow*>( view );

6
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -2260,17 +2260,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);
} }
} }
} }

34
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
View File

@ -89,6 +89,7 @@ SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule, const char* name,
WStyle_Title | WStyle_SysMenu | WDestructiveClose), WStyle_Title | WStyle_SysMenu | WDestructiveClose),
mySMESHGUI( theModule ), mySMESHGUI( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ), mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
mySelector(SMESH::GetViewWindow( theModule )->GetSelector()),
myIsBusy( false ), myIsBusy( false ),
myActor( 0 ) myActor( 0 )
{ {
@ -103,7 +104,6 @@ SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule, const char* name,
myGeomGroupLine->setEnabled(false); myGeomGroupLine->setEnabled(false);
} }
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
/* Move widget on the botton right corner of main widget */ /* Move widget on the botton right corner of main widget */
int x, y ; int x, y ;
@ -121,12 +121,11 @@ SMESHGUI_GroupDlg::SMESHGUI_GroupDlg( SMESHGUI* theModule, const char* name,
WStyle_Title | WStyle_SysMenu | WDestructiveClose), WStyle_Title | WStyle_SysMenu | WDestructiveClose),
mySMESHGUI( theModule ), mySMESHGUI( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ), mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
mySelector(SMESH::GetViewWindow( theModule )->GetSelector()),
myIsBusy( false ) myIsBusy( false )
{ {
if (!name) setName("SMESHGUI_GroupDlg"); if (!name) setName("SMESHGUI_GroupDlg");
mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
initDialog(false); initDialog(false);
if (!theGroup->_is_nil()) if (!theGroup->_is_nil())
init(theGroup); init(theGroup);
@ -563,14 +562,14 @@ void SMESHGUI_GroupDlg::setSelectionMode (int theMode)
aViewWindow->SetSelectionMode(VolumeSelection); aViewWindow->SetSelectionMode(VolumeSelection);
} }
} else { } else {
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
if (theMode == 4) if (theMode == 4)
mySelectionMgr->installFilter(mySubMeshFilter); mySelectionMgr->installFilter(mySubMeshFilter);
else if (theMode == 5) else if (theMode == 5)
mySelectionMgr->installFilter(myGroupFilter); mySelectionMgr->installFilter(myGroupFilter);
else if (theMode == 6) else if (theMode == 6)
mySelectionMgr->installFilter(myMeshFilter); mySelectionMgr->installFilter(myMeshFilter);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
} }
mySelectionMode = theMode; mySelectionMode = theMode;
} }
@ -716,8 +715,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 +1093,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();
} }

4
src/SMESHGUI/SMESHGUI_Selection.cxx
View File

@ -327,8 +327,8 @@ QVariant SMESHGUI_Selection::isVisible( int ind ) const
QString ent = entry( ind ); QString ent = entry( ind );
SMESH_Actor* actor = SMESH::FindActorByEntry( ent.latin1() ); SMESH_Actor* actor = SMESH::FindActorByEntry( ent.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 );

85
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"
@ -448,85 +445,83 @@ namespace SMESH{
double SP1 = mgr->doubleValue( "SMESH", "selection_precision_node", 0.025 ), double SP1 = mgr->doubleValue( "SMESH", "selection_precision_node", 0.025 ),
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] ); // update VTK viewer properties
if (!aVtkView) continue; if(SVTK_ViewWindow* aVtkView = GetVtkViewWindow( views[i] )){
// update VTK viewer properties // mesh element selection
SVTK_RenderWindowInteractor* anInteractor = aVtkView->getRWInteractor(); aVtkView->SetSelectionProp(aSelColor.red()/255.,
if (anInteractor) { aSelColor.green()/255.,
// mesh element selection aSelColor.blue()/255.,
anInteractor->SetSelectionProp(aSelColor.red()/255., aSelColor.green()/255., SW );
aSelColor.blue()/255., SW ); // tolerances
aVtkView->SetSelectionTolerance(SP1, SP2);
// tolerances // pre-selection
anInteractor->SetSelectionTolerance(SP1, SP2); aVtkView->SetPreselectionProp(aPreColor.red()/255.,
aPreColor.green()/255.,
// pre-selection aPreColor.blue()/255.,
SVTK_InteractorStyle* aStyle = PW);
dynamic_cast<SVTK_InteractorStyle*>( anInteractor->GetInteractorStyle() );
if (aStyle) {
aStyle->setPreselectionProp(aPreColor.red()/255., aPreColor.green()/255.,
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,

2
src/SMESH_I/Makefile.in
View File

@ -96,7 +96,7 @@ LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistr
LDFLAGSFORBIN += -lSMDS -lSMESHDS \ LDFLAGSFORBIN += -lSMDS -lSMESHDS \
-L${MED_ROOT_DIR}/lib/salome -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 \ -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 -lmed_V2_1 \
-lMeshDriver -lMeshDriverMED -lMeshDriverUNV -lMeshDriverDAT -lMeshDriverSTL \ -lMeshDriver -lMeshDriverMED -lMeshDriverUNV -lMeshDriverDAT -lMeshDriverSTL \
-L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry -lSalomeResourcesManager \ -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry -lSalomeResourcesManager \
-lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeNotification -lCASCatch \ -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeNotification -lCASCatch \