]> SALOME platform Git repositories - modules/homard.git/commitdiff
Salome HOME
Merge branch 'V8_0_BR' V8_0_0a2
authorvsr <vsr@opencascade.com>
Fri, 15 Jan 2016 07:31:10 +0000 (10:31 +0300)
committervsr <vsr@opencascade.com>
Fri, 15 Jan 2016 07:31:10 +0000 (10:31 +0300)
26 files changed:
CMakeLists.txt
SalomeHOMARDConfig.cmake.in
src/HOMARDGUI/CMakeLists.txt
src/HOMARDGUI/CreateBoundaryAn.h
src/HOMARDGUI/CreateBoundaryDi.h
src/HOMARDGUI/CreateCase.h
src/HOMARDGUI/CreateHypothesis.h
src/HOMARDGUI/CreateIteration.h
src/HOMARDGUI/CreateListGroup.h
src/HOMARDGUI/CreateYACS.h
src/HOMARDGUI/CreateZone.h
src/HOMARDGUI/EditFile.h
src/HOMARDGUI/IterInfo.h
src/HOMARDGUI/MeshInfo.h
src/HOMARDGUI/MonCreateBoundaryAn.cxx
src/HOMARDGUI/MonCreateBoundaryDi.cxx
src/HOMARDGUI/MonCreateCase.cxx
src/HOMARDGUI/MonCreateHypothesis.cxx
src/HOMARDGUI/MonCreateIteration.cxx
src/HOMARDGUI/MonCreateZone.cxx
src/HOMARDGUI/MonEditBoundaryAn.cxx
src/HOMARDGUI/MonEditBoundaryDi.cxx
src/HOMARDGUI/MonEditCase.cxx
src/HOMARDGUI/MonEditHypothesis.cxx
src/HOMARDGUI/MonEditZone.cxx
src/HOMARDGUI/PursueIteration.h

index ce776724f23aac80b71dcae4b9f0092df4dc32c9..83d6ff3982756be738d6010b22b8e1cd624ecf44 100755 (executable)
@@ -113,12 +113,20 @@ FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
 ##
 
 # Various
-# Qt4
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+# Qt
+IF (NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ELSE()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+ENDIF()
 # SIP
 FIND_PACKAGE(SalomeSIP REQUIRED)
-# PyQt4
-FIND_PACKAGE(SalomePyQt4 REQUIRED)
+# PyQt
+IF (NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomePyQt4 REQUIRED)
+ELSE()
+  FIND_PACKAGE(SalomePyQt5 REQUIRED)
+ENDIF()
 # OCCT
 FIND_PACKAGE(SalomeCAS REQUIRED)
 
index d0f02a4a6fe62aaae030f1ba33f4b2dcfe81f71c..a37dc502ecef80203e22f5ce2efad4a18fd45231 100644 (file)
@@ -53,32 +53,34 @@ SET(SALOME_HOMARD_BUILD_DOC   @SALOME_BUILD_DOC@)
 # Level 1 prerequisites:
 SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_SMESH_ROOT_DIR@")
 
-# For all prerequisites, load the corresponding targets if the package was used 
+# For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})  
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()
index 5b4a54ff64b9cdbffcf62fb37a1babc282eb737f..d040fa7f724bbb2fbf046931112a99ef859f01b7 100644 (file)
@@ -17,8 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(UsePyQt4)
+INCLUDE(UseQtExt)
+INCLUDE(UsePyQt)
 
 # --- options ---
 # additional include directories
@@ -110,7 +110,7 @@ SET(HOMARD_HEADERS ${_other_HEADERS} ${_moc_HEADERS})
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / static
 SET(_other_SOURCES
@@ -169,7 +169,7 @@ SET(_pyuic_files
 )
 
 # scripts / pyuic wrappings
-PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
+PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
 
 # --- rules ---
 
@@ -178,4 +178,4 @@ TARGET_LINK_LIBRARIES(HOMARD ${_link_LIBRARIES} )
 INSTALL(TARGETS HOMARD EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${HOMARD_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HOMARD_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HOMARD_INSTALL_RES_DATA}")
index 60cc12b7b8c9c3f325faabc073b4a548c4ce307a..8f996219e2bd37f155f47c15767c0f3b55b859be 100644 (file)
 #ifndef CREATEBOUNDARYAN_H
 #define CREATEBOUNDARYAN_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QDoubleSpinBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
 
 QT_BEGIN_NAMESPACE
 
@@ -744,52 +744,52 @@ public:
 
     void retranslateUi(QDialog *CreateBoundaryAn)
     {
-        CreateBoundaryAn->setWindowTitle(QApplication::translate("CreateBoundaryAn", "Create an analytical boundary", 0, QApplication::UnicodeUTF8));
-        Name->setText(QApplication::translate("CreateBoundaryAn", "Name", 0, QApplication::UnicodeUTF8));
-        TypeBoundary->setTitle(QApplication::translate("CreateBoundaryAn", "Type of boundary", 0, QApplication::UnicodeUTF8));
-        RBCylindre->setText(QApplication::translate("CreateBoundaryAn", "Cylinder", 0, QApplication::UnicodeUTF8));
-        RBSphere->setText(QApplication::translate("CreateBoundaryAn", "Sphere", 0, QApplication::UnicodeUTF8));
-        RBCone->setText(QApplication::translate("CreateBoundaryAn", "Cone", 0, QApplication::UnicodeUTF8));
-        RBTore->setText(QApplication::translate("CreateBoundaryAn", "Torus", 0, QApplication::UnicodeUTF8));
-        gBCylindre->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates", 0, QApplication::UnicodeUTF8));
-        TLXcent->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0, QApplication::UnicodeUTF8));
-        TLradius->setText(QApplication::translate("CreateBoundaryAn", "Radius", 0, QApplication::UnicodeUTF8));
-        TLZcent->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0, QApplication::UnicodeUTF8));
-        TLYcent->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0, QApplication::UnicodeUTF8));
-        TLXaxis->setText(QApplication::translate("CreateBoundaryAn", "X axis", 0, QApplication::UnicodeUTF8));
-        TLYaxis->setText(QApplication::translate("CreateBoundaryAn", "Y axis", 0, QApplication::UnicodeUTF8));
-        TLZaxis->setText(QApplication::translate("CreateBoundaryAn", "Z axis", 0, QApplication::UnicodeUTF8));
-        gBSphere->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates", 0, QApplication::UnicodeUTF8));
-        TLRayon->setText(QApplication::translate("CreateBoundaryAn", "Radius", 0, QApplication::UnicodeUTF8));
-        TLZcentre->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0, QApplication::UnicodeUTF8));
-        TLYcentre->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0, QApplication::UnicodeUTF8));
-        TLXcentre->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0, QApplication::UnicodeUTF8));
-        gBCone->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates", 0, QApplication::UnicodeUTF8));
-        groupBox->setTitle(QApplication::translate("CreateBoundaryAn", "Definition", 0, QApplication::UnicodeUTF8));
-        RB_Def_radius->setText(QApplication::translate("CreateBoundaryAn", "Radius", 0, QApplication::UnicodeUTF8));
-        RB_Def_angle->setText(QApplication::translate("CreateBoundaryAn", "Angle", 0, QApplication::UnicodeUTF8));
-        TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X 1", 0, QApplication::UnicodeUTF8));
-        TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X 2", 0, QApplication::UnicodeUTF8));
-        TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y 1", 0, QApplication::UnicodeUTF8));
-        TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y 2", 0, QApplication::UnicodeUTF8));
-        TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z 1", 0, QApplication::UnicodeUTF8));
-        TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z 2", 0, QApplication::UnicodeUTF8));
-        TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "V 1", 0, QApplication::UnicodeUTF8));
-        TLCone_V2->setText(QApplication::translate("CreateBoundaryAn", "V 2", 0, QApplication::UnicodeUTF8));
-        gBTore->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates", 0, QApplication::UnicodeUTF8));
-        TLToreXcent->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0, QApplication::UnicodeUTF8));
-        TLToreXaxe->setText(QApplication::translate("CreateBoundaryAn", "X axis", 0, QApplication::UnicodeUTF8));
-        TLToreYcent->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0, QApplication::UnicodeUTF8));
-        TLToreYaxe->setText(QApplication::translate("CreateBoundaryAn", "Y axis", 0, QApplication::UnicodeUTF8));
-        TLToreZcent->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0, QApplication::UnicodeUTF8));
-        TLToreZaxe->setText(QApplication::translate("CreateBoundaryAn", "Z axis", 0, QApplication::UnicodeUTF8));
-        TLToreRayRev->setText(QApplication::translate("CreateBoundaryAn", "R revolution", 0, QApplication::UnicodeUTF8));
-        TLToreRayPri->setText(QApplication::translate("CreateBoundaryAn", "Primary R", 0, QApplication::UnicodeUTF8));
+        CreateBoundaryAn->setWindowTitle(QApplication::translate("CreateBoundaryAn", "Create an analytical boundary", 0));
+        Name->setText(QApplication::translate("CreateBoundaryAn", "Name", 0));
+        TypeBoundary->setTitle(QApplication::translate("CreateBoundaryAn", "Type of boundary", 0));
+        RBCylindre->setText(QApplication::translate("CreateBoundaryAn", "Cylinder", 0));
+        RBSphere->setText(QApplication::translate("CreateBoundaryAn", "Sphere", 0));
+        RBCone->setText(QApplication::translate("CreateBoundaryAn", "Cone", 0));
+        RBTore->setText(QApplication::translate("CreateBoundaryAn", "Torus", 0));
+        gBCylindre->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates", 0));
+        TLXcent->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0));
+        TLradius->setText(QApplication::translate("CreateBoundaryAn", "Radius", 0));
+        TLZcent->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0));
+        TLYcent->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0));
+        TLXaxis->setText(QApplication::translate("CreateBoundaryAn", "X axis", 0));
+        TLYaxis->setText(QApplication::translate("CreateBoundaryAn", "Y axis", 0));
+        TLZaxis->setText(QApplication::translate("CreateBoundaryAn", "Z axis", 0));
+        gBSphere->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates", 0));
+        TLRayon->setText(QApplication::translate("CreateBoundaryAn", "Radius", 0));
+        TLZcentre->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0));
+        TLYcentre->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0));
+        TLXcentre->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0));
+        gBCone->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates", 0));
+        groupBox->setTitle(QApplication::translate("CreateBoundaryAn", "Definition", 0));
+        RB_Def_radius->setText(QApplication::translate("CreateBoundaryAn", "Radius", 0));
+        RB_Def_angle->setText(QApplication::translate("CreateBoundaryAn", "Angle", 0));
+        TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X 1", 0));
+        TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X 2", 0));
+        TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y 1", 0));
+        TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y 2", 0));
+        TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z 1", 0));
+        TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z 2", 0));
+        TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "V 1", 0));
+        TLCone_V2->setText(QApplication::translate("CreateBoundaryAn", "V 2", 0));
+        gBTore->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates", 0));
+        TLToreXcent->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0));
+        TLToreXaxe->setText(QApplication::translate("CreateBoundaryAn", "X axis", 0));
+        TLToreYcent->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0));
+        TLToreYaxe->setText(QApplication::translate("CreateBoundaryAn", "Y axis", 0));
+        TLToreZcent->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0));
+        TLToreZaxe->setText(QApplication::translate("CreateBoundaryAn", "Z axis", 0));
+        TLToreRayRev->setText(QApplication::translate("CreateBoundaryAn", "R revolution", 0));
+        TLToreRayPri->setText(QApplication::translate("CreateBoundaryAn", "Primary R", 0));
         GBButtons->setTitle(QString());
