// SALOME GUI includes
#include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h>
+#include <QtxMenu.h>
+#include <QtxToolButton.h>
// Qt includes
#include <QComboBox>
// Algorifm
QLabel* anAlgoLbl = new QLabel( tr( "ALGORITHM" ), this );
- myHypCombo[ Algo ] = new QComboBox( this );
+ myHypCombo[ Algo ] = new QtxToolButton( this );
// Hypothesis
QLabel* aHypLbl = new QLabel( tr( "HYPOTHESIS" ), this );
- myHypCombo[ MainHyp ] = new QComboBox( this );
+ myHypCombo[ MainHyp ] = new QtxToolButton( this );
myHypCombo[ MainHyp ]->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
myCreateHypBtn[ MainHyp ] = new QToolButton( this );
myCreateHypBtn[ MainHyp ]->setIcon( aCreateIcon );
// Add. hypothesis
QLabel* anAddHypLbl = new QLabel( tr( "ADD_HYPOTHESIS" ), this );
- myHypCombo[ AddHyp ] = new QComboBox( this );
+ myHypCombo[ AddHyp ] = new QtxToolButton( this );
myHypCombo[ AddHyp ]->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
myCreateHypBtn[ AddHyp ] = new QToolButton( this );
myCreateHypBtn[ AddHyp ]->setIcon( aCreateIcon );
aLay->addWidget( myMoreAddHypBtn, 4, 2 );
aLay->addWidget( myEditHypBtn[ MoreAddHyp ], 4, 3 );
aLay->addWidget( myLessAddHypBtn, 5, 2 );
+
aLay->addItem( new QSpacerItem( 0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding ), 6, 0 );
// Connect signals and slots
* \param [in] txt - item text
* \param [in] type - HypType
* \param [in] index - index of item in a list of items
+ * \param [in] isGroup - is the item a group title
*/
//================================================================================
-
-void SMESHGUI_MeshTab::addItem( const QString& txt, const int type, const int index )
+void SMESHGUI_MeshTab::addItem( const QString& txt,
+ const int type,
+ const int index,
+ const bool isGroup )
{
if ( type <= AddHyp )
{
- myHypCombo[ type ]->addItem( txt, QVariant( index ));
- myHypCombo[ type ]->setMaxVisibleItems( qMax( 10, myHypCombo[ type ]->count() ) );
+ if ( isGroup )
+ {
+ myHypCombo[ type ]->addSeparator( txt.mid( 6 ) );
+ }
+ else
+ {
+ myHypCombo[ type ]->addItem( txt, QVariant( index ));
+ }
+ //myHypCombo[ type ]->setMaxVisibleItems( qMax( 10, myHypCombo[ type ]->count() ) );
}
else
{
* \brief Returns index of hyp of a given type
*/
//================================================================================
-
int SMESHGUI_MeshTab::getCurrentIndex( const int type, const bool curByType ) const
{
if ( type <= AddHyp )
{
addItem( tr( "NONE"), Algo, 0 );
for ( int i = 0, nbHyp = theHyps.count(); i < nbHyp; ++i )
- addItem( theHyps[i], Algo, i+1 );
+ addItem( theHyps[i], Algo, i+1, theHyps[i].startsWith( "GROUP:" ));
myHypCombo[ Algo ]->setCurrentIndex( 0 );
}
}
myMoreAddHypBtn->setEnabled( true );
}
-//================================================================================
-/*!
- * \brief Renames hypothesis
- * \param theId - identifier of hypothesis (main or additional, see HypType enumeration)
- * \param theIndex - index of hypothesis to be renamed
- * \param theNewName - new name of hypothesis to be renamed
- *
- * Renames hypothesis
- */
-//================================================================================
-// void SMESHGUI_MeshTab::renameHyp( const int theId,
-// const int theIndex,
-// const QString& theNewName )
-// {
-// if ( theIndex > 0 && theIndex < myHypCombo[ theId ]->count() )
-// myHypCombo[ theId ]->setItemText( theIndex, theNewName );
-// }
-
//================================================================================
/*!
* \brief Sets current hypothesis
* range 0 <= i < this->nbAddHypTypes()
*/
//================================================================================
-
int SMESHGUI_MeshTab::nbAddHypTypes() const
{
return myAddHypList->count();
{
bool isMainHyp = ( sender() == myCreateHypBtn[ MainHyp ]);
- QMenu aPopup( this );
+ QtxMenu aPopup( this );
QStringList aHypNames = isMainHyp ?
myAvailableHypTypes[ MainHyp ] : myAvailableHypTypes[ AddHyp ];
QList<QAction*> actions;
for ( int i = 0, n = aHypNames.count(); i < n; i++ )
- actions.append( aPopup.addAction( aHypNames[ i ] ) );
-
+ {
+ QAction* a = 0;
+ if ( aHypNames[ i ].startsWith( "GROUP:" ))
+ {
+ aPopup.addGroup( aHypNames[ i ].mid( 6 ));
+ }
+ else
+ {
+ a = aPopup.addAction( aHypNames[ i ] );
+ }
+ actions.append( a );
+ }
QAction* a = aPopup.exec( QCursor::pos() );
if ( a )
emit createHyp( isMainHyp ? MainHyp : AddHyp, actions.indexOf( a ) );
//================================================================================
void SMESHGUI_MeshTab::onHyp( int theIndex )
{
- const QObject* aSender = sender();
+ QObject* aSender = sender();
+
+ if ( QComboBox* cb = qobject_cast< QComboBox* >( aSender ))
+ {
+ // don't allow selecting a group title
+ if ( cb->itemData( theIndex, Qt::AccessibleDescriptionRole ) == "separator" )
+ {
+ cb->setCurrentIndex( theIndex+1 );
+ return;
+ }
+ }
+
if ( aSender == myHypCombo[ Algo ] )
{
emit selectAlgo( theIndex - 1 ); // - 1 because there is NONE on the top
* SLOT called when myMoreAddHypBtn ("plus") clicked
*/
//================================================================================
-
void SMESHGUI_MeshTab::onMoreAddHyp()
{
int hypIndex = currentHyp( AddHyp );
* SLOT called when myLessAddHypBtn ("minus") clicked
*/
//================================================================================
-
void SMESHGUI_MeshTab::onLessAddHyp()
{
if ( QListWidgetItem * item = myAddHypList->currentItem() )
* \brief Set dialog title
*/
//================================================================================
-
void SMESHGUI_MeshDlg::setTitile( const bool theToCreate, const bool theIsMesh )
{
if ( theToCreate )
//================================================================================
/*!
- * \brief Sets curent tab
+ * \brief Sets current tab
*/
//================================================================================
void SMESHGUI_MeshDlg::setCurrentTab( const int theId )
//================================================================================
/*!
* \brief Enable/disable tabs
- * \param int - maximum possible dimention
+ * \param int - maximum possible dimension
*/
//================================================================================
-
void SMESHGUI_MeshDlg::setMaxHypoDim( const int maxDim )
{
const int DIM = maxDim;
* \brief Sets list of available Sets of Hypotheses
*/
//================================================================================
-
void SMESHGUI_MeshDlg::setHypoSets( const QStringList& theSets )
{
QMenu* aHypoSetPopup = myHypoSetButton->menu();
* signal to notify operation about this event
*/
//================================================================================
-
void SMESHGUI_MeshDlg::onHypoSetPopup( QAction* a )
{
emit hypoSet( a->text() );
* \param int - tab ID
*/
//================================================================================
-void SMESHGUI_MeshDlg::disableTab(const int theTabId) {
+void SMESHGUI_MeshDlg::disableTab(const int theTabId)
+{
myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ), false );
- if ( theTabId == Dim3D ) myHypoSetButton->setEnabled( false );
}
//================================================================================
* \param int - tab ID
*/
//================================================================================
-void SMESHGUI_MeshDlg::enableTab(const int theTabId) {
+void SMESHGUI_MeshDlg::enableTab(const int theTabId)
+{
myTabWg->setTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ), true );
if ( theTabId == Dim3D ) {
QMenu* aHypoSetPopup = myHypoSetButton->menu();
* \param int - tab ID
*/
//================================================================================
-bool SMESHGUI_MeshDlg::isTabEnabled(const int theTabId) const {
+bool SMESHGUI_MeshDlg::isTabEnabled(const int theTabId) const
+{
return myTabWg->isTabEnabled( myTabWg->indexOf( myTabs[ theTabId ] ) );
}
+//================================================================================
+/*!
+ * \brief SLOT called when a Geom selection button is clicked
+ */
+//================================================================================
void SMESHGUI_MeshDlg::onGeomSelectionButton(bool isBtnOn)
{
if ( myGeomPopup && isBtnOn )
myGeomPopup->exec( QCursor::pos() );
}
+//================================================================================
+/*!
+ * \brief SLOT called when a item of Geom selection popup is chosen
+ */
+//================================================================================
void SMESHGUI_MeshDlg::onGeomPopup( QAction* a )
{
emit geomSelectionByMesh( a->data().toInt() == GEOM_BY_MESH_INDEX );
}
+//================================================================================
+/*!
+ * \brief Return ID of an active selection button
+ */
+//================================================================================
int SMESHGUI_MeshDlg::getActiveObject()
{
for (int i = 0; i < 3; ++i )
