From 163af2de5772c38bacf0a4f72b7b02b352e18908 Mon Sep 17 00:00:00 2001 From: Afeef Date: Fri, 24 Jun 2022 15:07:02 +0200 Subject: [PATCH] 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. --- src/SMESHGUI/SMESHGUI_MeshInfo.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx index 8fe998131..cef3451ca 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx @@ -66,24 +66,24 @@ #include //////////////////////////////////////////////////////////////////////////////// -/// \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 ); } /*! -- 2.39.2