Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
vite
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
Package registry
Container registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
solverstack
vite
Commits
032df395
Commit
032df395
authored
7 years ago
by
François Trahay
Browse files
Options
Downloads
Patches
Plain Diff
remove a few unwanted messages
parent
62d41445
No related branches found
No related tags found
1 merge request
!1
remove a few unwanted messages
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/core/Core.cpp
+0
-4
0 additions, 4 deletions
src/core/Core.cpp
src/render/Render_alternate.cpp
+0
-20
0 additions, 20 deletions
src/render/Render_alternate.cpp
with
0 additions
and
24 deletions
src/core/Core.cpp
+
0
−
4
View file @
032df395
...
...
@@ -366,7 +366,6 @@ int Core::get_options(int &argc, char **argv)
**********************************/
bool
Core
::
draw_trace
(
const
string
&
filename
,
const
int
format
)
{
std
::
cout
<<
"Core::draw_trace"
<<
std
::
endl
;
parser
=
NULL
;
DrawTrace
drawing_ogl
;
bool
killed
=
false
;
...
...
@@ -622,9 +621,7 @@ bool Core::draw_trace(const string & filename, const int format) {
if
(
!
_xml_config_file
.
empty
()
&&
_trace
->
get_view_root_containers
()
->
empty
()){
//if we have a partial loading, process it here, but only once
launch_action
(
_DRAW_OPENGL_PARTIAL
,
NULL
);
}
std
::
cout
<<
"test"
<<
std
::
endl
;
if
(
_DRAW_OPENGL
==
format
)
{
std
::
cout
<<
"DRAW_OPENGL == format"
<<
std
::
endl
;
GanttDiagram
render
(
_render_opengl
);
drawing_ogl
.
build
(
&
render
,
_trace
);
_render_opengl
->
build
();
...
...
@@ -772,7 +769,6 @@ void Core::launch_action(int state, void* arg) {
/* Wait that the open gl renderer calls waitGUIInit->quit() to load the file */
waitGUIInit
->
exec
();
std
::
cout
<<
"gui init"
<<
std
::
endl
;
if
(
_STATE_OPEN_FILE
==
state
){
_main_window
->
opening_file
(
_file_opened
);
/* Must be called after binding the render area to the main window */
if
(
false
==
draw_trace
(
_file_opened
,
_DRAW_OPENGL
)
){
...
...
This diff is collapsed.
Click to expand it.
src/render/Render_alternate.cpp
+
0
−
20
View file @
032df395
...
...
@@ -173,7 +173,6 @@ void Render_alternate::initializeGL() {
checkGlError
();
// Check for OpenGL version support
std
::
cout
<<
"init"
<<
std
::
endl
;
const
GLubyte
*
version
=
glGetString
(
GL_SHADING_LANGUAGE_VERSION
);
checkGlError
();
if
(
version
==
NULL
)
...
...
@@ -181,16 +180,12 @@ void Render_alternate::initializeGL() {
else
std
::
cout
<<
"Version GLSL : "
<<
version
<<
std
::
endl
;
_glsl
=
(
version
[
0
]
-
'0'
)
*
100
+
(
version
[
2
]
-
'0'
)
*
10
+
version
[
3
]
-
'0'
;
std
::
cout
<<
_glsl
<<
std
::
endl
;
_shader
=
new
Shader
(
_glsl
);
_shader
->
charger
();
draw_wait
();
setAutoFillBackground
(
false
);
if
(
_core
==
NULL
)
std
::
cout
<<
"_core = NULL"
<<
std
::
endl
;
_core
->
waitGUIInit
->
quit
();
std
::
cout
<<
"init ok"
<<
std
::
endl
;
_modelview
=
glm
::
scale
(
_modelview
,
glm
::
vec3
(
1
,
-
1
,
1
));
_modelview
=
glm
::
translate
(
_modelview
,
glm
::
vec3
(
0
,
-
Info
::
Render
::
height
,
0
));
/* code from test on freetype library
...
...
@@ -252,7 +247,6 @@ for(int i = 32; i < 128; i++) {
void
Render_alternate
::
render_text
(
QString
text
,
float
x
,
float
y
,
float
w
,
float
h
){
/* Code trying to create text on QImage and create a texture from this. Then render the text thanks to this texture. Not working yet, the texture seems to be empty*/
std
::
cout
<<
"render_text"
<<
std
::
endl
;
GLuint
texture
;
checkGlError
();
glGenTextures
(
2
,
&
texture
);
...
...
@@ -355,7 +349,6 @@ void Render_alternate::paintGL(){
glBindTexture
(
GL_TEXTURE_2D
,
_textureID
);
checkGlError
();
std
::
cout
<<
"draw wait
\n
"
;
// GL_QUADS is deprecated for Opengl greater than 3., so an invalide enum is returned by glGetError and needs to be reset
// TODO: fix that by replacing by GL_TRIANGLES
glDrawArrays
(
GL_TRIANGLES
,
0
,
_wait
->
getNbVertex
());
/*glGetError();*/
...
...
@@ -461,7 +454,6 @@ void Render_alternate::paintGL(){
glDrawArrays
(
GL_LINES
,
0
,
it_arrow
->
second
.
first
->
getNbVertex
());
it_arrow
->
second
.
first
->
unlock
();
if
(
Info
::
Render
::
_arrows_shape
==
1
){
//head = points
std
::
cout
<<
"head of the arrow "
<<
it_arrow
->
second
.
second
->
getNbVertex
()
<<
" "
<<
it_arrow
->
second
.
first
->
getNbVertex
()
<<
std
::
endl
;
it_arrow
->
second
.
second
->
lock
();
glEnable
(
GL_PROGRAM_POINT_SIZE
);
glEnable
(
GL_POINT_SMOOTH
);
...
...
@@ -887,7 +879,6 @@ void Render_alternate::draw_quad(Element_pos x, Element_pos y, Element_pos z, El
offset_x
=
0
;
if
(
_draw_container
){
std
::
cout
<<
"container : "
<<
x
<<
" "
<<
y
<<
" "
<<
w
<<
" "
<<
h
<<
std
::
endl
;
_containers
.
add
(
x
+
offset_x
,
y
+
offset_y
,
_r
,
_g
,
_b
);
_containers
.
add
(
x
+
offset_x
+
w
,
y
+
offset_y
,
_r
,
_g
,
_b
);
_containers
.
add
(
x
+
offset_x
+
w
,
y
+
offset_y
+
h
,
_r
,
_g
,
_b
);
...
...
@@ -970,7 +961,6 @@ void Render_alternate::end_draw_containers(){
_draw_container
=
false
;
checkGlError
();
_containers
.
config
(
_glsl
);
cout
<<
"end_draw_containers"
<<
endl
;
checkGlError
();
}
...
...
@@ -1012,7 +1002,6 @@ void Render_alternate::end_draw_states(){
it
->
second
->
config
(
_glsl
);
it
++
;
}
cout
<<
"end_draw_states"
<<
endl
;
checkGlError
();
}
...
...
@@ -1075,7 +1064,6 @@ void Render_alternate::end_draw_arrows(){
//send datas to vbo
std
::
map
<
EntityValue
*
,
std
::
pair
<
Vbo
*
,
Vbo
*>
>::
iterator
it
=
_arrows
.
begin
();
while
(
it
!=
_arrows
.
end
()){
std
::
cout
<<
it
->
first
->
get_name
()
<<
std
::
endl
;
it
->
second
.
first
->
config
(
_glsl
);
it
->
second
.
second
->
config
(
_glsl
);
it
++
;
...
...
@@ -1083,7 +1071,6 @@ void Render_alternate::end_draw_arrows(){
//_arrows.config(_glsl);
//_arrows2.config(_glsl);
_arrows3
.
config
(
_glsl
);
cout
<<
"end_draw_arrows "
<<
_links
.
size
()
<<
endl
;
checkGlError
();
}
...
...
@@ -1118,13 +1105,11 @@ void Render_alternate::end_draw_events(){
_draw_event
=
false
;
std
::
map
<
EntityValue
*
,
std
::
pair
<
Vbo
*
,
Vbo
*>
>::
iterator
it
=
_events
.
begin
();
while
(
it
!=
_events
.
end
()){
std
::
cout
<<
it
->
first
->
get_name
()
<<
std
::
endl
;
it
->
second
.
first
->
config
(
_glsl
);
it
->
second
.
second
->
config
(
_glsl
);
it
++
;
}
_draw_event
=
false
;
cout
<<
"end_draw_events"
<<
endl
;
checkGlError
();
}
...
...
@@ -1142,7 +1127,6 @@ void Render_alternate::draw_counter(const Element_pos , const Element_pos ){
void
Render_alternate
::
end_draw_counter
(){
_draw_counter
=
false
;
_counters
.
config
(
_glsl
);
cout
<<
"end_draw_counters"
<<
endl
;
checkGlError
();
}
...
...
@@ -1156,7 +1140,6 @@ void Render_alternate::end_ruler(){
}
void
Render_alternate
::
end_draw
(){
cout
<<
"end_draw"
<<
endl
;
checkGlError
();
}
...
...
@@ -1171,7 +1154,6 @@ void Render_alternate::draw_stored_circles(){
}
void
Render_alternate
::
release
(){
std
::
cout
<<
"release"
<<
std
::
endl
;
}
void
Render_alternate
::
draw_text_value
(
long
int
id
,
double
text
,
double
y
){
...
...
@@ -1364,14 +1346,12 @@ void Render_alternate::change_event_color(std::string event, Element_col r, Elem
}
/*Same operating mode as change_color */
void
Render_alternate
::
change_link_color
(
std
::
string
link
,
Element_col
r
,
Element_col
g
,
Element_col
b
){
std
::
cout
<<
"change_link_color"
<<
" "
<<
link
<<
std
::
endl
;
std
::
map
<
EntityValue
*
,
std
::
pair
<
Vbo
*
,
Vbo
*>
>::
iterator
it
;
it
=
_arrows
.
begin
();
while
(
it
!=
_arrows
.
end
()){
//assert(it->first); // TODO: check why busy state exists and uncomment this assert
if
(
it
->
first
&&
(
it
->
first
->
get_name
()
==
link
)){
std
::
cout
<<
"xd lol"
<<
std
::
endl
;
Color
*
c
=
new
Color
(
r
,
g
,
b
);
it
->
first
->
set_used_color
(
c
);
it
->
second
.
first
->
delete_shader
();
...
...
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