Merge pull request #101 from africanmathsinitiative/master

fetching latest copy

instat/clsRLink.vb

@@ -621,7 +621,7 @@ Public Class RLink
             clsGetGraphNames.AddParameter("data_name", Chr(34) & strDataFrameName & Chr(34))
         End If
         expGraphNames = RunInternalScriptGetValue(clsGetGraphNames.ToScript(), bSilent:=True)
-        If Not expGraphNames.Type = Internals.SymbolicExpressionType.Null Then
+        If expGraphNames IsNot Nothing AndAlso Not expGraphNames.Type = Internals.SymbolicExpressionType.Null Then
             chrGraphNames = expGraphNames.AsCharacter()
             If chrGraphNames.Length > 0 Then
                 lstGraphNames.AddRange(chrGraphNames)

instat/dlgAppend.vb

@@ -29,15 +29,28 @@ Public Class dlgAppend
         TestOKEnabled()
     End Sub
     Private Sub InitialiseDialog()
+        ucrReceiverAppendDataframe.Selector = ucrSelectorDataframes
+        ucrReceiverAppendDataframe.SetMeAsReceiver()
+        ucrBase.clsRsyntax.SetFunction("bind_rows")
+        ucrReceiverAppendDataframe.SetItemType("dataframe")
+        ucrInputIDColName.SetValidationTypeAsRVariable()
 
     End Sub
 
     Private Sub TestOKEnabled()
-
+        If ucrReceiverAppendDataframe.IsEmpty = False Then
+            ucrBase.OKEnabled(True)
+        Else
+            ucrBase.OKEnabled(False)
+        End If
     End Sub
 
     Private Sub SetDefaults()
-
+        ucrSelectorDataframes.Reset()
+        ucrInputIDColName.SetName("ID_Col")
+        ucrInputNewDataframeName.ResetText()
+        ucrInputIDColName.ResetText()
+        chkIncludeIDColumn.Checked = False
     End Sub
 
     Private Sub ReopenDialog()
@@ -49,4 +62,32 @@ Public Class dlgAppend
         TestOKEnabled()
     End Sub
 
+    Private Sub ucrReceiverAppendDataframe_SelectionChanged(sender As Object, e As EventArgs) Handles ucrReceiverAppendDataframe.SelectionChanged
+        If ucrReceiverAppendDataframe.IsEmpty = False Then
+            ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverAppendDataframe.GetVariables)
+        Else
+            ucrBase.clsRsyntax.RemoveParameter("x")
+        End If
+        TestOKEnabled()
+    End Sub
+
+    Private Sub chkIncludeIDColumn_CheckedChanged(sender As Object, e As EventArgs) Handles chkIncludeIDColumn.CheckedChanged
+        includeIDColumn()
+    End Sub
+
+    Private Sub ucrInputIDColName_NameChanged() Handles ucrInputIDColName.NameChanged
+        includeIDColumn()
+    End Sub
+
+    Private Sub includeIDColumn()
+        If chkIncludeIDColumn.Checked Then
+            ucrBase.clsRsyntax.AddParameter(".id", Chr(34) & ucrInputIDColName.GetText & Chr(34))
+        Else
+            ucrBase.clsRsyntax.RemoveParameter(".id")
+        End If
+    End Sub
+
+    Private Sub ucrInputNewDataframeName_NameChanged() Handles ucrInputNewDataframeName.NameChanged
+        ucrBase.clsRsyntax.SetAssignTo(ucrInputNewDataframeName.GetText(), strTempDataframe:=ucrInputNewDataframeName.GetText())
+    End Sub
 End Class

instat/dlgBarAndPieChart.vb

@@ -41,6 +41,7 @@ Public Class dlgBarAndPieChart
         ucrBarChartSelector.Reset()
         ucrBarChartSelector.Focus()
         ucrFactorReceiver.SetMeAsReceiver()
+        sdgPlots.Reset()
     End Sub
 
     Private Sub InitialiseDialog()

instat/dlgBoxPlot.vb

@@ -47,6 +47,7 @@ Public Class dlgBoxplot
         ucrSelectorBoxPlot.Focus()
         ucrVariablesAsFactorForBoxplot.ResetControl()
         chkHorizontalBoxplot.Checked = False
+        sdgPlots.Reset()
         TestOkEnabled()
         SetXParameter()
     End Sub
@@ -145,7 +146,6 @@ Public Class dlgBoxplot
 
     Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
         SetDefaults()
-        sdgPlots.Reset()
     End Sub
 
     Private Sub chkHorizontalBoxplot_CheckedChanged(sender As Object, e As EventArgs) Handles chkHorizontalBoxplot.CheckedChanged