]> SALOME platform Git repositories - modules/eficas.git/commitdiff
Salome HOME
Merge from V6_main mergefrom_V6_main_08mar13
authorRenaud Barate <renaud.barate@edf.fr>
Fri, 8 Mar 2013 17:00:12 +0000 (17:00 +0000)
committerRenaud Barate <renaud.barate@edf.fr>
Fri, 8 Mar 2013 17:00:12 +0000 (17:00 +0000)
adm_local/unix/config_files/check_msg2qm.m4 [deleted file]
adm_local/unix/config_files/check_pal.m4 [deleted file]
adm_local/unix/config_files/check_visu.m4 [deleted file]
doc/conf.py
doc/eficas_principles.rst
resources/SalomeApp.xml
src/EFICASGUI/SelectMainShapeDiag_ui.ui [deleted file]
src/EFICASGUI/SelectMeshDiag_ui.ui [deleted file]
src/EFICASGUI/eficasSalome.py

diff --git a/adm_local/unix/config_files/check_msg2qm.m4 b/adm_local/unix/config_files/check_msg2qm.m4
deleted file mode 100755 (executable)
index 30e6376..0000000
+++ /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 (file)
index 1a4c55c..0000000
+++ /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 (file)
index 9aa8803..0000000
+++ /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
index 0b233e4d276bd48774001f80484ee17ec7ddad2a..f78ca209e7711d99a8f3f7808d01a364c52e45c8 100644 (file)
@@ -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:
index 470c5f0fcf944a76e5cd60bdb473fd6c0d3045ef..b7871b044a87d377a0d33129138356b127e8c7d3 100644 (file)
@@ -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 :
 
index 758b704e27f4c1f06f90ee13d191c5625e90451a..4e63fead7e94bfc515955fe15cf512e53e4eb1f9 100644 (file)
@@ -5,7 +5,7 @@
     <parameter name="icon"    value="eficas.png"/>
     <parameter name="library" value="SalomePyQtGUI"/>
     <parameter name="documentation" value="eficas_help"/>
-    <parameter name="version" value="6.5.0"/>
+    <parameter name="version" value="6.6.0"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
diff --git a/src/EFICASGUI/SelectMainShapeDiag_ui.ui b/src/EFICASGUI/SelectMainShapeDiag_ui.ui
deleted file mode 100644 (file)
index add435a..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>SelectMainShapeDiag</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>SelectMainShapeDiag</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>373</width>
-            <height>260</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>SALOME - Main Shape Selection</string>
-    </property>
-    <property name="sizeGripEnabled">
-        <bool>true</bool>
-    </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel">
-            <property name="name">
-                <cstring>textLabel2</cstring>
-            </property>
-            <property name="text">
-                <string>Select the main shape you want to work on</string>
-            </property>
-        </widget>
-        <widget class="QListBox">
-            <item>
-                <property name="text">
-                    <string>New Item</string>
-                </property>
-            </item>
-            <property name="name">
-                <cstring>lbMainShapes</cstring>
-            </property>
-        </widget>
-        <widget class="QLayoutWidget">
-            <property name="name">
-                <cstring>Layout1</cstring>
-            </property>
-            <hbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>buttonHelp</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Help</string>
-                    </property>
-                    <property name="accel">
-                        <string>F1</string>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <spacer>
-                    <property name="name">
-                        <cstring>Horizontal Spacing2</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>buttonOk</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;OK</string>
-                    </property>
-                    <property name="accel">
-                        <string></string>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                    <property name="default">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>buttonCancel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Cancel</string>
-                    </property>
-                    <property name="accel">
-                        <string></string>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-    </vbox>
-</widget>
-<connections>
-    <connection>
-        <sender>buttonOk</sender>
-        <signal>clicked()</signal>
-        <receiver>SelectMainShapeDiag</receiver>
-        <slot>accept()</slot>
-    </connection>
-    <connection>
-        <sender>buttonCancel</sender>
-        <signal>clicked()</signal>
-        <receiver>SelectMainShapeDiag</receiver>
-        <slot>reject()</slot>
-    </connection>
-</connections>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
diff --git a/src/EFICASGUI/SelectMeshDiag_ui.ui b/src/EFICASGUI/SelectMeshDiag_ui.ui
deleted file mode 100644 (file)
index d50d57b..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>SelectMeshDiag</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>SelectMeshDiag</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>400</width>
-            <height>392</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>SALOME - Mesh Selection</string>
-    </property>
-    <property name="sizeGripEnabled">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>textLabel2</cstring>
-            </property>
-            <property name="text">
-                <string>Select the mesh you want to work on</string>
-            </property>
-        </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
-            <property name="name">
-                <cstring>Layout1</cstring>
-            </property>
-            <hbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>0</number>
-                </property>
-                <property name="spacing">
-                    <number>6</number>
-                </property>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>buttonHelp</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Help</string>
-                    </property>
-                    <property name="accel">
-                        <string>F1</string>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <spacer>
-                    <property name="name">
-                        <cstring>Horizontal Spacing2</cstring>
-                    </property>
-                    <property name="orientation">
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                        <enum>Expanding</enum>
-                    </property>
-                    <property name="sizeHint">
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>buttonOk</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;OK</string>
-                    </property>
-                    <property name="accel">
-                        <string></string>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                    <property name="default">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton">
-                    <property name="name">
-                        <cstring>buttonCancel</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Cancel</string>
-                    </property>
-                    <property name="accel">
-                        <string></string>
-                    </property>
-                    <property name="autoDefault">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget class="QCheckBox" row="2" column="0">
-            <property name="name">
-                <cstring>cbAgain</cstring>
-            </property>
-            <property name="text">
-                <string>Don't ask again</string>
-            </property>
-        </widget>
-        <widget class="QListBox" row="1" column="0">
-            <item>
-                <property name="text">
-                    <string>New Item</string>
-                </property>
-            </item>
-            <property name="name">
-                <cstring>lbMeshes</cstring>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>buttonOk</sender>
-        <signal>clicked()</signal>
-        <receiver>SelectMeshDiag</receiver>
-        <slot>accept()</slot>
-    </connection>
-    <connection>
-        <sender>buttonCancel</sender>
-        <signal>clicked()</signal>
-        <receiver>SelectMeshDiag</receiver>
-        <slot>reject()</slot>
-    </connection>
-</connections>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
index 9b19ba746dc504f1d1d7412b1415e837a5adf9cc..b6953b6e29bceb444aa8e4b8677f64617dfc1df3 100644 (file)
@@ -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 ))