-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// 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 includes
//
-/**
-* SMESH SMESHGUI
-*
-* Copyright (C) 2005 CEA/DEN, EDF R&D
-*
-*
-*
-* File : SMESHGUI_MeshDlg.cxx
-* Author : Sergey LITONIN
-* Module : SMESH
-*/
-
#include "SMESHGUI_MeshDlg.h"
+// SALOME GUI includes
#include <SUIT_Session.h>
-
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qtabwidget.h>
-#include <qgroupbox.h>
-#include <qtoolbutton.h>
-#include <qiconset.h>
-#include <qstring.h>
-#include <qcombobox.h>
-#include <qpopupmenu.h>
-#include <qcursor.h>
-#include <qpushbutton.h>
+#include <SUIT_ResourceMgr.h>
+
+// Qt includes
+#include <QVBoxLayout>
+#include <QGridLayout>
+#include <QLabel>
+#include <QTabWidget>
+#include <QGroupBox>
+#include <QToolButton>
+#include <QComboBox>
+#include <QMenu>
+#include <QCursor>
+#include <QPushButton>
+
+#define SPACING 6
+#define MARGIN 11
/*!
* \brief Tab for tab widget containing controls for definition of
*/
//================================================================================
SMESHGUI_MeshTab::SMESHGUI_MeshTab( QWidget* theParent )
-: QFrame( theParent ),
- myPopup( 0 )
+ : QFrame( theParent )
{
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
- QIconSet aCreateIcon( aResMgr->loadPixmap( "SMESH", tr( "ICON_HYPO" ) ) );
- QIconSet aEditIcon( aResMgr->loadPixmap( "SMESH", tr( "ICON_HYPO_EDIT" ) ) );
+ QIcon aCreateIcon( aResMgr->loadPixmap( "SMESH", tr( "ICON_HYPO" ) ) );
+ QIcon aEditIcon( aResMgr->loadPixmap( "SMESH", tr( "ICON_HYPO_EDIT" ) ) );
// Algorifm
QLabel* anAlgoLbl = new QLabel( tr( "ALGORITHM" ), this );
myHyp[ MainHyp ] = new QComboBox( this );
myHyp[ MainHyp ]->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
myCreateHyp[ MainHyp ] = new QToolButton( this );
- myCreateHyp[ MainHyp ]->setIconSet( aCreateIcon );
+ myCreateHyp[ MainHyp ]->setIcon( aCreateIcon );
myEditHyp[ MainHyp ] = new QToolButton( this );
- myEditHyp[ MainHyp ]->setIconSet( aEditIcon );
+ myEditHyp[ MainHyp ]->setIcon( aEditIcon );
// Line
QFrame* aLine = new QFrame( this );
myHyp[ AddHyp ] = new QComboBox( this );
myHyp[ AddHyp ]->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
myCreateHyp[ AddHyp ] = new QToolButton( this );
- myCreateHyp[ AddHyp ]->setIconSet( aCreateIcon );
+ myCreateHyp[ AddHyp ]->setIcon( aCreateIcon );
myEditHyp[ AddHyp ] = new QToolButton( this );
- myEditHyp[ AddHyp ]->setIconSet( aEditIcon );
+ myEditHyp[ AddHyp ]->setIcon( aEditIcon );
// Fill layout
- QGridLayout* aLay = new QGridLayout( this, 5, 4, 5, 5 );
+ QGridLayout* aLay = new QGridLayout( this );
+ aLay->setMargin( MARGIN );
+ aLay->setSpacing( SPACING );
+
aLay->addWidget( anAlgoLbl, 0, 0 );
aLay->addWidget( myHyp[ Algo ], 0, 1 );
aLay->addWidget( aHypLbl, 1, 0 );
aLay->addWidget( myHyp[ MainHyp ], 1, 1 );
aLay->addWidget( myCreateHyp[ MainHyp ], 1, 2 );
aLay->addWidget( myEditHyp[ MainHyp ], 1, 3 );
- aLay->addMultiCellWidget( aLine, 2, 2, 0, 3 );
+ aLay->addWidget( aLine, 2, 0, 1, 4 );
aLay->addWidget( anAddHypLbl, 3, 0 );
aLay->addWidget( myHyp[ AddHyp ], 3, 1 );
aLay->addWidget( myCreateHyp[ AddHyp ], 3, 2 );
setAvailableHyps( AddHyp, QStringList() );
}
+//================================================================================
+/*!
+ * \brief Destructor
+ */
+//================================================================================
SMESHGUI_MeshTab::~SMESHGUI_MeshTab()
{
- if ( myPopup )
- delete myPopup;
}
//================================================================================
if ( theId == Algo )
{
myHyp[ Algo ]->clear();
- myHyp[ Algo ]->insertItem( tr( "NONE" ) );
- myHyp[ Algo ]->insertStringList( theHyps );
- myHyp[ Algo ]->setCurrentItem( 0 );
+ myHyp[ Algo ]->addItem( tr( "NONE" ) );
+ myHyp[ Algo ]->addItems( theHyps );
+ myHyp[ Algo ]->setCurrentIndex( 0 );
}
else {
myCreateHyp[ theId ]->setEnabled( enable );
if ( theId != Algo )
{
myHyp[ theId ]->clear();
- myHyp[ theId ]->insertItem( tr( "NONE" ) );
- myHyp[ theId ]->insertStringList( theHyps );
- myHyp[ theId ]->setCurrentItem( 0 );
+ myHyp[ theId ]->addItem( tr( "NONE" ) );
+ myHyp[ theId ]->addItems( theHyps );
+ myHyp[ theId ]->setCurrentIndex( 0 );
myHyp[ theId ]->setEnabled( !theHyps.isEmpty() );
myEditHyp[ theId ]->setEnabled( false );
}
//================================================================================
void SMESHGUI_MeshTab::addHyp( const int theId, const QString& theHyp )
{
- myHyp[ theId ]->insertItem( theHyp );
- myHyp[ theId ]->setCurrentItem( myHyp[ theId ]->count() - 1 );
+ myHyp[ theId ]->addItem( theHyp );
+ myHyp[ theId ]->setCurrentIndex( myHyp[ theId ]->count() - 1 );
myEditHyp[ theId ]->setEnabled( true );
myHyp[ theId ]->setEnabled( true );
}
const QString& theNewName )
{
if ( theIndex > 0 && theIndex < myHyp[ theId ]->count() )
- myHyp[ theId ]->changeItem( theNewName, theIndex );
+ myHyp[ theId ]->setItemText( theIndex, theNewName );
}
//================================================================================
{
if ( theIndex >= 0 && theIndex < myHyp[ theId ]->count() )
{
- myHyp[ theId ]->setCurrentItem( theIndex );
+ myHyp[ theId ]->setCurrentIndex( theIndex );
if ( myEditHyp[ theId ] )
myEditHyp[ theId ]->setEnabled( theIndex > 0 );
}
//================================================================================
int SMESHGUI_MeshTab::currentHyp( const int theId ) const
{
- return myHyp[ theId ]->currentItem();
+ return myHyp[ theId ]->currentIndex();
}
//================================================================================
//================================================================================
void SMESHGUI_MeshTab::onCreateHyp()
{
- const QObject* aSender = sender();
-
- if ( !myPopup )
- {
- myPopup = new QPopupMenu( 0 );
- connect( myPopup, SIGNAL( activated( int ) ), SLOT( onPopupItem( int ) ) );
- }
+ bool isMainHyp = sender() == myCreateHyp[ MainHyp ];
+
+ QMenu aPopup( this );
- QStringList aHypNames;
- if ( aSender == myCreateHyp[ MainHyp ] )
- {
- aHypNames = myAvailableHyps[ MainHyp ];
- myPopup->setName( "MainHypPopup" );
- }
- else
- {
- aHypNames = myAvailableHyps[ AddHyp ];
- myPopup->setName( "AddHypPopup" );
- }
-
- myPopup->clear();
+ QStringList aHypNames = isMainHyp ?
+ myAvailableHyps[ MainHyp ] : myAvailableHyps[ AddHyp ];
+
+ QList<QAction*> actions;
for ( int i = 0, n = aHypNames.count(); i < n; i++ )
- myPopup->insertItem( aHypNames[ i ], i );
+ actions.append( aPopup.addAction( aHypNames[ i ] ) );
- myPopup->exec( QCursor::pos() );
+ QAction* a = aPopup.exec( QCursor::pos() );
+ if ( a )
+ emit createHyp( isMainHyp ? MainHyp : AddHyp, actions.indexOf( a ) );
}
//================================================================================
{
const QObject* aSender = sender();
int aHypType = aSender == myEditHyp[ MainHyp ] ? MainHyp : AddHyp;
- emit editHyp( aHypType, myHyp[ aHypType ]->currentItem() - 1 ); // - 1 because there is NONE on the top
+ emit editHyp( aHypType, myHyp[ aHypType ]->currentIndex() - 1 ); // - 1 because there is NONE on the top
}
//================================================================================
}
}
-//================================================================================
-/*!
- * \brief Emits createHyp signal
- *
- * SLOT called when item of popup for hypothesis creation is activated. Emits
- * createHyp signal to notify operation obout this event
- */
-//================================================================================
-void SMESHGUI_MeshTab::onPopupItem( int theId )
-{
- const QObject* aSender = sender();
- if ( aSender )
- emit createHyp( strcmp( aSender->name(), "MainHypPopup" ) == 0 ? MainHyp : AddHyp, theId );
-}
-
//================================================================================
/*!
* \brief Resets all tab fields
{
for ( int i = Algo; i <= AddHyp; i++ )
{
- myHyp[ i ]->setCurrentItem( 0 );
+ myHyp[ i ]->setCurrentIndex( 0 );
if ( myEditHyp[ i ] )
myEditHyp[ i ]->setEnabled( false );
}
: SMESHGUI_Dialog( 0, false, true )
{
// Create top controls
-
- QGroupBox* aGrp = new QGroupBox( 3, Qt::Horizontal, mainFrame() );
- aGrp->setFrameStyle( QFrame::NoFrame );
- aGrp->setInsideMargin( 0 );
+
+ setObjectPixmap( "SMESH", tr( "ICON_SELECT" ) );
// name
- createObject( tr( "NAME" ), aGrp, Obj );
+ createObject( tr( "NAME" ), mainFrame(), Obj );
setNameIndication( Obj, OneName );
setReadOnly( Obj, false );
// mesh
- createObject( tr( "MESH" ), aGrp, Mesh );
+ createObject( tr( "MESH" ), mainFrame(), Mesh );
// geometry
- createObject( tr( "GEOMETRY" ), aGrp, Geom );
+ createObject( tr( "GEOMETRY" ), mainFrame(), Geom );
myGeomPopup = 0;
// Create tab widget
myTabWg->addTab( myTabs[ Dim0D ], tr( "DIM_0D" ) );
// Hypotheses Sets
- myHypoSetPopup = new QPopupMenu();
- QButton* aHypoSetButton = new QPushButton( mainFrame(), "aHypoSetButton");
- aHypoSetButton->setText( tr( "HYPOTHESES_SETS" ) );
+ myHypoSetButton = new QToolButton( mainFrame() );
+ myHypoSetButton->setText( tr( "HYPOTHESES_SETS" ) );
+ myHypoSetButton->setEnabled( false );
+ myHypoSetButton->setSizePolicy( QSizePolicy::MinimumExpanding,
+ myHypoSetButton->sizePolicy().verticalPolicy() );
// Fill layout
- QVBoxLayout* aLay = new QVBoxLayout( mainFrame(), 0, 5 );
- aLay->addWidget( aGrp );
- aLay->addItem( new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum) );
- aLay->addWidget( myTabWg );
- aLay->addWidget( aHypoSetButton );
+ QGridLayout* aLay = new QGridLayout( mainFrame() );
+ aLay->setMargin( 0 );
+ aLay->setSpacing( SPACING );
+
+ aLay->addWidget( objectWg( Obj, Label ), 0, 0 );
+ aLay->addWidget( objectWg( Obj, Btn ), 0, 1 );
+ aLay->addWidget( objectWg( Obj, Control ), 0, 2 );
+ aLay->addWidget( objectWg( Mesh, Label ), 1, 0 );
+ aLay->addWidget( objectWg( Mesh, Btn ), 1, 1 );
+ aLay->addWidget( objectWg( Mesh, Control ), 1, 2 );
+ aLay->addWidget( objectWg( Geom, Label ), 2, 0 );
+ aLay->addWidget( objectWg( Geom, Btn ), 2, 1 );
+ aLay->addWidget( objectWg( Geom, Control ), 2, 2 );
+ aLay->addWidget( myTabWg, 4, 0, 1, 3 );
+ aLay->addWidget( myHypoSetButton, 5, 0, 1, 3 );
+ aLay->setRowMinimumHeight( 3, 20 );
// Disable controls if necessary
setObjectShown( Mesh, false );
if ( theToCreate )
{
- setCaption( tr( "CREATE_MESH" ) );
+ setWindowTitle( tr( "CREATE_MESH" ) );
objectWg( Obj, Btn )->hide();
if ( theIsMesh )
- setCaption( tr( "CREATE_MESH" ) );
+ setWindowTitle( tr( "CREATE_MESH" ) );
else
{
- setCaption( tr( "CREATE_SUBMESH" ) );
+ setWindowTitle( tr( "CREATE_SUBMESH" ) );
setObjectShown( Mesh, true );
}
}
else
{
- setCaption( tr( "EDIT_MESH_SUBMESH" ) );
+ setWindowTitle( tr( "EDIT_MESH_SUBMESH" ) );
objectWg( Mesh, Btn )->hide();
objectWg( Geom, Btn )->hide();
}
-
- // Connect signals and slots
- connect( aHypoSetButton, SIGNAL( clicked() ), SLOT( onHypoSetButton() ) );
- connect( myHypoSetPopup, SIGNAL( activated( int ) ), SLOT( onHypoSetPopup( int ) ) );
}
SMESHGUI_MeshDlg::~SMESHGUI_MeshDlg()
{
- if ( myHypoSetPopup )
- delete myHypoSetPopup;
}
//================================================================================
//================================================================================
void SMESHGUI_MeshDlg::setCurrentTab( const int theId )
{
- myTabWg->setCurrentPage( Dim3D - theId );
+ myTabWg->setCurrentIndex( Dim3D - theId );
}
//================================================================================
bool enable = ( dim <= DIM );
if ( !enable )
myTabs[ dim ]->reset();
- myTabWg->setTabEnabled( myTabs[ dim ], enable );
+ myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ dim ] ), enable );
}
// deselect desabled tab
- if ( !myTabWg->isTabEnabled( myTabWg->currentPage() ))
- setCurrentTab( DIM - 1 );
+ if ( !myTabWg->isTabEnabled( myTabWg->currentIndex() ) )
+ setCurrentTab( DIM );
}
//================================================================================
void SMESHGUI_MeshDlg::setHypoSets( const QStringList& theSets )
{
- myHypoSetPopup->clear();
+ QMenu* aHypoSetPopup = myHypoSetButton->menu();
+ if ( !aHypoSetPopup ) {
+ aHypoSetPopup = new QMenu( myHypoSetButton );
+ connect( aHypoSetPopup, SIGNAL( triggered( QAction* ) ), SLOT( onHypoSetPopup( QAction* ) ) );
+ myHypoSetButton->setMenu( aHypoSetPopup );
+ myHypoSetButton->setPopupMode( QToolButton::InstantPopup );
+ }
+ aHypoSetPopup->clear();
for ( int i = 0, n = theSets.count(); i < n; i++ ) {
- myHypoSetPopup->insertItem( theSets[ i ], i );
+ aHypoSetPopup->addAction( theSets[ i ] );
}
+ myHypoSetButton->setEnabled( !aHypoSetPopup->isEmpty() );
}
//================================================================================
*/
//================================================================================
-void SMESHGUI_MeshDlg::onHypoSetPopup( int theIndex )
+void SMESHGUI_MeshDlg::onHypoSetPopup( QAction* a )
{
- emit hypoSet( myHypoSetPopup->text( theIndex ));
+ emit hypoSet( a->text() );
}
-//================================================================================
-/*!
- * \brief Shows myHypoSetPopup
- */
-//================================================================================
-
-void SMESHGUI_MeshDlg::onHypoSetButton()
-{
- myHypoSetPopup->exec( QCursor::pos() );
-}
-
//================================================================================
/*!
* \brief Enable showing of the popup when Geometry selection btn is clicked
void SMESHGUI_MeshDlg::setGeomPopupEnabled( const bool enable )
{
- if ( QButton* selBtn = dynamic_cast<QButton*>( objectWg( Geom, Btn )))
+ if ( QToolButton* selBtn = qobject_cast<QToolButton*>( objectWg( Geom, Btn )))
{
- disconnect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
if ( enable ) {
if ( ! myGeomPopup ) {
- myGeomPopup = new QPopupMenu();
- myGeomPopup->insertItem( tr("DIRECT_GEOM_SELECTION"), DIRECT_GEOM_INDEX );
- myGeomPopup->insertItem( tr("GEOM_BY_MESH_ELEM_SELECTION"), GEOM_BY_MESH_INDEX );
- connect( myGeomPopup, SIGNAL( activated( int ) ), SLOT( onGeomPopup( int ) ) );
+ myGeomPopup = new QMenu();
+ 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) ));
+ }
+ }
+ else {
+ disconnect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
+ if ( myGeomPopup ) {
+ delete myGeomPopup;
+ myGeomPopup = 0;
}
- connect( selBtn, SIGNAL( toggled(bool) ), this, SLOT( onGeomSelectionButton(bool) ));
}
}
}
*/
//================================================================================
void SMESHGUI_MeshDlg::disableTab(const int theTabId) {
- myTabWg->setTabEnabled( myTabs[ theTabId ], false );
+ myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ), false );
}
//================================================================================
*/
//================================================================================
void SMESHGUI_MeshDlg::enableTab(const int theTabId) {
- myTabWg->setTabEnabled( myTabs[ theTabId ], true );
+ myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ), true );
}
void SMESHGUI_MeshDlg::onGeomSelectionButton(bool isBtnOn)
myGeomPopup->exec( QCursor::pos() );
}
-void SMESHGUI_MeshDlg::onGeomPopup( int index )
+void SMESHGUI_MeshDlg::onGeomPopup( QAction* a )
{
- emit geomSelectionByMesh( index == GEOM_BY_MESH_INDEX );
+ emit geomSelectionByMesh( a->data().toInt() == GEOM_BY_MESH_INDEX );
}
