...

[iramuteq] / tabsplitvar.py

diff --git a/tabsplitvar.py b/tabsplitvar.py
index 6671d96..73eca1e 100644 (file)
--- a/tabsplitvar.py
+++ b/tabsplitvar.py
@@ -13,18 +13,20 @@ from analysematrix import AnalyseMatrix
 from functions import exec_rcode, check_Rresult
 from dialog import FreqDialog
 from PrintRScript import PrintRScript
+from tableau import Tableau
 
 class SplitMatrixFromVar(AnalyseMatrix):
     def doparametres(self, dlg=None) :
         if dlg is None :
             return
         else :
-            dial = FreqDialog(self.parent, -1, self.tableau.get_colnames(), u"Column", size=(350, 200))
+            dial = FreqDialog(self.parent, self.tableau.get_colnames(), u"Column", size=(350, 200), showNA = False)
             dial.CenterOnParent()
             val = dial.ShowModal()
             if val == wx.ID_OK :
-                self.parametres['colsel'] = dial.list_box_1.GetSelections()
+                self.parametres['colsel'] = dial.m_listBox1.GetSelections()
                 self.parametres['header'] = dial.header
+                self.parametres['tohistory'] = False
             else :
                 self.parametres = None
             dial.Destroy()
@@ -32,7 +34,10 @@ class SplitMatrixFromVar(AnalyseMatrix):
     def doanalyse(self):
         newtabs = self.tableau.splitfromvar(self.parametres['colsel'][0])
         for mod in newtabs :
-            fout = self.tableau.pathout['%s.csv' % mod].replace(u'*','')
-            with open(fout, 'w') as f :
-                f.write('\n'.join(['\t'.join(line) for line in newtabs[mod]]).encode(self.parent.syscoding))
-        print 'done!'
\ No newline at end of file
+            tab = Tableau(self.ira, os.path.join(self.tableau.pathout['%s.csv' % mod]).replace(u'*',''))
+            if not os.path.exists(tab.pathout.dirout) :
+                os.mkdir(tab.pathout.dirout)
+            tab.linecontent = newtabs[mod] 
+            tab.make_content_simple()
+            tab.parametres['matrix'] = tab.parametres['uuid']
+            self.ira.tree.OnItemAppend(tab.parametres, select = False)
\ No newline at end of file