From: Renaud Barate Date: Fri, 8 Mar 2013 17:00:12 +0000 (+0000) Subject: Merge from V6_main X-Git-Tag: mergefrom_V6_main_08mar13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a77e43e3f968bf0d766558b46faf57b66b044eba;p=modules%2Feficas.git Merge from V6_main --- diff --git a/adm_local/unix/config_files/check_msg2qm.m4 b/adm_local/unix/config_files/check_msg2qm.m4 deleted file mode 100755 index 30e63765..00000000 --- a/adm_local/unix/config_files/check_msg2qm.m4 +++ /dev/null @@ -1,59 +0,0 @@ -# Check availability of Qt's msg2qm tool binary distribution -# -# Author : Jerome Roy (CEA, 2003) -# - -AC_DEFUN([CHECK_MSG2QM],[ -AC_CHECKING(for msg2qm) - -msg2qm_ok=no - -AC_ARG_WITH(msg2qm, - [ --with-msg2qm=root_directory_path_of_MSG2QM_installation], - MSG2QM_DIR="$withval",MSG2QM_DIR="") - -if test "x$MSG2QM_DIR" == "x" ; then - # no --with-MSG2QM-dir option used - if test "x$MSG2QM_ROOT" != "x" ; then - # MSG2QM_ROOT environment variable defined - MSG2QM_DIR=$MSG2QM_ROOT - else - # search MSG2QM binaries in PATH variable - AC_PATH_PROG(TEMP, msg2qm) - if test "x$TEMP" != "x" ; then - MSG2QM_DIR=`dirname $TEMP` - fi - fi -fi - -# look for msg2qm in ${MSG2QM_DIR} directory -if test -f ${MSG2QM_DIR}/msg2qm ; then - msg2qm_ok=yes - MSG2QM="${MSG2QM_DIR}/msg2qm" - AC_MSG_RESULT(Using MSG2QM executable in ${MSG2QM_DIR}) -else - # if not found, look for msg2qm in ${MSG2QM_DIR}/bin directory - if test -f ${MSG2QM_DIR}/bin/msg2qm ; then - msg2qm_ok=yes - MSG2QM="${MSG2QM_DIR}/bin/msg2qm" - AC_MSG_RESULT(Using MSG2QM executable in ${MSG2QM_DIR}/bin) - fi -fi - -if test "$msg2qm_ok" == "no"; then - # At last, let's have a look in SALOME (until V2.2.X) - SALOME_MSG2QM=${KERNEL_ROOT_DIR}/bin/salome/msg2qm - if test -f $SALOME_MSG2QM ; then - msg2qm_ok=yes - MSG2QM=${SALOME_MSG2QM} - AC_MSG_RESULT(Using MSG2QM executable provided with SALOME KERNEL) - else - AC_MSG_WARN("Cannot find MSG2QM executable in SALOME") - fi -fi - -AC_SUBST(MSG2QM) -AC_MSG_RESULT(for MSG2QM: $msg2qm_ok) - -])dnl - diff --git a/adm_local/unix/config_files/check_pal.m4 b/adm_local/unix/config_files/check_pal.m4 deleted file mode 100644 index 1a4c55c6..00000000 --- a/adm_local/unix/config_files/check_pal.m4 +++ /dev/null @@ -1,50 +0,0 @@ -# Check availability of Salome's PAL binary distribution -# -# Author : Guillaume Boulant (CSSI - 03/08/2005) -# - -AC_DEFUN([CHECK_PAL],[ - -AC_CHECKING(for Pal) - -pal_ok=no - -AC_ARG_WITH(pal, - [ --with-pal=DIR root directory path of PAL build or installation], - PAL_DIR="$withval",PAL_DIR="") - -if test "x$PAL_DIR" = "x" ; then - -# no --with-pal-dir option used - - if test "x$PAL_ROOT_DIR" != "x" ; then - - # PAL_ROOT_DIR environment variable defined - PAL_DIR=$PAL_ROOT_DIR - - else - AC_MSG_WARN("PAL_ROOT_DIR is not defined") - fi -fi - -if test -f ${PAL_DIR}/bin/salome/testAppli ; then - pal_ok=yes - AC_MSG_RESULT(Using Pal module distribution in ${PAL_DIR}) - - if test "x$PAL_ROOT_DIR" = "x" ; then - PAL_ROOT_DIR=${PAL_DIR} - fi - if test "x$PAL_SITE_DIR" = "x" ; then - PAL_SITE_DIR=${PAL_ROOT_DIR} - fi - AC_SUBST(PAL_ROOT_DIR) - AC_SUBST(PAL_SITE_DIR) - -else - AC_MSG_WARN("Cannot find compiled Pal module distribution") -fi - -AC_MSG_RESULT(for Pal: $pal_ok) - -])dnl - diff --git a/adm_local/unix/config_files/check_visu.m4 b/adm_local/unix/config_files/check_visu.m4 deleted file mode 100644 index 9aa8803e..00000000 --- a/adm_local/unix/config_files/check_visu.m4 +++ /dev/null @@ -1,58 +0,0 @@ -# Check availability of Salome's VISU binary distribution -# -# Author : Jerome Roy (CEA, 2003) -# - -AC_DEFUN([CHECK_VISU],[ - -AC_CHECKING(for Visu) - -Visu_ok=no - -AC_ARG_WITH(visu, - [ --with-visu=DIR root directory path of VISU build or installation], - VISU_DIR="$withval",VISU_DIR="") - -if test "x$VISU_DIR" = "x" ; then - -# no --with-visu-dir option used - - if test "x$VISU_ROOT_DIR" != "x" ; then - - # VISU_ROOT_DIR environment variable defined - VISU_DIR=$VISU_ROOT_DIR - - else - - # search Visu binaries in PATH variable - AC_PATH_PROG(TEMP, runSalome) - if test "x$TEMP" != "x" ; then - VISU_BIN_DIR=`dirname $TEMP` - VISU_DIR=`dirname $VISU_BIN_DIR` - fi - - fi -# -fi - -if test -f ${VISU_DIR}/bin/salome/visu.py ; then - Visu_ok=yes - AC_MSG_RESULT(Using Visu module distribution in ${VISU_DIR}) - - if test "x$VISU_ROOT_DIR" = "x" ; then - VISU_ROOT_DIR=${VISU_DIR} - fi - if test "x$VISU_SITE_DIR" = "x" ; then - VISU_SITE_DIR=${VISU_ROOT_DIR} - fi - AC_SUBST(VISU_ROOT_DIR) - AC_SUBST(VISU_SITE_DIR) - -else - AC_MSG_WARN("Cannot find compiled Visu module distribution") -fi - -AC_MSG_RESULT(for Visu: $Visu_ok) - -])dnl - diff --git a/doc/conf.py b/doc/conf.py index 0b233e4d..f78ca209 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -42,9 +42,9 @@ copyright = '2011, Pascale Noyret' # other places throughout the built documents. # # The short X.Y version. -version = '6.4' +version = '6.6' # The full version, including alpha/beta/rc tags. -release = '6.4.0' +release = '6.6.0' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/doc/eficas_principles.rst b/doc/eficas_principles.rst index 470c5f0f..b7871b04 100644 --- a/doc/eficas_principles.rst +++ b/doc/eficas_principles.rst @@ -113,16 +113,16 @@ a parameter ("mot-clef simple") should have : :align: center -- a File parameter should be +- a File parameter should be : -an existing file (type='Fichier'), + - an existing file (type='Fichier'), - a directory (type='Repertoire'), - an existing file with specific suffix (type='Fichier','JDC Files (*.comm);;All Files (*)') The contents of the directory are filtered before being shown in the dialog, using a semicolon-separated list of filters specified. - - a non-allready existant (type=('Fichier',"",'Sauvegarde') + - a non-allready existant (type=('Fichier',"",'Sauvegarde'), - - a simple string (type='FichierNoAbs') + - a simple string (type='FichierNoAbs'). This is the way the catalog should look like : diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index 758b704e..4e63fead 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -5,7 +5,7 @@ - +
diff --git a/src/EFICASGUI/SelectMainShapeDiag_ui.ui b/src/EFICASGUI/SelectMainShapeDiag_ui.ui deleted file mode 100644 index add435ae..00000000 --- a/src/EFICASGUI/SelectMainShapeDiag_ui.ui +++ /dev/null @@ -1,138 +0,0 @@ - -SelectMainShapeDiag - - - SelectMainShapeDiag - - - - 0 - 0 - 373 - 260 - - - - SALOME - Main Shape Selection - - - true - - - - unnamed - - - - textLabel2 - - - Select the main shape you want to work on - - - - - - New Item - - - - lbMainShapes - - - - - Layout1 - - - - unnamed - - - 0 - - - 6 - - - - buttonHelp - - - &Help - - - F1 - - - true - - - - - Horizontal Spacing2 - - - Horizontal - - - Expanding - - - - 20 - 20 - - - - - - buttonOk - - - &OK - - - - - - true - - - true - - - - - buttonCancel - - - &Cancel - - - - - - true - - - - - - - - - buttonOk - clicked() - SelectMainShapeDiag - accept() - - - buttonCancel - clicked() - SelectMainShapeDiag - reject() - - - - diff --git a/src/EFICASGUI/SelectMeshDiag_ui.ui b/src/EFICASGUI/SelectMeshDiag_ui.ui deleted file mode 100644 index d50d57be..00000000 --- a/src/EFICASGUI/SelectMeshDiag_ui.ui +++ /dev/null @@ -1,146 +0,0 @@ - -SelectMeshDiag - - - SelectMeshDiag - - - - 0 - 0 - 400 - 392 - - - - SALOME - Mesh Selection - - - true - - - - unnamed - - - - textLabel2 - - - Select the mesh you want to work on - - - - - Layout1 - - - - unnamed - - - 0 - - - 6 - - - - buttonHelp - - - &Help - - - F1 - - - true - - - - - Horizontal Spacing2 - - - Horizontal - - - Expanding - - - - 20 - 20 - - - - - - buttonOk - - - &OK - - - - - - true - - - true - - - - - buttonCancel - - - &Cancel - - - - - - true - - - - - - - cbAgain - - - Don't ask again - - - - - - New Item - - - - lbMeshes - - - - - - - buttonOk - clicked() - SelectMeshDiag - accept() - - - buttonCancel - clicked() - SelectMeshDiag - reject() - - - - diff --git a/src/EFICASGUI/eficasSalome.py b/src/EFICASGUI/eficasSalome.py index 9b19ba74..b6953b6e 100644 --- a/src/EFICASGUI/eficasSalome.py +++ b/src/EFICASGUI/eficasSalome.py @@ -96,6 +96,10 @@ class MyEficas( qtEficas.Appli ): def closeEvent(self,event): + res=self.fileExit() + if res==2 : + event.ignore() + return if hasattr(self,'readercata') : del self.readercata global appli @@ -471,15 +475,30 @@ class MyEficas( qtEficas.Appli ): moduleEntry = self.editor.findOrCreateComponent(self.module, self.componentName) itemName = re.split("/",jdcPath)[-1] + if folderName.has_key(self.code) : + monFolderName=folderName[ self.code ] + else : + monFolderName=str(self.code)+"Files" + + if folderType.has_key(self.code) : + monFolderType=fileType[ self.code ] + else : + monFolderType=str(self.code)+"_FILE_FOLDER" + + if fileType.has_key(self.code) : + monFileType=fileType[ self.code ] + else : + monFileType="FICHIER_EFICAS_"+str(self.code) + fatherEntry = self.editor.findOrCreateItem( moduleEntry, - name = folderName[self.code], + name = monFolderName, #icon = "ICON_COMM_FOLDER", - fileType = folderType[self.code]) + fileType = monFolderType) commEntry = self.editor.findOrCreateItem( fatherEntry , name = itemName, - fileType = fileType[ self.code ], + fileType = monFileType, fileName = jdcPath, #icon = "ICON_COMM_FILE", comment = str( jdcPath ))