Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Cazier
CGoGN
Commits
549ab145
Commit
549ab145
authored
Mar 12, 2013
by
Sylvain Thery
Browse files
bugs in QGLViewer usage with stream
parent
cb6f8bf3
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/Utils/cgognStream.h
View file @
549ab145
...
...
@@ -133,29 +133,35 @@ public:
#ifdef WITH_QT
void
toStatusBar
(
void
*
ptr
);
/**
* remove output to status bars
*/
void
noStatusBar
();
void
toConsole
(
void
*
ptr
);
/**
* remove output to consoles
*/
void
noConsole
();
/**
* set output to status bar of Qt interface
*/
void
toStatusBar
(
Utils
::
QT
::
SimpleQT
*
sqt
);
void
toStatusBar
(
Utils
::
QT
::
SimpleQT
*
sqt
=
NULL
);
/**
* set output to console of Qt interface
*/
void
toConsole
(
Utils
::
QT
::
SimpleQT
*
sqt
);
void
toConsole
(
Utils
::
QT
::
SimpleQT
*
sqt
=
NULL
);
/**
* set output to status bar of Qt interface
*/
void
toStatusBar
(
Utils
::
QT
::
SimpleQGLV
*
sqglv
);
void
toStatusBar
(
Utils
::
QT
::
SimpleQGLV
*
sqglv
=
NULL
);
/**
* set output to console of Qt interface
*/
void
toConsole
(
Utils
::
QT
::
SimpleQGLV
*
sqglv
);
void
toConsole
(
Utils
::
QT
::
SimpleQGLV
*
sqglv
=
NULL
);
#endif
...
...
src/Utils/Qt/qtQGLV_glw.cpp
View file @
549ab145
...
...
@@ -130,19 +130,13 @@ void QGLView::resizeGL(int w, int h)
void
QGLView
::
keyPressEvent
(
QKeyEvent
*
event
)
{
if
(
event
->
key
()
==
Qt
::
Key_Escape
)
{
close
();
m_sqgl
->
close
();
return
;
}
m_state_modifier
=
event
->
modifiers
();
QGLViewer
::
keyPressEvent
(
event
);
if
(
m_sqgl
)
{
m_state_modifier
=
event
->
modifiers
();
int
k
=
event
->
key
();
if
(
(
k
>=
65
)
&&
(
k
<=
91
)
&&
!
(
event
->
modifier
s
()
&
Qt
::
ShiftModifier
)
)
if
(
(
k
>=
65
)
&&
(
k
<=
91
)
&&
!
(
m_state_
modifier
&
Qt
::
ShiftModifier
)
)
k
+=
32
;
m_sqgl
->
cb_keyPress
(
k
);
}
...
...
@@ -150,12 +144,12 @@ void QGLView::keyPressEvent(QKeyEvent* event)
void
QGLView
::
keyReleaseEvent
(
QKeyEvent
*
event
)
{
m_state_modifier
=
event
->
modifiers
();
QGLViewer
::
keyReleaseEvent
(
event
);
if
(
m_sqgl
)
{
m_state_modifier
=
event
->
modifiers
();
int
k
=
event
->
key
();
if
(
(
k
>=
65
)
&&
(
k
<=
91
)
&&
!
(
event
->
modifier
s
()
&
Qt
::
ShiftModifier
)
)
if
(
(
k
>=
65
)
&&
(
k
<=
91
)
&&
!
(
m_state_
modifier
&
Qt
::
ShiftModifier
)
)
k
+=
32
;
m_sqgl
->
cb_keyRelease
(
k
);
}
...
...
src/Utils/cgognStream.cpp
View file @
549ab145
...
...
@@ -162,18 +162,22 @@ void Out::toFile(const std::string& filename )
}
#ifdef WITH_QT
void
Out
::
t
oStatusBar
(
void
*
ptr
)
void
Out
::
n
oStatusBar
()
{
if
(
ptr
==
NULL
)
m_out_mode
&=
~
QTSTATUSBAR
;
m_out_mode
&=
~
QTSTATUSBAR
;
m_sqt_bar
=
NULL
;
m_sqglv_bar
=
NULL
;
}
void
Out
::
toConsole
(
void
*
ptr
)
void
Out
::
noConsole
()
{
if
(
ptr
==
NULL
)
m_out_mode
&=
~
QTCONSOLE
;
m_out_mode
&=
~
QTCONSOLE
;
m_sqt_console
=
NULL
;
m_sqglv_console
=
NULL
;
}
void
Out
::
toStatusBar
(
Utils
::
QT
::
SimpleQT
*
sqt
)
{
if
(
sqt
!=
NULL
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment