# -*- 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 not item == u'global' and not item == u'history':
shutil.copyfile(dictappli[item], filein)
+ dicoUser = self.DictPath
+ dicoAppli = ConstructDicoPath(self.AppliPath)
+ for fi in dicoUser :
+ if not os.path.exists(dicoUser[fi]) and os.path.exists(dicoAppli[fi]):
+ shutil.copyfile(dicoAppli[fi], dicoUser[fi])
def CreateIraDirectory(UserConfigPath,AppliPath):
if not os.path.exists(UserConfigPath):
for progpath in progpaths :
rpath = os.path.join(progpath, "R")
if os.path.exists(rpath) :
- for i in range(7,20):
+ 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):
dlg.Destroy()
def CheckRPackages(self):
- listdep = ['ca', 'gee', 'ape', 'igraph','proxy', 'wordcloud', '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)
dlg.Update(len(listdep),'fini')
dlg.Destroy()
install_textoR = False
- if 'textometrieR' in nolib :
- nolib.pop(nolib.index('textometrieR'))
- install_textoR = True
+ #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 :