-        buttonHelp->setText(QApplication::translate("CreateBoundaryAn", "Help", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("CreateBoundaryAn", "Cancel", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("CreateBoundaryAn", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonOk->setText(QApplication::translate("CreateBoundaryAn", "OK", 0, QApplication::UnicodeUTF8));
+        buttonHelp->setText(QApplication::translate("CreateBoundaryAn", "Help", 0));
+        buttonCancel->setText(QApplication::translate("CreateBoundaryAn", "Cancel", 0));
+        buttonApply->setText(QApplication::translate("CreateBoundaryAn", "Apply", 0));
+        buttonOk->setText(QApplication::translate("CreateBoundaryAn", "OK", 0));
     } // retranslateUi
 
 };
index 95c054c44ffc8303fe57958201f616a8cdb61a2a..99fcb2f38d0d23084ca9db9c774614f6e47686c6 100644 (file)
 #ifndef CREATEBOUNDARYDI_H
 #define CREATEBOUNDARYDI_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QDialog>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QDialog>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
 
 QT_BEGIN_NAMESPACE
 
@@ -136,16 +136,16 @@ public:
 
     void retranslateUi(QDialog *CreateBoundaryDi)
     {
-        CreateBoundaryDi->setWindowTitle(QApplication::translate("CreateBoundaryDi", "Create a discrete boundary", 0, QApplication::UnicodeUTF8));
+        CreateBoundaryDi->setWindowTitle(QApplication::translate("CreateBoundaryDi", "Create a discrete boundary", 0));
         GBButtons->setTitle(QString());
-        buttonHelp->setText(QApplication::translate("CreateBoundaryDi", "Help", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("CreateBoundaryDi", "Cancel", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("CreateBoundaryDi", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonOk->setText(QApplication::translate("CreateBoundaryDi", "OK", 0, QApplication::UnicodeUTF8));
-        CBGroupe->setText(QApplication::translate("CreateBoundaryDi", "Filtering with groups", 0, QApplication::UnicodeUTF8));
+        buttonHelp->setText(QApplication::translate("CreateBoundaryDi", "Help", 0));
+        buttonCancel->setText(QApplication::translate("CreateBoundaryDi", "Cancel", 0));
+        buttonApply->setText(QApplication::translate("CreateBoundaryDi", "Apply", 0));
+        buttonOk->setText(QApplication::translate("CreateBoundaryDi", "OK", 0));
+        CBGroupe->setText(QApplication::translate("CreateBoundaryDi", "Filtering with groups", 0));
         PushFichier->setText(QString());
-        Mesh->setText(QApplication::translate("CreateBoundaryDi", "Mesh", 0, QApplication::UnicodeUTF8));
-        Name->setText(QApplication::translate("CreateBoundaryDi", "Name", 0, QApplication::UnicodeUTF8));
+        Mesh->setText(QApplication::translate("CreateBoundaryDi", "Mesh", 0));
+        Name->setText(QApplication::translate("CreateBoundaryDi", "Name", 0));
     } // retranslateUi
 
 };
index adc14078a791cf86ea2e4b359d9ba6cf8dfb11f3..c41919bed7f6fc950f3ae03b2fbe7cba39fcf6dd 100644 (file)
 #ifndef CREATECASE_H
 #define CREATECASE_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QDialog>
-#include <QtGui/QFormLayout>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QTableWidget>
-#include <QtGui/QWidget>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDialog>
+#include <QFormLayout>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSpacerItem>
+#include <QTableWidget>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
@@ -497,44 +497,45 @@ public:
 
     void retranslateUi(QDialog *CreateCase)
     {
-        CreateCase->setWindowTitle(QApplication::translate("CreateCase", "Create a case", 0, QApplication::UnicodeUTF8));
-        Name->setText(QApplication::translate("CreateCase", "Name", 0, QApplication::UnicodeUTF8));
-        Directory->setText(QApplication::translate("CreateCase", "Directory", 0, QApplication::UnicodeUTF8));
+        CreateCase->setWindowTitle(QApplication::translate("CreateCase", "Create a case", 0));
+        Name->setText(QApplication::translate("CreateCase", "Name", 0));
+        Directory->setText(QApplication::translate("CreateCase", "Directory", 0));
         PushDir->setText(QString());
-        Mesh->setText(QApplication::translate("CreateCase", "Mesh", 0, QApplication::UnicodeUTF8));
+        Mesh->setText(QApplication::translate("CreateCase", "Mesh", 0));
         PushFichier->setText(QString());
-        GBTypeConf->setTitle(QApplication::translate("CreateCase", "Conformity type", 0, QApplication::UnicodeUTF8));
-        RBConforme->setText(QApplication::translate("CreateCase", "Conformal", 0, QApplication::UnicodeUTF8));
-        RBNonConforme->setText(QApplication::translate("CreateCase", "Non conformal", 0, QApplication::UnicodeUTF8));
-        CBBoundaryD->setText(QApplication::translate("CreateCase", "Discrete boundary", 0, QApplication::UnicodeUTF8));
-        CBBoundaryA->setText(QApplication::translate("CreateCase", "Analytical boundary", 0, QApplication::UnicodeUTF8));
-        GBBoundaryD->setTitle(QApplication::translate("CreateCase", "Discrete boundary", 0, QApplication::UnicodeUTF8));
-        PBBoundaryDiEdit->setText(QApplication::translate("CreateCase", "Edit", 0, QApplication::UnicodeUTF8));
-        PBBoundaryDiNew->setText(QApplication::translate("CreateCase", "New", 0, QApplication::UnicodeUTF8));
-        PBBoundaryDiHelp->setText(QApplication::translate("CreateCase", "Help", 0, QApplication::UnicodeUTF8));
-        GBBoundaryA->setTitle(QApplication::translate("CreateCase", "Analytical boundary", 0, QApplication::UnicodeUTF8));
+
+        GBTypeConf->setTitle(QApplication::translate("CreateCase", "Conformity type", 0));
+        RBConforme->setText(QApplication::translate("CreateCase", "Conformal", 0));
+        RBNonConforme->setText(QApplication::translate("CreateCase", "Non conformal", 0));
+        CBBoundaryD->setText(QApplication::translate("CreateCase", "Discrete boundary", 0));
+        CBBoundaryA->setText(QApplication::translate("CreateCase", "Analytical boundary", 0));
+        GBBoundaryD->setTitle(QApplication::translate("CreateCase", "Discrete boundary", 0));
+        PBBoundaryDiEdit->setText(QApplication::translate("CreateCase", "Edit", 0));
+        PBBoundaryDiNew->setText(QApplication::translate("CreateCase", "New", 0));
+        PBBoundaryDiHelp->setText(QApplication::translate("CreateCase", "Help", 0));
+        GBBoundaryA->setTitle(QApplication::translate("CreateCase", "Analytical boundary", 0));
         QTableWidgetItem *___qtablewidgetitem = TWBoundary->horizontalHeaderItem(0);
-        ___qtablewidgetitem->setText(QApplication::translate("CreateCase", "a_virer", 0, QApplication::UnicodeUTF8));
-        PBBoundaryAnEdit->setText(QApplication::translate("CreateCase", "Edit", 0, QApplication::UnicodeUTF8));
-        PBBoundaryAnNew->setText(QApplication::translate("CreateCase", "New", 0, QApplication::UnicodeUTF8));
-        PBBoundaryAnHelp->setText(QApplication::translate("CreateCase", "Help", 0, QApplication::UnicodeUTF8));
-        CBAdvanced->setText(QApplication::translate("CreateCase", "Advanced options", 0, QApplication::UnicodeUTF8));
-        GBAdvancedOptions->setTitle(QApplication::translate("CreateCase", "Advanced options", 0, QApplication::UnicodeUTF8));
-        CBPyramid->setText(QApplication::translate("CreateCase", "Authorized pyramids", 0, QApplication::UnicodeUTF8));
-        GBConforme->setTitle(QApplication::translate("CreateCase", "Conformity +", 0, QApplication::UnicodeUTF8));
-        RBStandard->setText(QApplication::translate("CreateCase", "Standard", 0, QApplication::UnicodeUTF8));
-        RBBox->setText(QApplication::translate("CreateCase", "Box", 0, QApplication::UnicodeUTF8));
-        RBNC1NpA->setText(QApplication::translate("CreateCase", "1 node per edge", 0, QApplication::UnicodeUTF8));
-        RBNCQuelconque->setText(QApplication::translate("CreateCase", "Free", 0, QApplication::UnicodeUTF8));
-        GBFormat->setTitle(QApplication::translate("CreateCase", "Format", 0, QApplication::UnicodeUTF8));
-        RBMED->setText(QApplication::translate("CreateCase", "MED", 0, QApplication::UnicodeUTF8));
-        RBSaturne2D->setText(QApplication::translate("CreateCase", "Saturne 2D", 0, QApplication::UnicodeUTF8));
-        Comment->setText(QApplication::translate("CreateCase", " No comment.", 0, QApplication::UnicodeUTF8));
+        ___qtablewidgetitem->setText(QApplication::translate("CreateCase", "a_virer", 0));
+        PBBoundaryAnEdit->setText(QApplication::translate("CreateCase", "Edit", 0));
+        PBBoundaryAnNew->setText(QApplication::translate("CreateCase", "New", 0));
+        PBBoundaryAnHelp->setText(QApplication::translate("CreateCase", "Help", 0));
+        CBAdvanced->setText(QApplication::translate("CreateCase", "Advanced options", 0));
+        GBAdvancedOptions->setTitle(QApplication::translate("CreateCase", "Advanced options", 0));
+        CBPyramid->setText(QApplication::translate("CreateCase", "Authorized pyramids", 0));
+        GBConforme->setTitle(QApplication::translate("CreateCase", "Conformity +", 0));
+        RBStandard->setText(QApplication::translate("CreateCase", "Standard", 0));
+        RBBox->setText(QApplication::translate("CreateCase", "Box", 0));
+        RBNC1NpA->setText(QApplication::translate("CreateCase", "1 node per edge", 0));
+        RBNCQuelconque->setText(QApplication::translate("CreateCase", "Free", 0));
+        GBFormat->setTitle(QApplication::translate("CreateCase", "Format", 0));
+        RBMED->setText(QApplication::translate("CreateCase", "MED", 0));
+        RBSaturne2D->setText(QApplication::translate("CreateCase", "Saturne 2D", 0));
+        Comment->setText(QApplication::translate("CreateCase", " No comment.", 0));
         GroupButtons->setTitle(QString());
-        buttonHelp->setText(QApplication::translate("CreateCase", "Help", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("CreateCase", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonOk->setText(QApplication::translate("CreateCase", "OK", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("CreateCase", "Cancel", 0, QApplication::UnicodeUTF8));
+        buttonHelp->setText(QApplication::translate("CreateCase", "Help", 0));
+        buttonApply->setText(QApplication::translate("CreateCase", "Apply", 0));
+        buttonOk->setText(QApplication::translate("CreateCase", "OK", 0));
+        buttonCancel->setText(QApplication::translate("CreateCase", "Cancel", 0));
     } // retranslateUi
 
 };
index 673a1a335f130af405c56121ae189457e45979e5..b4fdf4f64126424ea979d7fce73cb3644ad959ee 100644 (file)
 #ifndef CREATEHYPOTHESIS_H
 #define CREATEHYPOTHESIS_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QDoubleSpinBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
-#include <QtGui/QScrollArea>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QSpinBox>
-#include <QtGui/QTableWidget>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QScrollArea>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QTableWidget>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
@@ -818,77 +818,77 @@ public:
 
     void retranslateUi(QScrollArea *CreateHypothesis)
     {
-        CreateHypothesis->setWindowTitle(QApplication::translate("CreateHypothesis", "Create an hypothesis", 0, QApplication::UnicodeUTF8));
-        Name->setText(QApplication::translate("CreateHypothesis", "Name", 0, QApplication::UnicodeUTF8));
-        GBTypeAdaptation->setTitle(QApplication::translate("CreateHypothesis", "Type of adaptation", 0, QApplication::UnicodeUTF8));
-        RBUniforme->setText(QApplication::translate("CreateHypothesis", "Uniform", 0, QApplication::UnicodeUTF8));
-        RBChamp->setText(QApplication::translate("CreateHypothesis", "Driven by a field", 0, QApplication::UnicodeUTF8));
-        RBZone->setText(QApplication::translate("CreateHypothesis", "With geometrical zones", 0, QApplication::UnicodeUTF8));
-        CBGroupe->setText(QApplication::translate("CreateHypothesis", "Filtering with groups", 0, QApplication::UnicodeUTF8));
-        GBUniform->setTitle(QApplication::translate("CreateHypothesis", "Uniform adaptation", 0, QApplication::UnicodeUTF8));
-        RBUniDera->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0, QApplication::UnicodeUTF8));
-        RBUniRaff->setText(QApplication::translate("CreateHypothesis", "Refinement", 0, QApplication::UnicodeUTF8));
+        CreateHypothesis->setWindowTitle(QApplication::translate("CreateHypothesis", "Create an hypothesis", 0));
+        Name->setText(QApplication::translate("CreateHypothesis", "Name", 0));
+        GBTypeAdaptation->setTitle(QApplication::translate("CreateHypothesis", "Type of adaptation", 0));
+        RBUniforme->setText(QApplication::translate("CreateHypothesis", "Uniform", 0));
+        RBChamp->setText(QApplication::translate("CreateHypothesis", "Driven by a field", 0));
+        RBZone->setText(QApplication::translate("CreateHypothesis", "With geometrical zones", 0));
+        CBGroupe->setText(QApplication::translate("CreateHypothesis", "Filtering with groups", 0));
+        GBUniform->setTitle(QApplication::translate("CreateHypothesis", "Uniform adaptation", 0));
+        RBUniDera->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0));
+        RBUniRaff->setText(QApplication::translate("CreateHypothesis", "Refinement", 0));
         GBFieldFile->setTitle(QString());
-        FieldFile->setText(QApplication::translate("CreateHypothesis", "File of the fields", 0, QApplication::UnicodeUTF8));
-        GBFieldManagement->setTitle(QApplication::translate("CreateHypothesis", "Governing field for the adaptation", 0, QApplication::UnicodeUTF8));
-        FieldName->setText(QApplication::translate("CreateHypothesis", "Field name", 0, QApplication::UnicodeUTF8));
+        FieldFile->setText(QApplication::translate("CreateHypothesis", "File of the fields", 0));
+        GBFieldManagement->setTitle(QApplication::translate("CreateHypothesis", "Governing field for the adaptation", 0));
+        FieldName->setText(QApplication::translate("CreateHypothesis", "Field name", 0));
         QTableWidgetItem *___qtablewidgetitem = TWCMP->horizontalHeaderItem(0);
-        ___qtablewidgetitem->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8));
+        ___qtablewidgetitem->setText(QApplication::translate("CreateHypothesis", "Selection", 0));
         QTableWidgetItem *___qtablewidgetitem1 = TWCMP->horizontalHeaderItem(1);
-        ___qtablewidgetitem1->setText(QApplication::translate("CreateHypothesis", "Component", 0, QApplication::UnicodeUTF8));
-        RBL2->setText(QApplication::translate("CreateHypothesis", "L2 norm", 0, QApplication::UnicodeUTF8));
-        RBInf->setText(QApplication::translate("CreateHypothesis", "Infinite norm", 0, QApplication::UnicodeUTF8));
-        CBJump->setText(QApplication::translate("CreateHypothesis", "Jump between elements", 0, QApplication::UnicodeUTF8));
-        GBRefinementThresholds->setTitle(QApplication::translate("CreateHypothesis", "Refinement threshold", 0, QApplication::UnicodeUTF8));
-        RBRPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0, QApplication::UnicodeUTF8));
-        SpinBox_RPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
-        RBRRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0, QApplication::UnicodeUTF8));
-        SpinBox_RRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
-        RBRAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0, QApplication::UnicodeUTF8));
-        RBRMuSigma->setText(QApplication::translate("CreateHypothesis", "Mean + n*(std deviation)", 0, QApplication::UnicodeUTF8));
-        RBRNo->setText(QApplication::translate("CreateHypothesis", "No refinement", 0, QApplication::UnicodeUTF8));
-        GBCoarseningThresholds->setTitle(QApplication::translate("CreateHypothesis", "Coarsening threshold", 0, QApplication::UnicodeUTF8));
-        RBCPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0, QApplication::UnicodeUTF8));
-        SpinBox_CPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
-        RBCRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0, QApplication::UnicodeUTF8));
-        SpinBox_CRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8));
-        RBCAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0, QApplication::UnicodeUTF8));
-        RBCMuSigma->setText(QApplication::translate("CreateHypothesis", "Mean - n*(std deviation)", 0, QApplication::UnicodeUTF8));
-        RBCNo->setText(QApplication::translate("CreateHypothesis", "No coarsening", 0, QApplication::UnicodeUTF8));
-        GBAreaManagement->setTitle(QApplication::translate("CreateHypothesis", "Zone management", 0, QApplication::UnicodeUTF8));
+        ___qtablewidgetitem1->setText(QApplication::translate("CreateHypothesis", "Component", 0));
+        RBL2->setText(QApplication::translate("CreateHypothesis", "L2 norm", 0));
+        RBInf->setText(QApplication::translate("CreateHypothesis", "Infinite norm", 0));
+        CBJump->setText(QApplication::translate("CreateHypothesis", "Jump between elements", 0));
+        GBRefinementThresholds->setTitle(QApplication::translate("CreateHypothesis", "Refinement threshold", 0));
+        RBRPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0));
+        SpinBox_RPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0));
+        RBRRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0));
+        SpinBox_RRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0));
+        RBRAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0));
+        RBRMuSigma->setText(QApplication::translate("CreateHypothesis", "Mean + n*(std deviation)", 0));
+        RBRNo->setText(QApplication::translate("CreateHypothesis", "No refinement", 0));
+        GBCoarseningThresholds->setTitle(QApplication::translate("CreateHypothesis", "Coarsening threshold", 0));
+        RBCPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0));
+        SpinBox_CPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0));
+        RBCRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0));
+        SpinBox_CRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0));
+        RBCAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0));
+        RBCMuSigma->setText(QApplication::translate("CreateHypothesis", "Mean - n*(std deviation)", 0));
+        RBCNo->setText(QApplication::translate("CreateHypothesis", "No coarsening", 0));
+        GBAreaManagement->setTitle(QApplication::translate("CreateHypothesis", "Zone management", 0));
         QTableWidgetItem *___qtablewidgetitem2 = TWZone->horizontalHeaderItem(0);
