0023614: EDF 16256 - Coordinates of a group

diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx
index 34c737faf5fdd533c84526a18d1a95159dff5e6d..58c751408a9f952b38c3c20ba355e9a225f61bc6 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx
@@ -53,6 +53,7 @@
 #include <QApplication>
 #include <QButtonGroup>
 #include <QCheckBox>
+#include <QComboBox>
 #include <QContextMenuEvent>
 #include <QGridLayout>
 #include <QHBoxLayout>
@@ -65,6 +66,8 @@
 #include <QPushButton>
 #include <QToolButton>
 #include <QRadioButton>
+#include <QStackedWidget>
+#include <QStandardItemModel>
 #include <QTextStream>
 #include <QTabWidget>
 #include <QTextBrowser>
@@ -1007,6 +1010,19 @@ void SMESHGUI_ElemInfo::showInfo( QSet<long> ids, bool isElem )
   information( myIDs.mid( myIndex*MAXITEMS, MAXITEMS ));
 }
 
+void SMESHGUI_ElemInfo::showInfo( SMESH::SMESH_GroupBase_ptr group )
+{
+  QSet<long> ids;
+  bool isElem = false;
+  if ( !group->_is_nil() ) {
+    isElem = group->GetType() != SMESH::NODE;
+    SMESH::long_array_var corbaIds = group->GetListOfID();
+    for (int i = 0, n = corbaIds->length(); i < n; i++)
+      ids << corbaIds[i];
+  }
+  showInfo( ids, isElem );
+}
+
 /*!
   \brief Clear mesh element information widget
 */
@@ -2870,6 +2886,66 @@ void SMESHGUI_AddInfo::saveInfo( QTextStream &out )
   out << "\n";
 }
 
