X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Measurements.h;h=d8c4a4a35134ccd74533173c953bc480cc56313c;hp=a9ea2b7e774e77c5787211653cd81f1cd10e81f5;hb=6d32f944a0a115b6419184c50b57bf7c4eef5786;hpb=6bac08c1a81f34d3f21c550bd92f83654b2546a5 diff --git a/src/SMESHGUI/SMESHGUI_Measurements.h b/src/SMESHGUI/SMESHGUI_Measurements.h index a9ea2b7e7..d8c4a4a35 100644 --- a/src/SMESHGUI/SMESHGUI_Measurements.h +++ b/src/SMESHGUI/SMESHGUI_Measurements.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 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 @@ -37,10 +37,13 @@ class SUIT_SelectionFilter; class SALOME_Actor; class SMESH_Actor; class SMESHGUI_IdValidator; +class SMESHGUI_MeshEditPreview; #include #include CORBA_SERVER_HEADER(SMESH_Mesh) +#include + class SMESHGUI_EXPORT SMESHGUI_MinDistance : public QWidget { Q_OBJECT; @@ -167,6 +170,40 @@ private: SUIT_SelectionFilter* myFilter; }; +class SMESHGUI_EXPORT SMESHGUI_Angle : public QWidget +{ + Q_OBJECT; + +public: + + SMESHGUI_Angle( QWidget* = 0 ); + ~SMESHGUI_Angle(); + + void deactivate(); + void updateSelection(); + +private slots: + void selectionChanged(); + void nodesEdited(); + void compute(); + void clear(); + +private: + + bool addPointByActor( int id ); + bool addPointByIDSource( int id ); + gp_Vec getNormal(const gp_Vec& vec10 ); + + QLineEdit* myNodes; + QLineEdit* myResult; + + SMESH::SMESH_IDSource_var myIDSrc; + SMESH_Actor* myActor; + + std::vector< SMESH::PointStruct > myPoints; + SMESHGUI_MeshEditPreview* myPreview; +}; + class SMESHGUI_EXPORT SMESHGUI_MeasureDlg : public QDialog { Q_OBJECT; @@ -180,7 +217,8 @@ public: BoundingBox, //!< bounding box Length, //!< length Area, //!< area - Volume //!< volume + Volume, //!< volume + Angle }; SMESHGUI_MeasureDlg( QWidget* = 0, int = MinDistance ); @@ -203,6 +241,7 @@ private: SMESHGUI_MinDistance* myMinDist; SMESHGUI_BoundingBox* myBndBox; SMESHGUI_BasicProperties* myBasicProps; + SMESHGUI_Angle* myAngle; }; #endif // SMESHGUI_MEASUREMENTS_H