Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
vite
Commits
c10439cb
Commit
c10439cb
authored
Feb 05, 2014
by
Mathieu Faverge
Browse files
Move the palette to common directory and cleanuop some spaces
parent
c4506771
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
src/CMakeLists.txt
View file @
c10439cb
...
...
@@ -42,13 +42,14 @@
#
SET
(
VITE_HDRS
common/common.hpp
common/Message.hpp
common/Errors.hpp
common/Tools.hpp
common/Info.hpp
common/Session.hpp
common/Memory.hpp
common/Message.hpp
common/Palette.hpp
common/Session.hpp
common/Tools.hpp
common/common.hpp
# Data structure headers
trace/values/Color.hpp
trace/values/Date.hpp
...
...
@@ -83,7 +84,6 @@ SET(VITE_HDRS
trace/Trace.hpp
trace/IntervalOfContainer.hpp
# Render headers
render/Palette.hpp
render/Render.hpp
render/Geometry.hpp
render/Hook_event.hpp
...
...
@@ -145,12 +145,13 @@ SET(VITE_UIS
SET
(
VITE_SRCS
# Messages & Errors
common/Message.cpp
common/Errors.cpp
common/Tools.cpp
common/Info.cpp
common/Session.cpp
common/Memory.cpp
common/Message.cpp
common/Palette.cpp
common/Session.cpp
common/Tools.cpp
# Data structure code files
trace/values/Color.cpp
trace/values/Date.cpp
...
...
@@ -177,7 +178,6 @@ SET(VITE_SRCS
trace/Trace.cpp
trace/IntervalOfContainer.cpp
# Render code files
render/Palette.cpp
render/Geometry.cpp
render/Hook_event.cpp
render/Render.hpp
...
...
src/
render
/Palette.cpp
→
src/
common
/Palette.cpp
View file @
c10439cb
...
...
@@ -30,8 +30,8 @@ Color *Palette::get_color(const std::string &state_name) {
bool
Palette
::
is_visible
(
const
std
::
string
&
state_name
){
return
_visible
[
state_name
];
}
}
void
Palette
::
add_state
(
const
std
::
string
&
state
,
Color
&
c
,
bool
visible
)
{
if
(
_pairs
.
find
(
state
)
!=
_pairs
.
end
())
{
...
...
@@ -43,7 +43,7 @@ void Palette::add_state(const std::string &state, Color &c, bool visible) {
}
void
Palette
::
clear
(){
_pairs
.
clear
();
_pairs
.
clear
();
}
std
::
string
Palette
::
get_name
()
const
{
...
...
src/
render
/Palette.hpp
→
src/
common
/Palette.hpp
View file @
c10439cb
File moved
src/common/Session.cpp
View file @
c10439cb
...
...
@@ -60,7 +60,7 @@
/* -- */
#include
"trace/values/Value.hpp"
#include
"trace/values/Color.hpp"
#include
"
render
/Palette.hpp"
#include
"
common
/Palette.hpp"
#include
"common/Session.hpp"
using
namespace
std
;
...
...
@@ -77,11 +77,13 @@ int Session::Minimap::pen_size;
QColor
Session
::
Minimap
::
pen_color
;
QColor
Session
::
Minimap
::
brush_color
;
bool
Session
::
Minimap
::
is_closed
;
Palette
*
Session
::
_palette
=
NULL
;
Palette
*
Session
::
_link_types
=
NULL
;
Palette
*
Session
::
_event_types
=
NULL
;
bool
Session
::
_use_palettes
=
false
;
bool
Session
::
_use_palettes_is_set
=
false
;
QSettings
*
Session
::
settings
=
NULL
;
Session
::
Session
()
{
...
...
src/common/Session.hpp
View file @
c10439cb
...
...
@@ -119,7 +119,7 @@ private:
public:
static
QSettings
*
settings
;
static
Palette
*
_palette
;
//
static Palette *_palette;
static
Palette
*
_link_types
;
static
Palette
*
_event_types
;
...
...
src/interface/Settings_window.cpp
View file @
c10439cb
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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