Merge pull request #39 from africanmathsinitiative/master

Pulling changes from the main
dannyparsons · Jan 29, 2016 · c2e2c9f · c2e2c9f
2 parents c9e58d7 + f80da74
commit c2e2c9f
Show file tree

Hide file tree

Showing 63 changed files with 1,758 additions and 1,079 deletions.
diff --git a/instat/My Project/Resources.Designer.vb b/instat/My Project/Resources.Designer.vb
diff --git a/instat/My Project/Resources.resx b/instat/My Project/Resources.resx
@@ -979,4 +979,61 @@
   <data name="Shape" xml:space="preserve">
     <value>Shape</value>
   </data>
+  <data name="Colour_rainbow" xml:space="preserve">
+    <value>Colour rainbow</value>
+  </data>
+  <data name="Cumulative_exceedance" xml:space="preserve">
+    <value>Cumulative exceedance</value>
+  </data>
+  <data name="Day_Month" xml:space="preserve">
+    <value>Day Month</value>
+  </data>
+  <data name="Display_daily" xml:space="preserve">
+    <value>Display daily</value>
+  </data>
+  <data name="Display_daily_data_rain" xml:space="preserve">
+    <value>Display daily data rain</value>
+  </data>
+  <data name="Display_DOY_of_Year" xml:space="preserve">
+    <value>Display DOY of Year</value>
+  </data>
+  <data name="Grid_square" xml:space="preserve">
+    <value>Grid square</value>
+  </data>
+  <data name="Interested_variable" xml:space="preserve">
+    <value>Interested variable</value>
+  </data>
+  <data name="legend_bty" xml:space="preserve">
+    <value>legend bty</value>
+  </data>
+  <data name="Legend_label" xml:space="preserve">
+    <value>Legend label</value>
+  </data>
+  <data name="Legend_position" xml:space="preserve">
+    <value>Legend position</value>
+  </data>
+  <data name="Line_width" xml:space="preserve">
+    <value>Line width</value>
+  </data>
+  <data name="Percents" xml:space="preserve">
+    <value>Percents</value>
+  </data>
+  <data name="Plot_character" xml:space="preserve">
+    <value>Plot character</value>
+  </data>
+  <data name="Plot_window" xml:space="preserve">
+    <value>Plot window</value>
+  </data>
+  <data name="Station_name" xml:space="preserve">
+    <value>Station name</value>
+  </data>
+  <data name="Statistic" xml:space="preserve">
+    <value>Statistic</value>
+  </data>
+  <data name="Sum" xml:space="preserve">
+    <value>Sum</value>
+  </data>
+  <data name="Y_label" xml:space="preserve">
+    <value>Y label</value>
+  </data>
 </root>
diff --git a/instat/clsDistribution.vb b/instat/clsDistribution.vb
@@ -16,6 +16,7 @@
 
 Public Class Distribution
     Public strNameTag As String
+    Public bIncluded As Boolean = True
     Public strRFunctionName As String = ""
     Public strPFunctionName As String = ""
     Public strQFunctionName As String = ""

diff --git a/instat/clsRFunction.vb b/instat/clsRFunction.vb
@@ -63,13 +63,13 @@ Public Class RFunction
             strScript = strScript & strAssignTo & " <- " & strTemp & vbCrLf
             If Not strAssignToDataFrame = "" Then
                 If Not strAssignToColumn = "" Then
-                    strScript = strScript & frmMain.clsRLink.strInstatDataObject & "$add_column_to_data(obj_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ", col_name = " & Chr(34) & strAssignToColumn & Chr(34) & ", col_data = " & strAssignTo & ")" & vbCrLf
-                    strAssignTo = frmMain.clsRLink.strInstatDataObject & "$get_column_from_data(obj_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ", col_name = " & Chr(34) & strAssignToColumn & Chr(34) & ")"
+                    strScript = strScript & frmMain.clsRLink.strInstatDataObject & "$add_column_to_data(data_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ", col_name = " & Chr(34) & strAssignToColumn & Chr(34) & ", col_data = " & strAssignTo & ")" & vbCrLf
+                    strAssignTo = frmMain.clsRLink.strInstatDataObject & "$get_column_from_data(data_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ", col_name = " & Chr(34) & strAssignToColumn & Chr(34) & ")"
                     bIsAssigned = True
                     bToBeAssigned = False
                 Else
                     strScript = strScript & frmMain.clsRLink.strInstatDataObject & "$import_data(data_tables = list(" & strAssignToDataFrame & "=" & strAssignTo & "))" & vbCrLf
-                    strAssignTo = frmMain.clsRLink.strInstatDataObject & "$get_data(obj_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ")"
+                    strAssignTo = frmMain.clsRLink.strInstatDataObject & "$get_data(data_name = " & Chr(34) & strAssignToDataFrame & Chr(34) & ")"
                     bIsAssigned = True
                     bToBeAssigned = False
                 End If
@@ -113,4 +113,8 @@ Public Class RFunction
         bIsAssigned = False
     End Sub
 
+    Public Sub ClearParameters()
+        clsParameters.Clear()
+        bIsAssigned = False
+    End Sub
 End Class
diff --git a/instat/clsRSyntax.vb b/instat/clsRSyntax.vb
@@ -66,9 +66,7 @@ Public Class RSyntax
             clsFunction = clsBaseFunction
         End If
 
-        For Each clsCurrParam In clsFunction.clsParameters
-            clsFunction.RemoveParameterByName(clsCurrParam.strArgumentName)
-        Next
+        clsFunction.ClearParameters()
     End Sub
 
     Public Function GetScript(Optional ByRef clsFunction As RFunction = Nothing, Optional bExcludeAssignedFunctionOutput As Boolean = True) As String