Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main 13/12/2012
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MultiEditDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index a12ca8fbe1fed72b8fa009a7d0efc5d2047877ce..b87346e6313b43ff68d03ad5c241183776a06c21 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@
-225,7
+225,7
@@
QWidget* SMESHGUI_MultiEditDlg::createMainFrame (QWidget* theParent, const bool
myComboBoxFunctor->addItem(tr("ASPECTRATIO_ELEMENTS"));
myComboBoxFunctor->addItem(tr("MINIMUMANGLE_ELEMENTS"));
myComboBoxFunctor->addItem(tr("SKEW_ELEMENTS"));
myComboBoxFunctor->addItem(tr("ASPECTRATIO_ELEMENTS"));
myComboBoxFunctor->addItem(tr("MINIMUMANGLE_ELEMENTS"));
myComboBoxFunctor->addItem(tr("SKEW_ELEMENTS"));
- myComboBoxFunctor->addItem(tr("AREA_ELEMENTS"));
+
//
myComboBoxFunctor->addItem(tr("AREA_ELEMENTS"));
//myComboBoxFunctor->addItem(tr("LENGTH2D_EDGES")); // for existing elements only
//myComboBoxFunctor->addItem(tr("MULTI2D_BORDERS")); // for existing elements only
myComboBoxFunctor->setCurrentIndex(0);
//myComboBoxFunctor->addItem(tr("LENGTH2D_EDGES")); // for existing elements only
//myComboBoxFunctor->addItem(tr("MULTI2D_BORDERS")); // for existing elements only
myComboBoxFunctor->setCurrentIndex(0);
@@
-362,6
+362,8
@@
SMESH::NumericalFunctor_ptr SMESHGUI_MultiEditDlg::getNumericalFunctor()
aNF = aFilterMgr->CreateLength2D();
else if (myComboBoxFunctor->currentText() == tr("MULTI2D_BORDERS"))
aNF = aFilterMgr->CreateMultiConnection2D();
aNF = aFilterMgr->CreateLength2D();
else if (myComboBoxFunctor->currentText() == tr("MULTI2D_BORDERS"))
aNF = aFilterMgr->CreateMultiConnection2D();
+ else if (myComboBoxFunctor->currentText() == tr("MIN_DIAG_ELEMENTS"))
+ aNF = aFilterMgr->CreateMaxElementLength2D();
else;
return aNF._retn();
else;
return aNF._retn();
@@
-998,12
+1000,12
@@
void SMESHGUI_MultiEditDlg::setSelectionMode()
if (mySubmeshChk->isChecked()) {
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
if (mySubmeshChk->isChecked()) {
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
- mySelectionMgr->installFilter(new SMESH_TypeFilter(SUBMESH));
+ mySelectionMgr->installFilter(new SMESH_TypeFilter(S
MESH::S
UBMESH));
}
else if (myGroupChk->isChecked()) {
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
}
else if (myGroupChk->isChecked()) {
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
- mySelectionMgr->installFilter(new SMESH_TypeFilter(GROUP));
+ mySelectionMgr->installFilter(new SMESH_TypeFilter(
SMESH::
GROUP));
}
if (entityType()) {
}
if (entityType()) {
@@
-1153,7
+1155,8
@@
SMESHGUI_UnionOfTrianglesDlg
{
setWindowTitle(tr("CAPTION"));
{
setWindowTitle(tr("CAPTION"));
- myComboBoxFunctor->setEnabled(true);
+ myComboBoxFunctor->setEnabled(true);
+ myComboBoxFunctor->addItem(tr("AREA_ELEMENTS"));
myComboBoxFunctor->addItem(tr("WARP_ELEMENTS")); // for quadrangles only
myComboBoxFunctor->addItem(tr("TAPER_ELEMENTS")); // for quadrangles only
myComboBoxFunctor->addItem(tr("WARP_ELEMENTS")); // for quadrangles only
myComboBoxFunctor->addItem(tr("TAPER_ELEMENTS")); // for quadrangles only
@@
-1240,6
+1243,8
@@
SMESHGUI_CuttingOfQuadsDlg
myCriterionGrp->show();
myChoiceWidget->show();
myCriterionGrp->show();
myChoiceWidget->show();
+ myComboBoxFunctor->insertItem(0, tr("MIN_DIAG_ELEMENTS"));
+ myComboBoxFunctor->setCurrentIndex(0);
myComboBoxFunctor->setEnabled(false);
connect(myPreviewChk, SIGNAL(stateChanged(int)), this, SLOT(onPreviewChk()));
myComboBoxFunctor->setEnabled(false);
connect(myPreviewChk, SIGNAL(stateChanged(int)), this, SLOT(onPreviewChk()));