-        ___qtablewidgetitem2->setText(QApplication::translate("CreateHypothesis", "Refinement", 0, QApplication::UnicodeUTF8));
+        ___qtablewidgetitem2->setText(QApplication::translate("CreateHypothesis", "Refinement", 0));
         QTableWidgetItem *___qtablewidgetitem3 = TWZone->horizontalHeaderItem(1);
-        ___qtablewidgetitem3->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0, QApplication::UnicodeUTF8));
+        ___qtablewidgetitem3->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0));
         QTableWidgetItem *___qtablewidgetitem4 = TWZone->horizontalHeaderItem(2);
-        ___qtablewidgetitem4->setText(QApplication::translate("CreateHypothesis", "Zone name", 0, QApplication::UnicodeUTF8));
-        PBZoneNew->setText(QApplication::translate("CreateHypothesis", "New", 0, QApplication::UnicodeUTF8));
-        PBZoneEdit->setText(QApplication::translate("CreateHypothesis", "Edit", 0, QApplication::UnicodeUTF8));
+        ___qtablewidgetitem4->setText(QApplication::translate("CreateHypothesis", "Zone name", 0));
+        PBZoneNew->setText(QApplication::translate("CreateHypothesis", "New", 0));
+        PBZoneEdit->setText(QApplication::translate("CreateHypothesis", "Edit", 0));
         PBZoneDelete->setText(QString());
-        GBField->setTitle(QApplication::translate("CreateHypothesis", "Field Interpolation", 0, QApplication::UnicodeUTF8));
-        RBFieldNo->setText(QApplication::translate("CreateHypothesis", "None", 0, QApplication::UnicodeUTF8));
-        RBFieldAll->setText(QApplication::translate("CreateHypothesis", "All", 0, QApplication::UnicodeUTF8));
-        RBFieldChosen->setText(QApplication::translate("CreateHypothesis", "Chosen", 0, QApplication::UnicodeUTF8));
+        GBField->setTitle(QApplication::translate("CreateHypothesis", "Field Interpolation", 0));
+        RBFieldNo->setText(QApplication::translate("CreateHypothesis", "None", 0));
+        RBFieldAll->setText(QApplication::translate("CreateHypothesis", "All", 0));
+        RBFieldChosen->setText(QApplication::translate("CreateHypothesis", "Chosen", 0));
         QTableWidgetItem *___qtablewidgetitem5 = TWField->horizontalHeaderItem(0);
-        ___qtablewidgetitem5->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8));
+        ___qtablewidgetitem5->setText(QApplication::translate("CreateHypothesis", "Selection", 0));
         QTableWidgetItem *___qtablewidgetitem6 = TWField->horizontalHeaderItem(1);
-        ___qtablewidgetitem6->setText(QApplication::translate("CreateHypothesis", "Field Name", 0, QApplication::UnicodeUTF8));
-        CBAdvanced->setText(QApplication::translate("CreateHypothesis", "Advanced options", 0, QApplication::UnicodeUTF8));
-        GBAdvancedOptions->setTitle(QApplication::translate("CreateHypothesis", "Advanced options", 0, QApplication::UnicodeUTF8));
-        TLMinimalDiameter->setText(QApplication::translate("CreateHypothesis", "Minimal diameter", 0, QApplication::UnicodeUTF8));
-        TLMaximalLevel->setText(QApplication::translate("CreateHypothesis", "Maximal level", 0, QApplication::UnicodeUTF8));
-        GBAdapInit->setTitle(QApplication::translate("CreateHypothesis", "Initialization of adaptation", 0, QApplication::UnicodeUTF8));
-        RBAIN->setText(QApplication::translate("CreateHypothesis", "Nothing", 0, QApplication::UnicodeUTF8));
-        RBAIR->setText(QApplication::translate("CreateHypothesis", "Refinement", 0, QApplication::UnicodeUTF8));
-        RBAID->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0, QApplication::UnicodeUTF8));
-        CBOutputLevel->setText(QApplication::translate("CreateHypothesis", "Output of the level of refinement", 0, QApplication::UnicodeUTF8));
-        CBOutputQuality->setText(QApplication::translate("CreateHypothesis", "Output of the qualities", 0, QApplication::UnicodeUTF8));
-        CBOutputDiameter->setText(QApplication::translate("CreateHypothesis", "Output of the diameters", 0, QApplication::UnicodeUTF8));
+        ___qtablewidgetitem6->setText(QApplication::translate("CreateHypothesis", "Field Name", 0));
+        CBAdvanced->setText(QApplication::translate("CreateHypothesis", "Advanced options", 0));
+        GBAdvancedOptions->setTitle(QApplication::translate("CreateHypothesis", "Advanced options", 0));
+        TLMinimalDiameter->setText(QApplication::translate("CreateHypothesis", "Minimal diameter", 0));
+        TLMaximalLevel->setText(QApplication::translate("CreateHypothesis", "Maximal level", 0));
+        GBAdapInit->setTitle(QApplication::translate("CreateHypothesis", "Initialization of adaptation", 0));
+        RBAIN->setText(QApplication::translate("CreateHypothesis", "Nothing", 0));
+        RBAIR->setText(QApplication::translate("CreateHypothesis", "Refinement", 0));
+        RBAID->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0));
+        CBOutputLevel->setText(QApplication::translate("CreateHypothesis", "Output of the level of refinement", 0));
+        CBOutputQuality->setText(QApplication::translate("CreateHypothesis", "Output of the qualities", 0));
+        CBOutputDiameter->setText(QApplication::translate("CreateHypothesis", "Output of the diameters", 0));
         GBButtons->setTitle(QString());
-        buttonOk->setText(QApplication::translate("CreateHypothesis", "OK", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("CreateHypothesis", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("CreateHypothesis", "Cancel", 0, QApplication::UnicodeUTF8));
-        buttonHelp->setText(QApplication::translate("CreateHypothesis", "Help", 0, QApplication::UnicodeUTF8));
+        buttonOk->setText(QApplication::translate("CreateHypothesis", "OK", 0));
+        buttonApply->setText(QApplication::translate("CreateHypothesis", "Apply", 0));
+        buttonCancel->setText(QApplication::translate("CreateHypothesis", "Cancel", 0));
+        buttonHelp->setText(QApplication::translate("CreateHypothesis", "Help", 0));
     } // retranslateUi
 
 };
index 38a7e6ee2c61b18fe64be5d7169bc6356b968035..f04cde3bf543693a00a8c5d194d9b3bfc9a68994 100644 (file)
 #ifndef CREATEITERATION_H
 #define CREATEITERATION_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QComboBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
-#include <QtGui/QScrollArea>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QSpinBox>
-#include <QtGui/QWidget>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QScrollArea>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
@@ -382,28 +382,28 @@ public:
 
     void retranslateUi(QScrollArea *CreateIteration)
     {
-        CreateIteration->setWindowTitle(QApplication::translate("CreateIteration", "Create an iteration", 0, QApplication::UnicodeUTF8));
-        Iteration_Name->setText(QApplication::translate("CreateIteration", "Iteration Name", 0, QApplication::UnicodeUTF8));
-        Iter_Parent->setText(QApplication::translate("CreateIteration", "Previous iteration", 0, QApplication::UnicodeUTF8));
+        CreateIteration->setWindowTitle(QApplication::translate("CreateIteration", "Create an iteration", 0));
+        Iteration_Name->setText(QApplication::translate("CreateIteration", "Iteration Name", 0));
+        Iter_Parent->setText(QApplication::translate("CreateIteration", "Previous iteration", 0));
         PBIterParent->setText(QString());
-        Mesh_n->setText(QApplication::translate("CreateIteration", "Mesh n", 0, QApplication::UnicodeUTF8));
-        Mesh_np1->setText(QApplication::translate("CreateIteration", "Mesh n+1", 0, QApplication::UnicodeUTF8));
-        GBField->setTitle(QApplication::translate("CreateIteration", "Field information", 0, QApplication::UnicodeUTF8));
-        RBChosen->setText(QApplication::translate("CreateIteration", "Chosen time step", 0, QApplication::UnicodeUTF8));
-        Rank->setText(QApplication::translate("CreateIteration", "Rank", 0, QApplication::UnicodeUTF8));
-        TimeStep->setText(QApplication::translate("CreateIteration", "Time step", 0, QApplication::UnicodeUTF8));
-        RBLast->setText(QApplication::translate("CreateIteration", "Last time step", 0, QApplication::UnicodeUTF8));
-        RBNo->setText(QApplication::translate("CreateIteration", "No time step", 0, QApplication::UnicodeUTF8));
+        Mesh_n->setText(QApplication::translate("CreateIteration", "Mesh n", 0));
+        Mesh_np1->setText(QApplication::translate("CreateIteration", "Mesh n+1", 0));
+        GBField->setTitle(QApplication::translate("CreateIteration", "Field information", 0));
+        RBChosen->setText(QApplication::translate("CreateIteration", "Chosen time step", 0));
+        Rank->setText(QApplication::translate("CreateIteration", "Rank", 0));
+        TimeStep->setText(QApplication::translate("CreateIteration", "Time step", 0));
+        RBLast->setText(QApplication::translate("CreateIteration", "Last time step", 0));
+        RBNo->setText(QApplication::translate("CreateIteration", "No time step", 0));
         PushFieldFile->setText(QString());
-        FieldFile->setText(QApplication::translate("CreateIteration", "Field file", 0, QApplication::UnicodeUTF8));
-        Hypothese->setTitle(QApplication::translate("CreateIteration", "Hypothesis", 0, QApplication::UnicodeUTF8));
-        PBHypoEdit->setText(QApplication::translate("CreateIteration", "Edit", 0, QApplication::UnicodeUTF8));
-        PBHypoNew->setText(QApplication::translate("CreateIteration", "New", 0, QApplication::UnicodeUTF8));
+        FieldFile->setText(QApplication::translate("CreateIteration", "Field file", 0));
+        Hypothese->setTitle(QApplication::translate("CreateIteration", "Hypothesis", 0));
+        PBHypoEdit->setText(QApplication::translate("CreateIteration", "Edit", 0));
+        PBHypoNew->setText(QApplication::translate("CreateIteration", "New", 0));
         GroupButtons->setTitle(QString());
-        buttonOk->setText(QApplication::translate("CreateIteration", "OK", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("CreateIteration", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("CreateIteration", "Cancel", 0, QApplication::UnicodeUTF8));
-        buttonHelp->setText(QApplication::translate("CreateIteration", "Help", 0, QApplication::UnicodeUTF8));
+        buttonOk->setText(QApplication::translate("CreateIteration", "OK", 0));
+        buttonApply->setText(QApplication::translate("CreateIteration", "Apply", 0));
+        buttonCancel->setText(QApplication::translate("CreateIteration", "Cancel", 0));
+        buttonHelp->setText(QApplication::translate("CreateIteration", "Help", 0));
     } // retranslateUi
 
 };
index f57ebc20c4792fddc909c95867d3dd760724eac9..6eb83922344af18a4094b8086c25db85d7d788ac 100644 (file)
 #ifndef CREATELISTGROUP_H
 #define CREATELISTGROUP_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QTableWidget>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QPushButton>
+#include <QTableWidget>
 
 class Ui_CreateListGroup
 {
@@ -107,22 +107,22 @@ public:
 
     void retranslateUi(QDialog *CreateListGroup)
     {
-    CreateListGroup->setWindowTitle(QApplication::translate("CreateListGroup", "Selection of groups", 0, QApplication::UnicodeUTF8));
+    CreateListGroup->setWindowTitle(QApplication::translate("CreateListGroup", "Selection of groups", 0));
     GBButtons->setTitle(QString());
-    buttonHelp->setText(QApplication::translate("CreateListGroup", "Help", 0, QApplication::UnicodeUTF8));
-    buttonCancel->setText(QApplication::translate("CreateListGroup", "Cancel", 0, QApplication::UnicodeUTF8));
-    buttonApply->setText(QApplication::translate("CreateListGroup", "Apply", 0, QApplication::UnicodeUTF8));
-    buttonOk->setText(QApplication::translate("CreateListGroup", "OK", 0, QApplication::UnicodeUTF8));
-    GBOptions->setTitle(QApplication::translate("CreateListGroup", "Selected groups", 0, QApplication::UnicodeUTF8));
+    buttonHelp->setText(QApplication::translate("CreateListGroup", "Help", 0));
+    buttonCancel->setText(QApplication::translate("CreateListGroup", "Cancel", 0));
+    buttonApply->setText(QApplication::translate("CreateListGroup", "Apply", 0));
+    buttonOk->setText(QApplication::translate("CreateListGroup", "OK", 0));
+    GBOptions->setTitle(QApplication::translate("CreateListGroup", "Selected groups", 0));
     if (TWGroupe->columnCount() < 2)
         TWGroupe->setColumnCount(2);
 
     QTableWidgetItem *__colItem = new QTableWidgetItem();
-    __colItem->setText(QApplication::translate("CreateListGroup", "Selection", 0, QApplication::UnicodeUTF8));
+    __colItem->setText(QApplication::translate("CreateListGroup", "Selection", 0));
     TWGroupe->setHorizontalHeaderItem(0, __colItem);
 
     QTableWidgetItem *__colItem1 = new QTableWidgetItem();
-    __colItem1->setText(QApplication::translate("CreateListGroup", "Group", 0, QApplication::UnicodeUTF8));
+    __colItem1->setText(QApplication::translate("CreateListGroup", "Group", 0));
     TWGroupe->setHorizontalHeaderItem(1, __colItem1);
     Q_UNUSED(CreateListGroup);
     } // retranslateUi
index ff732b730710930fd05b9cf7f9298d11fa0f29c3..e0eabf5d64c095530678ab7a0a0629662cdd39c7 100644 (file)
 #ifndef CREATEYACS_H
 #define CREATEYACS_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDoubleSpinBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
-#include <QtGui/QScrollArea>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QSpinBox>
-#include <QtGui/QWidget>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QScrollArea>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
@@ -406,33 +406,33 @@ public:
 
     void retranslateUi(QScrollArea *CreateYACS)
     {
-        CreateYACS->setWindowTitle(QApplication::translate("CreateYACS", "Create YACS", 0, QApplication::UnicodeUTF8));
-        Name->setText(QApplication::translate("CreateYACS", "Name", 0, QApplication::UnicodeUTF8));
-        Case->setText(QApplication::translate("CreateYACS", "Case", 0, QApplication::UnicodeUTF8));
+        CreateYACS->setWindowTitle(QApplication::translate("CreateYACS", "Create YACS", 0));
+        Name->setText(QApplication::translate("CreateYACS", "Name", 0));
+        Case->setText(QApplication::translate("CreateYACS", "Case", 0));
         PBCaseName->setText(QString());
-        Script->setText(QApplication::translate("CreateYACS", "Script", 0, QApplication::UnicodeUTF8));
+        Script->setText(QApplication::translate("CreateYACS", "Script", 0));
         PBScriptFile->setText(QString());
-        DirectoryStart->setText(QApplication::translate("CreateYACS", "Directory", 0, QApplication::UnicodeUTF8));
+        DirectoryStart->setText(QApplication::translate("CreateYACS", "Directory", 0));
         PBDir->setText(QString());
-        MeshFile->setText(QApplication::translate("CreateYACS", "Mesh file", 0, QApplication::UnicodeUTF8));
+        MeshFile->setText(QApplication::translate("CreateYACS", "Mesh file", 0));
         PBMeshFile->setText(QString());
-        GBTypeSchema->setTitle(QApplication::translate("CreateYACS", "Type of schema", 0, QApplication::UnicodeUTF8));
-        RBConstant->setText(QApplication::translate("CreateYACS", "Constant", 0, QApplication::UnicodeUTF8));
-        RBVariable->setText(QApplication::translate("CreateYACS", "Variable", 0, QApplication::UnicodeUTF8));
-        GBMax->setTitle(QApplication::translate("CreateYACS", "Maximum of ...", 0, QApplication::UnicodeUTF8));
-        TLMaxIteration->setText(QApplication::translate("CreateYACS", "Iterations", 0, QApplication::UnicodeUTF8));
-        TLMaxNodes->setText(QApplication::translate("CreateYACS", "Nodes", 0, QApplication::UnicodeUTF8));
-        TLMaxElem->setText(QApplication::translate("CreateYACS", "Elements", 0, QApplication::UnicodeUTF8));
-        GBConvergence->setTitle(QApplication::translate("CreateYACS", "Test of convergence", 0, QApplication::UnicodeUTF8));
-        RBNone->setText(QApplication::translate("CreateYACS", "None", 0, QApplication::UnicodeUTF8));
-        RBVMinAbs->setText(QApplication::translate("CreateYACS", "Vtest > Vref", 0, QApplication::UnicodeUTF8));
-        RBVMaxAbs->setText(QApplication::translate("CreateYACS", "Vtest < Vref", 0, QApplication::UnicodeUTF8));
-        labelVref->setText(QApplication::translate("CreateYACS", "Vref", 0, QApplication::UnicodeUTF8));
+        GBTypeSchema->setTitle(QApplication::translate("CreateYACS", "Type of schema", 0));
+        RBConstant->setText(QApplication::translate("CreateYACS", "Constant", 0));
+        RBVariable->setText(QApplication::translate("CreateYACS", "Variable", 0));
+        GBMax->setTitle(QApplication::translate("CreateYACS", "Maximum of ...", 0));
+        TLMaxIteration->setText(QApplication::translate("CreateYACS", "Iterations", 0));
+        TLMaxNodes->setText(QApplication::translate("CreateYACS", "Nodes", 0));
+        TLMaxElem->setText(QApplication::translate("CreateYACS", "Elements", 0));
+        GBConvergence->setTitle(QApplication::translate("CreateYACS", "Test of convergence", 0));
+        RBNone->setText(QApplication::translate("CreateYACS", "None", 0));
+        RBVMinAbs->setText(QApplication::translate("CreateYACS", "Vtest > Vref", 0));
+        RBVMaxAbs->setText(QApplication::translate("CreateYACS", "Vtest < Vref", 0));
+        labelVref->setText(QApplication::translate("CreateYACS", "Vref", 0));
         GroupButtons->setTitle(QString());
-        buttonHelp->setText(QApplication::translate("CreateYACS", "Help", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("CreateYACS", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonOk->setText(QApplication::translate("CreateYACS", "OK", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("CreateYACS", "Cancel", 0, QApplication::UnicodeUTF8));
+        buttonHelp->setText(QApplication::translate("CreateYACS", "Help", 0));
+        buttonApply->setText(QApplication::translate("CreateYACS", "Apply", 0));
+        buttonOk->setText(QApplication::translate("CreateYACS", "OK", 0));
+        buttonCancel->setText(QApplication::translate("CreateYACS", "Cancel", 0));
     } // retranslateUi
 
 };
index 74f50886a19424f3bdc2c066c1270e67007631dd..827b407754f0e8a6689cfb3d657836b0b85b148c 100644 (file)
 #ifndef CREATEZONE_H
 #define CREATEZONE_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QDoubleSpinBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
-#include <QtGui/QSpacerItem>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSpacerItem>
 
 QT_BEGIN_NAMESPACE
 
@@ -751,49 +751,49 @@ public:
 
     void retranslateUi(QDialog *CreateZone)
     {
-        CreateZone->setWindowTitle(QApplication::translate("CreateZone", "Create a zone", 0, QApplication::UnicodeUTF8));
-        Name->setText(QApplication::translate("CreateZone", "Name", 0, QApplication::UnicodeUTF8));
-        TypeZone->setTitle(QApplication::translate("CreateZone", "Type of zone", 0, QApplication::UnicodeUTF8));
-        RBSphere->setText(QApplication::translate("CreateZone", "Sphere", 0, QApplication::UnicodeUTF8));
-        RBPipe->setText(QApplication::translate("CreateZone", "Pipe", 0, QApplication::UnicodeUTF8));
-        RBCylinder->setText(QApplication::translate("CreateZone", "Cylinder", 0, QApplication::UnicodeUTF8));
-        RBBox->setText(QApplication::translate("CreateZone", "Box", 0, QApplication::UnicodeUTF8));
-        gBBox->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
-        TLXmini->setText(QApplication::translate("CreateZone", "X mini", 0, QApplication::UnicodeUTF8));
-        TLYmini->setText(QApplication::translate("CreateZone", "Y mini", 0, QApplication::UnicodeUTF8));
-        TLZmini->setText(QApplication::translate("CreateZone", "Z mini", 0, QApplication::UnicodeUTF8));
-        TLXmaxi->setText(QApplication::translate("CreateZone", "X maxi", 0, QApplication::UnicodeUTF8));
-        TLZmaxi->setText(QApplication::translate("CreateZone", "Z maxi", 0, QApplication::UnicodeUTF8));
-        TLYmaxi->setText(QApplication::translate("CreateZone", "Y maxi", 0, QApplication::UnicodeUTF8));
-        gBSphere->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
-        TLXcentre->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8));
-        TLYcentre->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8));
-        TLRayon->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8));
-        TLZcentre->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8));
-        gBCylindre->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
-        TLHaut->setText(QApplication::translate("CreateZone", "Height", 0, QApplication::UnicodeUTF8));
-        TLRadius->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8));
-        TLZaxis->setText(QApplication::translate("CreateZone", "Z axis", 0, QApplication::UnicodeUTF8));
-        TLYaxis->setText(QApplication::translate("CreateZone", "Y axis", 0, QApplication::UnicodeUTF8));
-        TLXaxis->setText(QApplication::translate("CreateZone", "X axis", 0, QApplication::UnicodeUTF8));
-        TLYbase->setText(QApplication::translate("CreateZone", "Y base", 0, QApplication::UnicodeUTF8));
-        TLZbase->setText(QApplication::translate("CreateZone", "Z base", 0, QApplication::UnicodeUTF8));
-        TLXbase->setText(QApplication::translate("CreateZone", "X base", 0, QApplication::UnicodeUTF8));
-        gBPipe->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8));
-        TLHaut_p->setText(QApplication::translate("CreateZone", "Height", 0, QApplication::UnicodeUTF8));
-        TLXbase_p->setText(QApplication::translate("CreateZone", "X base", 0, QApplication::UnicodeUTF8));
-        TLRadius_int->setText(QApplication::translate("CreateZone", "Internal radius", 0, QApplication::UnicodeUTF8));
-        TLZbase_p->setText(QApplication::translate("CreateZone", "Z base", 0, QApplication::UnicodeUTF8));
-        TLYbase_p->setText(QApplication::translate("CreateZone", "Y base", 0, QApplication::UnicodeUTF8));
-        TLXaxis_p->setText(QApplication::translate("CreateZone", "X axis", 0, QApplication::UnicodeUTF8));
-        TLYaxis_p->setText(QApplication::translate("CreateZone", "Y axis", 0, QApplication::UnicodeUTF8));
-        TLZaxis_p->setText(QApplication::translate("CreateZone", "Z axis", 0, QApplication::UnicodeUTF8));
-        TLRadius_ext->setText(QApplication::translate("CreateZone", "External radius", 0, QApplication::UnicodeUTF8));
+        CreateZone->setWindowTitle(QApplication::translate("CreateZone", "Create a zone", 0));
+        Name->setText(QApplication::translate("CreateZone", "Name", 0));
+        TypeZone->setTitle(QApplication::translate("CreateZone", "Type of zone", 0));
+        RBSphere->setText(QApplication::translate("CreateZone", "Sphere", 0));
+        RBPipe->setText(QApplication::translate("CreateZone", "Pipe", 0));
+        RBCylinder->setText(QApplication::translate("CreateZone", "Cylinder", 0));
+        RBBox->setText(QApplication::translate("CreateZone", "Box", 0));
+        gBBox->setTitle(QApplication::translate("CreateZone", "Coordinates", 0));
+        TLXmini->setText(QApplication::translate("CreateZone", "X mini", 0));
+        TLYmini->setText(QApplication::translate("CreateZone", "Y mini", 0));
+        TLZmini->setText(QApplication::translate("CreateZone", "Z mini", 0));
+        TLXmaxi->setText(QApplication::translate("CreateZone", "X maxi", 0));
+        TLZmaxi->setText(QApplication::translate("CreateZone", "Z maxi", 0));
+        TLYmaxi->setText(QApplication::translate("CreateZone", "Y maxi", 0));
+        gBSphere->setTitle(QApplication::translate("CreateZone", "Coordinates", 0));
+        TLXcentre->setText(QApplication::translate("CreateZone", "X centre", 0));
+        TLYcentre->setText(QApplication::translate("CreateZone", "Y centre", 0));
+        TLRayon->setText(QApplication::translate("CreateZone", "Radius", 0));
+        TLZcentre->setText(QApplication::translate("CreateZone", "Z centre", 0));
+        gBCylindre->setTitle(QApplication::translate("CreateZone", "Coordinates", 0));
+        TLHaut->setText(QApplication::translate("CreateZone", "Height", 0));
+        TLRadius->setText(QApplication::translate("CreateZone", "Radius", 0));
+        TLZaxis->setText(QApplication::translate("CreateZone", "Z axis", 0));
+        TLYaxis->setText(QApplication::translate("CreateZone", "Y axis", 0));
+        TLXaxis->setText(QApplication::translate("CreateZone", "X axis", 0));
+        TLYbase->setText(QApplication::translate("CreateZone", "Y base", 0));
+        TLZbase->setText(QApplication::translate("CreateZone", "Z base", 0));
+        TLXbase->setText(QApplication::translate("CreateZone", "X base", 0));
+        gBPipe->setTitle(QApplication::translate("CreateZone", "Coordinates", 0));
+        TLHaut_p->setText(QApplication::translate("CreateZone", "Height", 0));
+        TLXbase_p->setText(QApplication::translate("CreateZone", "X base", 0));
+        TLRadius_int->setText(QApplication::translate("CreateZone", "Internal radius", 0));
+        TLZbase_p->setText(QApplication::translate("CreateZone", "Z base", 0));
+        TLYbase_p->setText(QApplication::translate("CreateZone", "Y base", 0));
+        TLXaxis_p->setText(QApplication::translate("CreateZone", "X axis", 0));
+        TLYaxis_p->setText(QApplication::translate("CreateZone", "Y axis", 0));
+        TLZaxis_p->setText(QApplication::translate("CreateZone", "Z axis", 0));
+        TLRadius_ext->setText(QApplication::translate("CreateZone", "External radius", 0));
         GBButtons->setTitle(QString());
