[chronojump] RaceAnalyzer on mac check on analyze/export if R is installed. If not, show message.
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] RaceAnalyzer on mac check on analyze/export if R is installed. If not, show message.
- Date: Fri, 18 Feb 2022 12:47:02 +0000 (UTC)
commit 5c8f70de92d64fc8d81e2923c9f018acbbaa1cca
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Feb 18 13:36:17 2022 +0100
RaceAnalyzer on mac check on analyze/export if R is installed. If not, show message.
src/gui/app1/chronojump.cs | 15 ++++++++++-----
src/gui/app1/runEncoderAnalyze.cs | 14 ++++++++++++++
2 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index 77140b5f3..251a16700 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -3528,11 +3528,7 @@ public partial class ChronoJumpWindow
operatingSystem == UtilAll.OperatingSystems.MACOSX &&
! Util.FileExists(Constants.ROSX) )
{
- new DialogMessage(Constants.MessageTypes.WARNING,
- Catalog.GetString("Sorry, R software is not installed.") +
- "\n" + Catalog.GetString("Please, install it from here:") +
- "\n\n" + Constants.RmacDownload,
- "button_go_r_mac");
+ showMacRInstallMessage ();
show_start_page();
return;
}
@@ -3997,6 +3993,15 @@ public partial class ChronoJumpWindow
}
+ private void showMacRInstallMessage ()
+ {
+ new DialogMessage(Constants.MessageTypes.WARNING,
+ Catalog.GetString("Sorry, R software is not installed.") +
+ "\n" + Catalog.GetString("Please, install it from here:") +
+ "\n\n" + Constants.RmacDownload,
+ "button_go_r_mac");
+ }
+
private void on_check_contacts_capture_show_modes_clicked (object o, EventArgs args)
{
if(! followSignals) //TODO: check if has to be this boolean
diff --git a/src/gui/app1/runEncoderAnalyze.cs b/src/gui/app1/runEncoderAnalyze.cs
index e2a794c25..54257d601 100644
--- a/src/gui/app1/runEncoderAnalyze.cs
+++ b/src/gui/app1/runEncoderAnalyze.cs
@@ -196,6 +196,13 @@ public partial class ChronoJumpWindow
return;
}
+ if(operatingSystem == UtilAll.OperatingSystems.MACOSX &&
+ ! Util.FileExists(Constants.ROSX) )
+ {
+ showMacRInstallMessage ();
+ return;
+ }
+
if(! currentRunEncoderExercise.IsSprint)
{
new DialogMessage(Constants.MessageTypes.WARNING, "Currently you can only analyze
sprint exercises.");
@@ -343,6 +350,13 @@ public partial class ChronoJumpWindow
private void on_button_run_encoder_export_not_set_clicked (object o, EventArgs args)
{
+ if(operatingSystem == UtilAll.OperatingSystems.MACOSX &&
+ ! Util.FileExists(Constants.ROSX) )
+ {
+ showMacRInstallMessage ();
+ return;
+ }
+
// 1) check if all sessions
if(radio_run_encoder_analyze_individual_all_sessions.Active)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]