From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Wed, 2 Apr 2008 09:57:44 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V1_14a3~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cec0df0d86101cdede57352c07fae75de373a964;p=tools%2Feficas.git

*** empty log message ***
---

diff --git a/InterfaceQT/composimp.py b/InterfaceQT/composimp.py
index 8a0c4a96..22bc5b77 100644
--- a/InterfaceQT/composimp.py
+++ b/InterfaceQT/composimp.py
@@ -324,21 +324,12 @@ class SIMPTreeItem(Objecttreeitem.AtomicObjectTreeItem):
   # Autres ...
   #
   #---------------------------------------------------
-  # SetText         a priori inutilisee --> commentee
   # GetIconName
   # GetText
-  # getval     a  priori inutilisee --> commentee
   # set_valeur_co
   # get_sd_avant_du_bon_type
-  # verif        a  priori inutilisee --> commentee
   # delete_valeur_co
 
-  #def SetText(self, text):
-  #  try:
-  #    value = eval(text)
-  #    self.object.setval(value)
-  #  except:
-  #    pass
 
   def GetIconName(self):
     if self.isvalid():
@@ -358,8 +349,6 @@ class SIMPTreeItem(Objecttreeitem.AtomicObjectTreeItem):
     if text == None : text=""
     return text
     
-  #def getval(self):
-  #    return self.object.getval()
 
   def set_valeur_co(self,nom_co):
       """
@@ -383,8 +372,6 @@ class SIMPTreeItem(Objecttreeitem.AtomicObjectTreeItem):
 
 
 
-  #def verif(self):
-  #    pass
 
   def delete_valeur_co(self,valeur=None):
       """
diff --git a/InterfaceQT/monPlusieursBasePanel.py b/InterfaceQT/monPlusieursBasePanel.py
index 9f038dc8..1c382a6c 100644
--- a/InterfaceQT/monPlusieursBasePanel.py
+++ b/InterfaceQT/monPlusieursBasePanel.py
@@ -53,6 +53,7 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
         type = mc.type[0]
         if not('grma' in repr(type)) or not(self.editor.salome) :
            self.BSalome.close()
+           self.BView2D.close
 
   def ViewDoc(self):
         QTPanel.ViewDoc(self)
@@ -149,8 +150,8 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
             if "GROUP_NO" in e: kwType = "GROUP_NO"
             if "GROUP_MA" in e: kwType = "GROUP_MA"
 
-        print "BkwType",kwType
-        print "editor", self.editor
+        #print "BkwType",kwType
+        #print "editor", self.editor
         selection, commentaire = self.editor.parent.appliEficas.selectGroupFromSalome(kwType,editor=self.editor)
         if commentaire !="" :
             self.Commentaire.setText(QString(commentaire))
@@ -161,3 +162,14 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
         monTexte= monTexte[0:-1]
         self.LEValeur.setText(QString(monTexte))
 
+  def BView2DPressed(self):
+        valeur=self.LEValeur.text()
+        if valeur == QString("") :
+           valeur=self.LBValeurs.currentText()
+        if valeur == QString("") : return
+        valeur = str(valeur)
+        if valeur :
+           ok, msgError = self.editor.parent.appliEficas.displayShape(valeur)
+           if not ok:
+              self.editor.parent.appli.affiche_infos(msgError)
+
diff --git a/InterfaceQT/monUniqueASSDPanel.py b/InterfaceQT/monUniqueASSDPanel.py
index c24f9062..a2280be3 100644
--- a/InterfaceQT/monUniqueASSDPanel.py
+++ b/InterfaceQT/monUniqueASSDPanel.py
@@ -40,6 +40,7 @@ class MonUniqueASSDPanel(DUnASSD,QTPanel,SaisieValeur):
   discrètes
   """
   def __init__(self,node, parent = None,name = None,fl = 0):
+        self.editor=parent
         QTPanel.__init__(self,node,parent)
         DUnASSD.__init__(self,parent,name,fl)
         self.politique=PolitiqueUnique(node,parent)
diff --git a/InterfaceQT/monUniqueBasePanel.py b/InterfaceQT/monUniqueBasePanel.py
index 1092d820..91bc8c08 100644
--- a/InterfaceQT/monUniqueBasePanel.py
+++ b/InterfaceQT/monUniqueBasePanel.py
@@ -57,6 +57,7 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
         #if not('grma' in repr(type)):
         if not('grma' in repr(type)) or not(self.editor.salome) :
            self.BSalome.close()
+           self.BView2D.close()
 
   def InitLineEditVal(self):
         valeur=self.node.item.get_valeur()
@@ -112,3 +113,12 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
         monTexte= monTexte[0:-1]
         self.LEValeur.setText(QString(monTexte))
 
+  def BView2DPressed(self):
+        valeur=self.LEValeur.text()
+        if valeur == QString("") : return
+        valeur = str(valeur)
+        if valeur :
+           ok, msgError = self.editor.parent.appliEficas.displayShape(valeur)
+           if not ok:
+              self.editor.parent.appli.affiche_infos(msgError)
+