From 78a97424af2abed074ebec479cbade8b14cda37c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20Ribes?= <andre.ribes@edf.fr>
Date: Thu, 24 Feb 2011 16:33:00 +0100
Subject: [PATCH] =?utf8?q?Ajout=20des=20icones=20etats=20dans=20l'arbre=20?=
 =?utf8?q?d'=C3=A9tude=20(+=20gestion=20activation)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 doc/resources/ADAO_small_rouge.png               | Bin 0 -> 645 bytes
 doc/resources/ADAO_small_vert.png                | Bin 0 -> 896 bytes
 src/daSalome/daGUI/daGuiImpl/adaoCase.py         |   5 +++++
 src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py   |   1 +
 src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py |  12 ++++++++++++
 src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py  |  14 ++++++++++++--
 6 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 doc/resources/ADAO_small_rouge.png
 create mode 100644 doc/resources/ADAO_small_vert.png

diff --git a/doc/resources/ADAO_small_rouge.png b/doc/resources/ADAO_small_rouge.png
new file mode 100644
index 0000000000000000000000000000000000000000..b600e06a5ff9a35a68db887fca80ae382ecaaa1f
GIT binary patch
literal 645
zcmV;00($+4P)<h;3K|Lk000e1NJLTq000mG000vR1^@s6nP-j900001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00I9100I92Ixr!b00007bV*G`2ipP|
z2_GU%s~)KU00IR`L_t(I%Z<|8YtL~Q2k_VTxBYBIyK#Y>o3qUpyC5QlxNy2~Ar~%)
zXzd?xxOSr?IbFICDG8IDGLg2B#*LDVmcs>Wk+jp};`dp8`?b|R_4M?4-iPn=Jl{_i
z!~>kc4D7%bW1n}piq6Cp#3^DPkr9Z^#4jR>qKDX%IC-Lys3Hs!JBiE0M`Bwt*<K{>
zCYC1ANurmiB^n5Cli*w;4-gwt?MdpSj+jQACZ-cpQYVLr@|S706)BhD1RmodZlt-}
z@EdFJJw*dF5jmoh_?qHf>Y$k@Ck~YC<3hqai1Jq$!rYQ==P?-rI9P(UV<MIyyH0#4
zA!JyOsj2ndC3q|Pu@PAm+8On9;Zr5+{*D5!;>ve&!}tDCIM1iiRy)dUN9no9gx(^9
zmMY%lM{@sEGiwXqh6@XD2Zv~DW#x||gD*>XF|Xun^VzkJTl29WEm&NDx?dKaeh&Ij
zQIDGc+P7uYY^LHT12Y*qj*24lPlc3&M^!ZLrFJ_VX^i$+H2lCOwzhKb=6`Jjxz9xg
zU5l7Ao7HQ1QC;}S{TcZt^fGsl&fCfOIp>eCx;q&Rpge6l%NVMo?=Jblk?UCanoB#F
zu#Y1xEbL3b{Ym2eV-X)kG>fN`#Q9^QBRBH-jup->7x6^IvO-~qXq;Ne<1)BbFQRf}
f@mV%LaS;CivPK(m^@j@B00000NkvXXu0mjfDV8F+

literal 0
HcmV?d00001

diff --git a/doc/resources/ADAO_small_vert.png b/doc/resources/ADAO_small_vert.png
new file mode 100644
index 0000000000000000000000000000000000000000..765f713c4b3f1707ecb4a84965641e9e47bb1f15
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000mG000vR1^@s6nP-j900001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00I9100I92Ixr!b00007bV*G`2ipP|
z2^S;tb)+`{00RI?L_t(I%Z-xVYZPY`#((eZWU^mw+)c*prkN&g(*)O#SQ?8-#F`R9
zC6Hb;6hx{Zl-`IaRuKFL)JyNAP@%OKMFkOx))3J&rBRe5t(8PKQL>ud%}O>i&YHNH
z%=BV4aTLLGdCqx$@5}QX(L2@aWCyY&&m{51eAIN+5Zw{wU8Rrfq%Nf>Ocki<szC<O
z$8?OOLApQ9<k?B8w^!48x)nJfFAIx$k>O**q%NfpvOstQ>Haj5V>>*(^_0ZH1Um<J
z66=hS9msO?z|Cdxd}f~OUtj0RA5YkDbOSx3Jp}86tctHfG9DOAU!BG(SOh){(Dq{+
zYMV;BFHLSJhgGl`+&f5duE@rt8%dr?a^>?Y7~=-v<}gxzG!H;{Qy2i@5hM;K0LcEC
z<?hM5=;J!=Kee-Z{c5T{t0L48TGq(<fAb)qyt15ynFRopumXT(T1@;rLH#%N%MYkq
zRVL3)k{ikqX^y-EIB>cBvde8D3zV>ev*Zxp9e2%UM`rQ(JcK?DAvb>4i22BLXC+`w
z+Zw#8mrz59NOQzBuIsHs`$|K21afV6?K?An{<uJ>N`9-aZdF;&45JtSLweP;7wxwe
zo!coYh9_J-8JlnUhXeWm^NM!`U|gHRyf^Dwu6{m8#|L>{<Vxmh=p3h?9`18(xD3xH
zu@yixo56SIkqc0Z!M-mS5Pf5G^MDidQ-=<~NXCyp<}aPHU9@Rb=ExVzNWBz48_Uz#
zWMV2_RLf+KokWsW;8}tIr5_ajdd%*2lkRl}g|X6MDI+PQ<`_TFMW$mj=Wi%0-Z(HL
zy#}aErHO0sMavT2+Yj-wh-2BDl3OuR@M%G=PL-k@7?Iiki;CT%l}xoQn+AEV6u*GD
zljqQ4AK%NG%a6=Qb?o}J9DQ?~z@AFHuTnApo@Q6;GnNpXV;%RJ!kqtY2&=^n@NLtu
zwrK?3h*}CioF=q3$T2#&Kmz}kD5rn-6KtyBeM&BilyihmilsmhLJ&RtDME<%0{jm}
W%oDTj0lr!Q0000<MNUMnLSTYl@t9ix

literal 0
HcmV?d00001

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoCase.py b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
index c783894..ca2e2c0 100644
--- a/src/daSalome/daGUI/daGuiImpl/adaoCase.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
@@ -37,6 +37,11 @@ class AdaoCase:
 
     self.eficas_editor = None               # Editor object from Eficas
 
+  def isOk(self):
+    if self.eficas_editor.jdc:
+      return self.eficas_editor.jdc.isvalid()
+    return False
+
   def createYACSFile(self):
     rtn = ""
     if (self.filename == ""):
diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
index 88c0caf..bce5d31 100644
--- a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py
@@ -121,6 +121,7 @@ class AdaoCaseManager(EficasObserver):
 
   def activate(self):
     self.eficas_manager.setEnabled(True)
+    sgPyQt.activateView(self.eficas_viewId)
     self.harmonizeSelectionFromEficas()
 
   def deactivate(self):
diff --git a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py
index 6f1af04..958a1ba 100644
--- a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py
@@ -91,6 +91,18 @@ def modulePixmap():
     """
     return "ADAO_small.png"
 
+def studyItemPixmapOk():
+    """
+    Get the reference pixmap for items of this module.
+    """
+    return "ADAO_small_vert.png"
+
+def studyItemPixmapNOk():
+    """
+    Get the reference pixmap for items of this module.
+    """
+    return "ADAO_small_rouge.png"
+
 __verbose__ = None
 def verbose():
     global __verbose__
diff --git a/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py b/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py
index aa0dc9a..b4d5391 100644
--- a/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py
@@ -66,10 +66,15 @@ def addInStudy(salomeStudyId, adaoCase):
     itemValue = adaoCase.filename
     itemType  = ADAO_ITEM_TYPES.ADAO_CASE
 
+    icon = adaoModuleHelper.studyItemPixmapNOk()
+    if adaoCase.isOk():
+      icon = adaoModuleHelper.studyItemPixmapOk()
+
     salomeStudyItem = studyEditor.createItem(
         adaoRootEntry, itemName,
         comment = itemValue,
-        typeId  = itemType)
+        typeId  = itemType,
+        icon    = icon)
 
     return salomeStudyItem
 
@@ -84,9 +89,14 @@ def updateItem(salomeStudyId, salomeStudyItem, adaoCase):
       itemName  = salomeStudyItem.GetName()
       itemValue = adaoCase.get_filename()
 
+    icon = adaoModuleHelper.studyItemPixmapNOk()
+    if adaoCase.isOk():
+      icon = adaoModuleHelper.studyItemPixmapOk()
+
     studyEditor.setItem(salomeStudyItem,
         name    = itemName,
-        comment = itemValue)
+        comment = itemValue,
+        icon    = icon)
 
 def removeItem(salomeStudyId, item):
     """
-- 
2.39.2