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
Merge branch V7_3_1_BR
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshInfo.h
diff --git
a/src/SMESHGUI/SMESHGUI_MeshInfo.h
b/src/SMESHGUI/SMESHGUI_MeshInfo.h
index d84097e1c97e689a9c1798f555454122a17f8278..54ee1aca5191d91d0e2e8bbd161d55940c04f9a9 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshInfo.h
+++ b/
src/SMESHGUI/SMESHGUI_MeshInfo.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-26,7
+26,6
@@
#define SMESHGUI_MESHINFO_H
#include "SMESH_SMESHGUI.hxx"
#define SMESHGUI_MESHINFO_H
#include "SMESH_SMESHGUI.hxx"
-#include <SALOME_InteractiveObject.hxx>
#include "SMESH_ControlsDef.hxx"
#include <Plot2d_Histogram.h>
#include "SMESH_ControlsDef.hxx"
#include <Plot2d_Histogram.h>
@@
-42,6
+41,10
@@
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_Group)
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_Group)
+#include CORBA_SERVER_HEADER(SMESH_Filter)
+
+#include <SALOME_InteractiveObject.hxx>
+#include <SALOME_GenericObj_wrap.hxx>
class QAbstractButton;
class QButtonGroup;
class QAbstractButton;
class QButtonGroup;
@@
-105,7
+108,8
@@
class SMESHGUI_EXPORT SMESHGUI_MeshInfo : public QFrame
iSingle = 1,
iTotal = iSingle,
iLinear,
iSingle = 1,
iTotal = iSingle,
iLinear,
- iQuadratic
+ iQuadratic,
+ iBiQuadratic
};
typedef QList<QWidget*> wlist;
};
typedef QList<QWidget*> wlist;
@@
-222,6
+226,7
@@
public:
protected:
void contextMenuEvent( QContextMenuEvent* e );
void information( const QList<long>& );
protected:
void contextMenuEvent( QContextMenuEvent* e );
void information( const QList<long>& );
+ void nodeInfo( const SMDS_MeshNode*, int, int, QTreeWidgetItem* );
void clearInternal();
private slots:
void clearInternal();
private slots:
@@
-303,13
+308,12
@@
private:
QwtPlot* createPlot( QWidget* );
void setFontAttributes( QWidget* );
void clearInternal();
QwtPlot* createPlot( QWidget* );
void setFontAttributes( QWidget* );
void clearInternal();
- SMESH::long_array_var getElementsByType( SMESH::ElementType theElementType );
- int nbElemsControl( SMESH::long_array_var&, SMESH::Controls::FunctorPtr );
- Plot2d_Histogram* getHistogram( SMESH::long_array_var&, SMESH::Controls::NumericalFunctorPtr );
+ Plot2d_Histogram* getHistogram( SMESH::NumericalFunctor_ptr functor );
+ void computeNb( int ft, int iBut, int iWdg );
private slots:
private slots:
- void compute
FaceInf
o();
- void compute
VolumeInfo
();
+ void compute
AspectRati
o();
+ void compute
AspectRatio3D
();
void computeFreeNodesInfo();
void computeDoubleNodesInfo();
void computeDoubleEdgesInfo();
void computeFreeNodesInfo();
void computeDoubleNodesInfo();
void computeDoubleEdgesInfo();
@@
-318,9
+322,12
@@
private slots:
void computeDoubleVolumesInfo();
void computeOverConstrainedVolumesInfo();
void setTolerance( const double theTolerance );
void computeDoubleVolumesInfo();
void computeOverConstrainedVolumesInfo();
void setTolerance( const double theTolerance );
+
private:
private:
- SMESH_Actor* myActor;
+ typedef SALOME::GenericObj_wrap< SMESH::Predicate > TPredicate;
+ typedef SALOME::GenericObj_wrap< SMESH::NumericalFunctor > TNumFunctor;
+ SMESH::SMESH_IDSource_var myObject;
ObjectType myObjectType;
SMESHGUI_SpinBox* myToleranceWidget;
QList<QLabel*> myWidgets;
ObjectType myObjectType;
SMESHGUI_SpinBox* myToleranceWidget;
QList<QLabel*> myWidgets;
@@
-328,6
+335,8
@@
private:
QwtPlot* myPlot;
QwtPlot* myPlot3D;
QList<QAbstractButton*> myButtons;
QwtPlot* myPlot;
QwtPlot* myPlot3D;
QList<QAbstractButton*> myButtons;
+ QList<TPredicate> myPredicates;
+ TNumFunctor myAspectRatio, myAspectRatio3D;
};
class SMESHGUI_EXPORT SMESHGUI_MeshInfoDlg : public QDialog
};
class SMESHGUI_EXPORT SMESHGUI_MeshInfoDlg : public QDialog
@@
-394,6
+403,8
@@
private slots:
void activate();
void deactivate();
void updateSelection();
void activate();
void deactivate();
void updateSelection();
+ void help();
+ void dump();
private:
SMESHGUI_CtrlInfo* myCtrlInfo;
private:
SMESHGUI_CtrlInfo* myCtrlInfo;