Attention une mise à jour du serveur va être effectuée le vendredi 16 avril entre 12h et 12h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 10364166 authored by Augustin Degomme's avatar Augustin Degomme

- warnings removal in Container.cpp, PajeFileManager.cpp and SerializerDispatcher.cpp

- better handling of trace reload with interval selection window
parent e668cc7a
......@@ -618,7 +618,12 @@ void Interface_graphic::on_reload_triggered() {
if(_is_rendering_trace) {
_core->launch_action(Core::_STATE_RELEASE_RENDER_AREA);
_core->draw_trace(_trace_path, Core::_DRAW_OPENGL);
_core->launch_action(Core:: _STATE_RENDER_UPDATE);
//update the interval selection display
if(_ui_interval_selection!=NULL)_ui_interval_selection->update_values();
}
}
void Interface_graphic::open_recent_file() {
......
......@@ -89,11 +89,11 @@ void PajeFileManager::close() {
_filesize = -1;
}
int PajeFileManager::get_filesize() const {
long long PajeFileManager::get_filesize() const {
return _filesize;
}
int PajeFileManager::get_size_loaded() {
long long PajeFileManager::get_size_loaded() {
return tellg();
}
......
......@@ -104,7 +104,7 @@ class PajeFileManager : public std::ifstream {
private:
std::string _filename;
int _filesize;
long long _filesize;
unsigned int _lineid;
int _nbtks;
......@@ -149,13 +149,13 @@ public:
* \fn get_filesize() const;
* \return The length of the file opened
*/
int get_filesize() const;
long long get_filesize() const;
/*!
* \fn get_size_loaded();
* \return The size already loaded
*/
int get_size_loaded();
long long get_size_loaded();
/*!
* \fn get_percent_loaded()
......
......@@ -80,7 +80,11 @@ using namespace std;
Container::Container():
_name(), _creation_time(0.0), _destruction_time(0.0), _type(NULL), _parent(NULL),
_n_states(0), _state_tree(NULL), _n_events(0), _event_tree(NULL), _events(NULL), _n_variables(0){}
_n_states(0), _state_tree(NULL), _n_events(0), _event_tree(NULL)
#ifdef USE_ITC
, _events(NULL)
#endif
, _n_variables(0){}
Container::Container(Name name, Date creation_time, ContainerType *type, Container *parent, map<string, Value *> &opt):
_name(name), _creation_time(creation_time), _destruction_time(0.0), _type(type), _parent(parent),
......
......@@ -63,7 +63,7 @@
void SerializerDispatcher::kill_all_threads(){
if(!_killed){
for(int i=0;i<_nb_threads; i++){
for(unsigned int i=0;i<_nb_threads; i++){
if(_evt_array[i].get_thread()!=NULL && _evt_array[i].get_thread()->isRunning()){
......
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