From: pierre <ratinaud@univ-tlse2.fr>
Date: Thu, 1 Oct 2020 14:57:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=commitdiff_plain;h=101e493f4787c751b2b1e1fabff4b5b61a14114d;hp=-c;ds=sidebyside

Merge remote-tracking branch 'origin/master'
---

101e493f4787c751b2b1e1fabff4b5b61a14114d
diff --combined iramuteq.py
index 2ab3cda,d653391..6dfa3ea
--- a/iramuteq.py
+++ b/iramuteq.py
@@@ -1,8 -1,9 +1,9 @@@
  #!/bin/env python
  # -*- coding: utf-8 -*-
  #Author: Pierre Ratinaud
 -#Copyright (c) 2008-2016, Pierre Ratinaud
 +#Copyright (c) 2008-2020, Pierre Ratinaud
  #License: GNU GPL
+ #test
  
  from optparse import OptionParser
  
@@@ -13,7 -14,6 +14,7 @@@ parser.add_option("-f", "--file", dest=
  
  import sys
  reload(sys)
 +#sys.path.insert(0, '/usr/lib/python2.7/dist-packages/wxPython-4.0.1-py2.7-linux-amd64.egg')
  import locale
  import tempfile
  import codecs
@@@ -29,7 -29,6 +30,7 @@@ import wx.lib.agw.aui as au
  import wx.html
  import wx.grid
  import wx.lib.hyperlink as hl
 +#import wx.lib.agw.hyperlink as hl
  #------------------------------------
  from functions import BugReport, PlaySound, History, progressbar
  from checkversion import NewVersion
@@@ -53,7 -52,7 +54,7 @@@ from textaslexico import Lexic
  from textlabbe import DistLabbe
  from textsimi import SimiTxt, SimiFromCluster
  from textwordcloud import WordCloud, ClusterCloud
 -from textreinert import Reinert
 +from textreinert import Reinert, ReDoReinert
  #from textcheckcorpus import checkcorpus
  from openanalyse import OpenAnalyse
  from corpus import Builder, SubBuilder, MergeClusters
@@@ -1033,9 -1032,6 +1034,9 @@@ Inc., 59 Temple Place - Suite 330, Bost
          #FIXME
          AnalyseMerge(self, {'type': 'merge', 'fileout' : '/tmp/test.txt'}, dlg = 5)
  
 +    def OnEliminate(self, corpus, parametres) :
 +        print parametres
 +
      def OnMergeClusters(self, evt) :
          builder = MergeClusters(self, {})
          if builder.res == wx.ID_OK :