From 048cdbd587d2ca79475901344909574b1dc0bfab Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Mon, 18 Jul 2016 14:22:30 +0200 Subject: [PATCH] 18_07_16 --- InterfaceQT4/compomacro.py | 2 +- InterfaceQT4/monWidgetInactif.py | 2 +- InterfaceQT4/monWidgetOptionnel.py | 9 ++++++++- InterfaceQT4/monWidgetVide.py | 2 -- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/InterfaceQT4/compomacro.py b/InterfaceQT4/compomacro.py index e04a6da5..72de1289 100644 --- a/InterfaceQT4/compomacro.py +++ b/InterfaceQT4/compomacro.py @@ -51,7 +51,7 @@ class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode): if ("AFFE_CARA_ELEM" in self.item.get_genealogie()) and self.editor.salome: self.ViewElt = QAction(tr('View3D'),self.tree) if monEnvQT5: - self.ViewElt.triggered.connect(self.View3D) + self.ViewElt.triggered.connect(self.view3D) else : self.tree.connect(self.ViewElt,SIGNAL("triggered()"),self.view3D) self.ViewElt.setStatusTip(tr("affiche dans Geom les elements de structure")) diff --git a/InterfaceQT4/monWidgetInactif.py b/InterfaceQT4/monWidgetInactif.py index 6ab006ae..1f852e06 100644 --- a/InterfaceQT4/monWidgetInactif.py +++ b/InterfaceQT4/monWidgetInactif.py @@ -79,7 +79,7 @@ class MonWidgetInactif(QWidget,Ui_WidgetInactif): # dans le cas ou l insertion n a pas eu leiu (souci d ordre par exemple) #if self.monOptionnel == None : return self.monOptionnel.parentMC=self - self.monOptionnel.affiche(liste) + self.monOptionnel.afficheOptionnelVide() def afficheCatalogue(self): diff --git a/InterfaceQT4/monWidgetOptionnel.py b/InterfaceQT4/monWidgetOptionnel.py index 929c060d..43dae4dc 100644 --- a/InterfaceQT4/monWidgetOptionnel.py +++ b/InterfaceQT4/monWidgetOptionnel.py @@ -62,10 +62,17 @@ class MonWidgetOptionnel (QWidget,Ui_WidgetOptionnel): #print "je passe dans vireLesAutres" genea =MC.obj.get_genealogie() for k in self.dicoMCWidgetOptionnel.keys(): - if k not in genea : self.dicoMCWidgetOptionnel[k].close() + if k not in genea : + self.dicoMCWidgetOptionnel[k].close() + del self.dicoMCWidgetOptionnel[k] #if k not in genea : print k #print "________" + def afficheOptionnelVide(self): + self.GeneaLabel.setText("") + for k in self.dicoMCWidgetOptionnel.keys(): + self.dicoMCWidgetOptionnel[k].close() + del self.dicoMCWidgetOptionnel[k] def titre(self,MC): labeltext,fonte,couleur = self.parentCommande.node.item.GetLabelText() diff --git a/InterfaceQT4/monWidgetVide.py b/InterfaceQT4/monWidgetVide.py index e6f34698..9f60328a 100644 --- a/InterfaceQT4/monWidgetVide.py +++ b/InterfaceQT4/monWidgetVide.py @@ -21,8 +21,6 @@ import string,types,os # Modules Eficas -from PyQt4.QtGui import * -from PyQt4.QtCore import * from Extensions.i18n import tr from feuille import Feuille -- 2.39.2