Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Plugin-SelectionVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
Plugin-SelectionVolumeMesh
Commits
e9a75f06
Commit
e9a75f06
authored
Dec 08, 2017
by
Martin Heistermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolve ODR violation with Plugin-SelectionMeshObject
parent
5ae33201
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
VolMeshParamWidget.cc
VolMeshParamWidget.cc
+2
-2
VolMeshParamWidget.hh
VolMeshParamWidget.hh
+3
-3
VolMeshParamWidget.ui
VolMeshParamWidget.ui
+2
-2
VolumeMeshSelectionPlugin.cc
VolumeMeshSelectionPlugin.cc
+2
-2
VolumeMeshSelectionPlugin.hh
VolumeMeshSelectionPlugin.hh
+2
-2
No files found.
Parameter
Widget.cc
→
VolMeshParam
Widget.cc
View file @
e9a75f06
...
...
@@ -47,10 +47,10 @@
* *
\*===========================================================================*/
#include "
Parameter
Widget.hh"
#include "
VolMeshParam
Widget.hh"
ParameterWidget
::
Parameter
Widget
(
QWidget
*
_parent
)
VolMeshParamWidget
::
VolMeshParam
Widget
(
QWidget
*
_parent
)
:
QWidget
(
_parent
)
{
setupUi
(
this
);
}
Parameter
Widget.hh
→
VolMeshParam
Widget.hh
View file @
e9a75f06
...
...
@@ -47,7 +47,7 @@
* *
\*===========================================================================*/
#include "ui_
Parameter
Widget.hh"
#include "ui_
VolMeshParam
Widget.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
...
...
@@ -56,11 +56,11 @@
#endif
class
ParameterWidget
:
public
QWidget
,
public
Ui
::
Parameter
Widget
class
VolMeshParamWidget
:
public
QWidget
,
public
Ui
::
VolMeshParam
Widget
{
Q_OBJECT
public:
explicit
Parameter
Widget
(
QWidget
*
_parent
=
0
);
explicit
VolMeshParam
Widget
(
QWidget
*
_parent
=
0
);
};
Parameter
Widget.ui
→
VolMeshParam
Widget.ui
View file @
e9a75f06
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
Parameter
Widget
</class>
<widget
class=
"QWidget"
name=
"
Parameter
Widget"
>
<class>
VolMeshParam
Widget
</class>
<widget
class=
"QWidget"
name=
"
VolMeshParam
Widget"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
...
...
VolumeMeshSelectionPlugin.cc
View file @
e9a75f06
...
...
@@ -48,7 +48,7 @@
\*===========================================================================*/
#include "VolumeMeshSelectionPlugin.hh"
#include "
Parameter
Widget.hh"
#include "
VolMeshParam
Widget.hh"
// Primitive type icons
#define VERTEX_TYPE "selection_vertex.png"
...
...
@@ -100,7 +100,7 @@ void VolumeMeshSelectionPlugin::initializePlugin() {
// Tell core about all scriptable slots
updateSlotDescriptions
();
if
(
!
OpenFlipper
::
Options
::
nogui
())
parameterWidget_
=
new
Parameter
Widget
(
nullptr
);
parameterWidget_
=
new
VolMeshParam
Widget
(
nullptr
);
}
//==============================================================================================
...
...
VolumeMeshSelectionPlugin.hh
View file @
e9a75f06
...
...
@@ -72,7 +72,7 @@
#include <ObjectTypes/TetrahedralMesh/TetrahedralMesh.hh>
#endif
class
Parameter
Widget
;
class
VolMeshParam
Widget
;
class
VolumeMeshSelectionPlugin
:
public
QObject
,
BaseInterface
,
KeyInterface
,
INIInterface
,
BackupInterface
,
LoggingInterface
,
ScriptInterface
,
SelectionInterface
...
...
@@ -375,7 +375,7 @@ private:
PrimitiveType
allSupportedTypes_
;
PrimitiveType
floodFillSupportedTypes_
;
Parameter
Widget
*
parameterWidget_
;
VolMeshParam
Widget
*
parameterWidget_
;
double
max_angle_
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment