Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Plugin-SimpleSmoother
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenFlipper-Free
Plugin-SimpleSmoother
Commits
d507ae2b
Commit
d507ae2b
authored
7 years ago
by
Martin Heistermann
Browse files
Options
Downloads
Patches
Plain Diff
Fix ODR (and property name) conflict with Plugin-Smoother
parent
9eeed579
Branches
fix-odr
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
SimpleSmootherPlugin.cc
+10
-10
10 additions, 10 deletions
SimpleSmootherPlugin.cc
SimpleSmootherPlugin.hh
+3
-3
3 additions, 3 deletions
SimpleSmootherPlugin.hh
with
13 additions
and
13 deletions
SmootherPlugin.cc
→
Simple
SmootherPlugin.cc
+
10
−
10
View file @
d507ae2b
...
...
@@ -49,24 +49,24 @@
#include
"SmootherPlugin.hh"
#include
"
Simple
SmootherPlugin.hh"
#include
<ObjectTypes/PolyMesh/PolyMesh.hh>
#include
<ObjectTypes/TriangleMesh/TriangleMesh.hh>
SmootherPlugin
::
SmootherPlugin
()
:
Simple
SmootherPlugin
::
Simple
SmootherPlugin
()
:
iterationsSpinbox_
(
0
)
{
}
SmootherPlugin
::~
SmootherPlugin
()
Simple
SmootherPlugin
::~
Simple
SmootherPlugin
()
{
}
void
SmootherPlugin
::
initializePlugin
()
void
Simple
SmootherPlugin
::
initializePlugin
()
{
// Create the Toolbox Widget
QWidget
*
toolBox
=
new
QWidget
();
...
...
@@ -99,7 +99,7 @@ void SmootherPlugin::initializePlugin()
emit
addToolbox
(
tr
(
"Simple Smoother"
)
,
toolBox
,
toolIcon
);
}
void
SmootherPlugin
::
pluginsInitialized
()
{
void
Simple
SmootherPlugin
::
pluginsInitialized
()
{
// Emit slot description
emit
setSlotDescription
(
tr
(
"simpleLaplace(int)"
),
tr
(
"Smooth mesh using the Laplace operator with uniform weights."
),
...
...
@@ -111,7 +111,7 @@ void SmootherPlugin::pluginsInitialized() {
* Smooth mesh using the Laplace operator
* with uniform weights.
*/
void
SmootherPlugin
::
simpleLaplace
()
{
void
Simple
SmootherPlugin
::
simpleLaplace
()
{
int
iterations
=
1
;
...
...
@@ -129,7 +129,7 @@ void SmootherPlugin::simpleLaplace() {
*
* @param _iterations Number of iterations
*/
void
SmootherPlugin
::
simpleLaplace
(
int
_iterations
)
{
void
Simple
SmootherPlugin
::
simpleLaplace
(
int
_iterations
)
{
for
(
PluginFunctions
::
ObjectIterator
o_it
(
PluginFunctions
::
TARGET_OBJECTS
)
;
o_it
!=
PluginFunctions
::
objectsEnd
();
++
o_it
)
{
...
...
@@ -144,7 +144,7 @@ void SmootherPlugin::simpleLaplace(int _iterations) {
OpenMesh
::
VPropHandleT
<
TriMesh
::
Point
>
origPositions
;
// Add a property to the mesh to store original vertex positions
mesh
->
add_property
(
origPositions
,
"SmootherPlugin_Original_Positions"
);
mesh
->
add_property
(
origPositions
,
"
Simple
SmootherPlugin_Original_Positions"
);
for
(
int
i
=
0
;
i
<
_iterations
;
++
i
)
{
...
...
@@ -213,7 +213,7 @@ void SmootherPlugin::simpleLaplace(int _iterations) {
OpenMesh
::
VPropHandleT
<
TriMesh
::
Point
>
origPositions
;
// Add a property to the mesh to store original vertex positions
mesh
->
add_property
(
origPositions
,
"SmootherPlugin_Original_Positions"
);
mesh
->
add_property
(
origPositions
,
"
Simple
SmootherPlugin_Original_Positions"
);
for
(
int
i
=
0
;
i
<
_iterations
;
++
i
)
{
...
...
@@ -287,7 +287,7 @@ void SmootherPlugin::simpleLaplace(int _iterations) {
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2
(
smootherplugin
,
SmootherPlugin
);
Q_EXPORT_PLUGIN2
(
smootherplugin
,
Simple
SmootherPlugin
);
#endif
...
...
This diff is collapsed.
Click to expand it.
SmootherPlugin.hh
→
Simple
SmootherPlugin.hh
+
3
−
3
View file @
d507ae2b
...
...
@@ -60,7 +60,7 @@
#include
<OpenFlipper/BasePlugin/BackupInterface.hh>
#include
<OpenFlipper/common/Types.hh>
class
SmootherPlugin
:
public
QObject
,
BaseInterface
,
ToolboxInterface
,
LoggingInterface
,
ScriptInterface
,
BackupInterface
class
Simple
SmootherPlugin
:
public
QObject
,
BaseInterface
,
ToolboxInterface
,
LoggingInterface
,
ScriptInterface
,
BackupInterface
{
Q_OBJECT
Q_INTERFACES
(
BaseInterface
)
...
...
@@ -95,8 +95,8 @@ class SmootherPlugin : public QObject, BaseInterface, ToolboxInterface, LoggingI
public:
SmootherPlugin
();
~
SmootherPlugin
();
Simple
SmootherPlugin
();
~
Simple
SmootherPlugin
();
// BaseInterface
QString
name
()
{
return
(
QString
(
"Simple Smoother"
));
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment