Merge branch 'master' of http://www.netdig.org/git/iramuteq
authorPierre <ratinaud@univ-tlse2.fr>
Tue, 8 Jan 2013 15:15:26 +0000 (16:15 +0100)
committerPierre <ratinaud@univ-tlse2.fr>
Tue, 8 Jan 2013 15:15:26 +0000 (16:15 +0100)
layout.py
openanalyse.py
tree.py

index aed4de2..6365a90 100644 (file)
--- a/layout.py
+++ b/layout.py
@@ -101,7 +101,6 @@ class GraphPanelAfc(wx.Panel):
         self.panel_1.SetScrollRate(20, 20)
 
     def __do_layout(self):    
-        log.info('do layout')
         self.sizer_1 = wx.BoxSizer(wx.VERTICAL)
         self.sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
         self.sizer_3 = wx.BoxSizer(wx.VERTICAL)
index 1c5a554..8957f2a 100644 (file)
@@ -33,7 +33,6 @@ class OpenAnalyse():
         if self.conf['type'] == 'corpus' :
             corpus = self.opencorpus()
         elif self.conf['corpus'] in self.parent.history.corpus :
-            print 'corpus in history.corpus'
             if self.conf['uuid'] in self.parent.history.analyses :
                 intree  = True
             else :
@@ -43,12 +42,11 @@ class OpenAnalyse():
                corpus.make_lems(True)
             else :
                corpus.make_lems(False)
-            self.doopen(corpus)
             if not intree :
-                self.parent.tree.AddAnalyse(self.conf)
+                self.parent.tree.AddAnalyse(self.conf, bold = True)
             else :
-                print 'passe apr la'
-                print self.parent.tree.GiveFocus(uuid = self.conf['uuid'], bold = True)
+                self.parent.tree.GiveFocus(uuid = self.conf['uuid'], bold = True)
+            self.doopen(corpus)
         else :
             corpus = None
         self.parent.history.addtab(self.conf)
diff --git a/tree.py b/tree.py
index 0d1aa3f..9f8fd17 100644 (file)
--- a/tree.py
+++ b/tree.py
@@ -248,17 +248,15 @@ class LeftTree(CT.CustomTreeCtrl):
         if itemParent is None :
             itemParent = self.root
         child, cookie = self.GetFirstChild(itemParent)
-        print child, cookie
         while child :
             pydata = self.GetPyData(child)
             if pydata['uuid'] == uuid :
                 self.SelectItem(child)
                 if bold :
                     self.SetItemBold(child, True)
-                return 'kool'
-            self.GiveFocus(child, uuid)
+                return
+            self.GiveFocus(child, uuid, bold)
             child, cookie = self.GetNextChild(itemParent, cookie)
-        return 'pas kool'
 
     def OnRightDown(self, event):