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
rnc: Added a missing translation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
index b6e2da7037c14c8e759bcc3b8a63081e09339c21..d2fb709892f82c193a752c33f770b6f1547b155f 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_MeshDlg.cxx
// Author : Sergey LITONIN, Open CASCADE S.A.S.
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_MeshDlg.cxx
// Author : Sergey LITONIN, Open CASCADE S.A.S.
@@
-381,7
+382,7
@@
SMESHGUI_MeshDlg::SMESHGUI_MeshDlg( const bool theToCreate, const bool theIsMesh
myHypoSetButton->setText( tr( "HYPOTHESES_SETS" ) );
myHypoSetButton->setEnabled( false );
myHypoSetButton->setSizePolicy( QSizePolicy::MinimumExpanding,
myHypoSetButton->setText( tr( "HYPOTHESES_SETS" ) );
myHypoSetButton->setEnabled( false );
myHypoSetButton->setSizePolicy( QSizePolicy::MinimumExpanding,
- myHypoSetButton->sizePolicy().verticalPolicy() );
+
myHypoSetButton->sizePolicy().verticalPolicy() );
// Fill layout
QGridLayout* aLay = new QGridLayout( mainFrame() );
// Fill layout
QGridLayout* aLay = new QGridLayout( mainFrame() );
@@
-478,9
+479,13
@@
void SMESHGUI_MeshDlg::setMaxHypoDim( const int maxDim )
const int DIM = maxDim;
for ( int dim = Dim0D; dim <= Dim3D; ++dim ) {
bool enable = ( dim <= DIM );
const int DIM = maxDim;
for ( int dim = Dim0D; dim <= Dim3D; ++dim ) {
bool enable = ( dim <= DIM );
- if ( !enable )
+ if ( !enable )
{
myTabs[ dim ]->reset();
myTabs[ dim ]->reset();
- myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ dim ] ), enable );
+ disableTab( dim );
+ }
+ else {
+ enableTab( dim );
+ }
}
// deselect desabled tab
if ( !myTabWg->isTabEnabled( myTabWg->currentIndex() ) )
}
// deselect desabled tab
if ( !myTabWg->isTabEnabled( myTabWg->currentIndex() ) )
@@
-542,14
+547,14
@@
void SMESHGUI_MeshDlg::setGeomPopupEnabled( const bool enable )
myGeomPopup->addAction( tr("DIRECT_GEOM_SELECTION") )->setData( DIRECT_GEOM_INDEX );
myGeomPopup->addAction( tr("GEOM_BY_MESH_ELEM_SELECTION") )->setData( GEOM_BY_MESH_INDEX );
connect( myGeomPopup, SIGNAL( triggered( QAction* ) ), SLOT( onGeomPopup( QAction* ) ) );
myGeomPopup->addAction( tr("DIRECT_GEOM_SELECTION") )->setData( DIRECT_GEOM_INDEX );
myGeomPopup->addAction( tr("GEOM_BY_MESH_ELEM_SELECTION") )->setData( GEOM_BY_MESH_INDEX );
connect( myGeomPopup, SIGNAL( triggered( QAction* ) ), SLOT( onGeomPopup( QAction* ) ) );
- connect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
+
connect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
}
}
else {
disconnect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
if ( myGeomPopup ) {
}
}
else {
disconnect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
if ( myGeomPopup ) {
- delete myGeomPopup;
- myGeomPopup = 0;
+
delete myGeomPopup;
+
myGeomPopup = 0;
}
}
}
}
}
}
@@
-564,6
+569,7
@@
void SMESHGUI_MeshDlg::setGeomPopupEnabled( const bool enable )
//================================================================================
void SMESHGUI_MeshDlg::disableTab(const int theTabId) {
myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ), false );
//================================================================================
void SMESHGUI_MeshDlg::disableTab(const int theTabId) {
myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ), false );
+ if ( theTabId == Dim3D ) myHypoSetButton->setEnabled( false );
}
//================================================================================
}
//================================================================================
@@
-574,6
+580,10
@@
void SMESHGUI_MeshDlg::disableTab(const int theTabId) {
//================================================================================
void SMESHGUI_MeshDlg::enableTab(const int theTabId) {
myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ), true );
//================================================================================
void SMESHGUI_MeshDlg::enableTab(const int theTabId) {
myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ), true );
+ if ( theTabId == Dim3D ) {
+ QMenu* aHypoSetPopup = myHypoSetButton->menu();
+ myHypoSetButton->setEnabled( aHypoSetPopup && !aHypoSetPopup->actions().isEmpty() );
+ }
}
//================================================================================
}
//================================================================================
@@
-583,7
+593,7
@@
void SMESHGUI_MeshDlg::enableTab(const int theTabId) {
*/
//================================================================================
bool SMESHGUI_MeshDlg::isTabEnabled(const int theTabId) const {
*/
//================================================================================
bool SMESHGUI_MeshDlg::isTabEnabled(const int theTabId) const {
- myTabWg->isTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ) );
+
return
myTabWg->isTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ) );
}
void SMESHGUI_MeshDlg::onGeomSelectionButton(bool isBtnOn)
}
void SMESHGUI_MeshDlg::onGeomSelectionButton(bool isBtnOn)