X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=checkinstall.py;h=8fbf6d77e30024169ccedccd7dec9ea12ff40cf8;hp=742c15ab5ba59f31fab9eec6a90c094ce2b39a0d;hb=5d84083b41b807307732adb78e1be7fd3e3ff004;hpb=be2de22859c8f59abe9e1082981e4c3a62e9b7ca

diff --git a/checkinstall.py b/checkinstall.py
index 742c15a..8fbf6d7 100644
--- a/checkinstall.py
+++ b/checkinstall.py
@@ -45,11 +45,17 @@ def IsNew(self):
                 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):
@@ -72,7 +78,7 @@ def CopyConf(self) :
     dicoUser = self.DictPath
     dicoAppli = ConstructDicoPath(self.AppliPath)
     for fi in dicoUser :
-        if not os.path.exists(dicoUser[fi]) :
+        if not os.path.exists(dicoUser[fi]) and os.path.exists(dicoAppli[fi]):
             shutil.copyfile(dicoAppli[fi], dicoUser[fi])
 
 def CheckRPath(PathPath):
@@ -95,7 +101,7 @@ def FindRPAthWin32():
         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):
@@ -132,7 +138,7 @@ def install_textometrieR(self) :
     dlg.Destroy()
 
 def CheckRPackages(self):
-    listdep = ['ca', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'textometrieR']
+    listdep = ['ca', 'rgl', 'gee', 'ape', 'igraph','proxy', 'wordcloud', 'irlba', 'textometrieR']
     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)
@@ -171,7 +177,7 @@ Sans ces bibliothèques, IRamuteq ne fonctionnera pas.
 - 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 :