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
0023064: [CEA 1471] Create and support quadratic polygons in SMESH
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshInfo.h
diff --git
a/src/SMESHGUI/SMESHGUI_MeshInfo.h
b/src/SMESHGUI/SMESHGUI_MeshInfo.h
index 54ee1aca5191d91d0e2e8bbd161d55940c04f9a9..357f269ca276aec5ab41990f2128a5d4ce9b638e 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshInfo.h
+++ b/
src/SMESHGUI/SMESHGUI_MeshInfo.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-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>
@@
-158,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; }
@@
-176,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 );
@@
-308,7
+314,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: