Merge pull request #21 from africanmathsinitiative/master

Updating master

docs/Download.html

@@ -77,13 +77,13 @@
       <div class="container">
           <div class="row">
               <div class="col-lg-8 col-lg-offset-2 text-center">
-                  <h2 class="section-heading">Download R-Instat 0.4.27</h2>
+                  <h2 class="section-heading">Download R-Instat 0.4.29</h2>
                   <hr class="light">
-                  <p>If this is your first time downloading R-Instat, we recommend you <a href="https://goo.gl/8QZFpV" style="color:blue;" target="_blank">download the Complete Installer</a>. The Complete Installer is the same version of R-Instat as the Basic Installer but also includes the required version of R (3.4.4 currently) to run R-Instat.</p>
+                  <p>If this is your first time downloading R-Instat, we recommend you <a href="https://goo.gl/GQirgF" style="color:blue;" target="_blank">download the Complete Installer</a>. The Complete Installer is the same version of R-Instat as the Basic Installer but also includes the required version of R (3.4.4 currently) to run R-Instat.</p>
                   <p>If you do not know if you have the latest version of R, download the Complete Installer. The Basic Installer does not include R.</p>
                   <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>
-                  <p><a href="https://goo.gl/8QZFpV" style="color:blue;" target="_blank">R-Instat 0.4.27 Complete Installer (.exe 540MB)</a></p>
-                  <p><a href="https://goo.gl/ZkRt27" style="color:blue;" target="_blank">R-Instat 0.4.27 Basic Installer (.msi 463MB)</a></p>
+                  <p><a href="https://goo.gl/GQirgF" style="color:blue;" target="_blank">R-Instat 0.4.29 Complete Installer (.exe 540MB)</a></p>
+                  <p><a href="https://goo.gl/1uEeVT" style="color:blue;" target="_blank">R-Instat 0.4.29 Basic Installer (.msi 463MB)</a></p>
 
                   <h2 class="section-heading">Installation & Documentation</h2>
                   <hr class="light">

instat/clsRCodeStructure.vb

@@ -24,6 +24,10 @@ Public Class RCodeStructure
     Public strAssignToGraph As String
     Public strAssignToSurv As String
     Public strAssignToTable As String
+    ' If true then a list of data frames is being assigned, otherwise a single data frame
+    Public bDataFrameList As Boolean = False
+    ' Optional R character vector to give names of new data frames if data frame list is not named
+    Public strDataFrameNames As String
     'These AssingTo's are only relevant in the string case, as RFunction and ROperator have internal equivalents.
     'If they are empty, the output Of the command Is Not linked To an R-instat object.
     'If they are non-empty, that gives the name of the R-instat Object fields it needs to be linked with.
@@ -78,7 +82,7 @@ Public Class RCodeStructure
     End Sub
 
     'Most methods from RFunction/ROperator have been moved here
-    Public Sub SetAssignTo(strTemp As String, Optional strTempDataframe As String = "", Optional strTempColumn As String = "", Optional strTempModel As String = "", Optional strTempGraph As String = "", Optional strTempSurv As String = "", Optional strTempTable As String = "", Optional bAssignToIsPrefix As Boolean = False, Optional bAssignToColumnWithoutNames As Boolean = False, Optional bInsertColumnBefore As Boolean = False, Optional bRequireCorrectLength As Boolean = True)
+    Public Sub SetAssignTo(strTemp As String, Optional strTempDataframe As String = "", Optional strTempColumn As String = "", Optional strTempModel As String = "", Optional strTempGraph As String = "", Optional strTempSurv As String = "", Optional strTempTable As String = "", Optional bAssignToIsPrefix As Boolean = False, Optional bAssignToColumnWithoutNames As Boolean = False, Optional bInsertColumnBefore As Boolean = False, Optional bRequireCorrectLength As Boolean = True, Optional bDataFrameList As Boolean = False, Optional strDataFrameNames As String = "")
         strAssignTo = strTemp
         If Not strTempDataframe = "" Then
             strAssignToDataFrame = strTempDataframe
@@ -104,6 +108,8 @@ Public Class RCodeStructure
         Me.bAssignToColumnWithoutNames = bAssignToColumnWithoutNames
         Me.bInsertColumnBefore = bInsertColumnBefore
         Me.bRequireCorrectLength = bRequireCorrectLength
+        Me.bDataFrameList = bDataFrameList
+        Me.strDataFrameNames = strDataFrameNames
     End Sub
 
     Public Sub RemoveAssignTo()
@@ -229,9 +235,16 @@ Public Class RCodeStructure
                 strAssignTo = clsGetTables.ToScript()
             ElseIf Not strAssignToDataFrame = "" Then
                 clsAddData.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_data")
-                clsDataList.SetRCommand("list")
-                clsDataList.AddParameter(strAssignToDataFrame, strAssignTo)
-                clsAddData.AddParameter("data_tables", clsRFunctionParameter:=clsDataList)
+                If bDataFrameList Then
+                    clsAddData.AddParameter("data_tables", strAssignTo, iPosition:=0)
+                    If strDataFrameNames <> "" Then
+                        clsAddData.AddParameter("data_names", strDataFrameNames, iPosition:=5)
+                    End If
+                Else
+                    clsDataList.SetRCommand("list")
+                    clsDataList.AddParameter(strAssignToDataFrame, strAssignTo)
+                    clsAddData.AddParameter("data_tables", clsRFunctionParameter:=clsDataList, iPosition:=0)
+                End If
                 strScript = strScript & clsAddData.ToScript() & Environment.NewLine
 
                 clsGetData.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame")
@@ -460,6 +473,8 @@ Public Class RCodeStructure
         clsTempCode.strAssignToGraph = strAssignToGraph
         clsTempCode.strAssignToSurv = strAssignToSurv
         clsTempCode.strAssignToTable = strAssignToTable
+        clsTempCode.bDataFrameList = bDataFrameList
+        clsTempCode.strDataFrameNames = strDataFrameNames
         clsTempCode.bToBeAssigned = bToBeAssigned
         clsTempCode.bIsAssigned = bIsAssigned
         clsTempCode.bAssignToIsPrefix = bAssignToIsPrefix

instat/dlgBarAndPieChart.resx

@@ -244,10 +244,10 @@
     <value>NoControl</value>
   </data>
   <data name="rdoPieChart.Location" type="System.Drawing.Point, System.Drawing">
-    <value>215, 12</value>
+    <value>206, 12</value>
   </data>
   <data name="rdoPieChart.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 28</value>
+    <value>110, 28</value>
   </data>
   <data name="rdoPieChart.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -280,10 +280,10 @@
     <value>NoControl</value>
   </data>
   <data name="rdoBarChart.Location" type="System.Drawing.Point, System.Drawing">
-    <value>117, 12</value>
+    <value>98, 12</value>
   </data>
   <data name="rdoBarChart.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 28</value>
+    <value>110, 28</value>
   </data>
   <data name="rdoBarChart.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -505,10 +505,10 @@
     <value>12</value>
   </data>
   <data name="ucrPnlOptions.Location" type="System.Drawing.Point, System.Drawing">
-    <value>107, 6</value>
+    <value>87, 6</value>
   </data>
   <data name="ucrPnlOptions.Size" type="System.Drawing.Size, System.Drawing">
-    <value>211, 36</value>
+    <value>241, 36</value>
   </data>
   <data name="ucrPnlOptions.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>