// Module : SMESH
// $Header$
-using namespace std;
-#include "SMESHGUI_MeshInfosDlg.h"
-
-#include "SMESHGUI.h"
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "QAD_WaitCursor.h"
-#include "utilities.h"
-
// QT Includes
#include <qgroupbox.h>
#include <qlabel.h>
#include <qmap.h>
#include <qpushbutton.h>
+#include "QAD_Application.h"
+#include "QAD_Desktop.h"
+#include "QAD_WaitCursor.h"
+
+#include "SMESHGUI_MeshInfosDlg.h"
+#include "SMESHGUI_Utils.h"
+#include "SMESHGUI.h"
+
+// IDL Headers
+#include "SALOMEconfig.h"
+#include CORBA_SERVER_HEADER(SMESH_Mesh)
+#include CORBA_SERVER_HEADER(SMESH_Group)
+
+#include "utilities.h"
+
+using namespace std;
+
#define COLONIZE( str ) ( QString( str ).contains( ":" ) > 0 ? QString( str ) : QString( str ) + " :" )
//=================================================================================
QLabel* myMeshNbQuadranglesLab = new QLabel( COLONIZE( tr( "SMESH_MESHINFO_QUADRANGLES" ) ), myMeshFacesGroup, "myMeshNbQuadranglesLab" );
myMeshNbQuadrangles = new QLabel( myMeshFacesGroup, "myMeshNbQuadrangles" );
myMeshNbQuadrangles->setMinimumWidth( 100 );
+
+ // --> faces --> quadrangles
+ QLabel* myMeshNbPolygonesLab = new QLabel( COLONIZE( tr( "SMESH_MESHINFO_POLYGONES" ) ), myMeshFacesGroup, "myMeshNbPolygonesLab" );
+ myMeshNbPolygones = new QLabel( myMeshFacesGroup, "myMeshNbPolygones" );
+ myMeshNbPolygones->setMinimumWidth( 100 );
myMeshFacesGroupLayout->addWidget( myMeshNbFacesLab, 0, 0 );
myMeshFacesGroupLayout->addWidget( myMeshNbFaces, 0, 1 );
myMeshFacesGroupLayout->addWidget( myMeshNbTriangles, 1, 1 );
myMeshFacesGroupLayout->addWidget( myMeshNbQuadranglesLab, 2, 0 );
myMeshFacesGroupLayout->addWidget( myMeshNbQuadrangles, 2, 1 );
+ myMeshFacesGroupLayout->addWidget( myMeshNbPolygonesLab, 3, 0 );
+ myMeshFacesGroupLayout->addWidget( myMeshNbPolygones, 3, 1 );
// --> volumes
myMeshVolumesGroup = new QGroupBox( tr( "SMESH_MESHINFO_VOLUMES" ), myMeshWidget, "myMeshVolumesGroup" );
QLabel* myMeshNbPyraLab = new QLabel( COLONIZE( tr( "SMESH_MESHINFO_PYRAS" ) ), myMeshVolumesGroup, "myMeshNbPyraLab" );
myMeshNbPyra = new QLabel( myMeshVolumesGroup, "myMeshNbPyra" );
myMeshNbPyra->setMinimumWidth( 100 );
+
+ // --> volumes --> polyherones
+ QLabel* myMeshNbPolyhedronesLab = new QLabel( COLONIZE( tr( "SMESH_MESHINFO_POLYEDRES" ) ), myMeshVolumesGroup, "myMeshNbPolyhedronLab" );
+ myMeshNbPolyhedrones = new QLabel( myMeshVolumesGroup, "myMeshNbPolyhedrones" );
+ myMeshNbPolyhedrones->setMinimumWidth( 100 );
myMeshVolumesGroupLayout->addWidget( myMeshNbVolumesLab, 0, 0 );
myMeshVolumesGroupLayout->addWidget( myMeshNbVolumes, 0, 1 );
myMeshVolumesGroupLayout->addWidget( myMeshNbPrism, 3, 1 );
myMeshVolumesGroupLayout->addWidget( myMeshNbPyraLab, 4, 0 );
myMeshVolumesGroupLayout->addWidget( myMeshNbPyra, 4, 1 );
+ myMeshVolumesGroupLayout->addWidget( myMeshNbPolyhedronesLab, 5, 0 );
+ myMeshVolumesGroupLayout->addWidget( myMeshNbPolyhedrones, 5, 1 );
aMeshLayout->addWidget( myMeshNameLab, 0, 0 );
aMeshLayout->addWidget( myMeshName, 0, 1 );
this->move( x, y );
this->show();
+ cout<<"----"<<this->height()<<endl;
+ cout<<"----"<<this->width()<<endl;
// init dialog with current selection
onSelectionChanged();
}
myStartSelection = false;
mySelectLab->setText( "" );
Handle(SALOME_InteractiveObject) IObject = mySelection->firstIObject();
- SALOMEDS::SObject_var aSO = SMESHGUI::GetSMESHGUI()->GetStudy()->FindObjectID( IObject->getEntry() );
+ SALOMEDS::SObject_var aSO = SMESH::GetActiveStudyDocument()->FindObjectID( IObject->getEntry() );
if ( !aSO->_is_nil() ) {
CORBA::Object_var anObject = aSO->GetObject();
if ( !CORBA::is_nil( anObject ) ) {
myMeshNbFaces->setNum( (int)aMesh->NbFaces() );
myMeshNbTriangles->setNum( (int)aMesh->NbTriangles() );
myMeshNbQuadrangles->setNum( (int)aMesh->NbQuadrangles() );
+ myMeshNbPolygones->setNum( (int)aMesh->NbPolygons() );
myMeshNbVolumes->setNum( (int)aMesh->NbVolumes() );
myMeshNbTetra->setNum( (int)aMesh->NbTetras() );
myMeshNbHexa->setNum( (int)aMesh->NbHexas() );
myMeshNbPrism->setNum( (int)aMesh->NbPrisms() );
myMeshNbPyra->setNum( (int)aMesh->NbPyramids() );
+ myMeshNbPolyhedrones->setNum( (int)aMesh->NbPolyhedrons() );
return;
}
SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( anObject );
myWGStack->raiseWidget( mySubMeshWidget );
setCaption( tr( "SMESH_MESHINFO_TITLE" ) + " [" + tr("SMESH_SUBMESH") +"]" );
mySubMeshName->setText( aSO->GetName() );
- mySubMeshNbNodes->setNum( (int)aSubMesh->GetNumberOfNodes() );
+ mySubMeshNbNodes->setNum( (int)aSubMesh->GetNumberOfNodes( true ) );
mySubMeshNbElements->setNum( (int)aSubMesh->GetNumberOfElements() );
mySubMeshNbEdges->setNum( (int)( aSubMesh->GetElementsByType( SMESH::EDGE )->length() ) );
mySubMeshNbFaces->setNum( (int)( aSubMesh->GetElementsByType( SMESH::FACE )->length() ) );
mySubMeshNbVolumes->setNum( (int)( aSubMesh->GetElementsByType( SMESH::VOLUME )->length() ) );
return;
}
- SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow( anObject );
+ SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( anObject );
if ( !aGroup->_is_nil() ) {
myWGStack->raiseWidget( myGroupWidget );
setCaption( tr( "SMESH_MESHINFO_TITLE" ) + " [" + tr("SMESH_GROUP") +"]" );