Merge branch 'master' of http://www.iramuteq.org/git/iramuteq

diff --git a/analysematrix.py b/analysematrix.py
index 7e3c93f..5daf6ae 100644 (file)
--- a/analysematrix.py
+++ b/analysematrix.py
@@ -65,7 +65,10 @@ class AnalyseMatrix :
         else :
             self.val = False
             if self.dlg is not None :
-                self.dlg.Destroy()
+                try :
+                    self.dlg.Destroy()
+                except :
+                    pass
  
     def doanalyse(self) :
         pass

diff --git a/configuration/global.cfg b/configuration/global.cfg
index 6c92be5..6fc7c20 100644 (file)
--- a/configuration/global.cfg
+++ b/configuration/global.cfg
@@ -6,6 +6,6 @@ copyright = (c) 2008-2014 Pierre Ratinaud
 author = Pierre Ratinaud
 gpl-fr = gpl-2.0-fr.txt
 dev = Pierre Ratinaud (Université de Toulouse - Laboratoire LERASS - ratinaud@univ-tlse2.fr);Sébastien Déjean (Université de Toulouse);David Skalinder (Mash Strategy - davids@mash.uk.com);
-version = 0.6 alpha 14
+version = 0.7 alpha 1
 licence = GNU GPL (v2)
-version_nb = 0.6.a14
\ No newline at end of file
+version_nb = 0.7.a1
\ No newline at end of file

diff --git a/configuration/iramuteq.cfg b/configuration/iramuteq.cfg
index 6f1b59e..647f6d6 100644 (file)
--- a/configuration/iramuteq.cfg
+++ b/configuration/iramuteq.cfg
@@ -5,7 +5,7 @@ language=french
 guilanguage=french
 R_mem = false
 R_max_mem = 1535
-version_nb = 0.6.a14
+version_nb = 0.7.a1
 rlibs = false
 libsvdc = false
 libsvdc_path = /usr/bin/svd

diff --git a/functions.py b/functions.py
index 6373176..f38a5c5 100644 (file)
--- a/functions.py
+++ b/functions.py
@@ -695,20 +695,21 @@ def read_list_file(filename, encoding = sys.getdefaultencoding()):
             
 
 def progressbar(self, maxi) :
-    if 'parent' in dir(self) :
-        parent = self.parent
-    else :
-        parent = self
+    ira = wx.GetApp().GetTopWindow()
+    parent = ira
     try :
         maxi = int(maxi)
     except :
         maxi = 1
-    return wx.ProgressDialog("Traitements",
+    prog = wx.ProgressDialog("Traitements",
                              "Veuillez patienter...",
                              maximum=maxi,
                              parent=parent,
                              style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE | wx.PD_ELAPSED_TIME | wx.PD_CAN_ABORT
                              )
+    prog.SetIcon(ira._icon)
+    prog.SetSize((400,150))
+    return prog
 
 
 def treat_var_mod(variables) :

diff --git a/guifunct.py b/guifunct.py
index c20ee70..822f213 100644 (file)
--- a/guifunct.py
+++ b/guifunct.py
@@ -329,7 +329,7 @@ class PrefSimi ( wx.Dialog ):
         self.m_staticline40 = wx.StaticLine( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL )
         fgSizer3.Add( self.m_staticline40, 0, wx.EXPAND |wx.ALL, 5 )
         
-        self.m_staticText321 = wx.StaticText( self.m_panel2, wx.ID_ANY, _(u"Edge curved"), wx.DefaultPosition, wx.DefaultSize, 0 )
+        self.m_staticText321 = wx.StaticText( self.m_panel2, wx.ID_ANY, _(u"Edge curved").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 )
         self.m_staticText321.Wrap( -1 )
         fgSizer3.Add( self.m_staticText321, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
         

diff --git a/images/splash.png b/images/splash.png
index 9b6d61a..0e60598 100644 (file)
Binary files a/images/splash.png and b/images/splash.png differ

diff --git a/images/splash.svg b/images/splash.svg
index c17ed19..cf09a24 100644 (file)
--- a/images/splash.svg
+++ b/images/splash.svg
@@ -167,10 +167,10 @@
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="2837"
-     inkscape:window-height="1776"
-     inkscape:window-x="43"
-     inkscape:window-y="24"
+     inkscape:window-width="2878"
+     inkscape:window-height="1778"
+     inkscape:window-x="0"
+     inkscape:window-y="20"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true">
@@ -332,7 +332,7 @@
            x="110.10663"
            y="146.45171"
            style="font-size:14px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#1c1010;fill-opacity:1;font-family:gargi;-inkscape-font-specification:gargi Medium" /></flowRegion><flowPara
-         id="flowPara3866">Version 0.6 alpha 14</flowPara></flowRoot>    <flowRoot
+         id="flowPara3866">Version 0.7 alpha 1</flowPara></flowRoot>    <flowRoot
        xml:space="preserve"
        id="flowRoot3868"
        style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Bitstream Vera Sans;font-style:normal;font-weight:normal;font-size:40px;line-height:125%;letter-spacing:0px;word-spacing:0px"

diff --git a/iramuteq.py b/iramuteq.py
index 8896308..9618316 100644 (file)
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -268,7 +268,7 @@ class IraFrame(wx.Frame):
         matrix_menu.Append(ID_SIMI, _(u"Similarities Analysis").decode('utf8'))
         matrix_menu.Append(ID_proto, _(u"Prototypical Analysis").decode('utf8'))
         ID_RCODE = wx.NewId()
-        matrix_menu.Append(ID_RCODE, u"Code R...") 
+        #matrix_menu.Append(ID_RCODE, u"Code R...") 
         #menu_splittab = wx.Menu()
         #ID_SPLITVAR = wx.NewId()
         #splitvar = wx.MenuItem(menu_splittab, ID_SPLITVAR, _(u"Split from variable").decode('utf8'))
@@ -402,7 +402,7 @@ class IraFrame(wx.Frame):
         self.Bind(wx.EVT_MENU, self.OnCHDReinert, id=ID_CHDReinert)
         self.Bind(wx.EVT_MENU, self.OnAFCM, id=ID_AFCM)
         self.Bind(wx.EVT_MENU, self.OnProto, id=ID_proto)
-        self.Bind(wx.EVT_MENU, self.OnRCode, id=ID_RCODE)
+        #self.Bind(wx.EVT_MENU, self.OnRCode, id=ID_RCODE)
         #self.Bind(wx.EVT_MENU, self.OnSplitVar, id=ID_SPLITVAR)
         #self.Bind(wx.EVT_MENU, self.OnCheckcorpus, id = ID_CHECKCORPUS)
         self.Bind(wx.EVT_MENU, self.OnTextStat, id=ID_TEXTSTAT)

diff --git a/tabchdalc.py b/tabchdalc.py
index ce05833..b1cff3c 100644 (file)
--- a/tabchdalc.py
+++ b/tabchdalc.py
@@ -101,7 +101,10 @@ class AnalyseQuest(AnalyseMatrix):
         while pid.poll() == None :
             self.dlg.Pulse(u"Analyse (patientez...)")
             time.sleep(0.2)
-        check_Rresult(self.parent, pid)
+        if not check_Rresult(self.parent, pid) :
+            if self.dlg :
+                self.dlg.Destroy()
+            return 'NOK'
 #------------------------------------------------------------
         count += 1
         self.dlg.Update(count, u"Ecriture des résultats")