From 6159c6da137bcf03e699588ec80ca62694d10101 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 25 Mar 2021 17:28:13 +0100 Subject: [PATCH] Mesh: [skip ci] use enum to define the various 2D meshing algorithms --- src/Mod/Mesh/Gui/RemeshGmsh.cpp | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/Mod/Mesh/Gui/RemeshGmsh.cpp b/src/Mod/Mesh/Gui/RemeshGmsh.cpp index 0be6a86402..a80a5b00cf 100644 --- a/src/Mod/Mesh/Gui/RemeshGmsh.cpp +++ b/src/Mod/Mesh/Gui/RemeshGmsh.cpp @@ -92,16 +92,25 @@ GmshWidget::GmshWidget(QWidget* parent, Qt::WindowFlags fl) d->syntax = new Gui::DockWnd::ReportHighlighter(d->ui.outputWindow); d->ui.outputWindow->setReadOnly(true); - // Meshing algorithms - // 1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=BAMG, 8=Frontal Quad, - // 9=Packing of Parallelograms - d->ui.method->addItem(tr("Automatic"), static_cast(2)); - d->ui.method->addItem(tr("Adaptive"), static_cast(1)); - d->ui.method->addItem(QString::fromLatin1("Delaunay"), static_cast(5)); - d->ui.method->addItem(tr("Frontal"), static_cast(6)); - d->ui.method->addItem(QString::fromLatin1("BAMG"), static_cast(7)); - d->ui.method->addItem(tr("Frontal Quad"), static_cast(8)); - d->ui.method->addItem(tr("Parallelograms"), static_cast(9)); + // 2D Meshing algorithms + // https://gmsh.info/doc/texinfo/gmsh.html#index-Mesh_002eAlgorithm + enum { + MeshAdapt = 1, + Automatic = 2, + Delaunay = 5, + FrontalDelaunay = 6, + BAMG = 7, + FrontalDelaunayForQuads = 8, + PackingOfParallelograms = 9 + }; + + d->ui.method->addItem(tr("Automatic"), static_cast(Automatic)); + d->ui.method->addItem(tr("Adaptive"), static_cast(MeshAdapt)); + d->ui.method->addItem(QString::fromLatin1("Delaunay"), static_cast(Delaunay)); + d->ui.method->addItem(tr("Frontal"), static_cast(FrontalDelaunay)); + d->ui.method->addItem(QString::fromLatin1("BAMG"), static_cast(BAMG)); + d->ui.method->addItem(tr("Frontal Quad"), static_cast(FrontalDelaunayForQuads)); + d->ui.method->addItem(tr("Parallelograms"), static_cast(PackingOfParallelograms)); } GmshWidget::~GmshWidget()