[chronojump] Updated R install path for mac



commit 053accfc366712e1f4b8d6a398ce4009d2ea37a7
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Jun 25 11:00:30 2020 +0200

    Updated R install path for mac

 src/constants.cs           | 2 ++
 src/gui/app1/chronojump.cs | 2 +-
 src/gui/app1/encoder.cs    | 2 +-
 src/gui/dialogMessage.cs   | 2 +-
 src/stats/main.cs          | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/constants.cs b/src/constants.cs
index fd605e0e..fc5cc33c 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -1061,6 +1061,8 @@ public class Constants
         */
        public static string ROSX = "/Library/Frameworks/R.framework/Resources/R";
        public static string RScriptOSX = "/Library/Frameworks/R.framework/Resources/Rscript";
+
+       public static string RmacDownload = "https://cran.rediris.es/bin/macosx/R-3.6.3.nn.pkg";;
        
        //public static string EncoderScriptCapturePythonLinux = "pyserial_pyper.py";
        //public static string EncoderScriptCapturePythonWindows = "pyserial_pyper_windows.exe";
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index faaf176b..18ce8196 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -2891,7 +2891,7 @@ public partial class ChronoJumpWindow
                        new DialogMessage(Constants.MessageTypes.WARNING,
                                        Catalog.GetString("Sorry, R software is not installed.") +
                                        "\n" + Catalog.GetString("Please, install it from here:") +
-                                       "\n\nhttp://cran.cnr.berkeley.edu/bin/macosx/R-latest.pkg";,
+                                       "\n\n" + Constants.RmacDownload,
                                        "button_go_r_mac");
                        show_start_page();
                        return;
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 60b565cd..a7a9c431 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -6651,7 +6651,7 @@ public partial class ChronoJumpWindow
                                                        Catalog.GetString("Sorry. Error doing graph.") + 
                                                        "\n" + Catalog.GetString("Maybe R is not installed.") 
+ 
                                                        "\n" + Catalog.GetString("Please, install it from 
here:") +
-                                                       
"\n\nhttp://cran.cnr.berkeley.edu/bin/macosx/R-latest.pkg";);
+                                                       "\n\n" + Constants.RmacDownload);
                                        encoderProcessProblems = false;
                                } else {
                                        if(action == encoderActions.CAPTURE_IM)
diff --git a/src/gui/dialogMessage.cs b/src/gui/dialogMessage.cs
index ce1e2a32..5b521de3 100644
--- a/src/gui/dialogMessage.cs
+++ b/src/gui/dialogMessage.cs
@@ -59,7 +59,7 @@ public class DialogMessage
                        hbox_stiffness_formula.Show();
                else if(objectToShow == "button_go_r_mac")
                {
-                       button_go_link = "http://cran.cnr.berkeley.edu/bin/macosx/R-latest.pkg";;
+                       button_go_link = Constants.RmacDownload;
                        button_go.Show();
                }
        }
diff --git a/src/stats/main.cs b/src/stats/main.cs
index 99f1ca95..67ac79dc 100644
--- a/src/stats/main.cs
+++ b/src/stats/main.cs
@@ -1515,7 +1515,7 @@ public class Stat
                                                Catalog.GetString("Sorry. Error doing graph.") + 
                                                "\n" + Catalog.GetString("Maybe R is not installed.") + 
                                                "\n" + Catalog.GetString("Please, install it from here:") +
-                                               "\n\nhttp://cran.cnr.berkeley.edu/bin/macosx/R-latest.pkg";);
+                                               "\n\n" + Constants.RmacDownload);
                        else
                                new DialogImageTest(Catalog.GetString("Chronojump Graph"), fileName, 
DialogImageTest.ArchiveType.FILE);
                }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]