Commit b2c0afcc authored by Mathieu Faverge's avatar Mathieu Faverge

Whitespaces

parent 31c7856f
......@@ -129,7 +129,7 @@ SET(VITE_HDRS
plugin/Command_window.hpp
plugin/Plugin_window.hpp
plugin/Plugin.hpp
)
)
SET(VITE_UIS
interface/info_window.ui
......@@ -141,7 +141,7 @@ SET(VITE_UIS
interface/list_of_counter_to_export.ui
interface/node_select.ui
interface/interval_select.ui
)
)
SET(VITE_SRCS
# Messages & Errors
......@@ -381,25 +381,25 @@ IF(USE_QT5)
QT5_WRAP_CPP(VITE_MOC ${VITE_UIS_H} ${VITE_MOC_HDRS})
QT5_ADD_RESOURCES(VITE_RCC_SRCS ${VITE_RCCS})
ADD_DEFINITIONS(-DQT_NO_DEBUG)
#############################################
# QT4
#############################################
#############################################
# QT4
#############################################
ELSE(USE_QT5)
QT4_AUTOMOC(${VITE_SRCS})
FOREACH(_hdrs_file ${VITE_HDRS})
GET_FILENAME_COMPONENT(_abs_file ${_hdrs_file} ABSOLUTE)
FILE(READ ${_abs_file} _contents)
STRING(REGEX MATCHALL "Q_OBJECT" _match "${_contents}")
IF(_match)
SET(VITE_MOC_HDRS ${VITE_MOC_HDRS} ${_hdrs_file})
ENDIF(_match)
ENDFOREACH(_hdrs_file ${VITE_HDRS})
QT4_WRAP_UI(VITE_UIS_H ${VITE_UIS})
QT4_WRAP_CPP(VITE_MOC ${VITE_UIS_H} ${VITE_MOC_HDRS})
QT4_ADD_RESOURCES(VITE_RCC_SRCS ${VITE_RCCS})
ADD_DEFINITIONS(-DQT_NO_DEBUG)
QT4_AUTOMOC(${VITE_SRCS})
FOREACH(_hdrs_file ${VITE_HDRS})
GET_FILENAME_COMPONENT(_abs_file ${_hdrs_file} ABSOLUTE)
FILE(READ ${_abs_file} _contents)
STRING(REGEX MATCHALL "Q_OBJECT" _match "${_contents}")
IF(_match)
SET(VITE_MOC_HDRS ${VITE_MOC_HDRS} ${_hdrs_file})
ENDIF(_match)
ENDFOREACH(_hdrs_file ${VITE_HDRS})
QT4_WRAP_UI(VITE_UIS_H ${VITE_UIS})
QT4_WRAP_CPP(VITE_MOC ${VITE_UIS_H} ${VITE_MOC_HDRS})
QT4_ADD_RESOURCES(VITE_RCC_SRCS ${VITE_RCCS})
ADD_DEFINITIONS(-DQT_NO_DEBUG)
ENDIF(USE_QT5)
#############################################
......@@ -408,7 +408,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${QTCOLORPICKERDIR}
)
)
#ADD_LIBRARY(vite2 SHARED ${VITE_SRCS} ${VITE_MOC} ${VITE_RCC_SRCS})
IF( VITE_ENABLE_OTF )
......@@ -422,14 +422,14 @@ if( APPLE )
set_source_files_properties(${OSX_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
ADD_EXECUTABLE(vite MACOSX_BUNDLE ${VITE_SRCS} ${VITE_MOC} ${VITE_RCC_SRCS} ${OSX_ICON_FILES})
SET_TARGET_PROPERTIES(vite PROPERTIES
MACOSX_BUNDLE_INFO_STRING "ViTE"
MACOSX_BUNDLE_ICON_FILE "mac_logo.icns"
MACOSX_BUNDLE_LONG_VERSION_STRING "Visual Trace Explorer - version ${VITE_VERSION_MAJOR}.${VITE_VERSION_MINOR}"
MACOSX_BUNDLE_BUNDLE_NAME "Vite-MacOSX"
MACOSX_BUNDLE_SHORT_VERSION_STRING "ViTE-${VITE_VERSION_MAJOR}.${VITE_VERSION_MINOR}"
MACOSX_BUNDLE_BUNDLE_VERSION "1.0"
MACOSX_BUNDLE_COPYRIGHT "INRIA 2006-2012"
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/vite-info.plist.in)
MACOSX_BUNDLE_INFO_STRING "ViTE"
MACOSX_BUNDLE_ICON_FILE "mac_logo.icns"
MACOSX_BUNDLE_LONG_VERSION_STRING "Visual Trace Explorer - version ${VITE_VERSION_MAJOR}.${VITE_VERSION_MINOR}"
MACOSX_BUNDLE_BUNDLE_NAME "Vite-MacOSX"
MACOSX_BUNDLE_SHORT_VERSION_STRING "ViTE-${VITE_VERSION_MAJOR}.${VITE_VERSION_MINOR}"
MACOSX_BUNDLE_BUNDLE_VERSION "1.0"
MACOSX_BUNDLE_COPYRIGHT "INRIA 2006-2012"
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/vite-info.plist.in)
else( APPLE )
ADD_EXECUTABLE(vite ${VITE_SRCS} ${VITE_MOC} ${VITE_RCC_SRCS})
endif( APPLE )
......@@ -449,8 +449,8 @@ TARGET_LINK_LIBRARIES(vite
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
TARGET_LINK_LIBRARIES(vite
rt
)
rt
)
ADD_DEFINITIONS("-DBOOST_GZIP")
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
......
This diff is collapsed.
/*
** 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 Interface.hpp
*/
......@@ -56,10 +56,10 @@ class Interface;
*\brief This is an interface, used by the terminal and graphical interfaces.
*
*Interface defines functions implemented in their inherited classes. It gives functions which can be used by others parts of ViTE (for example the Parser and the Data Structure). Thus, it hides which kind of interface is used: a console interface (where messages are displayed in the terminal) or a graphical interface (where messages are displayed in a dialog box).
*/
*/
class Interface{
public:
public:
/*!
* \arg string : the string to be displayed.
......@@ -69,27 +69,27 @@ class Interface{
/*!
\arg string : the string to be displayed.
\brief The function takes a string then displayed it either on the terminal if there is an Interface_console instance, or on a dialog box for the Interface_graphic. Then the program go on, but with an indeterminated behaviour.
*/
\arg string : the string to be displayed.
\brief The function takes a string then displayed it either on the terminal if there is an Interface_console instance, or on a dialog box for the Interface_graphic. Then the program go on, but with an indeterminated behaviour.
*/
virtual void warning(const std::string &) const =0;
/*!
\arg string : the string to be displayed.
\brief The function takes a string then displayed it either on the terminal if there is an Interface_console instance, or on a dialog box for the Interface_graphic. Then the program go on normally.
*/
\arg string : the string to be displayed.
\brief The function takes a string then displayed it either on the terminal if there is an Interface_console instance, or on a dialog box for the Interface_graphic. Then the program go on normally.
*/
virtual void information(const std::string &) const =0;
/*!
/*!
*\arg string : the string to be displayed.
*\brief The function takes strings and/or numbers then displayed it in the entity informative text area in the info window (use in graphic interface).
*/
*/
virtual void selection_information(const std::string &) const =0;
/*!
\brief Return the name of the file opened.
*/
\brief Return the name of the file opened.
*/
virtual const std::string get_filename() const = 0;
};
......
......@@ -6,13 +6,13 @@
** 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,
......@@ -23,7 +23,7 @@
** 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.
**
......@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
/*!
......@@ -82,7 +82,7 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
protected:
/***********************************
*
* Window function.
......@@ -128,12 +128,12 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
* \brief This variable contains the OpenGL render area.
*/
QGLWidget* _ui_render_area;
/*!
* \brief Layout which will contain the render area.
*/
QVBoxLayout* _ui_render_area_layout;
/*!
* \brief This variable contains the instance of the horizontal scroll bar.
*/
......@@ -158,7 +158,7 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
* \brief Contains the zoom box instance.
*/
QComboBox* _ui_zoom_box;
/*!
* \brief Use to store the filename when the trace is exported.
*/
......@@ -168,17 +168,17 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
* \brief Contains the last zoom value. (Prevent recursive calls)
*/
QString _zoom_box_check_value;
/*!
* \brief Contains the trace displayed path.
*/
std::string _trace_path;
/*!
* \brief Contains the conversion factor between x virtual and real scroll unit.
*/
double _x_factor_virtual_to_real;
/*!
* \brief Contains the conversion factor between y virtual and real scroll unit.
*/
......@@ -188,12 +188,12 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
* \brief Contains the real x scroll bar length.
*/
static const int _REAL_X_SCROLL_LENGTH = 10000;
/*!
* \brief Contains the real x scroll bar length.
*/
static const int _REAL_Y_SCROLL_LENGTH = 10000;
/***********************************
*
* Informative window widget attributes.
......@@ -208,7 +208,7 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
/*!
* \brief This variable contains the floatting export box window of the application.
*/
QWidget* _ui_time_selection_export;
QWidget* _ui_time_selection_export;
/*!
* \brief Dialog box to give some help for user.
......@@ -219,7 +219,7 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
* \brief Dialog box to allow user to set its ViTE environment. (change color, text size, etc.)
*/
Settings_window* _ui_settings;
/*!
* \brief Dialog box to allow user to select nodes to display
*/
......@@ -260,7 +260,7 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
* Export windows.
*
**********************************/
/*!
* \brief ComboBox which allow the choice between svg export and counter export.
*/
......@@ -275,13 +275,13 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
QWidget* _ui_counter_choice_to_export;
QComboBox *_counter_list_names;
std::map <std::string, Variable *> _all_variables;
/***********************************
*
* Help window.
*
**********************************/
/*!
* \brief Button uses to close the help window.
*/
......@@ -303,12 +303,12 @@ class Interface_graphic : public QMainWindow, protected Ui::main_window, public
* \brief Prevent warnings to be displayed (used with malformed traces to prevent Qt spending too much time).
*/
bool _no_warning;
/*!
* \brief if true, reload button reloads it from the trace (new parsing), if false, just update the render
*/
bool _reload_type;
/*!
* \brief Prevent recursive callings when changing manualy scroll bars.
*/
......@@ -369,7 +369,7 @@ public:
* \param string The string to be displayed.
*/
void information(const std::string &string) const;
/***********************************
......@@ -395,7 +395,7 @@ public:
* \param filename The file name of the file parsed.
*/
void init_parsing(const std::string &filename);
/*!
* \brief Update the bar with the new time and the percentage loaded.
* \param filename The file name of the file parsed.
......@@ -418,33 +418,33 @@ public:
* Tool functions.
*
**********************************/
/*!
* \brief Create a Parser and a DataStructure to display a trace file.
* \param path The path of the file.
*/
void opening_file(const std::string &path);
/*!
* \brief Bind a render area to the main window.
* \param render_area A pointer to a QGLWidget.
*/
void bind_render_area(QGLWidget* render_area);
/*!
* \brief Ajust scroll bar length.
* \param new_x_virtual_length The new virtual x length of the scroll bar.
* \param new_y_virtual_length The new virtual y length of the scroll bar.
*/
void set_scroll_bars_length(Element_pos new_x_virtual_length, Element_pos new_y_virtual_length);
/*!
* \brief Ajust scroll bar values when there is a translation.
* \param x_bar_new_value The new x_scroll bar value.
* \param y_bar_new_value The new y_scroll bar value.
*/
void linking_scroll_bars(Element_pos x_bar_new_value, Element_pos y_bar_new_value);
/*!
* \brief Convert scroll units from real scroll bar unit to render area scroll unit.
* \param scroll_position The real value to convert.
......@@ -452,7 +452,7 @@ public:
* \return The converted value.
*/
Element_pos real_to_virtual_scroll_unit(int scroll_position, const char &axe);
/*!
* \brief Convert scroll units from virtual render area scroll unit to real scroll bar unit.
* \param scroll_position The virtual value to convert.
......@@ -460,7 +460,7 @@ public:
* \return The converted value.
*/
int virtual_to_real_scroll_unit(Element_pos scroll_position, const char &axe);
/*!
* \brief Change the current value of the zoom box.
* \param new_value The new zoom value.
......@@ -488,18 +488,18 @@ public:
*/
Core *get_console();
/*!
/*!
* \fn get_node_select()
* \brief To get the node selection console
*/
Node_select* get_node_select();
Node_select* get_node_select();
/*!
/*!
* \fn get_interval_select()
* \brief To get the node selection console
*/
Interval_select* get_interval_select();
Interval_select* get_interval_select();
/*!
* \fn update_recent_files_menu()
......@@ -579,8 +579,8 @@ protected slots:
*\brief A slot called when 'Shaded states' in the menu is clicked.
*/
void on_shaded_states_triggered();
/*!
/*!
*\brief A slot called when 'Vertical line' in the menu is clicked.
*/
void on_vertical_line_triggered();
......@@ -589,7 +589,7 @@ protected slots:
*\brief A slot called when 'Show toolbar' in the menu is clicked.
*/
void on_toolbar_menu_triggered();
/*!
*\brief A slot called when 'Show minimap' in the menu is clicked.
*/
......@@ -602,7 +602,7 @@ protected slots:
/*!
*\brief A slot called when 'help' in the menu is clicked.
*/
*/
void on_help_triggered();
/*!
......@@ -619,13 +619,13 @@ protected slots:
*\brief A slot called when 'Settings' in the menu is clicked.
*/
void on_show_settings_triggered();
/*!
*\brief A slot called when 'Node selection' in the menu is clicked.
*/
void on_node_selection_triggered();
/*!
/*!
*\brief A slot called when 'Node selection' in the menu is clicked.
*/
void on_interval_selection_triggered();
......@@ -639,7 +639,7 @@ protected slots:
*\brief A slot called when 'no_warning' in the menu is clicked.
*/
void on_no_warning_triggered();
/*!
*\brief A slot called when 'reload_from_file' in the menu is clicked.
*/
......@@ -649,7 +649,7 @@ protected slots:
*\brief A slot called when 'no_arrows' in the menu is clicked.
*/
void on_no_arrows_triggered();
/*!
*\brief A slot called when 'no_events' in the menu is clicked.
*/
......@@ -669,12 +669,12 @@ protected slots:
*\brief A slot called when 'goto_start' in the menu is clicked.
*/
void on_goto_start_triggered();
/*!
*\brief A slot called when 'goto_end' in the menu is clicked.
*/
void on_goto_end_triggered();
/*!
*\brief A slot called when 'show_all_trace' in the menu is clicked.
*/
......
This diff is collapsed.
This diff is collapsed.
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