+
+class GroupCombo: public QComboBox
+{
+  class Item: public QStandardItem
+  {
+  public:
+    SMESH::SMESH_GroupBase_var myGroup;
+    Item( SMESH::SMESH_GroupBase_ptr group )
+    {
+      myGroup = SMESH::SMESH_GroupBase::_duplicate( group );
+      setText( myGroup->GetName() );
+    }
+    SMESH::SMESH_GroupBase_ptr group()
+    {
+      return SMESH::SMESH_GroupBase::_duplicate( myGroup );
+    }
+  };
+  SMESH::SMESH_IDSource_var myObj;
+public:
+  GroupCombo( QWidget* parent ): QComboBox( parent )
+  {
+    setModel( new QStandardItemModel( this ) );
+  }
+  void setSource( SMESH::SMESH_IDSource_ptr obj )
+  {
+    if ( myObj->_is_equivalent( obj ) )
+      return;
+    myObj = SMESH::SMESH_IDSource::_duplicate( obj );
+    bool blocked = blockSignals( true );
+    QStandardItemModel* m = dynamic_cast<QStandardItemModel*>(model());
+    m->clear();
+    SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( myObj );
+    SMESH::SMESH_GroupBase_var group = SMESH::SMESH_GroupBase::_narrow( myObj );
+    if ( !mesh->_is_nil() ) {
+      SMESH::ListOfGroups_var groups = mesh->GetGroups();
+      for ( size_t i = 0; i < groups->length(); ++i ) {
+       if ( !CORBA::is_nil( groups[i] ) ) {
+         QString name = groups[0]->GetName();
+         if ( !name.isEmpty() )
+           m->appendRow( new Item( groups[i].in() ) );
+       }
+      }
+      setCurrentIndex(-1); // for performance reasons
+    }
+    else if ( !group->_is_nil() ) {
+      m->appendRow( new Item( group.in() ) );
+      setCurrentIndex(0);
+    }
+    blockSignals( blocked );
+  }
+  SMESH::SMESH_GroupBase_ptr currentGroup()
+  {
+    SMESH::SMESH_GroupBase_var group;
+    QStandardItemModel* m = dynamic_cast<QStandardItemModel*>(model());
+    if ( currentIndex() >= 0 )
+      group = dynamic_cast<Item*>(m->item(currentIndex()))->myGroup;
+    return group._retn();
+  }
+};
+
 /*!
   \class SMESHGUI_MeshInfoDlg
   \brief Mesh information dialog box
@@ -2902,9 +2978,14 @@ SMESHGUI_MeshInfoDlg::SMESHGUI_MeshInfoDlg( QWidget* parent, int page )
   myMode = new QButtonGroup( this );
   myMode->addButton( new QRadioButton( tr( "NODE_MODE" ), w ), NodeMode );
   myMode->addButton( new QRadioButton( tr( "ELEM_MODE" ), w ), ElemMode );
+  myMode->addButton( new QRadioButton( tr( "GROUP_MODE" ), w ), GroupMode );
   myMode->button( NodeMode )->setChecked( true );
   myID = new QLineEdit( w );
   myID->setValidator( new SMESHGUI_IdValidator( this ));
+  myGroups = new GroupCombo( w );
+  QStackedWidget* stack = new QStackedWidget( w );
+  stack->addWidget( myID );
+  stack->addWidget( myGroups );
   myIDPreviewCheck = new QCheckBox( tr( "SHOW_IDS" ), w );
   myIDPreview = new SMESHGUI_IdPreview( SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() ));
 
@@ -2915,15 +2996,17 @@ SMESHGUI_MeshInfoDlg::SMESHGUI_MeshInfoDlg( QWidget* parent, int page )
     myElemInfo = new SMESHGUI_SimpleElemInfo( w );
   else
     myElemInfo = new SMESHGUI_TreeElemInfo( w );
+  stack->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
 
   QGridLayout* elemLayout = new QGridLayout( w );
   elemLayout->setMargin( MARGIN );
   elemLayout->setSpacing( SPACING );
   elemLayout->addWidget( myMode->button( NodeMode ), 0, 0 );
   elemLayout->addWidget( myMode->button( ElemMode ), 0, 1 );
-  elemLayout->addWidget( myID,                       0, 2 );
-  elemLayout->addWidget( myIDPreviewCheck,           1, 0, 1, 2 );
-  elemLayout->addWidget( myElemInfo,                 2, 0, 1, 3 );
+  elemLayout->addWidget( myMode->button( GroupMode ), 0, 2 );
+  elemLayout->addWidget( stack, 0, 3 );
+  elemLayout->addWidget( myIDPreviewCheck, 1, 0, 1, 4 );
+  elemLayout->addWidget( myElemInfo, 2, 0, 1, 4 );
 
   myTabWidget->addTab( w, tr( "ELEM_INFO" ));
 
@@ -2970,13 +3053,14 @@ SMESHGUI_MeshInfoDlg::SMESHGUI_MeshInfoDlg( QWidget* parent, int page )
   connect( helpBtn,     SIGNAL( clicked() ),              this, SLOT( help() ));
   connect( myTabWidget, SIGNAL( currentChanged( int  )), this, SLOT( updateSelection() ));
   connect( myMode,      SIGNAL( buttonClicked( int  )),  this, SLOT( modeChanged() ));
+  connect( myGroups,    SIGNAL( currentIndexChanged( int )),  this, SLOT( modeChanged() ));
   connect( myID,        SIGNAL( textChanged( QString )), this, SLOT( idChanged() ));
   connect( myIDPreviewCheck,         SIGNAL( toggled(bool) ), this, SLOT( idPreviewChange(bool) ));
   connect( SMESHGUI::GetSMESHGUI(),  SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( deactivate() ));
   connect( SMESHGUI::GetSMESHGUI(),  SIGNAL( SignalCloseAllDialogs() ),        this, SLOT( reject() ));
   connect( myElemInfo,  SIGNAL( itemInfo( int )),     this, SLOT( showItemInfo( int )));
   connect( myElemInfo,  SIGNAL( itemInfo( QString )), this, SLOT( showItemInfo( QString )));
-
+  connect( this,        SIGNAL( switchMode( int ) ), stack, SLOT( setCurrentIndex( int ) ) );
   myIDPreviewCheck->setChecked( SMESHGUI::resourceMgr()->booleanValue( "SMESH", id_preview_resource, false ));
 
   updateSelection();
@@ -3000,15 +3084,33 @@ void SMESHGUI_MeshInfoDlg::showInfo( const Handle(SALOME_InteractiveObject)& IO
     myIO = IO;
 
   SMESH::SMESH_IDSource_var obj = SMESH::IObjectToInterface<SMESH::SMESH_IDSource>( IO );
-  if ( !CORBA::is_nil( obj ))
+  if ( !CORBA::is_nil( obj ) )
   {
-    myAddInfo->showInfo( obj );  // nb of nodes in a group can be computed by myAddInfo,
-    myBaseInfo->showInfo( obj ); // and it will be used by myBaseInfo (IPAL52871)
+    // "Additional info" tab
+    myAddInfo->showInfo( obj );
+
+    // "Base info" tab
+    // Note: we update it AFTER additional info as nb of nodes in a group
+    // can be computed there and this data will be shown in base info (see IPAL52871)
+    myBaseInfo->showInfo( obj );
+
+    // "Quality info" tab
+    // Note: for performance reasons we update it only if it is currently active
     if ( myTabWidget->currentIndex() == CtrlInfo )
       myCtrlInfo->showInfo( obj );
 
-    {
-      myActor = SMESH::FindActorByEntry( IO->getEntry() );
+    // "Element info" tab
+    myGroups->setSource( obj.in() );
+    myActor = SMESH::FindActorByEntry( IO->getEntry() );
+    myElemInfo->setSource( myActor, obj );
+    if ( myMode->checkedId() == GroupMode ) {
+      SMESH::SMESH_GroupBase_var group = myGroups->currentGroup();
+      if ( !group->_is_nil() )
+        myElemInfo->showInfo( group );
+      else
+        myElemInfo->clear();
+    }
+    else {
       SVTK_Selector* selector = SMESH::GetSelector();
       QString ID;
       int nb = 0;
@@ -3017,7 +3119,6 @@ void SMESHGUI_MeshInfoDlg::showInfo( const Handle(SALOME_InteractiveObject)& IO
           SMESH::GetNameOfSelectedElements( selector, IO, ID ) :
           SMESH::GetNameOfSelectedNodes( selector, IO, ID );
       }
-      myElemInfo->setSource( myActor, obj ) ;
       if ( nb > 0 ) {
         myID->setText( ID.trimmed() );
         QSet<long> ids;
@@ -3079,25 +3180,14 @@ void SMESHGUI_MeshInfoDlg::updateSelection()
   disconnect( selMgr, 0, this, 0 );
   selMgr->clearFilters();
 
-  if ( myTabWidget->currentIndex() == BaseInfo ||
-       myTabWidget->currentIndex() == AddInfo ||
-       myTabWidget->currentIndex() == CtrlInfo ) {
-    SMESH::SetPointRepresentation( false );
-    if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow() )
-      aViewWindow->SetSelectionMode( ActorSelection );
-  }
-  else {
-    if ( myMode->checkedId() == NodeMode ) {
-      SMESH::SetPointRepresentation( true );
-      if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow() )
-        aViewWindow->SetSelectionMode( NodeSelection );
-    }
-    else {
-      SMESH::SetPointRepresentation( false );
-      if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow() )
-        aViewWindow->SetSelectionMode( CellSelection );
-    }
-  }
+  int selMode = ActorSelection;
+  if ( myTabWidget->currentIndex() == ElemInfo && myMode->checkedId() == NodeMode )
+    selMode = NodeSelection;
+  else if ( myTabWidget->currentIndex() == ElemInfo && myMode->checkedId() == ElemMode )
+    selMode = CellSelection;
+  SMESH::SetPointRepresentation( selMode == NodeSelection );
+  if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow() )
+    aViewWindow->SetSelectionMode( selMode );
 
   QString oldID = myID->text().trimmed();
   SMESH_Actor* oldActor = myActor;
@@ -3166,6 +3256,7 @@ void SMESHGUI_MeshInfoDlg::deactivate()
 */
 void SMESHGUI_MeshInfoDlg::modeChanged()
 {
+  emit( switchMode( myMode->checkedId() == GroupMode ? 1 : 0 ) );
   myID->clear();
   updateSelection();
 }

diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.h b/src/SMESHGUI/SMESHGUI_MeshInfo.h
index 85edb6001be0c7e56d9119479a77cd0bf3790247..f5cbb7cd8f7e77bb54e10e723d20148950614d42 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshInfo.h
+++ b/src/SMESHGUI/SMESHGUI_MeshInfo.h
@@ -67,6 +67,7 @@ class SMESHGUI_SpinBox;
 class SMESH_Actor;
 
 class ExtraWidget;
+class GroupCombo;
 
 class SMESHGUI_EXPORT SMESHGUI_MeshInfo : public QFrame
 {
@@ -156,6 +157,7 @@ public:
   void         setSource( SMESH_Actor*, SMESH::SMESH_IDSource_var );
   void         showInfo( long, bool );
   void         showInfo( QSet<long>, bool );
+  void         showInfo( SMESH::SMESH_GroupBase_ptr );
   void         clear();
   virtual void saveInfo( QTextStream &out ) = 0;
 
@@ -362,7 +364,7 @@ class SMESHGUI_EXPORT SMESHGUI_MeshInfoDlg : public QDialog
 { 
   Q_OBJECT;
 
-  enum { NodeMode, ElemMode };
+  enum { NodeMode, ElemMode, GroupMode };
 
 public:
   //! Information type
@@ -383,6 +385,9 @@ protected:
   void keyPressEvent( QKeyEvent* );
   void enterEvent( QEvent* );
 
+signals:
+  void switchMode( int );
+
 private slots:
   void help();
   void updateSelection();
@@ -402,6 +407,7 @@ private:
   QButtonGroup*                    myMode;
   QLineEdit*                       myID;
   QCheckBox*                       myIDPreviewCheck;
+  GroupCombo*                      myGroups;
   SMESHGUI_IdPreview*              myIDPreview;
   SMESHGUI_ElemInfo*               myElemInfo;   
   SMESHGUI_AddInfo*                myAddInfo;

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 46aa7f35f26124c9529e2ff099fe51595ceb4de8..3ad9844e3959668009147f7ecb17520e414af54d 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -7547,6 +7547,10 @@ as they are of improper type:
         <source>ELEM_MODE</source>
         <translation>Element</translation>
     </message>
+    <message>
+        <source>GROUP_MODE</source>
+        <translation>Group</translation>
+    </message>
     <message>
         <source>SHOW_IDS</source>
         <translation>Show IDs</translation>

diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index 52b164b813ac0e18fcfc2fe668891d463e72c488..ea37cef1a6fc65bd508e06d6865fd0187f302618 100755 (executable)
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -7470,6 +7470,10 @@ en raison de leurs types incompatibles:
         <source>ELEM_MODE</source>
         <translation>Elément</translation>
     </message>
+    <message>
+        <source>GROUP_MODE</source>
+        <translation>Groupe</translation>
+    </message>
     <message>
         <source>SHOW_IDS</source>
         <translation>Montre les IDs</translation>

diff --git a/src/SMESHGUI/SMESH_msg_ja.ts b/src/SMESHGUI/SMESH_msg_ja.ts
index 3b32bdd8cc25aa6cb95703f43b3936094c5dfded..28c95b66f9f08220a9bc0e9fba8b116651d0e81e 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_ja.ts
+++ b/src/SMESHGUI/SMESH_msg_ja.ts
@@ -7366,6 +7366,10 @@
       <source>ELEM_MODE</source>
       <translation>要素</translation>
     </message>
+    <message>
+      <source>GROUP_MODE</source>
+      <translation type="unfinished">Group</translation>
+    </message>
     <message>
       <source>SHOW_IDS</source>
       <translation>IDの表示</translation>