X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshInfo.cxx;h=a6d6b3cda6c1a89cb0076b45c8037432030a6928;hp=57b1c9343725927976d4a079f6b430a2e79d6ee4;hb=refs%2Ftags%2FV9_7_0a1;hpb=734c82522e411c7771f5fe027bb326a95b50643d diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx index 57b1c9343..a6d6b3cda 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 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 @@ -1804,8 +1804,8 @@ void SMESHGUI_ElemInfo::writeInfo( InfoWriter* writer, const QList& ids ) writer->write( SMESHGUI_AddInfo::tr( "TYPE" ), SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" ) ); } int size = group.size(); - if ( size != -1 ); - writer->write( SMESHGUI_AddInfo::tr( "SIZE" ), size ); + if ( size != -1 ) + writer->write( SMESHGUI_AddInfo::tr( "SIZE" ), size ); QColor color = group.color(); if ( color.isValid() ) writer->write( SMESHGUI_AddInfo::tr( "COLOR" ), color.name() ); @@ -1935,7 +1935,7 @@ void SMESHGUI_ElemInfo::writeInfo( InfoWriter* writer, const QList& ids ) writer->write( SMESHGUI_AddInfo::tr( "TYPE" ), SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" ) ); } int size = group.size(); - if ( size != -1 ); + if ( size != -1 ) writer->write( SMESHGUI_AddInfo::tr( "SIZE" ), size ); QColor color = group.color(); if ( color.isValid() ) @@ -2147,11 +2147,7 @@ SMESHGUI_TreeElemInfo::SMESHGUI_TreeElemInfo( QWidget* parent ) 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( centralWidget() ); l->setMargin( 0 ); @@ -2179,8 +2175,8 @@ void SMESHGUI_TreeElemInfo::information( const QList& ids ) \param nbNodes number of unique nodes in element \param parentItem parent item of tree */ -void SMESHGUI_TreeElemInfo::nodeInfo( const SMDS_MeshNode* node, int index, - int nbNodes, QTreeWidgetItem* parentItem ) +void SMESHGUI_TreeElemInfo::nodeInfo( const SMDS_MeshNode* /*node*/, int /*index*/, + int /*nbNodes*/, QTreeWidgetItem* /*parentItem*/ ) { // int precision = SMESHGUI::resourceMgr()->integerValue( "SMESH", "length_precision", 6 ); // // node number and ID @@ -2288,7 +2284,7 @@ void SMESHGUI_TreeElemInfo::contextMenuEvent( QContextMenuEvent* e ) } } -void SMESHGUI_TreeElemInfo::itemDoubleClicked( QTreeWidgetItem* theItem, int theColumn ) +void SMESHGUI_TreeElemInfo::itemDoubleClicked( QTreeWidgetItem* theItem, int /*theColumn*/ ) { if ( theItem ) { int type = theItem->data( 1, TypeRole ).toInt(); @@ -2379,11 +2375,7 @@ SMESHGUI_AddInfo::SMESHGUI_AddInfo( QWidget* parent ): SMESHGUI_Info( parent ) myTree->setColumnCount( 2 ); myTree->header()->setStretchLastSection( true ); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myTree->header()->setResizeMode( 0, QHeaderView::ResizeToContents ); -#else myTree->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); -#endif myTree->header()->hide(); l->addWidget( myTree ); @@ -3323,7 +3315,7 @@ void SMESHGUI_MeshInfoDlg::idChanged() myIDPreview->SetPointsLabeled( false ); if ( myProxy ) { - TColStd_MapOfInteger ID; + SVTK_TVtkIDsMap ID; QSet ids; std::vector idVec; std::list< gp_XYZ > aGrCentersXYZ; @@ -3410,7 +3402,11 @@ void SMESHGUI_MeshInfoDlg::dump() if ( fd.isChecked( BaseInfo ) ) myBaseInfo->saveInfo( out ); if ( fd.isChecked( ElemInfo ) ) myElemInfo->saveInfo( out ); if ( fd.isChecked( AddInfo ) ) myAddInfo->saveInfo( out ); - if ( fd.isChecked( CtrlInfo ) ) myCtrlInfo->saveInfo( out ); + if ( fd.isChecked( CtrlInfo ) ) + { + myCtrlInfo->showInfo( myProxy ); // it saves what is shown only + myCtrlInfo->saveInfo( out ); + } } } } @@ -3650,14 +3646,14 @@ void SMESHGUI_CtrlInfo::showInfo( const SMESH::SelectionProxy& proxy ) for ( int i = 0; i < myButtons.count(); ++i ) myButtons[i]->setEnabled( true ); - SMESH::long_array_var nbElemsByType = obj->GetNbElementsByType(); + SMESH::smIdType_array_var nbElemsByType = obj->GetNbElementsByType(); if ( ! &nbElemsByType.in() ) return; const CORBA::Long ctrlLimit = meshLoaded ? SMESHGUI::resourceMgr()->integerValue( "SMESH", "info_controls_limit", 3000 ) : -1; // nodes info - const CORBA::Long nbNodes = nbElemsByType[ SMESH::NODE ]; + const SMESH::smIdType nbNodes = nbElemsByType[ SMESH::NODE ]; // const CORBA::Long nbElems = ( nbElemsByType[ SMESH::EDGE ] + // nbElemsByType[ SMESH::FACE ] + // nbElemsByType[ SMESH::VOLUME ] ); @@ -3911,9 +3907,15 @@ void SMESHGUI_CtrlInfo::clearInternal() void SMESHGUI_CtrlInfo::setTolerance( double theTolerance ) { - //SMESH::long_array_var anElems = getElementsByType( SMESH::NODE ); - myButtons[1]->setEnabled( true ); - myWidgets[2]->setText(""); + myButtons[2]->setEnabled( true ); + myWidgets[3]->setText(""); + for ( int i = 0; i < myPredicates.count(); ++i ) + if ( myPredicates[i]->GetFunctorType() == SMESH::FT_EqualNodes ) + { + SMESH::EqualNodes_var functor = SMESH::EqualNodes::_narrow( myPredicates[i] ); + if ( !functor->_is_nil() ) + functor->SetTolerance( theTolerance ); + } } #ifndef DISABLE_PLOT2DVIEWER @@ -3964,15 +3966,15 @@ void SMESHGUI_CtrlInfo::saveInfo( QTextStream &out ) out << tr( "NAME_LAB" ) << " " << myWidgets[0]->text() << endl; out << tr( "NODES_INFO" ) << endl; out << indent() << tr( "NUMBER_OF_THE_FREE_NODES" ) << ": " << myWidgets[1]->text() << endl; - out << indent() << tr( "NUMBER_OF_THE_DOUBLE_NODES" ) << ": " << myWidgets[2]->text() << endl; + out << indent() << tr( "NUMBER_OF_THE_DOUBLE_NODES" ) << ": " << myWidgets[3]->text() << endl; out << tr( "EDGES_INFO" ) << endl; - out << indent() << tr( "NUMBER_OF_THE_DOUBLE_EDGES" ) << ": " << myWidgets[3]->text() << endl; + out << indent() << tr( "NUMBER_OF_THE_DOUBLE_EDGES" ) << ": " << myWidgets[4]->text() << endl; out << tr( "FACES_INFO" ) << endl; - out << indent() << tr( "NUMBER_OF_THE_DOUBLE_FACES" ) << ": " << myWidgets[4]->text() << endl; - out << indent() << tr( "NUMBER_OF_THE_OVER_CONSTRAINED" ) << ": " << myWidgets[5]->text() << endl; + out << indent() << tr( "NUMBER_OF_THE_DOUBLE_FACES" ) << ": " << myWidgets[5]->text() << endl; + out << indent() << tr( "NUMBER_OF_THE_OVER_CONSTRAINED" ) << ": " << myWidgets[6]->text() << endl; out << tr( "VOLUMES_INFO" ) << endl; - out << indent() << tr( "NUMBER_OF_THE_DOUBLE_VOLUMES" ) << ": " << myWidgets[6]->text() << endl; - out << indent() << tr( "NUMBER_OF_THE_OVER_CONSTRAINED" ) << ": " << myWidgets[7]->text() << endl; + out << indent() << tr( "NUMBER_OF_THE_DOUBLE_VOLUMES" ) << ": " << myWidgets[7]->text() << endl; + out << indent() << tr( "NUMBER_OF_THE_OVER_CONSTRAINED" ) << ": " << myWidgets[8]->text() << endl; } ////////////////////////////////////////////////////////////////////////////////