Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Plugin-VSI
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
Plugin-VSI
Commits
4207404f
Commit
4207404f
authored
Dec 08, 2017
by
Martin Heistermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ODR violations by using VSI namespace
parent
08e01a88
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
4 deletions
+20
-4
types/objectId/SelectionObjectMarker.cc
types/objectId/SelectionObjectMarker.cc
+5
-2
types/objectId/SelectionObjectMarker.hh
types/objectId/SelectionObjectMarker.hh
+3
-0
types/objectId/TreeModel.cc
types/objectId/TreeModel.cc
+4
-0
types/objectId/TreeModel.hh
types/objectId/TreeModel.hh
+4
-0
types/objectId/objectIdWidget.hh
types/objectId/objectIdWidget.hh
+2
-1
types/objectId/objectPickDialog.hh
types/objectId/objectPickDialog.hh
+2
-1
No files found.
types/objectId/SelectionObjectMarker.cc
View file @
4207404f
...
...
@@ -49,11 +49,13 @@
#include <OpenFlipper/common/Types.hh>
#include "SelectionObjectMarker.hh"
namespace
VSI
{
//******************************************************************************
const
ACG
::
Vec4f
disabled_color
(
0.4
f
,
0.4
f
,
0.4
f
,
1.0
f
);
const
ACG
::
Vec4f
selected_color
(
0.0
f
,
1.0
f
,
0.0
f
,
0.5
f
);
static
const
ACG
::
Vec4f
disabled_color
(
0.4
f
,
0.4
f
,
0.4
f
,
1.0
f
);
static
const
ACG
::
Vec4f
selected_color
(
0.0
f
,
1.0
f
,
0.0
f
,
0.5
f
);
//******************************************************************************
...
...
@@ -93,3 +95,4 @@ bool SelectionObjectMarker::blendForStencilRefNumber(GLuint _reference, GLenum &
return
false
;
}
}
// namespace VSI
types/objectId/SelectionObjectMarker.hh
View file @
4207404f
...
...
@@ -54,6 +54,7 @@
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/common/ViewObjectMarker.hh>
namespace
VSI
{
/** Object marker to visualize objectPickDialog selection
*/
class
SelectionObjectMarker
:
public
ViewObjectMarker
...
...
@@ -65,4 +66,6 @@ class SelectionObjectMarker : public ViewObjectMarker
bool
blendForStencilRefNumber
(
GLuint
_reference
,
GLenum
&
_src
,
GLenum
&
_dst
,
ACG
::
Vec4f
&
_color
);
};
}
// namespce VSI
#endif
types/objectId/TreeModel.cc
View file @
4207404f
...
...
@@ -60,6 +60,7 @@
#include <QtGui>
#endif
namespace
VSI
{
//******************************************************************************
...
...
@@ -603,3 +604,6 @@ bool TreeModel::setData(const QModelIndex &_index, const QVariant &_value, int /
bool
TreeModel
::
isRoot
(
TreeItem
*
_item
)
{
return
(
_item
==
rootItem_
);
}
}
// namespace VSI
types/objectId/TreeModel.hh
View file @
4207404f
...
...
@@ -56,6 +56,8 @@
#include "TreeItem.hh"
namespace
VSI
{
class
TreeModel
:
public
QAbstractItemModel
{
Q_OBJECT
...
...
@@ -175,5 +177,7 @@ private:
};
}
// namespace VSI
#endif
types/objectId/objectIdWidget.hh
View file @
4207404f
...
...
@@ -56,11 +56,12 @@
//== FORWARDDECLARATIONS ======================================================
class
QComboBox
;
class
QPushButton
;
class
TreeModel
;
//== NAMESPACES ===============================================================
namespace
VSI
{
class
TreeModel
;
//== CLASS DEFINITION =========================================================
/** Widget to configure object id inputs
...
...
types/objectId/objectPickDialog.hh
View file @
4207404f
...
...
@@ -61,13 +61,14 @@ class QPushButton;
class
QTreeView
;
class
QMouseEvent
;
class
TreeModel
;
class
SimpleViewer
;
//== NAMESPACES ===============================================================
namespace
VSI
{
class
TreeModel
;
//== CLASS DEFINITION =========================================================
/** Widget to pick a object
...
...
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