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
INT PAL 0053060: Preview in clipping
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshInfo.h
diff --git
a/src/SMESHGUI/SMESHGUI_MeshInfo.h
b/src/SMESHGUI/SMESHGUI_MeshInfo.h
index bc8c406834fe98678d1d3c8c9c099ca4ef09d2ae..f06db38d25970f98f15e0f82723fd91571869cc7 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
5
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
@@
-28,7
+28,11
@@
#include "SMESH_SMESHGUI.hxx"
#include "SMESH_ControlsDef.hxx"
#include "SMESH_SMESHGUI.hxx"
#include "SMESH_ControlsDef.hxx"
-#include <Plot2d_Histogram.h>
+#ifndef DISABLE_PLOT2DVIEWER
+ #include <Plot2d_Histogram.h>
+#else
+ #include <qwt_plot.h>
+#endif
#include <QFrame>
#include <QDialog>
#include <QFrame>
#include <QDialog>
@@
-108,7
+112,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;
@@
-157,6
+162,7
@@
protected:
{
double myX, myY, myZ;
XYZ() { myX = myY = myZ = 0.0; }
{
double myX, myY, myZ;
XYZ() { myX = myY = myZ = 0.0; }
+ XYZ(double x, double y, double z) { myX = x; myY = y; myZ = z; }
void add( double x, double y, double z ) { myX += x; myY += y; myZ += z; }
void divide( double a ) { if ( a != 0.) { myX /= a; myY /= a; myZ /= a; } }
double x() const { return myX; }
void add( double x, double y, double z ) { myX += x; myY += y; myZ += z; }
void divide( double a ) { if ( a != 0.) { myX /= a; myY /= a; myZ /= a; } }
double x() const { return myX; }
@@
-175,6
+181,7
@@
protected:
Connectivity nodeConnectivity( const SMDS_MeshNode* );
QString formatConnectivity( Connectivity, int );
XYZ gravityCenter( const SMDS_MeshElement* );
Connectivity nodeConnectivity( const SMDS_MeshNode* );
QString formatConnectivity( Connectivity, int );
XYZ gravityCenter( const SMDS_MeshElement* );
+ XYZ normal( const SMDS_MeshElement* );
signals:
void itemInfo( int );
signals:
void itemInfo( int );
@@
-225,6
+232,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:
@@
-242,7
+250,7
@@
class GrpComputor: public QObject
Q_OBJECT;
public:
Q_OBJECT;
public:
- GrpComputor( SMESH::SMESH_GroupBase_ptr, QTreeWidgetItem*, QObject*
);
+ GrpComputor( SMESH::SMESH_GroupBase_ptr, QTreeWidgetItem*, QObject*
, bool = false
);
QTreeWidgetItem* getItem() { return myItem; }
public slots:
QTreeWidgetItem* getItem() { return myItem; }
public slots:
@@
-251,6
+259,7
@@
public slots:
private:
SMESH::SMESH_GroupBase_var myGroup;
QTreeWidgetItem* myItem;
private:
SMESH::SMESH_GroupBase_var myGroup;
QTreeWidgetItem* myItem;
+ bool myToComputeSize;
};
class SMESHGUI_EXPORT SMESHGUI_AddInfo : public QTreeWidget
};
class SMESHGUI_EXPORT SMESHGUI_AddInfo : public QTreeWidget
@@
-306,7
+315,9
@@
private:
QwtPlot* createPlot( QWidget* );
void setFontAttributes( QWidget* );
void clearInternal();
QwtPlot* createPlot( QWidget* );
void setFontAttributes( QWidget* );
void clearInternal();
+#ifndef DISABLE_PLOT2DVIEWER
Plot2d_Histogram* getHistogram( SMESH::NumericalFunctor_ptr functor );
Plot2d_Histogram* getHistogram( SMESH::NumericalFunctor_ptr functor );
+#endif
void computeNb( int ft, int iBut, int iWdg );
private slots:
void computeNb( int ft, int iBut, int iWdg );
private slots: