kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Mesh: add GUI to perform mesh decimation

Browse Source
This commit is contained in:
wmayer
2020-05-03 15:06:03 +02:00
parent a759c7ecd6
commit 3bef7ba7c9
6 changed files with 426 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Mesh/Gui/CMakeLists.txt
View File

@@ -34,6 +34,7 @@ set(Mesh_MOC_HDRS
DlgRegularSolidImp.h
DlgSettingsMeshView.h
DlgSettingsImportExportImp.h
DlgDecimating.h
DlgSmoothing.h
MeshEditor.h
PropertyEditorMesh.h
@@ -51,6 +52,7 @@ set(Dialogs_UIC_SRCS
DlgRegularSolid.ui
DlgSettingsMeshView.ui
DlgSettingsImportExport.ui
DlgDecimating.ui
DlgSmoothing.ui
RemoveComponents.ui
RemeshGmsh.ui
@@ -76,6 +78,9 @@ SET(Dialogs_SRCS
DlgSettingsImportExport.ui
DlgSettingsImportExportImp.cpp
DlgSettingsImportExportImp.h
DlgDecimating.ui
DlgDecimating.cpp
DlgDecimating.h
DlgSmoothing.ui
DlgSmoothing.cpp
DlgSmoothing.h

32
src/Mod/Mesh/Gui/Command.cpp
View File

@@ -74,6 +74,7 @@
#include "RemoveComponents.h"
#include "RemeshGmsh.h"
#include "DlgSmoothing.h"
#include "DlgDecimating.h"
#include "ViewProviderMeshFaceSet.h"
#include "ViewProviderCurvature.h"
#include "MeshEditor.h"
@@ -1437,6 +1438,36 @@ bool CmdMeshSmoothing::isActive(void)
//--------------------------------------------------------------------------------------
DEF_STD_CMD_A(CmdMeshDecimating)
CmdMeshDecimating::CmdMeshDecimating()
:Command("Mesh_Decimating")
{
sAppModule = "Mesh";
sGroup = QT_TR_NOOP("Mesh");
sMenuText = QT_TR_NOOP("Decimation...");
sToolTipText = QT_TR_NOOP("Decimates a mesh");
sWhatsThis = QT_TR_NOOP("Decimates a mesh");
sStatusTip = QT_TR_NOOP("Decimates a mesh");
}
void CmdMeshDecimating::activated(int)
{
Gui::Control().showDialog(new MeshGui::TaskDecimating());
}
bool CmdMeshDecimating::isActive(void)
{
#if 1
if (Gui::Control().activeDialog())
return false;
#endif
// Check for the selected mesh feature (all Mesh types)
return getSelection().countObjectsOfType(Mesh::Feature::getClassTypeId()) > 0;
}
//--------------------------------------------------------------------------------------
DEF_STD_CMD_A(CmdMeshHarmonizeNormals)
CmdMeshHarmonizeNormals::CmdMeshHarmonizeNormals()
@@ -1842,6 +1873,7 @@ void CreateMeshCommands(void)
rcCmdMgr.addCommand(new CmdMeshHarmonizeNormals());
rcCmdMgr.addCommand(new CmdMeshFlipNormals());
rcCmdMgr.addCommand(new CmdMeshSmoothing());
rcCmdMgr.addCommand(new CmdMeshDecimating());
rcCmdMgr.addCommand(new CmdMeshBoundingBox());
rcCmdMgr.addCommand(new CmdMeshBuildRegularSolid());
rcCmdMgr.addCommand(new CmdMeshFillupHoles());

169
src/Mod/Mesh/Gui/DlgDecimating.cpp Normal file
View File

@@ -0,0 +1,169 @@
/***************************************************************************
* Copyright (c) 2020 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#include "DlgDecimating.h"
#include "ui_DlgDecimating.h"
#include <Gui/WaitCursor.h>
#include <Gui/Command.h>
#include <Gui/Selection.h>
#include <Mod/Mesh/App/MeshFeature.h>
using namespace MeshGui;
/* TRANSLATOR MeshGui::DlgDecimating */
DlgDecimating::DlgDecimating(QWidget* parent, Qt::WindowFlags fl)
: QWidget(parent, fl)
, numberOfTriangles(0)
, ui(new Ui_DlgDecimating)
{
ui->setupUi(this);
ui->spinBoxReduction->setMinimumWidth(60);
ui->checkAbsolueNumber->setEnabled(false);
on_checkAbsolueNumber_toggled(false);
}
DlgDecimating::~DlgDecimating()
{
}
bool DlgDecimating::isAbsoluteNumber() const
{
return ui->checkAbsolueNumber->isChecked();
}
int DlgDecimating::targetNumberOfTriangles() const
{
if (ui->checkAbsolueNumber->isChecked()) {
return ui->spinBoxReduction->value();
}
else {
return numberOfTriangles * (1.0 - reduction());
}
}
void DlgDecimating::setNumberOfTriangles(int num)
{
numberOfTriangles = num;
ui->checkAbsolueNumber->setEnabled(num > 0);
if (num <= 0)
ui->checkAbsolueNumber->setChecked(false);
}
void DlgDecimating::on_checkAbsolueNumber_toggled(bool on)
{
ui->sliderReduction->setDisabled(on);
ui->groupBoxTolerance->setDisabled(on);
if (on) {
disconnect(ui->sliderReduction, SIGNAL(valueChanged(int)), ui->spinBoxReduction, SLOT(setValue(int)));
disconnect(ui->spinBoxReduction, SIGNAL(valueChanged(int)), ui->sliderReduction, SLOT(setValue(int)));
ui->spinBoxReduction->setRange(1, numberOfTriangles);
ui->spinBoxReduction->setValue(numberOfTriangles * (1.0 - reduction()));
ui->spinBoxReduction->setSuffix(QString());
ui->checkAbsolueNumber->setText(tr("Absolute number (Maximum: %1)").arg(numberOfTriangles));
}
else {
ui->spinBoxReduction->setRange(0, 100);
ui->spinBoxReduction->setValue(ui->sliderReduction->value());
ui->spinBoxReduction->setSuffix(QString::fromLatin1("%"));
ui->checkAbsolueNumber->setText(tr("Absolute number"));
connect(ui->sliderReduction, SIGNAL(valueChanged(int)), ui->spinBoxReduction, SLOT(setValue(int)));
connect(ui->spinBoxReduction, SIGNAL(valueChanged(int)), ui->sliderReduction, SLOT(setValue(int)));
}
}
double DlgDecimating::tolerance() const
{
return ui->spinBoxTolerance->value();
}
/**
* Returns the level of reduction in the range [0, 1]. 0 means no reduction, 1 means full
* reduction.
*/
double DlgDecimating::reduction() const
{
double max = static_cast<double>(ui->sliderReduction->maximum());
double min = static_cast<double>(ui->sliderReduction->minimum());
double val = static_cast<double>(ui->sliderReduction->value());
return (val - min)/(max - min);
}
// ---------------------------------------
/* TRANSLATOR MeshGui::TaskDecimating */
TaskDecimating::TaskDecimating()
{
widget = new DlgDecimating();
Gui::TaskView::TaskBox* taskbox = new Gui::TaskView::TaskBox(
QPixmap(), widget->windowTitle(), false, 0);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);
std::vector<Mesh::Feature*> meshes = Gui::Selection().getObjectsOfType<Mesh::Feature>();
if (meshes.size() == 1) {
Mesh::Feature* mesh = meshes.front();
const Mesh::MeshObject& mm = mesh->Mesh.getValue();
widget->setNumberOfTriangles(static_cast<int>(mm.countFacets()));
}
}
TaskDecimating::~TaskDecimating()
{
// automatically deleted in the sub-class
}
bool TaskDecimating::accept()
{
std::vector<Mesh::Feature*> meshes = Gui::Selection().getObjectsOfType<Mesh::Feature>();
if (meshes.empty())
return true;
Gui::Selection().clearSelection();
Gui::WaitCursor wc;
Gui::Command::openCommand("Mesh Decimating");
float tolerance = widget->tolerance();
float reduction = widget->reduction();
bool absolute = widget->isAbsoluteNumber();
int targetSize = 0;
if (absolute)
targetSize = widget->targetNumberOfTriangles();
for (std::vector<Mesh::Feature*>::const_iterator it = meshes.begin(); it != meshes.end(); ++it) {
Mesh::Feature* mesh = *it;
Mesh::MeshObject* mm = mesh->Mesh.startEditing();
if (absolute)
mm->decimate(targetSize);
else
mm->decimate(tolerance, reduction);
mesh->Mesh.finishEditing();
}
Gui::Command::commitCommand();
return true;
}
#include "moc_DlgDecimating.cpp"

80
src/Mod/Mesh/Gui/DlgDecimating.h Normal file
View File

@@ -0,0 +1,80 @@
/***************************************************************************
* Copyright (c) 2020 Werner Mayer <wmayer[at]users.sourceforge.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef MESHGUI_DLGDECIMATING_H
#define MESHGUI_DLGDECIMATING_H
#include <QDialog>
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
#include <memory>
namespace MeshGui {
class Ui_DlgDecimating;
class DlgDecimating : public QWidget
{
Q_OBJECT
public:
DlgDecimating(QWidget* parent = 0, Qt::WindowFlags fl = 0);
~DlgDecimating();
void setNumberOfTriangles(int);
double tolerance() const;
double reduction() const;
bool isAbsoluteNumber() const;
int targetNumberOfTriangles() const;
private Q_SLOTS:
void on_checkAbsolueNumber_toggled(bool);
private:
int numberOfTriangles;
std::unique_ptr<Ui_DlgDecimating> ui;
};
/**
* Embed the panel into a task dialog.
*/
class TaskDecimating : public Gui::TaskView::TaskDialog
{
Q_OBJECT
public:
TaskDecimating();
~TaskDecimating();
public:
bool accept();
virtual QDialogButtonBox::StandardButtons getStandardButtons() const
{ return QDialogButtonBox::Ok | QDialogButtonBox::Cancel; }
virtual bool isAllowedAlterDocument(void) const
{ return true; }
private:
DlgDecimating* widget;
};
}
#endif // MESHGUI_DLGDECIMATING_H

139
src/Mod/Mesh/Gui/DlgDecimating.ui Normal file
View File

@@ -0,0 +1,139 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MeshGui::DlgDecimating</class>
<widget class="QWidget" name="MeshGui::DlgDecimating">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>412</width>
<height>214</height>
</rect>
</property>
<property name="windowTitle">
<string>Decimating</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBoxReduction">
<property name="title">
<string>Reduction</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="textLabel1">
<property name="text">
<string>None</string>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="sliderReduction">
<property name="maximum">
<number>100</number>
</property>
<property name="pageStep">
<number>5</number>
</property>
<property name="value">
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksAbove</enum>
</property>
<property name="tickInterval">
<number>10</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>Full</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkAbsolueNumber">
<property name="text">
<string>Absolute number</string>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>170</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2">
<widget class="QSpinBox" name="spinBoxReduction">
<property name="suffix">
<string notr="true">%</string>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>50</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBoxTolerance">
<property name="title">
<string>Tolerance</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>16</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="spinBoxTolerance">
<property name="singleStep">
<double>0.050000000000000</double>
</property>
<property name="value">
<double>0.100000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>

1
src/Mod/Mesh/Gui/Workbench.cpp
View File

@@ -218,6 +218,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Mesh_SegmentationBestFit"
<< "Separator"
<< "Mesh_Smoothing"
<< "Mesh_Decimating"
<< "Mesh_Scale"
<< "Separator"
<< "Mesh_BuildRegularSolid"