Merge remote branch 'origin/V7_dev'

diff --combined src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index 1e8e270de676ac257cd39b9bd4c8bbde6c57c46a,ad4453c1c749f7a27038896e64e2792daad9714f..c4de8a50729fdcbd0ab88554291c59dfe01e08fc
--- 1/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
--- 2/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
@@@ -575,11 -575,7 +575,11 @@@ QFrame* SMESHGUI_ComputeDlg::createMain
    myTable->hideColumn( COL_PUBLISHED );
    myTable->hideColumn( COL_SHAPEID );
    myTable->hideColumn( COL_BAD_MESH );
 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    myTable->horizontalHeader()->setResizeMode( COL_ERROR, QHeaderView::Interactive );
 +#else
 +  myTable->horizontalHeader()->setSectionResizeMode( COL_ERROR, QHeaderView::Interactive );
 +#endif
    myTable->setWordWrap( true );
    myTable->horizontalHeader()->setStretchLastSection( true );
    myTable->setMinimumWidth( 500 );
@@@ -943,7 -939,9 +943,9 @@@ void SMESHGUI_BaseComputeOp::computeMes
            if ( !smSObj ) continue;
            SMESH::SMESH_IDSource_var aSubMeshObj =
              SMESH::SObjectToInterface<SMESH::SMESH_IDSource>( smSObj );
-           aListToUpdate.append( TListOf_IDSrc_SObj::value_type( aSubMeshObj, smSObj ));
+           SMESH_Actor *anActor = SMESH::FindActorByObject( aSubMeshObj );
+           if ( anActor && anActor->GetVisibility() )
+             aListToUpdate.append( TListOf_IDSrc_SObj::value_type( aSubMeshObj, smSObj ));
          }
          // put Groups into list
          SMESH::ListOfGroups_var aGroups = myMesh->GetGroups();
@@@ -959,7 -957,9 +961,9 @@@
            if ( !aGroupSO ) continue;
            SMESH::SMESH_IDSource_var aGroupObj =
              SMESH::SObjectToInterface<SMESH::SMESH_IDSource>( aGroupSO );
-           aListToUpdate.append( TListOf_IDSrc_SObj::value_type( aGroupObj, aGroupSO ));
+           SMESH_Actor *anActor = SMESH::FindActorByObject( aGroupObj );
+           if ( anActor && anActor->GetVisibility() )
+             aListToUpdate.append( TListOf_IDSrc_SObj::value_type( aGroupObj, aGroupSO ));
          }
  
          // update mesh, sub-mesh and groups, if it's possible

diff --combined src/SMESHGUI/SMESHGUI_MeshInfo.cxx
index d6603652ecd29a8b75e243cff4c3986cf9814de3,27b0c85d1e5870f6daadd9341515a6da59043e99..b0b1a6ed772207ba78b156d1b00dfe5e80f94260
--- 1/src/SMESHGUI/SMESHGUI_MeshInfo.cxx
--- 2/src/SMESHGUI/SMESHGUI_MeshInfo.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx
@@@ -1227,7 -1227,7 +1227,7 @@@ void SMESHGUI_SimpleElemInfo::informati
            int shapeID = pos->shapeID;
            if ( shapeID > 0 ) {
              QString shapeType;
-             double u, v;
+             double u = 0, v = 0;
              switch ( pos->shapeType ) {
              case GEOM::EDGE:
                shapeType = SMESHGUI_ElemInfo::tr( "GEOM_EDGE" );
@@@ -1650,11 -1650,7 +1650,11 @@@ SMESHGUI_TreeElemInfo::SMESHGUI_TreeEle
    myInfo->setColumnCount( 2 );
    myInfo->setHeaderLabels( QStringList() << tr( "PROPERTY" ) << tr( "VALUE" ) );
    myInfo->header()->setStretchLastSection( true );
 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    myInfo->header()->setResizeMode( 0, QHeaderView::ResizeToContents );
 +#else
 +  myInfo->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents );
 +#endif
    myInfo->setItemDelegate( new ItemDelegate( myInfo ) );
    QVBoxLayout* l = new QVBoxLayout( frame() );
    l->setMargin( 0 );
@@@ -1751,7 -1747,7 +1751,7 @@@ void SMESHGUI_TreeElemInfo::information
            int shapeID = pos->shapeID;
            if ( shapeID > 0 ) {
              QString shapeType;
-             double u, v;
+             double u = 0, v = 0;
              switch ( pos->shapeType ) {
              case GEOM::EDGE:
                shapeType = SMESHGUI_ElemInfo::tr( "GEOM_EDGE" );
@@@ -2347,11 -2343,7 +2347,11 @@@ SMESHGUI_AddInfo::SMESHGUI_AddInfo( QWi
  {
    setColumnCount( 2 );
    header()->setStretchLastSection( true );
 +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    header()->setResizeMode( 0, QHeaderView::ResizeToContents );
 +#else
 +  header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents );
 +#endif
    header()->hide();
  }