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
vite
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
vite
Commits
55bc0034
Commit
55bc0034
authored
Jun 24, 2014
by
Thibault Soucarre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fusionned draw_container and draw_container_text
parent
6a4e83d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
+15
-8
src/render/GanttDiagram.hpp
src/render/GanttDiagram.hpp
+12
-5
src/trace/DrawTrace.hpp
src/trace/DrawTrace.hpp
+2
-2
src/trace/values/Color.hpp
src/trace/values/Color.hpp
+1
-1
No files found.
src/render/GanttDiagram.hpp
View file @
55bc0034
...
...
@@ -155,7 +155,7 @@ public:
* \param w the width of the container
* \param h the height of the container
*/
inline
void
draw_container
(
const
Element_pos
x
,
const
Element_pos
y
,
const
Element_pos
w
,
const
Element_pos
h
){
inline
void
draw_container
(
const
Element_pos
x
,
const
Element_pos
y
,
const
Element_pos
w
,
const
Element_pos
h
,
const
std
::
string
&
value
){
Container_
buf
;
...
...
@@ -166,6 +166,13 @@ public:
_containers
.
push_back
(
buf
);
Container_text_
buft
;
buft
.
x
=
x
;
buft
.
y
=
y
+
h
/
2
;
buft
.
value
=
value
;
_container_texts
.
push_back
(
buft
);
if
((
x
+
w
)
>
Info
::
Container
::
x_max
)
Info
::
Container
::
x_max
=
x
+
w
;
...
...
@@ -197,12 +204,12 @@ public:
*/
inline
void
draw_container_text
(
const
Element_pos
x
,
const
Element_pos
y
,
const
std
::
string
value
){
Container_text_
buf
;
/*
Container_text_ buf;
buf.x = x;
buf.y = y;
buf.value = value;
_container_texts
.
push_back
(
buf
);
_container_texts.push_back(buf);*/
}
/*!
...
...
@@ -534,13 +541,13 @@ public:
}
// position += browse_container(draw_object, *i, position, 0,container);
...
...
src/trace/DrawTrace.hpp
View file @
55bc0034
...
...
@@ -369,8 +369,8 @@ public:
//Element_pos x = depth *(_container_width +_container_h_space) + _container_h_space/2;
//Element_pos y = position*(_container_height+_container_v_space) + _container_v_space/2;
//Element_pos height = size *(_container_height+_container_v_space) - _container_v_space;
draw_object
->
draw_container
(
x
,
y
+
_container_v_space
/
2
,
w
,
h
);
draw_object
->
draw_container_text
(
x
,
y
+
h
/
2
,
text
);
draw_object
->
draw_container
(
x
,
y
+
_container_v_space
/
2
,
w
,
h
,
text
);
//
draw_object->draw_container_text(x, y+h/2, text);
}
/*!
...
...
src/trace/values/Color.hpp
View file @
55bc0034
whites
/*
/*
** This file is part of the ViTE project.
**
** This software is governed by the CeCILL-A license under French law
...
...
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