Skip to content
GitLab
Commit 91e02ab4 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Comments cleanup

parent 1fcc471c
Hide whitespace changes
Inline Side-by-side
src/common/Info.hpp
View file @ 91e02ab4
/*
** This file is part of the ViTE project.
**
** This software is governed by the CeCILL-A license under French law
** and abiding by the rules of distribution of free software. You can
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
** that may mean that it is complicated to manipulate, and that also
** therefore means that it is reserved for developers and experienced
** professionals having in-depth computer knowledge. Users are therefore
** encouraged to load and test the software's suitability as regards
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
**
** ViTE developers are (for version 0.* to 1.0):
**
** - COULOMB Kevin
** - FAVERGE Mathieu
** - JAZEIX Johnny
** - LAGRASSE Olivier
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
**
*/
** This file is part of the ViTE project.
**
** This software is governed by the CeCILL-A license under French law
** and abiding by the rules of distribution of free software. You can
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
** that may mean that it is complicated to manipulate, and that also
** therefore means that it is reserved for developers and experienced
** professionals having in-depth computer knowledge. Users are therefore
** encouraged to load and test the software's suitability as regards
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
**
** ViTE developers are (for version 0.* to 1.0):
**
** - COULOMB Kevin
** - FAVERGE Mathieu
** - JAZEIX Johnny
** - LAGRASSE Olivier
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
**
*/
/*!
*\file Info.hpp
*/
......@@ -177,7 +177,6 @@ public:
/*!
* \brief Specify the shape of arrows heads. 0 is triangle, 1 is a point and 2 is none.
*/
static int _arrows_shape;
/*!
......@@ -190,17 +189,17 @@ public:
*/
static bool _no_events;
/*!
* \brief Control if the color of State is uniform (value is false) or shaded (value is true). (By default, shaded)
*/
static bool _shaded_states;
/*!
* \brief Control if the color of State is uniform (value is false) or shaded (value is true). (By default, shaded)
*/
static bool _shaded_states;
/*!
* \brief Control if the vertical line is on. (By default, yes)
*/
static bool _vertical_line;
/*!
* \brief Control if the vertical line is on. (By default, yes)
*/
static bool _vertical_line;
/*!
/*!
* \brief Contains the trace minimum visible time.
*/
static Element_pos _x_min_visible;
......@@ -210,7 +209,7 @@ public:
*/
static Element_pos _x_max;
/*!
/*!
* \brief Contains the trace minimum visible time, uncorrected (state width isn't removed)
*/
static Element_pos _x_min;
......@@ -238,7 +237,6 @@ public:
/*!
* \brief To show the x beginning of the trace.
*/
static const int X_TRACE_BEGINNING = 0;
/*!
......@@ -283,48 +281,45 @@ public:
struct Trace{
/*!
* \brief The depth (number of stacked containers) of the data structure.
*/
* \brief The depth (number of stacked containers) of the data structure.
*/
static int depth;
};
struct Splitter{
/*!
* \brief are we splitting ?
*/
* \brief are we splitting ?
*/
static bool split;
/*!
* \brief are we loading from a splitted set of files (needed in core to know which action to initiate)
*/
* \brief are we loading from a splitted set of files (needed in core to know which action to initiate)
*/
static bool load_splitted;
/*!
* \brief are we loadinga preview version of a splitted file (needed in core to know which action to initiate)
*/
* \brief are we loadinga preview version of a splitted file (needed in core to know which action to initiate)
*/
static bool preview;
/*!
* \brief path of the folder to split
*/
* \brief path of the folder to split
*/
static std::string path;
/*!
* \brief filename of the splitted file, used to name the folder
*/
* \brief filename of the splitted file, used to name the folder
*/
static std::string filename;
/*!
* \brief filename of the node selection file, used to select nodes to display in PArserSplitted
*/
* \brief filename of the node selection file, used to select nodes to display in PArserSplitted
*/
static std::string xml_filename;
/*!
* \brief min time we want to load
*/
* \brief min time we want to load
*/
static Element_pos _x_min;
/*!
* \brief max time we want to load
*/
* \brief max time we want to load
*/
static Element_pos _x_max;
};
};
};
#endif
src/common/Palette.cpp
View file @ 91e02ab4
......@@ -13,10 +13,8 @@ Palette::Palette(const std::string &name) : _name(name) {
}
Palette::~Palette() {
// Delete colors
for(std::map<std::string, Color *>::iterator it = _pairs.begin() ;
it != _pairs.end() ; ++ it) {
//The color* are the same than usedcolor in class EntityValue. They should not be free'd here.
Color *c = (*it).second;
delete c;
}
......@@ -24,10 +22,9 @@ Palette::~Palette() {
Color *Palette::get_color(const std::string &state_name) {
if(_pairs.find(state_name) != _pairs.end() /*&& is_visible(state_name)*/)
if(_pairs.find(state_name) != _pairs.end())
return _pairs[state_name];
else{
//std::cout << state_name << " non trouvé" << std::endl;
return NULL;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment