merge -r 985:1060 svn+ssh://faverge@scm.gforge.inria.fr/svn/vite/branches/memory/

CMakeLists.txt

@@ -23,5 +23,9 @@ IF(VITE_ENABLE_OTF)
   INCLUDE(cmake/FindOTF.cmake)
 ENDIF(VITE_ENABLE_OTF)
 
+OPTION(VITE_ENABLE_TAU "Enable the support of TAU file format." OFF)
+IF(VITE_ENABLE_TAU)
+  INCLUDE(cmake/FindTAU.cmake)
+ENDIF(VITE_ENABLE_TAU)
 
 SUBDIRS(src)
\ No newline at end of file

cmake/FindTAU.cmake

+#
+# Find the TAU libraries and include dir
+#
+
+# TAU_INCLUDE_DIR  - Directories to include to use TAU
+# TAU_LIBRARY    - Files to link against to use TAU
+# TAU_FOUND        - When false, don't try to use TAU
+#
+# TAU_DIR can be used to make it simpler to find the various include
+# directories and compiled libraries when TAU was not installed in the
+# usual/well-known directories (e.g. because you made an in tree-source
+# compilation or because you installed it in an "unusual" directory).
+# Just set TAU_DIR it to your specific installation directory
+#
+FIND_LIBRARY(TAU_LIBRARY TAU_traceinput
+  PATHS
+  /usr/lib
+  /usr/local/lib
+  ${TAU_DIR}/lib
+)
+
+IF(TAU_LIBRARY)
+  GET_FILENAME_COMPONENT(TAU_GUESSED_INCLUDE_DIR_tmp "${TAU_LIBRARY}" PATH)
+  STRING(REGEX REPLACE "lib$" "include" TAU_GUESSED_INCLUDE_DIR "${TAU_GUESSED_INCLUDE_DIR_tmp}")
+ENDIF(TAU_LIBRARY)
+
+FIND_PATH( TAU_INCLUDE_DIR TAU_tf.h
+  PATHS
+  ${TAU_GUESSED_INCLUDE_DIR}
+  ${TAU_DIR}/include
+  /usr/include
+  /usr/local/include
+)
+
+
+IF( TAU_INCLUDE_DIR )
+  IF( TAU_LIBRARY )
+    SET( TAU_FOUND "YES" )
+    MARK_AS_ADVANCED( TAU_DIR )
+    MARK_AS_ADVANCED( TAU_INCLUDE_DIR )
+    MARK_AS_ADVANCED( TAU_LIBRARY )
+  ENDIF( TAU_LIBRARY )
+ENDIF( TAU_INCLUDE_DIR )
+
+
+
+IF( NOT TAU_FOUND )
+  MESSAGE("TAU installation was not found. Please provide TAU_DIR:")
+  MESSAGE("  - through the GUI when working with ccmake, ")
+  MESSAGE("  - as a command line argument when working with cmake e.g. ")
+  MESSAGE("    cmake .. -DTAU_DIR:PATH=/usr/local/tau ")
+  MESSAGE("Note: the following message is triggered by cmake on the first ")
+  MESSAGE("    undefined necessary PATH variable (e.g. TAU_INCLUDE_DIR).")
+  MESSAGE("    Providing TAU_DIR (as above described) is probably the")
+  MESSAGE("    simplest solution unless you have a really customized/odd")
+  MESSAGE("    TAU installation...")
+  SET(TAU_DIR "" CACHE PATH "Root of TAU install tree." )
+ENDIF( NOT TAU_FOUND )

configure

@@ -49,7 +49,8 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 makefile="Makefile"
 
 with_otf=0
-with_otf_default=1
+with_otf_include_default=1
+with_otf_lib_default=1
 config_specified=0
 
 # where will we concatenate options like macros, libs...
@@ -107,6 +108,9 @@ usage()
 ## Will be added later
   echo "  --otf_include_dir=<path>    set the otf directory path (default is general/otf/otflib if --enable_otf is set)"
   echo "  --otf_library_dir=<path>    set the otf library path (<path>/libotf.a)"
+
+  echo "  --enable_tau"
+  echo "        enables the tau support. The tau release used by default is in the src/general directory" # search in /usr/include, /usr/lib and if not found ask to download and install.
   exit 0
 }
 
@@ -140,12 +144,18 @@ while [ 0 -lt $# ]; do
             include_dir=`echo $OPT | awk -F"--otf_include_dir=" '{print $2}'`
             includepath="$includepath $include_dir"
             dependpath="$dependpath $include_dir"
-            with_otf_default=0
+            with_otf_include_default=0
             ;;
         --otf_library_dir=*)
             lib_dir=`echo $OPT | awk -F"--otf_library_dir=" '{print $2}'`
             libs="$libs $lib_dir/libotf.a -L$lib_dir"
-            with_otf_default=0
+            with_otf_lib_default=0
+            ;;
+        --enable_tau) # tau support
+            defines="$defines WITH_TAU"
+            sources="$sources parser/ParserTau.cpp"
+            headers="$headers parser/ParserTau.hpp parser/TauStructs.hpp"
+            libs="$libs -lTAU_traceinput"
             ;;
         *)
             echo "invalid option : $OPT";
@@ -161,12 +171,12 @@ else
     config="$config release\"";
 fi
 
-if [ $with_otf = 1 -a "$includepath" = "\"INCLUDEPATH+=" ]; then
+if [ $with_otf = 1 -a $with_otf_include_default = 1 ]; then
     includepath="$includepath general/otf/otflib/"
     dependpath="$dependpath general/otf/otflib/"
 fi
 
-if [ $with_otf = 1 -a "$libs" = "\"LIBS+=" ]; then
+if [ $with_otf = 1 -a $with_otf_lib_default = 1 ]; then
     libs="$libs general/otf/otflib/.libs/libotf.a -Lgeneral/otf/otflib/.libs"
 fi
 
@@ -208,7 +218,7 @@ cat > "$makefile" <<EOF
 ########################################################################
 EOF
 
-if [ $with_otf = 1 -a $with_otf_default = 1 ]; then # set the directory... should be decided by the user, we will see after how to do beautiful options :)
+if [ $with_otf = 1 -a $with_otf_lib_default = 1 ]; then # set the directory... should be decided by the user, we will see after how to do beautiful options :)
 
 cat >> "$makefile" <<EOF
 OTFLIB_DIR = ./src/general/otf
@@ -275,7 +285,7 @@ clean:
 cleanall:	clean
 EOF
 
-if [ $with_otf = 1 -a $with_otf_default = 1 ]; then
+if [ $with_otf = 1 -a $with_otf_lib_default = 1 ]; then
     cat >>"$makefile" <<EOF
 	make -C \$(OTFLIB_DIR) clean
 EOF
@@ -300,7 +310,7 @@ fi
 EOF
 
 
-if [ $with_otf = 1 -a $with_otf_default = 1 ]; then
+if [ $with_otf = 1 -a $with_otf_lib_default = 1 ]; then
     echo >&2 "Configuration of the otf library"
     cd $OTFLIB_DIR && ./configure
 fi

src/CMakeLists.txt