-        buttonHelp->setText(QApplication::translate("CreateZone", "Help", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("CreateZone", "Cancel", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("CreateZone", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonOk->setText(QApplication::translate("CreateZone", "OK", 0, QApplication::UnicodeUTF8));
+        buttonHelp->setText(QApplication::translate("CreateZone", "Help", 0));
+        buttonCancel->setText(QApplication::translate("CreateZone", "Cancel", 0));
+        buttonApply->setText(QApplication::translate("CreateZone", "Apply", 0));
+        buttonOk->setText(QApplication::translate("CreateZone", "OK", 0));
     } // retranslateUi
 
 };
index 66500c6b4165963f490f034281b259f0c06e983d..3e81990568376eb8d91a62bf6e6f030dc2cf0ecd 100644 (file)
 #ifndef EDITFILE_H
 #define EDITFILE_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QTextBrowser>
-#include <QtGui/QWidget>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QTextBrowser>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
@@ -103,10 +103,10 @@ public:
 
     void retranslateUi(QWidget *EditFile)
     {
-        EditFile->setWindowTitle(QApplication::translate("EditFile", "Edit a file", 0, QApplication::UnicodeUTF8));
+        EditFile->setWindowTitle(QApplication::translate("EditFile", "Edit a file", 0));
         GroupButtons->setTitle(QString());
-        buttonPrint->setText(QApplication::translate("EditFile", "Print", 0, QApplication::UnicodeUTF8));
-        buttonQuit->setText(QApplication::translate("EditFile", "Quit", 0, QApplication::UnicodeUTF8));
+        buttonPrint->setText(QApplication::translate("EditFile", "Print", 0));
+        buttonQuit->setText(QApplication::translate("EditFile", "Quit", 0));
     } // retranslateUi
 
 };
index 452a9daba8613bbaf6a0750155216ff673eb961a..5445856b74fb5e45d0cf9cf436ca173bac3cb945 100644 (file)
 #ifndef ITERINFO_H
 #define ITERINFO_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QDialog>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QDialog>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QPushButton>
 
 QT_BEGIN_NAMESPACE
 
@@ -131,18 +131,18 @@ public:
 
     void retranslateUi(QDialog *IterInfo)
     {
-        IterInfo->setWindowTitle(QApplication::translate("IterInfo", "Information on a mesh", 0, QApplication::UnicodeUTF8));
-        GBOptions->setTitle(QApplication::translate("IterInfo", "Options", 0, QApplication::UnicodeUTF8));
-        CBQuality->setText(QApplication::translate("IterInfo", "Quality", 0, QApplication::UnicodeUTF8));
-        CBConnection->setText(QApplication::translate("IterInfo", "Connection", 0, QApplication::UnicodeUTF8));
-        CBDiametre->setText(QApplication::translate("IterInfo", "Diametre", 0, QApplication::UnicodeUTF8));
-        CBBlockSize->setText(QApplication::translate("IterInfo", "Group size", 0, QApplication::UnicodeUTF8));
-        CBEntanglement->setText(QApplication::translate("IterInfo", "Entanglement", 0, QApplication::UnicodeUTF8));
+        IterInfo->setWindowTitle(QApplication::translate("IterInfo", "Information on a mesh", 0));
+        GBOptions->setTitle(QApplication::translate("IterInfo", "Options", 0));
+        CBQuality->setText(QApplication::translate("IterInfo", "Quality", 0));
+        CBConnection->setText(QApplication::translate("IterInfo", "Connection", 0));
+        CBDiametre->setText(QApplication::translate("IterInfo", "Diametre", 0));
+        CBBlockSize->setText(QApplication::translate("IterInfo", "Group size", 0));
+        CBEntanglement->setText(QApplication::translate("IterInfo", "Entanglement", 0));
         GroupButtons->setTitle(QString());
-        buttonHelp->setText(QApplication::translate("IterInfo", "Help", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("IterInfo", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonOk->setText(QApplication::translate("IterInfo", "OK", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("IterInfo", "Cancel", 0, QApplication::UnicodeUTF8));
+        buttonHelp->setText(QApplication::translate("IterInfo", "Help", 0));
+        buttonApply->setText(QApplication::translate("IterInfo", "Apply", 0));
+        buttonOk->setText(QApplication::translate("IterInfo", "OK", 0));
+        buttonCancel->setText(QApplication::translate("IterInfo", "Cancel", 0));
     } // retranslateUi
 
 };
index 95dc88bf8fc73c4bd660460f3ffb9d8499a2e7ac..4831c98befa3dc5cfaa1a03b988fb37d2e185772 100644 (file)
 #ifndef MESHINFO_H
 #define MESHINFO_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QDialog>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QDialog>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpacerItem>
 
 QT_BEGIN_NAMESPACE
 
@@ -240,23 +240,23 @@ public:
 
     void retranslateUi(QDialog *MeshInfo)
     {
-        MeshInfo->setWindowTitle(QApplication::translate("MeshInfo", "Information on a mesh", 0, QApplication::UnicodeUTF8));
-        Name->setText(QApplication::translate("MeshInfo", "Name", 0, QApplication::UnicodeUTF8));
-        Directory->setText(QApplication::translate("MeshInfo", "Directory", 0, QApplication::UnicodeUTF8));
+        MeshInfo->setWindowTitle(QApplication::translate("MeshInfo", "Information on a mesh", 0));
+        Name->setText(QApplication::translate("MeshInfo", "Name", 0));
+        Directory->setText(QApplication::translate("MeshInfo", "Directory", 0));
         PushDir->setText(QString());
-        Mesh_2->setText(QApplication::translate("MeshInfo", "Mesh", 0, QApplication::UnicodeUTF8));
+        Mesh_2->setText(QApplication::translate("MeshInfo", "Mesh", 0));
         PushFichier->setText(QString());
-        GBOptions->setTitle(QApplication::translate("MeshInfo", "Options", 0, QApplication::UnicodeUTF8));
-        CBQuality->setText(QApplication::translate("MeshInfo", "Quality", 0, QApplication::UnicodeUTF8));
-        CBConnection->setText(QApplication::translate("MeshInfo", "Connection", 0, QApplication::UnicodeUTF8));
-        CBDiametre->setText(QApplication::translate("MeshInfo", "Diametre", 0, QApplication::UnicodeUTF8));
-        CBBlockSize->setText(QApplication::translate("MeshInfo", "Group size", 0, QApplication::UnicodeUTF8));
-        CBEntanglement->setText(QApplication::translate("MeshInfo", "Entanglement", 0, QApplication::UnicodeUTF8));
+        GBOptions->setTitle(QApplication::translate("MeshInfo", "Options", 0));
+        CBQuality->setText(QApplication::translate("MeshInfo", "Quality", 0));
+        CBConnection->setText(QApplication::translate("MeshInfo", "Connection", 0));
+        CBDiametre->setText(QApplication::translate("MeshInfo", "Diametre", 0));
+        CBBlockSize->setText(QApplication::translate("MeshInfo", "Group size", 0));
+        CBEntanglement->setText(QApplication::translate("MeshInfo", "Entanglement", 0));
         GroupButtons->setTitle(QString());
-        buttonHelp->setText(QApplication::translate("MeshInfo", "Help", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("MeshInfo", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonOk->setText(QApplication::translate("MeshInfo", "OK", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("MeshInfo", "Cancel", 0, QApplication::UnicodeUTF8));
+        buttonHelp->setText(QApplication::translate("MeshInfo", "Help", 0));
+        buttonApply->setText(QApplication::translate("MeshInfo", "Apply", 0));
+        buttonOk->setText(QApplication::translate("MeshInfo", "OK", 0));
+        buttonCancel->setText(QApplication::translate("MeshInfo", "Cancel", 0));
     } // retranslateUi
 
 };
index 10018e6a1cfa7abf96a092917c5f64d739750481..034195636678376f12b1173f5bc12ec588a6826d 100644 (file)
@@ -611,28 +611,28 @@ void MonCreateBoundaryAn::SetConeR()
 //
   _Type=4;
 //
-  TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X centre 1", 0, QApplication::UnicodeUTF8));
+  TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X centre 1", 0));
   SpinBox_Cone_X1->setValue(_BoundaryAnXcone1);
-  TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y centre 1", 0, QApplication::UnicodeUTF8));
+  TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y centre 1", 0));
   SpinBox_Cone_Y1->setValue(_BoundaryAnYcone1);
-  TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z centre 1", 0, QApplication::UnicodeUTF8));
+  TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z centre 1", 0));
   SpinBox_Cone_Z1->setValue(_BoundaryAnZcone1);
 //
-  TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "Radius 1", 0, QApplication::UnicodeUTF8));
+  TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "Radius 1", 0));
   SpinBox_Cone_V1->setSingleStep(_Rayon/10.);
   SpinBox_Cone_V1->setMaximum(100000.*_DMax);
   SpinBox_Cone_V1->setValue(_BoundaryAnRayon1);
 //
-  TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X centre 2", 0, QApplication::UnicodeUTF8));
+  TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X centre 2", 0));
   SpinBox_Cone_X2->setValue(_BoundaryAnXcone2);
-  TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y centre 2", 0, QApplication::UnicodeUTF8));
+  TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y centre 2", 0));
   SpinBox_Cone_Y2->setValue(_BoundaryAnYcone2);
-  TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z centre 2", 0, QApplication::UnicodeUTF8));
+  TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z centre 2", 0));
   SpinBox_Cone_Z2->setValue(_BoundaryAnZcone2);
 //
   TLCone_V2->setVisible(1);
   SpinBox_Cone_V2->setVisible(1);
-  TLCone_V2->setText(QApplication::translate("CreateBoundaryAn", "Radius 2", 0, QApplication::UnicodeUTF8));
+  TLCone_V2->setText(QApplication::translate("CreateBoundaryAn", "Radius 2", 0));
   SpinBox_Cone_V2->setValue(_BoundaryAnRayon2);
 //
 //   MESSAGE("Fin de SetConeR")
@@ -666,21 +666,21 @@ void MonCreateBoundaryAn::SetConeA()
 //
   _Type=3;
 //
-  TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X axis", 0, QApplication::UnicodeUTF8));
+  TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X axis", 0));
   SpinBox_Cone_X1->setValue(_BoundaryAnXaxisCone);
-  TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y axis", 0, QApplication::UnicodeUTF8));
+  TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y axis", 0));
   SpinBox_Cone_Y1->setValue(_BoundaryAnYaxisCone);
-  TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z axis", 0, QApplication::UnicodeUTF8));
+  TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z axis", 0));
   SpinBox_Cone_Z1->setValue(_BoundaryAnZaxisCone);
 //
-  TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0, QApplication::UnicodeUTF8));
+  TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0));
   SpinBox_Cone_X2->setValue(_BoundaryAnXorigCone);
