Commit 716228b4 authored by Mathieu Faverge's avatar Mathieu Faverge

End (Enjoy the merge :))

parent bf8b37b5
......@@ -42,13 +42,11 @@
#
SET(VITE_HDRS
message/Message.hpp
message/Errors.hpp
main_resource.hpp
# Info header
info/info.hpp
# General headers
general/Tools.hpp
common/common.hpp
common/Message.hpp
common/Errors.hpp
common/Tools.hpp
common/info.hpp
# Data structure headers
trace/values/Color.hpp
trace/values/Date.hpp
......@@ -73,7 +71,6 @@ SET(VITE_HDRS
trace/Container.hpp
trace/Entity.hpp
trace/Event.hpp
trace/resource.hpp
trace/State.hpp
trace/StateChange.hpp
trace/Link.hpp
......@@ -126,12 +123,10 @@ SET(VITE_UIS
SET(VITE_SRCS
# Messages & Errors
message/Message.cpp
message/Errors.cpp
# General code files
general/Tools.cpp
# Info code file
info/info.cpp
common/Message.cpp
common/Errors.cpp
common/Tools.cpp
common/info.cpp
# Data structure code files
trace/values/Color.cpp
trace/values/Date.cpp
......@@ -229,16 +224,6 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
general/
info/
interface/
message/
parser/
render/
statistics/
trace/
trace/values/
trace/tree
)
ADD_EXECUTABLE(vite ${VITE_SRCS} ${VITE_MOC} ${VITE_RCC_SRCS})
......
......@@ -53,8 +53,8 @@
# include "interface/interface.hpp"
#endif
/* -- */
#include "message/Message.hpp"
#include "message/Errors.hpp"
#include "common/Message.hpp"
#include "common/Errors.hpp"
/* -- */
using namespace std;
......
......@@ -73,7 +73,7 @@ public:
#include "interface/interface.hpp"
#endif
/* -- */
#include "message/Message.hpp"
#include "common/Message.hpp"
Message *Message::_message = NULL;
Interface *Message::_interface = NULL;
......
......@@ -41,20 +41,28 @@
**
*/
/*!
*\file main_resource.hpp
*\file common.hpp
*\brief This file gives some common header files for the interface classes.
*/
#ifndef MAIN_RESOURCE_HPP
#define MAIN_RESOURCE_HPP
#ifndef COMMON_HPP
#define COMMON_HPP
#include <iostream>/* to use the C standard library input output functions */
#include <string>
#include <cstdlib> /* for macros EXIT_SUCCESS and EXIT_FAILURE */
#include <math.h> /* for min and max functions */
#include <math.h> /* for min and max functions */
#include <sstream>
/* -- */
/* -- */
#include "common/Errors.hpp" /* Message management */
#include "common/Message.hpp" /* Message management */
/* Example:
* *Message::get_instance() << "Test:" << 45 << " and " << true << Message::endi;
* -> display as an informative message.
*/
/*!
* \def VITE_VERSION
......@@ -75,7 +83,7 @@
/*!
* \brief Unity for count elements such as number of states or events... NOT USED YET
*/
typedef long Element_count ;
typedef long Element_count;
/*!
* \brief Unity for variables of position of a element in the display such as height, abscissa...
......@@ -92,16 +100,4 @@ typedef double Element_col;
*/
typedef double Times;
/* Message management */
#include <sstream>
#include "Message.hpp"
/* Example:
* *Message::get_instance() << "Test:" << 45 << " and " << true << Message::endi;
* -> display as an informative message.
*/
#endif
#endif /* COMMON_H */
......@@ -44,8 +44,8 @@
*\file info.cpp
*/
#include "main_resource.hpp"
#include "info/info.hpp"
#include "common/common.hpp"
#include "common/info.hpp"
// void (Interface_console:: *Info::Core::launch_action)(int, void*) = NULL;
// const int Info::Core::_STATE_UNKNOWN = -1;
......
......@@ -56,10 +56,10 @@
/* -- */
#include <QObject>
/* -- */
#include "main_resource.hpp"
#include "info/info.hpp"
#include "message/Errors.hpp"
#include "general/Tools.hpp"
#include "common/common.hpp"
#include "common/info.hpp"
#include "common/Errors.hpp"
#include "common/Tools.hpp"
/* -- */
#include "render/render.hpp"
#include "render/render_svg.hpp"
......
......@@ -52,9 +52,9 @@
/* -- */
#include <QObject>
/* -- */
#include "main_resource.hpp"
#include "info/info.hpp"
#include "general/Tools.hpp"
#include "common/common.hpp"
#include "common/info.hpp"
#include "common/Tools.hpp"
/* -- */
#include "trace/values/Values.hpp"
/* -- */
......
......@@ -51,7 +51,7 @@
#define INTERFACE_RESOURCE_HPP
#include "main_resource.hpp"
#include "common/common.hpp"
/*
......
......@@ -64,15 +64,15 @@
#include <QApplication>
/* Global informations */
#include "main_resource.hpp"
#include "common/common.hpp"
/* -- */
#include "info/info.hpp"
#include "common/info.hpp"
#include "render/Render_opengl.hpp"
#include "interface.hpp"
#include "interface_graphic.hpp"
#include "interface_console.hpp"
#include "interface/interface.hpp"
#include "interface/interface_graphic.hpp"
#include "interface/interface_console.hpp"
/*!
*\brief The main function of ViTE.
......
......@@ -47,7 +47,7 @@
#include <set>
#include <queue>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "parser/Line.hpp"
#include "parser/Definition.hpp"
......
......@@ -50,7 +50,7 @@
/* -- */
#include <otf.h>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityValue.hpp"
......
......@@ -47,7 +47,7 @@
#include <queue>
#include <list>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityValue.hpp"
......
......@@ -49,7 +49,7 @@
#include <queue>
#include <list>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/Trace.hpp"
......
......@@ -55,7 +55,7 @@
#include <QFileInfo>
#include <QStringList>
/* -- */
#include "message/Errors.hpp"
#include "common/Errors.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityTypes.hpp"
......
......@@ -44,9 +44,9 @@
*\file Render_area.cpp
*/
#include "main_resource.hpp"
#include "common/common.hpp"
/* -- */
#include "info/info.hpp"
#include "common/info.hpp"
/* -- */
#include "render/render.hpp"
#include "render/Render_area.hpp"
......
......@@ -50,7 +50,7 @@
#include <stack>
#include <QGLWidget>
#include "main_resource.hpp"
#include "common/common.hpp"
class Render_area;
class Interface_console;
......
......@@ -44,8 +44,8 @@
*\file Render_opengl.cpp
*/
#include "main_resource.hpp"
#include "info/info.hpp"
#include "common/common.hpp"
#include "common/info.hpp"
/* -- */
#include "render/render.hpp"
#include "render/Render_area.hpp"
......
......@@ -48,7 +48,7 @@
#define RENDER_OPENGL_HPP
#include <QGLWidget>
#include "main_resource.hpp"
#include "common/common.hpp"
#include "render.hpp"
#include "Render_area.hpp"
......
......@@ -48,7 +48,7 @@
#define RENDER_OPENGL_DL_HPP
#include <QTimer>
#include "main_resource.hpp"
#include "common/common.hpp"
#include "interface/resource.hpp"
#include "Render_opengl.hpp"
......
......@@ -44,9 +44,9 @@
*\file render_stats_opengl.cpp
*/
#include "main_resource.hpp"
#include "common/common.hpp"
/* -- */
#include "info/info.hpp"
#include "common/info.hpp"
/* -- */
#include "interface/resource.hpp"
#include "interface/interface.hpp"
......
......@@ -51,7 +51,7 @@
#include <list>
#include <QGLWidget>
#include "main_resource.hpp"
#include "common/common.hpp"
#include "render_stats.hpp"
class Render_stats_opengl;
......
......@@ -50,7 +50,7 @@
#include <string>
#include <list>
/* -- */
#include "main_resource.hpp"
#include "common/common.hpp"
/* -- */
#include "render/render_stats.hpp"
#include "render/render_stats_svg.hpp"
......
......@@ -47,11 +47,11 @@
/* -- */
#include <QObject>
/* -- */
#include "Message.hpp"
#include "resource.hpp"
#include "common/common.hpp"
#include "interface/resource.hpp"
/* -- */
#include "render.hpp"
#include "render_svg.hpp"
#include "render/render.hpp"
#include "render/render_svg.hpp"
/* -- */
using namespace std;
......
/*
** 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 render/resource.hpp
*\brief This file gives some common header files for the render classes.
*/
#ifndef RENDER_RESOURCE_HPP
#define RENDER_RESOURCE_HPP
#include "main_resource.hpp"
#endif
......@@ -44,7 +44,7 @@
*\file vbo.cpp
*/
#include "main_resource.hpp"
#include "common/common.hpp"
/* -- */
#include "render/vbo.hpp"
/* -- */
......
......@@ -51,8 +51,8 @@ QT+=opengl
TEMPLATE = app
TARGET = vite
macx:QMAKE_LIBS_OPENGL += -framework GLUT -lobjc
DEPENDPATH += . interface message parser trace trace/values trace/tree general general/otf/otflib info render statistics
INCLUDEPATH += . interface message parser trace trace/values trace/tree general general/otf/otflib info render statistics
DEPENDPATH += . common interface parser trace trace/values trace/tree general general/otf/otflib info render statistics
INCLUDEPATH += . general/otf/otflib
QMAKE_CFLAGS += -O2
QMAKE_CXXFLAGS += -O2
LIBS += general/otf/otflib/.libs/libotf.a -Lgeneral/otf/otflib/.libs
......@@ -70,11 +70,11 @@ macx {
}
# Input
HEADERS += message/Message.hpp \
message/Errors.hpp \
main_resource.hpp \
# Info header
info/info.hpp \
HEADERS += common/common.hpp \
common/Message.hpp \
common/Errors.hpp \
common/Tools.hpp \
common/info.hpp \
# Interface headers
interface/interface.hpp \
interface/interface_console.hpp \
......@@ -135,8 +135,6 @@ HEADERS += message/Message.hpp \
trace/tree/BinaryTree.hpp \
trace/tree/Node.hpp \
trace/tree/Interval.hpp \
# General headers
general/Tools.hpp \
# Statistics headers
statistics/Stats_window.hpp \
statistics/Statistic.hpp \
......@@ -146,62 +144,60 @@ HEADERS += message/Message.hpp \
statistics/DrawCounter.hpp
FORMS += interface/info_window.ui interface/main_window.ui interface/option_export_window.ui interface/stats_viewer.ui
SOURCES += message/Message.cpp \
message/Errors.cpp \
main.cpp \
# Info code file
info/info.cpp \
# Interface code files
interface/interface_console.cpp \
interface/interface_graphic.cpp \
interface/parsing_thread.cpp \
interface/help.cpp \
# Render code files
render/Render_area.cpp \
render/Render_opengl.cpp \
render/render_svg.cpp \
render/render_stats_opengl.cpp \
render/render_stats_svg.cpp \
# render/vbo.cpp \
SOURCES += common/Message.cpp \
common/Errors.cpp \
common/Tools.cpp \
common/info.cpp \
# Data structure code files
trace/values/Color.cpp \
trace/values/Date.cpp \
trace/values/Double.cpp \
trace/values/Hex.cpp \
trace/values/Integer.cpp \
trace/values/Name.cpp \
trace/values/String.cpp \
trace/EntityType.cpp \
trace/ContainerType.cpp \
trace/EventType.cpp \
trace/StateType.cpp \
trace/Linktype.cpp \
trace/VariableType.cpp \
trace/EntityValue.cpp \
trace/Entity.cpp \
trace/Event.cpp \
trace/State.cpp \
trace/StateChange.cpp \
trace/Link.cpp \
trace/Variable.cpp \
trace/Container.cpp \
trace/tree/Interval.cpp \
trace/Trace.cpp \
# Parser code files
parser/Definition.cpp \
parser/Line.cpp \
parser/Definition.cpp \
parser/File.cpp \
parser/Line.cpp \
parser/ParserDefinitionPaje.cpp \
parser/ParserEventPaje.cpp \
parser/ParserPaje.cpp \
parser/ParserVite.cpp \
parser/File.cpp \
parser/ParserEventPaje.cpp \
parser/ParserPaje.cpp \
parser/ParserVite.cpp \
parser/ParserDefinitionOTF.cpp \
parser/ParserEventOTF.cpp \
parser/ParserOTF.cpp \
# Data structure code files
trace/Container.cpp \
trace/ContainerType.cpp \
trace/Entity.cpp \
trace/EntityType.cpp \
trace/EntityValue.cpp \
trace/Event.cpp \
trace/EventType.cpp \
trace/State.cpp \
trace/StateChange.cpp \
trace/StateType.cpp \
trace/Link.cpp \
trace/Linktype.cpp \
trace/Variable.cpp \
trace/VariableType.cpp \
trace/Trace.cpp \
trace/values/Color.cpp \
trace/values/Date.cpp \
trace/values/Double.cpp \
trace/values/Hex.cpp \
trace/values/Integer.cpp \
trace/values/Name.cpp \
trace/values/String.cpp \
trace/tree/Interval.cpp \
# General code files
general/Tools.cpp \
parser/ParserEventOTF.cpp \
parser/ParserOTF.cpp \
# Render code files
render/Render_area.cpp \
render/Render_opengl.cpp \
render/render_svg.cpp \
render/render_stats_opengl.cpp \
render/render_stats_svg.cpp \
# render/vbo.cpp \
# Statistics code files
statistics/Stats_window.cpp \
statistics/Statistic.cpp
statistics/Stats_window.cpp \
statistics/Statistic.cpp \
# Interface code files
interface/help.cpp \
interface/parsing_thread.cpp \
interface/interface_graphic.cpp \
interface/interface_console.cpp \
main.cpp
RESOURCES += interface/vite.qrc
......@@ -49,9 +49,9 @@
#include <stack>
#include <vector>
/* -- */
#include "main_resource.hpp"
#include "common/common.hpp"
#include "interface/resource.hpp"
#include "info/info.hpp"
#include "common/info.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityValue.hpp"
......
......@@ -49,7 +49,7 @@
#include <sstream>
#include <stack>
/* -- */
#include "message/Message.hpp"
#include "common/Message.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityValue.hpp"
......
/*
** 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 trace/resource.hpp
*\brief This file gives some common header files for the trace classes.
*/
#ifndef RESOURCE_HPP
#define RESOURCE_HPP
#include "main_resource.hpp"
#endif
......@@ -45,7 +45,7 @@
#include <sstream>
#include <iomanip> // For std::setprecision
/* -- */
#include "general/Tools.hpp"
#include "common/Tools.hpp"
/* -- */
#include "trace/values/Value.hpp"
#include "trace/values/Color.hpp"
......
......@@ -45,7 +45,7 @@
#include <sstream>
#include <iomanip> // For std::setprecision
/* -- */
#include "general/Tools.hpp"
#include "common/Tools.hpp"
/* -- */
#include "trace/values/Value.hpp"
#include "trace/values/Date.hpp"
......
......@@ -45,7 +45,7 @@
#include <sstream>
#include <iomanip> // For std::setprecision
/* -- */
#include "general/Tools.hpp"
#include "common/Tools.hpp"
/* -- */
#include "trace/values/Value.hpp"
#include "trace/values/Double.hpp"
......
Markdown is supported
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