ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 18:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021197: EDF 1772 SMESH: Automatic meshing hypothesis

Browse Source 
-  myDlg->setHypoSets( SMESH::GetHypothesesSets() );
+  myDlg->setHypoSets( SMESH::GetHypothesesSets( shapeDim ));
This commit is contained in:
eap 2011-03-11 13:17:33 +00:00
parent ed77213c0d
commit 28a69ca812
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SMESHGUI/SMESHGUI_MeshOp.cxx
View File

@ -240,8 +240,6 @@ void SMESHGUI_MeshOp::startOperation()
else else
myDlg->activateObject( SMESHGUI_MeshDlg::Obj ); myDlg->activateObject( SMESHGUI_MeshDlg::Obj );
myDlg->setHypoSets( SMESH::GetHypothesesSets() );
myDlg->setCurrentTab( SMESH::DIM_3D ); myDlg->setCurrentTab( SMESH::DIM_3D );
myDlg->show(); myDlg->show();
@ -513,7 +511,7 @@ void SMESHGUI_MeshOp::selectionDone()
{ {
//shapeDim = 3; // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab //shapeDim = 3; // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab
TopoDS_Shape aShape; TopoDS_Shape aShape;
bool isClosed = GEOMBase::GetShape(aGeomVar, aShape) && /*aShape.Closed()*/BRep_Tool::IsClosed(aShape); bool isClosed = GEOMBase::GetShape(aGeomVar, aShape) && /*aShape.Closed()*/BRep_Tool::IsClosed(aShape);
shapeDim = qMax(isClosed ? 3 : 2, shapeDim); shapeDim = qMax(isClosed ? 3 : 2, shapeDim);
} }
break; break;
@ -550,7 +548,7 @@ void SMESHGUI_MeshOp::selectionDone()
onAlgoSelected(-1, i); onAlgoSelected(-1, i);
} }
myDlg->setMaxHypoDim( shapeDim ); myDlg->setMaxHypoDim( shapeDim );
myDlg->setHypoSets( SMESH::GetHypothesesSets( shapeDim ));
if (!myToCreate) // edition: read hypotheses if (!myToCreate) // edition: read hypotheses
{ {
@ -620,7 +618,7 @@ void SMESHGUI_MeshOp::selectionDone()
myDlg->setGeomPopupEnabled( enable ); myDlg->setGeomPopupEnabled( enable );
} }
} }
else { else { // no geometry defined
myDlg->enableTab( SMESH::DIM_3D ); myDlg->enableTab( SMESH::DIM_3D );
QStringList hypList; QStringList hypList;
availableHyps( SMESH::DIM_3D, Algo, hypList, availableHyps( SMESH::DIM_3D, Algo, hypList,
@ -1882,7 +1880,6 @@ SMESH::SMESH_Hypothesis_var SMESHGUI_MeshOp::getAlgo( const int theDim )
{ {
// Get hypotheses creator client (GUI) // Get hypotheses creator client (GUI)
// BUG 0020378 // BUG 0020378
//SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator(aHypName);
SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator(aHypName); SMESHGUI_GenericHypothesisCreator* aCreator = SMESH::GetHypothesisCreator(aHypName);
// Create algorithm // Create algorithm