Skip to content

Commit

Permalink
Merge pull request #296 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history
updating
  • Loading branch information
maxwellfundi authored Apr 6, 2018
2 parents 9d6f18e + 5dd0c6e commit 9723069
Show file tree
Hide file tree
Showing 41 changed files with 3,879 additions and 1,944 deletions.
2 changes: 1 addition & 1 deletion instat/UcrPanel.vb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Public Class UcrPanel
End If
End Sub

Protected Overrides Sub SetToValue(objTemp As Object)
Public Overrides Sub SetToValue(objTemp As Object)
Dim rdoTemp As RadioButton

If objTemp IsNot Nothing Then
Expand Down
13 changes: 11 additions & 2 deletions instat/clsRLink.vb
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Public Class RLink
Dim expTemp As SymbolicExpression
Dim strMajor As String = ""
Dim strMinor As String = ""
Dim iMinor2 As Integer
Dim iCurrentCallType As Integer
Dim bClose As Boolean = False

Expand All @@ -92,8 +93,16 @@ Public Class RLink
If expTemp IsNot Nothing AndAlso expTemp.Type <> Internals.SymbolicExpressionType.Null Then
strMinor = expTemp.AsCharacter(0)
End If
If Not (strMajor = strRVersionMajorRequired AndAlso strMinor.Count > 0 AndAlso strMinor(0) = strRVersionMinorRequired) Then
MsgBox("Your current version of R is outdated. You are currently running R version " & strMajor & "." & strMinor & vbNewLine & "R-Instat requires version " & strRVersionMajorRequired & "." & strRVersionMinorRequired & ".0 or later." & vbNewLine & "Rerun the installation to install an updated version of R or download the latest version from https://cran.r-project.org/ and restart R-Instat.", MsgBoxStyle.Critical, "R Version outdated.")
' TEMPORARY strMinor(2) = "4" is required because R 3.4.3 has a bug and so R 3.4.4 is required
' Once R 3.5.1 is released this can be removed. Error message should also be updated.
If strMinor.Count >= 3 AndAlso Integer.TryParse(strMinor(2), iMinor2) Then
If Not (strMajor = strRVersionMajorRequired AndAlso strMinor.Count > 0 AndAlso strMinor(0) = strRVersionMinorRequired AndAlso iMinor2 >= 4) Then
MsgBox("Your current version of R is outdated. You are currently running R version: " & strMajor & "." & strMinor & vbNewLine & "R-Instat requires version " & strRVersionMajorRequired & "." & strRVersionMinorRequired & ".4 or later." & vbNewLine & "Rerun the installation to install an updated version of R or download the latest version from https://cran.r-project.org/ and restart R-Instat.", MsgBoxStyle.Critical, "R Version outdated.")
Application.Exit()
Environment.Exit(0)
End If
Else
MsgBox("Could not determine version of R installed on your machine. R-Instat requires version: " & strRVersionMajorRequired & "." & strRVersionMinorRequired & ".4 or later." & vbNewLine & "Rerun the installation to install an updated version of R or download the latest version from https://cran.r-project.org/ and restart R-Instat.", MsgBoxStyle.Critical, "R Version error.")
Application.Exit()
Environment.Exit(0)
End If
Expand Down
102 changes: 15 additions & 87 deletions instat/dlgClimaticSummary.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9723069

Please sign in to comment.