X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;ds=sidebyside;f=layout.py;h=0e89647ea363021299f89d938ccfd953bf432838;hb=ea75400310e91c45b6a705119b2e33afc0933e3e;hp=642121cfb4daba9c66b40af293a921424e70a80f;hpb=a503f041dc4947ee21c1d353ddd05ddb13a5e322;p=iramuteq

diff --git a/layout.py b/layout.py
index 642121c..0e89647 100644
--- a/layout.py
+++ b/layout.py
@@ -65,8 +65,10 @@ class GraphPanelAfc(wx.Panel):
               'qui' : 0,
               'do_select_nb' : 0,
               'do_select_chi' : 0,
+              'do_select_chi_classe' : 0,
               'select_nb' : 50,
               'select_chi' : 4,
+              'nbchic' : 30,
               'over' : 0, 
               'cex_txt' : 0,
               'txt_min' : 5,
@@ -116,8 +118,10 @@ class GraphPanelAfc(wx.Panel):
                           'qui' : dial.choice2.GetSelection(),
                           'do_select_nb' : dial.check1.GetValue(),
                           'do_select_chi' : dial.check2.GetValue(),
+                          'do_select_chi_classe' : dial.check_chic.GetValue(),
                           'select_nb' : dial.spin_nb.GetValue(),
                           'select_chi' : dial.spin_chi.GetValue(),
+                          'nbchic' : dial.spin_nbchic.GetValue(),
                           'over' : dial.check3.GetValue(), 
                           'cex_txt' : dial.check4.GetValue(),
                           'txt_min' : dial.spin_min.GetValue(),
@@ -142,6 +146,12 @@ class GraphPanelAfc(wx.Panel):
                 afc <- afcf
                 afc_table <- afcf_table
                 chistabletot <- specfp
+                infp <- which(is.infinite(chistabletot) & chistabletot > 0)
+                infm <- which(is.infinite(chistabletot) & chistabletot < 0)
+                chistabletot[infp] <- 0
+                chistabletot[infm] <- 0
+                chistabletot[infp] <- max(chistabletot) + 1
+                chistabletot[infm] <- min(chistabletot) - 1
                 """ 
             elif self.itempath == 'liste_graph_afct' :
                 txt +="""
@@ -952,7 +962,7 @@ class SimiLayout(DefaultTextLayout) :
         if self.actives is None :
             with codecs.open(self.pathout['actives.csv'], 'r', self.parametres['encoding']) as f :
                 self.actives = f.read()
-            self.actives = [act for act in self.actives.splitlines()]
+            self.actives = self.actives.splitlines()#[act for act in self.actives.splitlines()]
         dictcol = dict([[i, [act, self.corpus.getlemeff(act)]] for i, act in enumerate(self.actives)])
         SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'], selected = selected) 
         prep = PrepSimi(self.ira, self.parametres, indices_simi)