Fix for using Gmsh 4.10

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 dacd89c7df
commit e6cfdf34c5

View File

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