From: pierre <pierre.ratinaud@univ-tlse2.fr>
Date: Mon, 12 Feb 2024 16:00:10 +0000 (+0100)
Subject: Merge branch '3.0' of http://www.iramuteq.org/git/iramuteq into 3.0
X-Git-Url: http://iramuteq.org/git?a=commitdiff_plain;h=e6f6318b1ab077a97c10559b3323ccf158ae6203;p=iramuteq

Merge branch '3.0' of iramuteq.org/git/iramuteq into 3.0
---

e6f6318b1ab077a97c10559b3323ccf158ae6203
diff --cc iramuteq.py
index 5c61d5b,d0bfb72..a8afd32
--- a/iramuteq.py
+++ b/iramuteq.py
@@@ -235,8 -238,9 +238,10 @@@ class IraFrame(wx.Frame)
                         wx.CLIP_CHILDREN):
          log.info('Starting Iramuteq... ' )
          log.info('version : %s' % ConfigGlob.get('DEFAULT', 'version'))
 +        print(size)
          wx.Frame.__init__(self, parent, id, title, pos, size, style)
+         #Font
+         self.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
          # configuration
          self.AppliPath = AppliPath
          self.images_path = os.path.join(AppliPath,'images')
@@@ -701,9 -707,10 +708,14 @@@
          BestRPath = False
          if not CheckRPath(self.PathPath) :
              if sys.platform == 'win32':
-                 BestRPath = FindRPAthWin32()
 -                if os.path.exists(self.AppliPath + '\\R\\R') :
++                if os.path.exists(self.AppliPath + '\\R\\R\\x64\\R.exe') :
+                     BestRPath = self.AppliPath + '\\R\\R\\bin\\x64\\R.exe'
++                elif os.path.exists(self.AppliPath + '\\R\\R\\i386\\R.exe') :
++                    BestRPath = self.AppliPath + '\\R\\R\\bin\\i386\\R.exe'
+                 else :
+                     BestRPath = FindRPAthWin32()
 +            elif os.path.exists(self.AppliPath + '/R/R') :
 +                BestRPath = self.AppliPath + '/R/R'
              else:
                  BestRPath = FindRPathNix()
              if BestRPath: