Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

Commit 70ed832c authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch 'plugins/enable_wo_traces' into 'master'

Enable plugin window without trace opened

See merge request !3
parents 4b03000c 19ecbc08
......@@ -814,23 +814,17 @@ void Interface_graphic::on_about_triggered(){
"</a>.<br /><br />"));
}
void Interface_graphic::on_show_plugins_triggered() {
if(_core->get_trace() != NULL) {
void Interface_graphic::on_show_plugins_triggered()
{
if(_plugin_window == NULL) { //Creation of the window
_plugin_window = new Plugin_window( _core, this );
}
if(_plugin_window == NULL) { //Creation of the window
_plugin_window = new Plugin_window(_core, this);
}
if( _core->get_trace() != NULL ) {
_plugin_window->update_trace();
_plugin_window->show();
// TODO create actions as for the recent files menu in order to open at the good tab
}
else {
error("Must load a trace before applying plugins");
}
_plugin_window->show();
}
......
/*
** 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
**
*/
#include <map>
/* -- */
......
......@@ -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
**
*/
......
......@@ -73,12 +73,15 @@
using namespace std;
Plugin_window::Plugin_window(Core *c, QWidget *parent) : QMainWindow(parent), _current_index(0), _plugin_directories() {
Plugin_window::Plugin_window(Core *c, QWidget *parent)
: QMainWindow(parent), _current_index(0), _plugin_directories()
{
_layout = new QVBoxLayout();
_tab_widget = new QTabWidget();
_execute_button = new QPushButton("Execute");
_layout->addWidget(_tab_widget);
_layout->addWidget(_execute_button);
QWidget *centralWidget = new QWidget();
centralWidget->setLayout(_layout);
setCentralWidget(centralWidget);
......
......@@ -170,18 +170,20 @@ void Stats_window::set_trace(Trace *trace) {
// Clear the boxes
clear();
// Fill the tree
set_container_names();
// Fill in the combobox
states_types_list = _trace->get_state_types();
end = states_types_list->end();
for (it = states_types_list->begin();
it != end;
it++){
string alias = (*it).second->get_alias();
QString temp(QString::fromStdString(alias));
_kind_of_state_box->addItem(temp);
if ( trace != NULL ) {
// Fill the tree
set_container_names();
// Fill in the combobox
states_types_list = _trace->get_state_types();
end = states_types_list->end();
for (it = states_types_list->begin();
it != end;
it++){
string alias = (*it).second->get_alias();
QString temp(QString::fromStdString(alias));
_kind_of_state_box->addItem(temp);
}
}
}
......@@ -430,7 +432,9 @@ void Stats_window::keyPressEvent(QKeyEvent *event) {
void Stats_window::init() {
// We set the names of the containers for the tree widget
_nodes_selected->clear();
set_container_names();
if ( _trace != NULL ) {
set_container_names();
}
// We init the times
_start_time = Info::Render::_x_min_visible;
......
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