X-Git-Url: http://www.iramuteq.org/git?a=blobdiff_plain;f=guifunct.py;h=26127921749111daeea03cf61d0d054b594347b4;hb=refs%2Fheads%2F3.0;hp=8ae23ab08b663366ab65c76991ce831395e9700c;hpb=eaa044d1147e26b82942ce56d5965c83fdddf069;p=iramuteq

diff --git a/guifunct.py b/guifunct.py
index 8ae23ab..2612792 100644
--- a/guifunct.py
+++ b/guifunct.py
@@ -163,7 +163,7 @@ class SelectColumn :
                 dial.Destroy()
                 column = [actives.index(val) for val in indexes]
                 column.sort()
-                with open(pathout, 'w') as f :
+                with open(pathout, 'w' ,encoding='utf8') as f :
                     f.write('\n'.join([repr(val) for val in column]))
                 self.ok = True
             else :
@@ -172,7 +172,7 @@ class SelectColumn :
             self.ok = True
             if selected is None :
                 selected = [i for i in range(0, len(actives))]
-            with open(pathout, 'w') as f :
+            with open(pathout, 'w', encoding='utf8') as f :
                 f.write('\n'.join([repr(i) for i in selected]))
 
 
@@ -468,10 +468,10 @@ class PrefSimi ( wx.Dialog ):
         bSizer9 = wx.BoxSizer( wx.VERTICAL )
 
         self.check2 = wx.CheckBox( self.m_panel3, wx.ID_ANY, "eff.", wx.DefaultPosition, wx.DefaultSize, 0 )
-        bSizer9.Add( self.check2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        bSizer9.Add( self.check2, 0, wx.ALL, 5 )
 
         self.checki = wx.CheckBox( self.m_panel3, wx.ID_ANY, "chi2", wx.DefaultPosition, wx.DefaultSize, 0 )
-        bSizer9.Add( self.checki, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        bSizer9.Add( self.checki, 0, wx.ALL, 5 )
 
 
         bSizer7.Add( bSizer9, 0, wx.ALIGN_CENTER_VERTICAL, 5 )
@@ -515,10 +515,10 @@ class PrefSimi ( wx.Dialog ):
         bSizer8 = wx.BoxSizer( wx.VERTICAL )
 
         self.check_vcex = wx.CheckBox( self.m_panel3, wx.ID_ANY, "eff.", wx.DefaultPosition, wx.DefaultSize, 0 )
-        bSizer8.Add( self.check_vcex, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        bSizer8.Add( self.check_vcex, 0, wx.ALL, 5 )
 
         self.checkit = wx.CheckBox( self.m_panel3, wx.ID_ANY, "chi2", wx.DefaultPosition, wx.DefaultSize, 0 )
-        bSizer8.Add( self.checkit, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+        bSizer8.Add( self.checkit, 0, wx.ALL, 5 )
 
 
         bSizer71.Add( bSizer8, 0, wx.ALIGN_CENTER_VERTICAL, 5 )
@@ -950,7 +950,7 @@ class PrepSimi :
                     indexes.append(self.dial.listcol.getColumnText(last,0))
                 column = [actives.index(val) for val in indexes]
                 column.sort()
-                with open(pathout, 'w') as f :
+                with open(pathout, 'w', encoding='utf8') as f :
                     f.write('\n'.join([repr(val) for val in column]))
                 self.make_param()
                 self.dial.Destroy()
@@ -1144,13 +1144,13 @@ class TGenFrame ( wx.Frame ):
         self.tgens = wx.ListBox( self.panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, tgensChoices, 0 )
         self.tgens.SetMinSize( wx.Size( 250,350 ) )
 
-        fgSizer1.Add( self.tgens, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
+        fgSizer1.Add( self.tgens, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
 
         tgencontentChoices = []
         self.tgencontent = wx.ListBox( self.panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, tgencontentChoices, 0|wx.VSCROLL )
         self.tgencontent.SetMinSize( wx.Size( 250,350 ) )
 
-        fgSizer1.Add( self.tgencontent, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
+        fgSizer1.Add( self.tgencontent, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
 
         fgSizer2 = wx.FlexGridSizer( 0, 2, 0, 0 )
         fgSizer2.SetFlexibleDirection( wx.BOTH )
@@ -1176,7 +1176,7 @@ class TGenFrame ( wx.Frame ):
 
         fgSizer1.Add( fgSizer3, 0, wx.EXPAND, 0 )
 
-        bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 )
+        bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
 
 
         m_sdbSizer2 = wx.StdDialogButtonSizer()
@@ -1288,15 +1288,15 @@ class ExportMetaTable :
 
 
 def redosimi(self, evt) :
-    with open(self.pathout['selected.csv'],'r') as f :
+    with open(self.pathout['selected.csv'],'r', encoding='utf8') as f :
         selected = f.read()
     selected = [int(val) for val in selected.splitlines()]
     if self.actives is None :
-        with codecs.open(self.pathout['actives.csv'], 'r') as f :
+        with open(self.pathout['actives.csv'], 'r', encoding='utf8') as f :
             self.actives = f.read()
         self.actives = self.actives.splitlines()#[act for act in self.actives.splitlines()]
     if os.path.exists(self.pathout['actives_nb.csv']) :
-        with open(self.pathout['actives_nb.csv'], 'r') as f :
+        with open(self.pathout['actives_nb.csv'], 'r', encoding='utf8') as f :
             act_nb = f.read()
             act_nb = act_nb.splitlines()
         dictcol = dict([[i, [self.actives[i], int(act_nb[i])]] for i, val in enumerate(self.actives)])
@@ -1313,7 +1313,7 @@ def redosimi(self, evt) :
         prep.parametres = self.parametres
         order_actives = [[i, act, self.corpus.getlemeff(act)] for i, act in enumerate(self.actives)]
         order_actives = sorted(order_actives, key=itemgetter(2), reverse = True)
-        with open(self.pathout['selected.csv'], 'w') as f :
+        with open(self.pathout['selected.csv'], 'w', encoding='utf8') as f :
             f.write('\n'.join([repr(order_actives[val][0]) for val in self.parametres['selected']]))
     if prep.val == wx.ID_OK or evt is None:
         self.parametres = prep.parametres