# -*- coding: utf-8 -*-
#Author: Pierre Ratinaud
#Copyright (c) 2008 Pierre Ratinaud
-#Lisense: GNU/GPL
+#License: GNU/GPL
import os
import sys
return True
def UpgradeConf(self) :
+ log.info('upgrade conf')
dictuser = self.ConfigPath
dictappli = ConstructConfigPath(self.AppliPath, user = False)
for item,filein in dictuser.iteritems():
if progpaths != [] :
for progpath in progpaths :
rpath = os.path.join(progpath, "R")
- if os.path.exists(rpath) :
- for i in range(13,20):
- for j in range(0,15):
- path=os.path.join(rpath,"R-2."+str(i)+"."+str(j),'bin','R.exe')
- if os.path.exists(path):
- BestPath=path
+ if os.path.exists(rpath) :
+ for maj in range(2,4) :
+ for i in range(0,30):
+ for j in range(0,20):
+ for poss in ['', 'i386', 'x64'] :
+ path=os.path.join(rpath,"R-%i.%i.%i" % (maj, i, j),'bin',poss,'R.exe')
+ if os.path.exists(path):
+ BestPath=path
return BestPath
def FindRPathNix():
else :
return True
-def install_textometrieR(self) :
- dlg = wx.ProgressDialog("Installation de textometrieR",
- "Veuillez patientez...",
- maximum= 2,
- parent=self,
- style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE | wx.PD_ELAPSED_TIME | wx.PD_CAN_ABORT
- )
- dlg.Center()
- dlg.Update(1, 'Installation de textometrieR')
- path = os.path.join(self.AppliPath, 'Rlib', 'textometrieR')
- exec_RCMD(self.RPath, path)
- dlg.Update(2,'fini')
- dlg.Destroy()
-
def CheckRPackages(self):
- listdep = ['ca', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'irlba', 'textometrieR']
+ listdep = ['ca', 'rgl', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'irlba', 'textometry']
nolib = []
i=0
dlg = wx.ProgressDialog("Test des librairies de R", "test en cours...", maximum = len(listdep), parent=self, style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE | wx.PD_ELAPSED_TIME | wx.PD_CAN_ABORT)
log.info('packages %s : OK' % bib)
dlg.Update(len(listdep),'fini')
dlg.Destroy()
- install_textoR = False
- if 'textometrieR' in nolib :
- nolib.pop(nolib.index('textometrieR'))
- install_textoR = True
if nolib != [] :
txt = '\n'.join(nolib)
msg = u"""Les bibliothèques de R suivantes sont manquantes :
- ou laisser IRamuteq les installer automatiquement en cliquant sur VALIDER .
Les bibliothèques seront téléchargées depuis le site miroir de R %s.
""" % (txt, self.pref.get('iramuteq','rmirror'))
- dial = wx.MessageDialog(self, msg, u"Installation incomplète", wx.OK | wx.CANCEL | wx.NO_DEFAULT | wx.ICON_WARNING)
+ dial = wx.MessageDialog(self, msg, u"Installation incomplète", wx.OK | wx.CANCEL | wx.ICON_WARNING)
dial.CenterOnParent()
val = dial.ShowModal()
if val == wx.ID_OK :
dlg.Update(len(nolib) + 1, 'fin')
dlg.Destroy()
dial.Destroy()
- if install_textoR :
- install_textometrieR(self)
- if nolib == [] and not install_textoR :
+ if nolib == [] :
self.pref.set('iramuteq', 'rlibs', True)
with open(self.ConfigPath['preferences'], 'w') as f :
self.pref.write(f)