Merge pull request #299 from africanmathsinitiative/master

Updating branch

docs/Download.html

@@ -80,9 +80,9 @@
                   <h2 class="section-heading">Download R-Instat</h2>
                   <p><strong>In response to the recent <a href=https://r4stats.com/articles/software-reviews/r-instat/ style="color:blue;" target="_blank">review of R-Instat</a> by Bob Muenchen we have released a new version of R-Instat, version 0.7.5, which includes some new features and initial improvements from the review. Many thanks to Bob for reviewing R-Instat.</strong></p>
                   <hr class="light">
-                  <p><a href=https://downloads.r-instat.org/R-Instat_0.7.5_Installer_32.exe style="color:blue;" target="_blank">R-Instat 0.7.5 Installer 32 Bit (.exe 734MB)</a></p>
+                  <p><a href=https://downloads.r-instat.org/R-Instat_0.7.6_Installer_32.exe style="color:blue;" target="_blank">R-Instat 0.7.6 Installer 32 Bit (.exe 802MB)</a></p>
                   <p>If you know that you have a 64 bit computer, we suggest you download the 64 Bit version</p>
-                  <a href=https://downloads.r-instat.org/R-Instat_0.7.5_Installer_64.exe style="color:blue;" target="_blank">R-Instat 0.7.5 Installer 64 Bit (.exe 736MB)</a>
+                  <a href=https://downloads.r-instat.org/R-Instat_0.7.6_Installer_64.exe style="color:blue;" target="_blank">R-Instat 0.7.6 Installer 64 Bit (.exe 802MB)</a>
                   <p>R-Instat is currently a Windows only application. However, it can be accessed on Mac or Linux through use of a Virtual Windows Machine.</p>
 
                   <h2 class="section-heading">Installation & Documentation</h2>

instat/clsInstatOptionsDefaults.vb

@@ -32,7 +32,7 @@ Public Class clsInstatOptionsDefaults
     Public Shared ReadOnly DEFAULTclrEditor As Color = Color.Black
     Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10
     Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000
-    Public Shared ReadOnly DEFAULTiMaxCols As Integer = 30
+    Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50
     Public Shared ReadOnly DEFAULTstrComment As String = "Code generated by the dialog,"
     Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window"
     Public Shared ReadOnly DEFAULTbChangeDataFrame As Boolean = False

instat/clsRLink.vb

@@ -359,13 +359,18 @@ Public Class RLink
             '    then assume command is not complete
             Dim cLastChar As Char = strTrimmedLine.Last
             Dim strLast3Chars As String = ""
+            Dim iNumOpenRound As Integer = strScriptCmd.Where(Function(c) c = "("c).Count
+            Dim iNumClosedRound As Integer = strScriptCmd.Where(Function(c) c = ")"c).Count
             Dim iNumOpenCurlies As Integer = strScriptCmd.Where(Function(c) c = "{"c).Count
             Dim iNumClosedCurlies As Integer = strScriptCmd.Where(Function(c) c = "}"c).Count
             Dim iNumDoubleQuotes As Integer = strScriptCmd.Where(Function(c) c = """"c).Count
             If strTrimmedLine.Length >= 3 Then
                 strLast3Chars = strTrimmedLine.Substring(strTrimmedLine.Length - 3)
             End If
-            If cLastChar = "+" OrElse cLastChar = "," OrElse strLast3Chars = "%>%" OrElse iNumOpenCurlies <> iNumClosedCurlies OrElse iNumDoubleQuotes Mod 2 Then
+            If cLastChar = "+" OrElse cLastChar = "," OrElse strLast3Chars = "%>%" _
+                    OrElse iNumOpenRound <> iNumClosedRound _
+                    OrElse iNumOpenCurlies <> iNumClosedCurlies _
+                    OrElse iNumDoubleQuotes Mod 2 Then
                 Continue For
             End If
 

instat/dlgPivotTable.resx → instat/dlgApsimx.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="ttSelectedVariable.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

instat/dlgApsimx.vb

@@ -0,0 +1,41 @@
+' R- Instat
+' Copyright (C) 2015-2017
+'
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU General Public License for more details.
+'
+' You should have received a copy of the GNU General Public License 
+' along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Imports instat.Translations
+Public Class dlgApsimx
+    Public bFirstLoad As Boolean = True
+    Private Sub dlgApsimx_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        If bFirstLoad Then
+            InitialiseDialog()
+            SetDefaults()
+            bFirstLoad = False
+        End If
+        TestOKEnabled()
+        autoTranslate(Me)
+    End Sub
+
+    Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 479
+    End Sub
+
+    Private Sub TestOKEnabled()
+
+    End Sub
+
+    Private Sub SetDefaults()
+        TestOKEnabled()
+    End Sub
+End Class

instat/dlgCalculator.vb

@@ -89,7 +89,7 @@ Public Class dlgCalculator
         ucrCalc.ucrSaveResultInto.SetSaveTypeAsColumn()
         ucrCalc.ucrSaveResultInto.SetIsComboBox()
         ucrCalc.ucrSaveResultInto.SetCheckBoxText("Save Result")
-        ucrCalc.ucrSaveResultInto.SetAssignToIfUncheckedValue("calc")
+        ucrCalc.ucrSaveResultInto.SetAssignToIfUncheckedValue("last_calc")
 
         ucrCalc.ucrSaveResultInto.SetDataFrameSelector(ucrCalc.ucrSelectorForCalculations.ucrAvailableDataFrames)
         ucrCalc.ucrTryCalculator.StrvecOutputRequired()
@@ -188,7 +188,7 @@ Public Class dlgCalculator
                 Me.Width = iBasicWidth * 1.27
                 ucrBase.iHelpTopicID = 598
             Case "Integer"
-                Me.Width = iBasicWidth * 1.18
+                Me.Width = iBasicWidth * 1.37
             Case Else
                 Me.Width = iBasicWidth
         End Select

instat/dlgClimaticDataEntry.vb

@@ -181,7 +181,7 @@ Public Class dlgClimaticDataEntry
 
     Private Sub TestOkEnabled()
         If Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverElements.IsEmpty Then
-            ucrBase.OKEnabled(clsSaveDataEntryFunction.ContainsParameter("rows_changed"))
+            ucrBase.OKEnabled(clsSaveDataEntryFunction.ContainsParameter("rows_changed") OrElse clsCommentsListFunction.ContainsParameter("comment"))
             cmdEnterData.Enabled = True
             If Not ucrReceiverStation.IsEmpty AndAlso ucrInputSelectStation.IsEmpty Then
                 cmdEnterData.Enabled = False