ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-11 16:19:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for using Gmsh 4.10

Browse Source 
Two algorithms from Gmsh 4.10 for generating quad mesh, Packing of Parallelograms and Quasi Structured Quad,
depend on frame/cross-field computations in Gmsh. As such when using these algorithms a class Field is used
(see Field.h in gmsh source). As the class Field also exists in src/SMESHGUI/SMESHGUI_MeshInfo.cxx this cr-
eates an error for displaying the mesh Info.

Hence the Field has been renamed as FieldInfo in src/SMESHGUI/SMESHGUI_MeshInfo.cxx.
This commit is contained in:
Afeef 2022-06-24 15:07:02 +02:00
parent 9d7121c884
commit 163af2de57
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/SMESHGUI/SMESHGUI_MeshInfo.cxx
View File

@ -66,24 +66,24 @@
#include <QVBoxLayout> #include <QVBoxLayout>
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \class Field /// \class FieldInfo
/// \brief Field widget. /// \brief FieldInfo widget.
/// \internal /// \internal
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
class Field : public QLabel class FieldInfo : public QLabel
{ {
public: public:
Field( QWidget*, const QString& = QString() ); FieldInfo( QWidget*, const QString& = QString() );
bool event( QEvent* ); bool event( QEvent* );
}; };
/*! /*!
\brief Constructor. \brief Constructor.
\param parent Parent widget. \param parent Parent widget.
\param name Field name. Defaults to null string. \param name FieldInfo name. Defaults to null string.
*/ */
Field::Field( QWidget* parent, const QString& name ): QLabel( parent ) FieldInfo::FieldInfo( QWidget* parent, const QString& name ): QLabel( parent )
{ {
setFrameStyle( QLabel::StyledPanel | QLabel::Sunken ); setFrameStyle( QLabel::StyledPanel | QLabel::Sunken );
setAlignment( Qt::AlignCenter ); setAlignment( Qt::AlignCenter );
@ -100,7 +100,7 @@ Field::Field( QWidget* parent, const QString& name ): QLabel( parent )
/*! /*!
\brief Event handler. Redefined from QLabel. \brief Event handler. Redefined from QLabel.
*/ */
bool Field::event( QEvent* e ) bool FieldInfo::event( QEvent* e )
{ {
if ( e->type() == QEvent::DynamicPropertyChange ) if ( e->type() == QEvent::DynamicPropertyChange )
{ {
@ -332,12 +332,12 @@ namespace
/*! /*!
\brief Create information field. \brief Create information field.
\param parent Parent widget. \param parent Parent widget.
\param name Field's object. Default to null string. \param name FieldInfo's object. Default to null string.
\return New field. \return New FieldInfo.
*/ */
QLabel* createField( QWidget* parent, const QString& name = QString() ) QLabel* createField( QWidget* parent, const QString& name = QString() )
{ {
return new Field( parent, name ); return new FieldInfo( parent, name );
} }
/*! /*!