@@ -94,20 +94,21 @@ SET(VITE_HDRS
   render/Ruler.hpp
   # Interface headers
   interface/resource.hpp
-  interface/parsing_thread.hpp
   interface/Interface.hpp
   interface/Interface_graphic.hpp
   # Core header
   core/Core.hpp
   # Parser headers
-  parser/Definition.hpp
-  parser/Line.hpp
+  parser/ParsingThread.hpp
   parser/Parser.hpp
+  parser/ParserFactory.hpp
+  # Paje 
+  parser/PajeDefinition.hpp
+  parser/PajeFileManager.hpp
   parser/ParserDefinitionPaje.hpp
   parser/ParserEventPaje.hpp
   parser/ParserPaje.hpp
-  parser/ParserVite.hpp
-  parser/File.hpp
+#  parser/ParserVite.hpp
   # Statistics headers
   statistics/Stats_window.hpp
   statistics/Statistic.hpp
@@ -169,24 +170,25 @@ SET(VITE_SRCS
   render/render_stats_opengl.cpp
   render/render_stats_svg.cpp
   render/Ruler.cpp
-
   # Parser code files
-  parser/Definition.cpp
-  parser/Line.cpp
-  parser/File.cpp
+  parser/Parser.cpp
+  parser/ParserFactory.cpp
+  parser/ParsingThread.cpp
+  # Paje Parser
+  parser/PajeDefinition.cpp
+  parser/PajeFileManager.cpp
   parser/ParserDefinitionPaje.cpp
   parser/ParserEventPaje.cpp
   parser/ParserPaje.cpp
-  parser/ParserVite.cpp
+#  parser/ParserVite.cpp
   # Statistics code files
   statistics/Statistic.cpp
   statistics/Stats_window.cpp
   # Interface code files
-  interface/parsing_thread.cpp
   interface/Interface_graphic.cpp
   # Plugin code file
   plugin/Command_window.cpp
-  # Core code files
+ # Core code files
   core/Core.cpp
   # Main
   main.cpp
@@ -235,7 +237,26 @@ IF(VITE_ENABLE_OTF)
 
 ENDIF(VITE_ENABLE_OTF)
 
-# ADD_DEFINITIONS(-DMEMORY_USAGE -DMEMORY_TRACE)
+IF(VITE_ENABLE_TAU)
+  ADD_DEFINITIONS(-DWITH_TAU)
+
+  SET(VITE_HDRS
+    ${VITE_HDRS}
+    parser/ParserTau.hpp
+    parser/TauStructs.hpp
+    )
+
+  SET(VITE_SRCS
+    ${VITE_SRCS}
+    parser/ParserTau.cpp
+    )
+
+  INCLUDE_DIRECTORIES(${TAU_INCLUDE_DIR})
+
+ENDIF(VITE_ENABLE_TAU)
+
+#ADD_DEFINITIONS(-DMEMORY_USAGE)
+#ADD_DEFINITIONS(-DMEMORY_TRACE)
 
 QT4_AUTOMOC(${VITE_SRCS})
 FOREACH(_hdrs_file ${VITE_HDRS})
@@ -276,4 +297,10 @@ IF(VITE_ENABLE_OTF)
     )
 ENDIF(VITE_ENABLE_OTF)
 
+IF(VITE_ENABLE_TAU)
+  TARGET_LINK_LIBRARIES(vite
+    ${TAU_LIBRARY}
+    )
+ENDIF(VITE_ENABLE_TAU)
+
 INSTALL_TARGETS(/bin vite)

src/common/Errors.cpp

@@ -42,21 +42,21 @@
 */
 
 #include <fstream>
+#include <iostream>
 #include <string>
 #include <sstream>
 #include <queue>
 /* -- */
 #include <QObject>
+#define MyString(str) QObject::tr(str).toStdString()
 /* -- */
-#ifndef VITE_DEBUG
-#  include "core/Core.hpp"
-#else // TODO Include the debug one
-#  include "core/Core.hpp"
-#endif
+#include "interface/Interface.hpp"
 /* -- */
 #include "common/Message.hpp"
 #include "common/Errors.hpp"
 /* -- */
+
+
 using namespace std;
 
 queue<string> Error::_errors;
@@ -67,37 +67,41 @@ const int Error::_EVERYTHING = 0;
 const int Error::_WARNING    = 1;
 const int Error::_ERROR      = 2;
 
-string Error::_content = QObject::tr("").toStdString();
-
-
-const string Error::_PARSE             = QObject::tr("expected \" before end of file").toStdString();
-const string Error::_MMAP              = QObject::tr("mmap error").toStdString();
-const string Error::_EMPTY_FILE        = QObject::tr("empty file").toStdString();
-const string Error::_FSTAT             = QObject::tr("status file error").toStdString();
-const string Error::_OPEN              = QObject::tr("open file error").toStdString();
-const string Error::_MUNMAP            = QObject::tr("munmap error").toStdString();
-const string Error::_EXPECT_END_DEF    = QObject::tr("expected %EndEventDef").toStdString();
-const string Error::_EXPECT_EVENT_DEF  = QObject::tr("expected %EventDef").toStdString();
-const string Error::_EXPECT_NAME_DEF   = QObject::tr("the definition is not named").toStdString();
-const string Error::_EXPECT_ID_DEF     = QObject::tr("the definition is not identified").toStdString();
-const string Error::_UNKNOWN_ID_DEF    = QObject::tr("there is no definition with the identity: ").toStdString();
-const string Error::_EXTRA_TOKEN       = QObject::tr("extra token(s) ignored").toStdString();
-const string Error::_UNKNOWN_EVENT_DEF = QObject::tr("the following event doesn't match with any event known: ").toStdString();
-const string Error::_FIELD_TYPE_MISSING = QObject::tr("a field type is missing ").toStdString();
-const string Error::_FIELD_TYPE_UNKNOWN = QObject::tr("the following field type is unknown: ").toStdString();
-const string Error::_EMPTY_DEF          = QObject::tr("a definition line is empty").toStdString();
-const string Error::_INCOMPATIBLE_VALUE_IN_EVENT = QObject::tr("incompatible value: ").toStdString();
-const string Error::_BAD_FILE_EXTENSION   = QObject::tr("the extension of the file is not .trace").toStdString();
-const string Error::_LINE_TOO_SHORT_EVENT = QObject::tr("missing field value(s) in an event").toStdString();
-
-const string Error::_UNKNOWN_CONTAINER_TYPE = QObject::tr("Unknown container type: ").toStdString();
-const string Error::_UNKNOWN_CONTAINER      = QObject::tr("Unknown container: ").toStdString();
-const string Error::_UNKNOWN_EVENT_TYPE     = QObject::tr("Unknown event type: ").toStdString();
-const string Error::_UNKNOWN_STATE_TYPE     = QObject::tr("Unknown state type: ").toStdString();
-const string Error::_UNKNOWN_VARIABLE_TYPE  = QObject::tr("Unknown variable type: ").toStdString();
-const string Error::_UNKNOWN_LINK_TYPE      = QObject::tr("Unknown link type: ").toStdString();
-const string Error::_UNKNOWN_ENTITY_TYPE    = QObject::tr("Unknown entity type: ").toStdString();
-const string Error::_UNKNOWN_ENTITY_VALUE   = QObject::tr("Unknown entity value: ").toStdString();
+string Error::_content = MyString("");
+
+const string Error::_PARSE                       = MyString("expected \" before end of file");
+const string Error::_MMAP                        = MyString("mmap error");
+const string Error::_EMPTY_FILE                  = MyString("empty file");
+const string Error::_FSTAT                       = MyString("status file error");
+const string Error::_OPEN                        = MyString("open file error");
+const string Error::_MUNMAP                      = MyString("munmap error");
+const string Error::_EXPECT_END_DEF              = MyString("expected %EndEventDef");
+const string Error::_EXPECT_EVENT_DEF            = MyString("expected %EventDef");
+const string Error::_EXPECT_NAME_DEF             = MyString("the definition is not named");
+const string Error::_EXPECT_ID_DEF               = MyString("the definition is not identified");
+const string Error::_UNKNOWN_ID_DEF              = MyString("there is no definition with the identity: ");
+const string Error::_EXTRA_TOKEN                 = MyString("extra token(s) ignored");
+const string Error::_UNKNOWN_EVENT_DEF           = MyString("the following event doesn't match with any event known: ");
+const string Error::_FIELD_TYPE_MISSING          = MyString("a field type is missing ");
+const string Error::_FIELD_TYPE_UNKNOWN          = MyString("the following field type is unknown: ");
+const string Error::_EMPTY_DEF                   = MyString("a definition line is empty");
+const string Error::_INCOMPATIBLE_VALUE_IN_EVENT = MyString("incompatible value: ");
+const string Error::_BAD_FILE_EXTENSION          = MyString("the extension of the file is not .trace");
+const string Error::_LINE_TOO_SHORT_EVENT        = MyString("missing field value(s) in an event");
+
+const string Error::_UNKNOWN_CONTAINER_TYPE      = MyString("Unknown container type: ");
+const string Error::_UNKNOWN_CONTAINER           = MyString("Unknown container: ");
+const string Error::_UNKNOWN_EVENT_TYPE          = MyString("Unknown event type: ");
+const string Error::_UNKNOWN_STATE_TYPE          = MyString("Unknown state type: ");
+const string Error::_UNKNOWN_VARIABLE_TYPE       = MyString("Unknown variable type: ");
+const string Error::_UNKNOWN_LINK_TYPE           = MyString("Unknown link type: ");
+const string Error::_UNKNOWN_ENTITY_TYPE         = MyString("Unknown entity type: ");
+const string Error::_UNKNOWN_ENTITY_VALUE        = MyString("Unknown entity value: ");
+
+const string Error::_EVENT_ALREADY_DEF           = MyString("Event trid is already defined");
+const string Error::_FIELD_NAME_MISSING          = MyString("Field's name is missing");
+const string Error::_FIELD_NOT_ALLOWED           = MyString("This type is not allowed for this field");
+const string Error::_EVENT_NOT_CORRECT           = MyString("The definition of this event is not correct : ");
 
 
 void Error::set(const string kind_of_error, const int priority){
@@ -114,8 +118,8 @@ void Error::set(const string kind_of_error, const int priority){
 
 void Error::set(const string kind_of_error, const unsigned int line_number, const int priority){
     char line[10];
-    sprintf(line, "%d", line_number);
-    set(kind_of_error + " on line " + line, priority);
+    sprintf(line, "%d : ", line_number);
+    set(line + kind_of_error, priority);
 }
 
 void Error::set_and_print(const string kind_of_error, const int priority){

src/common/Errors.hpp

@@ -43,9 +43,6 @@
 #ifndef ERRORS_HPP
 #define ERRORS_HPP
 
-#include <string>
-#include <queue>
-
 /*!
  * \file Errors.hpp
  * This file contains all the significations of the errors or warnings that can be thrown by the parser 
@@ -202,7 +199,10 @@ public:
      */
     const static std::string _UNKNOWN_ENTITY_VALUE;
 
-
+    const static std::string _EVENT_ALREADY_DEF; 
+    const static std::string _FIELD_NAME_MISSING;
+    const static std::string _FIELD_NOT_ALLOWED;
+    const static std::string _EVENT_NOT_CORRECT;
 
     /*!
      *  \fn set(const std::string kind_of_error, const int priority) static void

src/common/Memory.cpp

@@ -48,9 +48,19 @@
 
 #ifdef MEMORY_USAGE
 
-#include <pthread.h>
+#include <cstdio>
+#include <iostream>
 #include "common/common.hpp"
 #include "common/trace.h"
+#include "common/Tools.hpp"
+#if (defined _PTHREAD_H) || (defined MEMORY_THREADED)
+#include <pthread.h>
+#else
+#define pthread_mutex_init(x,y)
+#define pthread_mutex_lock(x)
+#define pthread_mutex_unlock(x)
+#define pthread_mutex_t int
+#endif
 
 /*
   Group: Variables
@@ -212,8 +222,6 @@ void *operator new(std::size_t size) throw(std::bad_alloc)
 {
   double *              memptr;
 
-  fprintf(stderr, "toto %d\n", memalloctraceflag);
-
 // #ifdef DEBUG_ALLOC
 //   if (size == 0)
 //     errorPrint("%s:%d allocating 0\n",filename,line);
@@ -262,8 +270,6 @@ void operator delete(void *memptr)
 {
   double * newmemptr;
 
-  fprintf(stderr, "tutu\n");
-
   pthread_mutex_lock (&memallocmutexdat);         /* Lock local mutex */
 
   if (!(memptr == NULL)){

src/common/Message.cpp

@@ -41,6 +41,7 @@
 **
 */
 
+#include <iostream>
 #include <sstream>
 /* -- */
 #include <QObject>
@@ -69,7 +70,7 @@ public:
 };
 #else
 /* Release mode */
-#include "core/Core.hpp"
+#include "interface/Interface.hpp"
 #endif
 /* -- */
 #include "common/Message.hpp"

src/common/Message.hpp

@@ -50,7 +50,6 @@
 
 class stringstream;
 class ostream;
-class Interface;
 
 class Message: public std::stringstream {
 private:

src/common/Session.cpp

@@ -44,6 +44,8 @@
  *\file Session.cpp
  */
 
+#include <QByteArray>
+/* -- */
 #include "common/Session.hpp"
 
 const QByteArray Session::Export::DEFAULT_STATE     = QByteArray::number(-1);

src/common/Session.hpp

@@ -47,8 +47,6 @@
 #ifndef SESSION_HPP
 #define SESSION_HPP
 
-#include <QObject>
-
 /*!
  * \brief Class used to store information between two software launch.
  *

src/common/Tools.cpp

@@ -92,7 +92,6 @@ double convert_to_double(const string arg){
     }
 }
 
-#ifdef MEMORY_TRACE
 double clockGet (void)
 {
 #if (defined X_ARCHalpha_compaq_osf1) || (defined X_ARCHi686_mac)
@@ -110,4 +109,3 @@ double clockGet (void)
 #endif
 }
 
-#endif

src/common/Tools.hpp

@@ -48,8 +48,6 @@
 #ifndef TOOLS_HPP
 #define TOOLS_HPP
 
-#include <string>
-
 /*!
  * \fn convert_to_double(const std::string args)
  * \brief Convert the string in double

src/common/common.hpp

@@ -42,7 +42,7 @@
 */
 /*!
  *\file common.hpp
- *\brief This file gives some common header files for the interface classes.
+ *\brief This file gives some global defines and typedef.
  */
 
 
@@ -50,18 +50,6 @@
 #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 M_PI */
-#include <algorithm>  /* for min and max functions */
-#include <sstream>
-/* -- */
-/* -- */
-#include "common/Errors.hpp"  /* Errors  management */
-#include "common/Message.hpp" /* Message management */
-#include "common/Tools.hpp"   /* Tools              */
-#include "common/Memory.hpp"  /* Memory  management */
 /* Example:
  * *Message::get_instance() << "Test:" << 45 << " and " << true << Message::endi;
  * -> display as an informative message.

src/core/Core.hpp

@@ -61,11 +61,13 @@ class Render_opengl;
 
 class Render_svg;
 class Trace;
-#include "render/Render.hpp"
+//#include "render/Render.hpp"
 class Variable;
 
+//#include "interface/Interface.hpp"
 
-#include "interface/Interface.hpp"
+// Todo : remove from the Core!!
+#include <QProgressDialog>
 
 /*!
  *\brief This class is an terminal interface, it inherited from the Interface interface.
@@ -317,11 +319,6 @@ protected:
      */
     int _state;
 
-    /*!
-     *\brief The parser thread.
-     */
-    
-
     /*!
      *\brief To show the avancement of parsing.
      */

src/interface/Interface.hpp

@@ -52,8 +52,6 @@
 
 class Interface;
 
-#include "interface/resource.hpp"
-
 /*!
  *\brief  This is an interface, used by the terminal and graphical interfaces.
  *

src/interface/Interface_graphic.cpp

@@ -46,11 +46,24 @@
  */
 #include <fstream>
 #include <string>
+#include <iostream>
+#include <sstream>
 #include <stack>
 #include <map>
 #include <list>
 /* -- */
 #include <QObject>
+#include <QGLWidget>/* for the OpenGL Widget */
+#include <QtUiTools>/* for the run-time loading .ui file */
+#include <QCloseEvent>
+#include <QDir>
+#include <QtGui/QFileDialog>
+#include <QtGui/QRadioButton>
+#include <QtGui/QTextEdit>
+#include <QtGui/QCheckBox>
+#include <QtGui/QMessageBox>
+/* -- */
+#include "interface/resource.hpp"
 /* -- */
 #include "common/common.hpp"
 #include "common/info.hpp"
@@ -67,12 +80,9 @@
 /* -- */
 #include "statistics/Stats_window.hpp"
 /* -- */
-#include "interface/resource.hpp"
-//#include "interface/help.hpp"
-//#include "interface/interface.hpp"
+#include "interface/Interface.hpp"
 #include "core/Core.hpp"
 #include "interface/Interface_graphic.hpp"
-//#include "resource.hpp"
 
 #include "plugin/Command_window.hpp"
 
@@ -206,22 +216,6 @@ void Interface_graphic::load_windows(){
     //  CKFP(Info::Render::_ui_render_min_value = qFindChild<QLabel*>(this, "render_min_value"), "Cannot find the render_min_value label in the .ui file");
     // CKFP(Info::Render::_ui_render_max_value = qFindChild<QLabel*>(this, "render_max_value"), "Cannot find the render_max_value label in the .ui file");
 
-    /* Export window */
-    CKFP(_ui_export_ok_button = qFindChild<QPushButton*>(_ui_time_selection_export, "option_export_ok"), "Cannot find the ok push button in the export dialog .ui file");   
-    CKFP(_ui_min_time_export = qFindChild<QLineEdit*>(_ui_time_selection_export, "min_time"), "Cannot find the ok push button in the export dialog .ui file");
-
-    CKFP(_ui_max_time_export = qFindChild<QLineEdit*>(_ui_time_selection_export, "max_time"), "Cannot find the ok push button in the export dialog .ui file");
-
-    CKFP(_ui_CheckBox_time_export = qFindChild<QCheckBox*>(_ui_time_selection_export, "export_all"), "Cannot find the Line text \"export_all\" in the export dialog .ui file");   
-
-    CKFP(_ui_wide_export = qFindChild<QLineEdit*>(_ui_time_selection_export, "wide"), "Cannot find the Line text \"wide\" in the export dialog .ui file");   
-    CKFP(_ui_grow_export = qFindChild<QLineEdit*>(_ui_time_selection_export, "grow"), "Cannot find the Line text \"grow\" in the export dialog .ui file");   
-    CKFP(_ui_accuracy_export = qFindChild<QLineEdit*>(_ui_time_selection_export, "accuracy"), "Cannot find the Line text \"accuracy\" in the export dialog .ui file");   
-    CKFP(_ui_CheckBox_wide_export = qFindChild<QCheckBox*>(_ui_time_selection_export, "checkBox_wide"), "Cannot find the Line text \"wide\" in the export dialog .ui file");   
-    CKFP(_ui_CheckBox_grow_export = qFindChild<QCheckBox*>(_ui_time_selection_export, "checkBox_grow"), "Cannot find the Line text \"grow\" in the export dialog .ui file");   
-    CKFP(_ui_CheckBox_accuracy_export = qFindChild<QCheckBox*>(_ui_time_selection_export, "checkBox_accuracy"), "Cannot find the Line text \"accuracy\" in the export dialog .ui file");   
-    CKFP(_ui_more_options_export = qFindChild<QCommandLinkButton*>(_ui_time_selection_export, "more_options"), "Cannot find the button \"more_options\" in the export dialog .ui file");   
-
     /* Help window */
     CKFP(_ui_help_ok_button = qFindChild<QPushButton*>(_ui_help_window, "help_ok"), "Cannot find the ok push button in the help dialog .ui file");     
  
@@ -232,9 +226,7 @@ void Interface_graphic::load_windows(){
     /* connect(_ui_kind_of_export_choice, SIGNAL(accepted()),
             this, SLOT(choice_of_the_export_pressed()));
     */
-    connect(_ui_export_ok_button, SIGNAL(pressed()),
-            this, SLOT(option_export_ok_pressed()));
-
+    
     connect(_ui_help_ok_button, SIGNAL(clicked()),
             _ui_help_window, SLOT(close()));
 

src/interface/Interface_graphic.hpp

@@ -55,7 +55,16 @@ class Command_window;
 class Svg;
 class Variable;