-  TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0, QApplication::UnicodeUTF8));
+  TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0));
   SpinBox_Cone_Y2->setValue(_BoundaryAnYorigCone);
-  TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0, QApplication::UnicodeUTF8));
+  TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0));
   SpinBox_Cone_Z2->setValue(_BoundaryAnZorigCone);
 //
-  TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "Angle", 0, QApplication::UnicodeUTF8));
+  TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "Angle", 0));
   SpinBox_Cone_V1->setValue(_BoundaryAngle);
   SpinBox_Cone_V1->setSingleStep(1.);
   SpinBox_Cone_V1->setMaximum(90.);
index ea99e6747a982cf9ca18e696f93d2d945e976880..22c201b01cf886a38ef5bd0494f4a743a96a62ea 100644 (file)
@@ -204,7 +204,7 @@ void MonCreateBoundaryDi::SetFiltrage()
     return;
   }
 
-  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL,this,  TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
+  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL,this,  true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }
index 87892c7ae90e7ba31c8551e5af7e6d81eb3248a9..4349b60673b4e8dfef16b5590c134103923492d8 100644 (file)
@@ -118,7 +118,7 @@ void MonCreateCase::InitBoundarys()
 // Pour les frontieres analytiques : la colonne des groupes
   HOMARD::ListGroupType_var _listeGroupesCas = aCase->GetGroups();
   QTableWidgetItem *__colItem = new QTableWidgetItem();
-  __colItem->setText(QApplication::translate("CreateCase", "", 0, QApplication::UnicodeUTF8));
+  __colItem->setText(QApplication::translate("CreateCase", "", 0));
   TWBoundary->setHorizontalHeaderItem(0, __colItem);
   for ( int i = 0; i < _listeGroupesCas->length(); i++ )
   {
@@ -503,7 +503,7 @@ void MonCreateCase::AddBoundaryAn(QString newBoundary)
   nbcol += 1 ;
   TWBoundary->setColumnCount ( nbcol ) ;
   QTableWidgetItem *__colItem = new QTableWidgetItem();
-  __colItem->setText(QApplication::translate("CreateCase", newBoundary.toStdString().c_str(), 0, QApplication::UnicodeUTF8));
+  __colItem->setText(QApplication::translate("CreateCase", newBoundary.toStdString().c_str(), 0));
   TWBoundary->setHorizontalHeaderItem(nbcol-1, __colItem);
 /*  TWBoundary->horizontalHeaderItem(nbcol-1)->setFlags( Qt::ItemIsSelectable|Qt::ItemIsEnabled );*/
 // Chaque case est a cocher
index 7ec1a47a202dcaa10f56d148015ff97a30f3dc5a..8388f811d46bbe95f33ed004009504de7f39f0f8 100644 (file)
@@ -316,7 +316,7 @@ void MonCreateHypothesis::PushZoneNew()
 // ------------------------------------------------------------------------
 {
   MESSAGE("Debut de MonCreateHypothesis::PushZoneNew")
-  MonCreateZone *aDlg = new MonCreateZone(this, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ;
+  MonCreateZone *aDlg = new MonCreateZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ;
   aDlg->show();
 }
 
@@ -334,7 +334,7 @@ void MonCreateHypothesis::PushZoneEdit()
     return;
   }
   QString zoneName = monItem->text().trimmed();
-  MonEditZone *aDlg = new MonEditZone(this, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ;
+  MonEditZone *aDlg = new MonEditZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ;
   aDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -709,7 +709,7 @@ void MonCreateHypothesis::SetFiltrage()
 // ------------------------------------------------------------------------
 {
   if (!CBGroupe->isChecked()) return;
-  MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
+  MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
   aDlg->show();
 }
 
index 0709abcab3094b98821ff0117d8c5c235f054d5a..3c4e4cce8296d922ebdf7e018d48d7be59a90195 100644 (file)
@@ -249,7 +249,7 @@ void MonCreateIteration::PushHypoEdit()
     return;
   }
   QString aFieldFile=LEFieldFile->text().trimmed();
-  MonEditHypothesis *HypoDlg = new MonEditHypothesis(this,TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
+  MonEditHypothesis *HypoDlg = new MonEditHypothesis(this,true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 
@@ -277,7 +277,7 @@ void MonCreateIteration::PushHypoNew()
     _CaseName = aIterParent->GetCaseName();
   }
   QString aFieldFile=LEFieldFile->text().trimmed();
-  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this,TRUE,HOMARD::HOMARD_Gen::_duplicate(myHomardGen),QString(""),_CaseName, aFieldFile) ;
+  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this,true,HOMARD::HOMARD_Gen::_duplicate(myHomardGen),QString(""),_CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 // ------------------------------------------------------------------------
index a7f099c10aad8ced7b701dca3a5242af83b48994..87446b017ac89c2315dbe4a075ffa9c6254d462f 100644 (file)
@@ -199,19 +199,19 @@ void MonCreateZone::InitValZone()
 
   if ( _Orient == 0 ) { pix = resMgr->loadPixmap( "HOMARD", "cylinderpointvector.png" ) ; }
   else                { pix = resMgr->loadPixmap( "HOMARD", "disk.png" ) ;
-                        RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0, QApplication::UnicodeUTF8));
-                        TLXbase->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8));
-                        TLYbase->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8));
-                        TLZbase->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8)); }
+                        RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0));
+                        TLXbase->setText(QApplication::translate("CreateZone", "X centre", 0));
+                        TLYbase->setText(QApplication::translate("CreateZone", "Y centre", 0));
+                        TLZbase->setText(QApplication::translate("CreateZone", "Z centre", 0)); }
   IS=QIcon(pix) ;
   RBCylinder->setIcon(IS) ;
 
   if ( _Orient == 0 ) { pix = resMgr->loadPixmap( "HOMARD", "pipe.png" ) ; }
   else                { pix = resMgr->loadPixmap( "HOMARD", "diskwithhole.png" ) ;
-                        RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0, QApplication::UnicodeUTF8));
-                        TLXbase_p->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8));
-                        TLYbase_p->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8));
-                        TLZbase_p->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8)); }
+                        RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0));
+                        TLXbase_p->setText(QApplication::translate("CreateZone", "X centre", 0));
+                        TLYbase_p->setText(QApplication::translate("CreateZone", "Y centre", 0));
+                        TLZbase_p->setText(QApplication::translate("CreateZone", "Z centre", 0)); }
   IS=QIcon(pix) ;
   RBPipe->setIcon(IS) ;
 
index 395752f3c43306ffa98813605c327edefba47d5c..8ddd7f033c352a566a31d9fec6037b87fa0f0962 100644 (file)
@@ -252,21 +252,21 @@ void MonEditBoundaryAn::SetConeA()
   RBTore->setDisabled(true);
   _Type=3;
 //
-  TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X axis", 0, QApplication::UnicodeUTF8));
+  TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X axis", 0));
   SpinBox_Cone_X1->setValue(_BoundaryAnXaxisCone);
-  TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y axis", 0, QApplication::UnicodeUTF8));
+  TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y axis", 0));
   SpinBox_Cone_Y1->setValue(_BoundaryAnYaxisCone);
-  TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z axis", 0, QApplication::UnicodeUTF8));
+  TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z axis", 0));
   SpinBox_Cone_Z1->setValue(_BoundaryAnZaxisCone);
 //
-  TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0, QApplication::UnicodeUTF8));
+  TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0));
   SpinBox_Cone_X2->setValue(_BoundaryAnXorigCone);
-  TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0, QApplication::UnicodeUTF8));
+  TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y centre", 0));
   SpinBox_Cone_Y2->setValue(_BoundaryAnYorigCone);
-  TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0, QApplication::UnicodeUTF8));
+  TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0));
   SpinBox_Cone_Z2->setValue(_BoundaryAnZorigCone);
 //
-  TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "Angle", 0, QApplication::UnicodeUTF8));
+  TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "Angle", 0));
   SpinBox_Cone_V1->setValue(_BoundaryAngle);
   SpinBox_Cone_V1->setSingleStep(1.);
   SpinBox_Cone_V1->setMaximum(90.);
@@ -291,28 +291,28 @@ void MonEditBoundaryAn::SetConeR()
   RBTore->setDisabled(true);
   _Type=4;
 //
-  TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X centre 1", 0, QApplication::UnicodeUTF8));
+  TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X centre 1", 0));
   SpinBox_Cone_X1->setValue(_BoundaryAnXcone1);
