Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Gestion des erreurs de données
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshInfo.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx
b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx
index 142f41ad549721e31c2895ef7db69330805f78da..66db3c27f787ad495f4d9a62071581c1c89ad4ab 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshInfo.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshInfo.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
//
// 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<uint>& ids )
writer->write( SMESHGUI_AddInfo::tr( "TYPE" ), SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" ) );
}
int size = group.size();
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() );
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<uint>& ids )
writer->write( SMESHGUI_AddInfo::tr( "TYPE" ), SMESHGUI_AddInfo::tr( "GROUP_ON_FILTER" ) );
}
int size = group.size();
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() )
writer->write( SMESHGUI_AddInfo::tr( "SIZE" ), size );
QColor color = group.color();
if ( color.isValid() )
@@
-2175,8
+2175,8
@@
void SMESHGUI_TreeElemInfo::information( const QList<uint>& ids )
\param nbNodes number of unique nodes in element
\param parentItem parent item of tree
*/
\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
{
// int precision = SMESHGUI::resourceMgr()->integerValue( "SMESH", "length_precision", 6 );
// // node number and ID
@@
-2284,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();
{
if ( theItem ) {
int type = theItem->data( 1, TypeRole ).toInt();
@@
-3402,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( 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 );
+ }
}
}
}
}
}
}
@@
-3962,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 << 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 << 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 << 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 << 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;
}
////////////////////////////////////////////////////////////////////////////////
}
////////////////////////////////////////////////////////////////////////////////