Merge pull request #208 from africanmathsinitiative/master

latest changes from master

docs/Download.html

@@ -79,7 +79,9 @@
               <div class="col-lg-8 col-lg-offset-2 text-center">
                   <h2 class="section-heading">Download R-Instat</h2>
                   <hr class="light">
-                  <p><a href=https://bit.ly/35jzZo8" style="color:blue;" target="_blank">R-Instat 0.6.3 Installer (.exe 550MB)</a></p>
+                  <p><a href=https://bit.ly/r-instat_065_installer_32bit" style="color:blue;" target="_blank">R-Instat 0.6.5 Installer 32 Bit (.exe 550MB)</a></p>
+                  <p>If you know that you have a 64 bit computer, you can download the 64 Bit version</p>
+                  <a href=https://bit.ly/r-instat_065_installer_64bit" style="color:blue;" target="_blank">R-Instat 0.6.5 Installer 64 Bit (.exe 551MB)</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>

installer/inno_install_script_32bit.iss

@@ -5,9 +5,9 @@
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{A28EA3A8-6635-48BE-BCF0-F783E0132E5C}
+AppId={{4D376AB0-1496-4DDA-8250-9319B03FC411}
 AppName=R-Instat
-#define AppVerName "0.6.3"
+#define AppVerName "0.6.5"
 AppVersion={#AppVerName}
 AppPublisher=African Maths Initiative
 AppPublisherURL=http://r-instat.org/
@@ -23,18 +23,18 @@ SolidCompression=yes
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; OnlyBelowVersion: 0,6.4
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; OnlyBelowVersion: 0,6.6
 
 [Files]
 Source: "..\instat\bin\Release\instat.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\instat\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\R-Instat 0.6.3"; Filename: "{app}\instat.exe"
+Name: "{group}\R-Instat 0.6.5"; Filename: "{app}\instat.exe"
 Name: "{group}\{cm:UninstallProgram,R-Instat}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\R-Instat 0.6.3"; Filename: "{app}\instat.exe"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\R-Instat 0.6.3"; Filename: "{app}\instat.exe"; Tasks: quicklaunchicon
+Name: "{commondesktop}\R-Instat 0.6.5"; Filename: "{app}\instat.exe"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\R-Instat 0.6.5"; Filename: "{app}\instat.exe"; Tasks: quicklaunchicon
 
 [Run]
 Filename: "{app}\instat.exe"; Description: "{cm:LaunchProgram,R-Instat}"; Flags: nowait postinstall skipifsilent

installer/inno_install_script_64bit.iss

@@ -5,9 +5,9 @@
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{A28EA3A8-6635-48BE-BCF0-F783E0132E5C}
+AppId={{4D376AB0-1496-4DDA-8250-9319B03FC411}
 AppName=R-Instat
-#define AppVerName "0.6.3"
+#define AppVerName "0.6.5"
 AppVersion={#AppVerName}
 AppPublisher=African Maths Initiative
 AppPublisherURL=http://r-instat.org/
@@ -24,18 +24,18 @@ ArchitecturesInstallIn64BitMode=x64
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; OnlyBelowVersion: 0,6.4
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; OnlyBelowVersion: 0,6.6
 
 [Files]
 Source: "..\instat\bin\x64\Release\instat.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\instat\bin\x64\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\R-Instat 0.6.3"; Filename: "{app}\instat.exe"
+Name: "{group}\R-Instat 0.6.5"; Filename: "{app}\instat.exe"
 Name: "{group}\{cm:UninstallProgram,R-Instat}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\R-Instat 0.6.3"; Filename: "{app}\instat.exe"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\R-Instat 0.6.3"; Filename: "{app}\instat.exe"; Tasks: quicklaunchicon
+Name: "{commondesktop}\R-Instat 0.6.5"; Filename: "{app}\instat.exe"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\R-Instat 0.6.5"; Filename: "{app}\instat.exe"; Tasks: quicklaunchicon
 
 [Run]
 Filename: "{app}\instat.exe"; Description: "{cm:LaunchProgram,R-Instat}"; Flags: nowait postinstall skipifsilent

instat/DlgUseDate.vb

@@ -38,7 +38,6 @@ Public Class dlgUseDate
 
     Private Sub InitialiseDialog()
         ucrBase.iHelpTopicID = 462
-        ucrBase.clsRsyntax.iCallType = 2
 
         'Selector
         ucrSelectorUseDate.SetParameter(New RParameter("data_name", 0))

instat/clsInstatOptions.vb

@@ -36,6 +36,7 @@ Imports RDotNet
     Public bCommandsinOutput As Nullable(Of Boolean)
     Public bIncludeCommentDefault As Nullable(Of Boolean) 'sets the default for comments on the dialog
     Public bShowProcurementMenu As Nullable(Of Boolean)
+    Public bShowStructuredMenu As Nullable(Of Boolean)
     Public bShowClimaticMenu As Nullable(Of Boolean)
     Public bShowOptionsByContextMenu As Nullable(Of Boolean)
     Public iDigits As Nullable(Of Integer)
@@ -57,6 +58,7 @@ Imports RDotNet
         bCommandsinOutput = clsInstatOptionsDefaults.DEFAULTbCommandsinOutput
         bIncludeCommentDefault = clsInstatOptionsDefaults.DEFAULTbIncludeCommentDefault
         bShowClimaticMenu = clsInstatOptionsDefaults.DEFAULTbShowClimaticMenu
+        bShowStructuredMenu = clsInstatOptionsDefaults.DEFAULTbShowStructuredMenu
         bShowProcurementMenu = clsInstatOptionsDefaults.DEFAULTbShowProcurementMenu
         bShowOptionsByContextMenu = clsInstatOptionsDefaults.DEFAULTbShowOptionsByContextMenu
         fntOutput = clsInstatOptionsDefaults.DEFAULTfntOutput
@@ -201,6 +203,12 @@ Imports RDotNet
             SetShowProcurementMenu(clsInstatOptionsDefaults.DEFAULTbShowProcurementMenu)
         End If
 
+        If bShowStructuredMenu.HasValue Then
+            SetShowStructuredMenu(bShowStructuredMenu)
+        Else
+            SetShowStructuredMenu(clsInstatOptionsDefaults.DEFAULTbShowStructuredMenu)
+        End If
+
         If bShowClimaticMenu.HasValue Then
             SetShowClimaticMenu(bShowClimaticMenu)
         Else
@@ -415,6 +423,11 @@ Imports RDotNet
         frmMain.SetShowProcurementMenu(bNewShowProcurementMenu)
     End Sub
 
+    Public Sub SetShowStructuredMenu(bNewShowStructuredMenu As Boolean)
+        bShowStructuredMenu = bNewShowStructuredMenu
+        frmMain.SetShowStructuredMenu(bNewShowStructuredMenu)
+    End Sub
+
     Public Sub SetShowClimaticMenu(bNewShowClimaticMenu As Boolean)
         bShowClimaticMenu = bNewShowClimaticMenu
         frmMain.SetShowClimaticMenu(bNewShowClimaticMenu)

instat/clsInstatOptionsDefaults.vb

@@ -20,6 +20,7 @@ Public Class clsInstatOptionsDefaults
     Public Shared ReadOnly DEFAULTbIncludeCommentDefault As Boolean = True
     Public Shared ReadOnly DEFAULTbShowProcurementMenu As Boolean = True
     Public Shared ReadOnly DEFAULTbShowClimaticMenu As Boolean = True
+    Public Shared ReadOnly DEFAULTbShowStructuredMenu As Boolean = True
     Public Shared ReadOnly DEFAULTbShowOptionsByContextMenu As Boolean = True
     Public Shared ReadOnly DEFAULTfntOutput As Font = New Font(FontFamily.GenericMonospace, 11, FontStyle.Regular)
     Public Shared ReadOnly DEFAULTclrOutput As Color = Color.Blue

instat/clsRLink.vb

@@ -1385,6 +1385,7 @@ Public Class RLink
         Dim clsSetWd As New RFunction
         Dim clsSource As New RFunction
         Dim clsCreateIO As New ROperator
+        Dim clsDplyrOption As New RFunction
         Dim strScript As String = ""
 
         clsSetWd.SetRCommand("setwd")
@@ -1394,11 +1395,14 @@ Public Class RLink
         clsCreateIO.SetOperation("<-")
         clsCreateIO.AddParameter("left", strInstatDataObject, iPosition:=0)
         clsCreateIO.AddParameter("right", strDataBookClassName & "$new()", iPosition:=1)
+        clsDplyrOption.SetRCommand("options")
+        clsDplyrOption.AddParameter("dplyr.summarise.inform", "FALSE", iPosition:=0)
 
         strScript = ""
         strScript = strScript & clsSetWd.ToScript() & Environment.NewLine
         strScript = strScript & clsSource.ToScript() & Environment.NewLine
-        strScript = strScript & clsCreateIO.ToScript()
+        strScript = strScript & clsCreateIO.ToScript() & Environment.NewLine
+        strScript = strScript & clsDplyrOption.ToScript()
 
         Return strScript
     End Function

instat/dlgAddLink.resx

@@ -174,7 +174,7 @@
     <value>True</value>
   </data>
   <data name="lblFrom.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 10</value>
+    <value>10, 11</value>
   </data>
   <data name="lblFrom.Size" type="System.Drawing.Size, System.Drawing">
     <value>33, 13</value>
@@ -201,7 +201,7 @@
     <value>True</value>
   </data>
   <data name="lblTo.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 76</value>
+    <value>10, 77</value>
   </data>
   <data name="lblTo.Size" type="System.Drawing.Size, System.Drawing">
     <value>23, 13</value>
@@ -294,14 +294,14 @@
     <value>7</value>
   </data>
   <data name="ucrDataSelectorTo.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 92</value>
+    <value>15, 93</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ucrDataSelectorTo.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
   </data>
   <data name="ucrDataSelectorTo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 50</value>
+    <value>150, 50</value>
   </data>
   <data name="ucrDataSelectorTo.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -319,13 +319,13 @@
     <value>9</value>
   </data>
   <data name="ucrDataSelectorFrom.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 26</value>
+    <value>15, 27</value>
   </data>
   <data name="ucrDataSelectorFrom.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
   </data>
   <data name="ucrDataSelectorFrom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 50</value>
+    <value>150, 50</value>
   </data>
   <data name="ucrDataSelectorFrom.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>