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
C
CommonGUI
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Frédéric Larue
CommonGUI
Commits
91f87eb6
Commit
91f87eb6
authored
Aug 01, 2019
by
Frédéric Larue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Display of metric grid improved.
parent
e7e9b102
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
GLViewer/MetricGrid.cpp
GLViewer/MetricGrid.cpp
+6
-6
GLViewer/MetricGrid.h
GLViewer/MetricGrid.h
+12
-12
No files found.
GLViewer/MetricGrid.cpp
View file @
91f87eb6
...
...
@@ -240,18 +240,18 @@ void MetricGrid::display( GLViewer *viewer )
QVector3D
front
=
viewer
->
frontAxis
();
if
(
std
::
abs
(
front
.
x
())
==
1.0
f
)
{
m_EnabledGrids
=
m_EnableGridsOnAlignedOrtho
?
YZ
:
NONE
;
m_EnabledAxis
=
m_EnableAxisOnAlignedOrtho
?
Y
|
Z
:
NONE
;
m_EnabledGrids
=
m_EnableGridsOnAlignedOrtho
*
YZ
;
m_EnabledAxis
=
m_EnableAxisOnAlignedOrtho
*
(
Y
|
Z
)
;
}
else
if
(
std
::
abs
(
front
.
y
())
==
1.0
f
)
{
m_EnabledGrids
=
m_EnableGridsOnAlignedOrtho
?
ZX
:
NONE
;
m_EnabledAxis
=
m_EnableAxisOnAlignedOrtho
?
Z
|
X
:
NONE
;
m_EnabledGrids
=
m_EnableGridsOnAlignedOrtho
*
ZX
;
m_EnabledAxis
=
m_EnableAxisOnAlignedOrtho
*
(
Z
|
X
)
;
}
else
if
(
std
::
abs
(
front
.
z
())
==
1.0
f
)
{
m_EnabledGrids
=
m_EnableGridsOnAlignedOrtho
?
XY
:
NONE
;
m_EnabledAxis
=
m_EnableAxisOnAlignedOrtho
?
X
|
Y
:
NONE
;
m_EnabledGrids
=
m_EnableGridsOnAlignedOrtho
*
XY
;
m_EnabledAxis
=
m_EnableAxisOnAlignedOrtho
*
(
X
|
Y
)
;
}
}
...
...
GLViewer/MetricGrid.h
View file @
91f87eb6
...
...
@@ -44,8 +44,8 @@ private:
int
m_EnabledGrids
;
int
m_EnabledAxis
;
bool
m_EnableLabels
;
bool
m_EnableAxisOnAlignedOrtho
;
bool
m_EnableGridsOnAlignedOrtho
;
int
m_EnableAxisOnAlignedOrtho
;
int
m_EnableGridsOnAlignedOrtho
;
/*****************************\
| Constructor(s) / destructor |
...
...
@@ -55,16 +55,16 @@ public:
m_EnabledGrids
(
NONE
),
m_EnabledAxis
(
ALL
),
m_EnableLabels
(
true
),
m_EnableAxisOnAlignedOrtho
(
true
),
m_EnableGridsOnAlignedOrtho
(
true
)
m_EnableAxisOnAlignedOrtho
(
1
),
m_EnableGridsOnAlignedOrtho
(
1
)
{}
inline
MetricGrid
(
int
enabledGrids
,
int
enabledAxis
)
:
m_EnabledGrids
(
enabledGrids
),
m_EnabledAxis
(
enabledAxis
),
m_EnableLabels
(
true
),
m_EnableAxisOnAlignedOrtho
(
true
),
m_EnableGridsOnAlignedOrtho
(
true
)
m_EnableAxisOnAlignedOrtho
(
1
),
m_EnableGridsOnAlignedOrtho
(
1
)
{}
/********************\
...
...
@@ -88,13 +88,13 @@ public:
inline
void
disableLabels
()
{
m_EnableLabels
=
false
;
}
inline
bool
areLabelsEnabled
()
const
{
return
m_EnableLabels
;
}
inline
void
enableAxisOnAlignedOrtho
()
{
m_EnableAxisOnAlignedOrtho
=
true
;
}
inline
void
disableAxisOnAlignedOrtho
()
{
m_EnableAxisOnAlignedOrtho
=
false
;
}
inline
bool
areAxisOnAlignedOrthoEnabled
()
const
{
return
m_EnableAxisOnAlignedOrtho
;
}
inline
void
enableAxisOnAlignedOrtho
()
{
m_EnableAxisOnAlignedOrtho
=
1
;
}
inline
void
disableAxisOnAlignedOrtho
()
{
m_EnableAxisOnAlignedOrtho
=
0
;
}
inline
bool
areAxisOnAlignedOrthoEnabled
()
const
{
return
m_EnableAxisOnAlignedOrtho
!=
0
;
}
inline
void
enableGridsOnAlignedOrtho
()
{
m_EnableGridsOnAlignedOrtho
=
true
;
}
inline
void
disableGridsOnAlignedOrtho
()
{
m_EnableGridsOnAlignedOrtho
=
false
;
}
inline
bool
areGridsOnAlignedOrthoEnabled
()
const
{
return
m_EnableGridsOnAlignedOrtho
;
}
inline
void
enableGridsOnAlignedOrtho
()
{
m_EnableGridsOnAlignedOrtho
=
1
;
}
inline
void
disableGridsOnAlignedOrtho
()
{
m_EnableGridsOnAlignedOrtho
=
0
;
}
inline
bool
areGridsOnAlignedOrthoEnabled
()
const
{
return
m_EnableGridsOnAlignedOrtho
!=
0
;
}
void
display
(
GLViewer
*
viewer
);
};
...
...
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