-  TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y centre 1", 0, QApplication::UnicodeUTF8));
+  TLCone_Y1->setText(QApplication::translate("CreateBoundaryAn", "Y centre 1", 0));
   SpinBox_Cone_Y1->setValue(_BoundaryAnYcone1);
-  TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z centre 1", 0, QApplication::UnicodeUTF8));
+  TLCone_Z1->setText(QApplication::translate("CreateBoundaryAn", "Z centre 1", 0));
   SpinBox_Cone_Z1->setValue(_BoundaryAnZcone1);
 //
-  TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "Radius 1", 0, QApplication::UnicodeUTF8));
+  TLCone_V1->setText(QApplication::translate("CreateBoundaryAn", "Radius 1", 0));
   SpinBox_Cone_V1->setSingleStep(_Rayon/10.);
   SpinBox_Cone_V1->setMaximum(100000.*_DMax);
   SpinBox_Cone_V1->setValue(_BoundaryAnRayon1);
 //
-  TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X centre 2", 0, QApplication::UnicodeUTF8));
+  TLCone_X2->setText(QApplication::translate("CreateBoundaryAn", "X centre 2", 0));
   SpinBox_Cone_X2->setValue(_BoundaryAnXcone2);
-  TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y centre 2", 0, QApplication::UnicodeUTF8));
+  TLCone_Y2->setText(QApplication::translate("CreateBoundaryAn", "Y centre 2", 0));
   SpinBox_Cone_Y2->setValue(_BoundaryAnYcone2);
-  TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z centre 2", 0, QApplication::UnicodeUTF8));
+  TLCone_Z2->setText(QApplication::translate("CreateBoundaryAn", "Z centre 2", 0));
   SpinBox_Cone_Z2->setValue(_BoundaryAnZcone2);
 //
   TLCone_V2->setVisible(1);
   SpinBox_Cone_V2->setVisible(1);
-  TLCone_V2->setText(QApplication::translate("CreateBoundaryAn", "Radius 2", 0, QApplication::UnicodeUTF8));
+  TLCone_V2->setText(QApplication::translate("CreateBoundaryAn", "Radius 2", 0));
   SpinBox_Cone_V2->setValue(_BoundaryAnRayon2);
 //
   adjustSize();
index 6a91808d2f1d061ccb0b6662392e377145d9d076..ab29763502e071184925985aaa7a4d7803d2c222 100644 (file)
@@ -98,7 +98,7 @@ void MonEditBoundaryDi::SetFiltrage()
   HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
   HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
 
-  MonEditListGroup *aDlg = new MonEditListGroup(NULL,this,  TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
+  MonEditListGroup *aDlg = new MonEditListGroup(NULL,this,  true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }
index 8824d61f5a67b195f535ce81e90ffb2329533705..84e0c920228749fe98aa1514541e54c5da2193f0 100644 (file)
@@ -149,7 +149,7 @@ void MonEditCase::InitValEdit()
       { for ( int j = 0; j < nbcol; j++ ) TWBoundary->item( i, j )->setFlags( Qt::ItemIsSelectable ); }
 //    on met un nom blanc au coin
       QTableWidgetItem *__colItem = new QTableWidgetItem();
-      __colItem->setText(QApplication::translate("CreateCase", "", 0, QApplication::UnicodeUTF8));
+      __colItem->setText(QApplication::translate("CreateCase", "", 0));
       TWBoundary->setHorizontalHeaderItem(0, __colItem);
 //    on cache les boutons inutiles
       PBBoundaryAnNew->setVisible(0);
@@ -226,8 +226,8 @@ void MonEditCase::InitValEdit()
 // L'etat
   int etat = aCase->GetState();
   MESSAGE("etat "<<etat);
-  if ( etat == 0 ) { Comment->setText(QApplication::translate("CreateCase", "HOM_CASE_EDIT_STATE_0", 0, QApplication::UnicodeUTF8)); }
-  else             { Comment->setText(QApplication::translate("CreateCase", "HOM_CASE_EDIT_STATE", 0, QApplication::UnicodeUTF8)); }
+  if ( etat == 0 ) { Comment->setText(QApplication::translate("CreateCase", "HOM_CASE_EDIT_STATE_0", 0)); }
+  else             { Comment->setText(QApplication::translate("CreateCase", "HOM_CASE_EDIT_STATE", 0)); }
 
   Comment->setVisible(1);
 //
index 08bc91c1ef4ad5350ddf1681181cc18cd7392ec4..e018777456dbdc7bc5978aed7f5144358cf44c36 100644 (file)
@@ -450,7 +450,7 @@ void MonEditHypothesis::SetFiltrage()
 {
   if (CBGroupe->isChecked())
   {
-    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, TRUE, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
+    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
     aDlg->show();
   }
 }
index a9e526992627e485004bfcdd73f80e3d7a7f5d0f..4ee8b60538bb51ce67cd907ae4b877204ac34bc0 100644 (file)
@@ -190,8 +190,8 @@ void MonEditZone::SetBox()
   RBPipe->setDisabled(true);
   if ( _Type == 2 ) { RBSphere->setDisabled(true); }
   else                  { RBSphere->setVisible(0);
-                          RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0, QApplication::UnicodeUTF8));
-                          RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0, QApplication::UnicodeUTF8));
+                          RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0));
+                          RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0));
                           SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr() ;
                           QPixmap pix = resMgr->loadPixmap( "HOMARD", "boxdxy.png" ) ;
                           QIcon IS=QIcon(pix) ;
@@ -268,11 +268,11 @@ void MonEditZone::SetCylinder()
   RBPipe->setDisabled(true);
   if ( _Type == 5 ) { RBSphere->setDisabled(true); }
   else                  { RBSphere->setVisible(0);
-                          RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0, QApplication::UnicodeUTF8));
-                          RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0, QApplication::UnicodeUTF8));
-                          TLXbase->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8));
-                          TLYbase->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8));
-                          TLZbase->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8));
+                          RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0));
+                          RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0));
+                          TLXbase->setText(QApplication::translate("CreateZone", "X centre", 0));
+                          TLYbase->setText(QApplication::translate("CreateZone", "Y centre", 0));
+                          TLZbase->setText(QApplication::translate("CreateZone", "Z centre", 0));
                           SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr() ;
                           QPixmap pix = resMgr->loadPixmap( "HOMARD", "disk.png" ) ;
                           QIcon IS=QIcon(pix) ;
@@ -327,11 +327,11 @@ void MonEditZone::SetPipe()
   RBCylinder->setDisabled(true);
   if ( _Type == 7 ) { RBSphere->setDisabled(true); }
   else                  { RBSphere->setVisible(0);
-                          RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0, QApplication::UnicodeUTF8));
-                          RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0, QApplication::UnicodeUTF8));
-                          TLXbase_p->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8));
-                          TLYbase_p->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8));
-                          TLZbase_p->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8));
+                          RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0));
+                          RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0));
+                          TLXbase_p->setText(QApplication::translate("CreateZone", "X centre", 0));
+                          TLYbase_p->setText(QApplication::translate("CreateZone", "Y centre", 0));
+                          TLZbase_p->setText(QApplication::translate("CreateZone", "Z centre", 0));
                           SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr() ;
                           QPixmap pix = resMgr->loadPixmap( "HOMARD", "diskwithhole.png" ) ;
                           QIcon IS=QIcon(pix) ;
index ee87c56f0e22ccaef6e016fe77a6bfa2f73cc1bd..360cf3924e25308e385eb8ae15105d95202095bd 100644 (file)
 #ifndef PURSUEITERATION_H
 #define PURSUEITERATION_H
 
-#include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QGridLayout>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QSpinBox>
+#include <QVariant>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSpacerItem>
+#include <QSpinBox>
 
 QT_BEGIN_NAMESPACE
 
@@ -229,22 +229,22 @@ public:
 
     void retranslateUi(QDialog *PursueIteration)
     {
-        PursueIteration->setWindowTitle(QApplication::translate("PursueIteration", "Pursue an iteration", 0, QApplication::UnicodeUTF8));
-        Name->setText(QApplication::translate("PursueIteration", "Name", 0, QApplication::UnicodeUTF8));
-        Directory->setText(QApplication::translate("PursueIteration", "Directory", 0, QApplication::UnicodeUTF8));
+        PursueIteration->setWindowTitle(QApplication::translate("PursueIteration", "Pursue an iteration", 0));
+        Name->setText(QApplication::translate("PursueIteration", "Name", 0));
+        Directory->setText(QApplication::translate("PursueIteration", "Directory", 0));
         PushDir->setText(QString());
-        RBIteration->setText(QApplication::translate("PursueIteration", "From an iteration", 0, QApplication::UnicodeUTF8));
-        RBCase->setText(QApplication::translate("PursueIteration", "From a case", 0, QApplication::UnicodeUTF8));
-        DirectoryStart->setText(QApplication::translate("PursueIteration", "Directory", 0, QApplication::UnicodeUTF8));
+        RBIteration->setText(QApplication::translate("PursueIteration", "From an iteration", 0));
+        RBCase->setText(QApplication::translate("PursueIteration", "From a case", 0));
+        DirectoryStart->setText(QApplication::translate("PursueIteration", "Directory", 0));
         PushDirStart->setText(QString());
-        GBIterationintoCase->setTitle(QApplication::translate("PursueIteration", "Iteration into the case", 0, QApplication::UnicodeUTF8));
-        RBCaseLastIteration->setText(QApplication::translate("PursueIteration", "Last iteration", 0, QApplication::UnicodeUTF8));
-        RBCaseNIteration->setText(QApplication::translate("PursueIteration", "Iteration number", 0, QApplication::UnicodeUTF8));
+        GBIterationintoCase->setTitle(QApplication::translate("PursueIteration", "Iteration into the case"));
+        RBCaseLastIteration->setText(QApplication::translate("PursueIteration", "Last iteration", 0));
+        RBCaseNIteration->setText(QApplication::translate("PursueIteration", "Iteration number", 0));
         GroupButtons->setTitle(QString());
-        buttonHelp->setText(QApplication::translate("PursueIteration", "Help", 0, QApplication::UnicodeUTF8));
-        buttonApply->setText(QApplication::translate("PursueIteration", "Apply", 0, QApplication::UnicodeUTF8));
-        buttonOk->setText(QApplication::translate("PursueIteration", "OK", 0, QApplication::UnicodeUTF8));
-        buttonCancel->setText(QApplication::translate("PursueIteration", "Cancel", 0, QApplication::UnicodeUTF8));
+        buttonHelp->setText(QApplication::translate("PursueIteration", "Help", 0));
+        buttonApply->setText(QApplication::translate("PursueIteration", "Apply", 0));
+        buttonOk->setText(QApplication::translate("PursueIteration", "OK", 0));
+        buttonCancel->setText(QApplication::translate("PursueIteration", "Cancel", 0));
     } // retranslateUi
 
 };