ajout CARMEL3D

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index fe9f49c8718ca5e0d1ff9ef611305c0370f6517c..5bce823e96fa50194f1a03144758c2a6da6ec0a4 100644 (file)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -23,7 +23,7 @@ class Appli(Ui_Eficas,QMainWindow):
         Ui_Eficas.__init__(self)
         self.setupUi(self)
 
-        self.VERSION_EFICAS="Eficas QT4 V6.3.1"
+        self.VERSION_EFICAS="Eficas QT4 V6.4"
         self.salome=salome
         self.ihm="QT"
        self.top = self    #(pour CONFIGURATION)
@@ -79,8 +79,8 @@ class Appli(Ui_Eficas,QMainWindow):
            import sys
            reload(sys)
            sys.setdefaultencoding(prefsCode.encoding)
-        if code in Appli.__dict__.keys():
-          listeTexte=apply(Appli.__dict__[code],(self,))
+        if self.code in Appli.__dict__.keys():
+          listeTexte=apply(Appli.__dict__[self.code],(self,))
         self.initPatrons()
         self.ficRecents={}
 
@@ -105,6 +105,23 @@ class Appli(Ui_Eficas,QMainWindow):
 
 
 
+    def CARMEL3D(self):
+        if self.salome == 0 : return
+        self.menuMesh = self.menubar.addMenu("menuMesh")
+        self.menuMesh.setObjectName("Mesh")
+        self.actionChercheGrpMesh = QAction(self)
+        self.actionChercheGrpMesh.setText("Acquiert Groupe Maille")
+        self.menuMesh.addAction(self.actionChercheGrpMesh)
+        self.connect(self.actionChercheGrpMesh,SIGNAL("activated()"),self.ChercheGrpMesh)
+
+    def ChercheGrpMesh(self):
+        Msg,listeGroup=self.ChercheGrpMeshInSalome()
+        if Msg == None :
+           self.viewmanager.handleAjoutGroup(listeGroup)
+           #self.viewmanager.handleAjoutGroup(('Grp1','Grp2'))
+        else :
+           print "il faut gerer les erreurs"
+
     def MAP(self): 
         self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8))
         self.menuExecution.setObjectName("menuExecution")
@@ -140,6 +157,12 @@ class Appli(Ui_Eficas,QMainWindow):
         self.actionExecutionYACS.setText(QApplication.translate("Eficas", "Execution YACS", None, QApplication.UnicodeUTF8))
         self.connect(self.actionExecutionYACS,SIGNAL("activated()"),self.runYACS)
 
+    def OPENTURNS_STUDY(self):
+        self.menuOptions.setDisabled(True)
+    
+    def OPENTURNS_WRAPPER(self):
+        self.menuOptions.setDisabled(True)
+    
     def ajoutIcones(self) :
         # Pour pallier les soucis de repertoire d icone
         icon = QIcon(self.RepIcon+"/New24.png")
@@ -229,7 +252,7 @@ class Appli(Ui_Eficas,QMainWindow):
     def initRecents(self):
        try :
            rep=self.CONFIGURATION.rep_user
-           monFichier=rep+"/.listefichiers_"+self.code
+           monFichier=rep+"/listefichiers_"+self.code
            index=0
            f=open(monFichier)
            while ( index < 9) :
@@ -257,7 +280,7 @@ class Appli(Ui_Eficas,QMainWindow):
 
     def sauveRecents(self) :
        rep=self.CONFIGURATION.rep_user
-       monFichier=rep+"/.listefichiers_"+self.code
+       monFichier=rep+"/listefichiers_"+self.code
        try :
             f=open(monFichier,'w')
             if len(self.recent) == 0 : return
@@ -421,9 +444,9 @@ class Appli(Ui_Eficas,QMainWindow):
         return texte
         
     def cleanPath(self):
-        for pathCode in ('Aster','Cuve2dg','Openturns_Study','Openturns_Wrapper','MAP'):
+        for pathCode in ('Aster','Carmel3D','Cuve2dg','Openturns_Study','Openturns_Wrapper','MAP'):
             try:
-              aEnlever=os.path.abspath(os.path.join(os.getcwd(),'..',pathCode))
+              aEnlever=os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__),'..',pathCode)))
               sys.path.remove(aEnlever)
             except :
               pass

diff --git a/InterfaceQT4/viewManager.py b/InterfaceQT4/viewManager.py
index 23aec4682eefe2758f2d2f6a10e428c042978c26..70b50f533cf9dec1e2a8c9ea2c3e43bc9a0f3d5a 100644 (file)
--- a/InterfaceQT4/viewManager.py
+++ b/InterfaceQT4/viewManager.py
@@ -309,3 +309,8 @@ class MyTabview:
                     self.myQtab.setTabText(index,fileName)
                 return ok
         return res
+
+   def handleAjoutGroup(self,listeGroup):
+       index=self.myQtab.currentIndex()
+       editor=self.dict_editors[index]
+       editor.handleAjoutGroup(listeGroup)

diff --git a/UiQT4/OptionsPdf.ui b/UiQT4/OptionsPdf.ui
index 1884d98cef64ad7725fe11623092976dba7a6fb1..4128a1da6aea8d7b3ced9dc64b5f058652b0a727 100644 (file)
--- a/UiQT4/OptionsPdf.ui
+++ b/UiQT4/OptionsPdf.ui
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <class>desPdf</class>
- <widget class="QDialog" name="desPdf">
-  <property name="geometry">
+ <widget class="QDialog" name="desPdf" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
@@ -10,28 +9,28 @@
     <height>142</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>desPdf</string>
+  <property name="windowTitle" >
+   <string>Lire les Pdf</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout_2" >
      <item>
-      <widget class="QLabel" name="textLabel1_2">
-       <property name="text">
+      <widget class="QLabel" name="textLabel1_2" >
+       <property name="text" >
         <string>Lecteur Pdf :</string>
        </property>
-       <property name="wordWrap">
+       <property name="wordWrap" >
         <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
+      <spacer name="horizontalSpacer_2" >
+       <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>40</width>
          <height>20</height>
@@ -41,27 +40,27 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <widget class="QLineEdit" name="LERepPdf">
-     <property name="minimumSize">
+   <item row="1" column="0" >
+    <widget class="QLineEdit" name="LERepPdf" >
+     <property name="minimumSize" >
       <size>
        <width>0</width>
        <height>30</height>
       </size>
      </property>
-     <property name="text">
+     <property name="text" >
       <string>acroread</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
+   <item row="2" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
      <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
+      <spacer name="horizontalSpacer" >
+       <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>40</width>
          <height>20</height>
@@ -70,15 +69,15 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="Bok">
-       <property name="text">
+      <widget class="QPushButton" name="Bok" >
+       <property name="text" >
         <string>Ok</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="BCancel">
-       <property name="text">
+      <widget class="QPushButton" name="BCancel" >
+       <property name="text" >
         <string>Cancel</string>
        </property>
       </widget>
@@ -87,7 +86,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
+ <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>LERepPdf</tabstop>

diff --git a/UiQT4/desChoixCode.ui b/UiQT4/desChoixCode.ui
index 607b09a52453594841f537cff37d9bf883456e74..2006fc34626bdd0dfac63eae33ee8178f92d1566 100644 (file)
--- a/UiQT4/desChoixCode.ui
+++ b/UiQT4/desChoixCode.ui
@@ -124,7 +124,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="rB_MAP">
+         <widget class="QRadioButton" name="rB_Carmel3D">
           <property name="minimumSize">
            <size>
             <width>0</width>