Merge pull request #182 from africanmathsinitiative/master

update

instat/Model/DataFrame/clsDataBook.vb

@@ -155,11 +155,10 @@ Public Class clsDataBook
             End If
             'if data not refreshed successfully, remove the data frame from the data book
             If Not dataFrame.RefreshData() Then
-                MessageBox.Show("Error: Could not retrieve data frame:" & strDataFrameName & " from R" &
-                                Environment.NewLine & "Data displayed in spreadsheet may not be up to date." &
-                                Environment.NewLine & "We strongly suggest restarting R-Instat before continuing.",
+                MessageBox.Show("Error: Sorry R-Instat can not retrieve the: " & strDataFrameName & " data from R.",
                                 "Cannot retrieve data", MessageBoxButtons.OK, MessageBoxIcon.Warning)
                 _lstDataFrames.Remove(dataFrame)
+                DeleteDataFrames(strDataFrameName)
             End If
         Next
         If lstOfCurrentRDataFrameNames.Count = _lstDataFrames.Count Then
@@ -189,5 +188,12 @@ Public Class clsDataBook
         Return listOfDataFrames
     End Function
 
+    Private Sub DeleteDataFrames(strDataName As String)
+        Dim clsDeleteFunction As New RFunction
+        clsDeleteFunction.SetRCommand(_RLink.strInstatDataObject & "$delete_dataframes")
+        clsDeleteFunction.AddParameter("data_names", Chr(34) & strDataName & Chr(34))
+        _RLink.RunScript(clsDeleteFunction.ToScript(), strComment:="Delete DataFrame(s)")
+    End Sub
+
 End Class
 

instat/Model/Output/clsOutputElement.vb

@@ -85,11 +85,15 @@ Public Class clsOutputElement
         _strOutput = strOutput
     End Sub
 
-    ''' <summary>
+    ''' <summary> 
     ''' Gets formatted R Script, split into R Script Elements
     ''' </summary>
     ''' <returns></returns>
     Public ReadOnly Property FormattedRScript As List(Of clsRScriptElement)
+
+        'todo.
+        'this function may end up being called multiple times. For long scripts initialising clsRScript And getting tokens takes  lot of time. You can test this effect by pasting new data frame that has many columns.
+        'should the operation of getting tokens be done just once then stored to be reused f need be?
         Get
             Dim _lstRScriptElements As New List(Of clsRScriptElement)
             Try

instat/UserControl/ucrOutputPage.vb

@@ -133,7 +133,7 @@ Public Class ucrOutputPage
         'whether it's just a script output
 
         'todo. temporary fix. Output element should always have an R script
-        If outputElement.FormattedRScript IsNot Nothing Then
+        If outputElement.Script IsNot Nothing Then
             AddNewScript(outputElement)
         End If
 

instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb

@@ -309,10 +309,12 @@ Public Class ucrDataViewReoGrid
             ' Check if the row index is within the valid range
             If rowNumber >= 0 AndAlso rowNumber < currWorkSheet.RowCount Then
                 If bApplyToRows Then
-                    ' Apply the row style to the entire row
-                    currWorkSheet.Cells(rowNumber, colIndex).Style.BackColor = color
+                    For i As Integer = 0 To currWorkSheet.ColumnCount - 1
+                        ' Apply the row style to the entire row
+                        currWorkSheet.Cells(rowNumber, i).Style.BackColor = color
+                    Next
                 Else
-                    currWorkSheet.SetRangeStyles(New RangePosition(rowNumber, 0, 1, colIndex), rowStyle)
+                    currWorkSheet.Cells(rowNumber, colIndex).Style.BackColor = color
                 End If
             End If
         Next

instat/dlgName.vb

@@ -95,8 +95,10 @@ Public Class dlgName
         ucrPnlCase.AddRadioButton(rdoReplace, "stringr::str_replace")
 
         ucrPnlSelectData.SetParameter(New RParameter("data", 0))
-        ucrPnlSelectData.AddRadioButton(rdoWholeDataFrame, "x")
-        ucrPnlSelectData.AddRadioButton(rdoSelectedColumn, "y")
+        ucrPnlSelectData.AddRadioButton(rdoWholeDataFrame)
+        ucrPnlSelectData.AddRadioButton(rdoSelectedColumn)
+        ucrPnlSelectData.AddParameterValuesCondition(rdoWholeDataFrame, "checked", "whole")
+        ucrPnlSelectData.AddParameterValuesCondition(rdoSelectedColumn, "checked", "selected")
 
         ucrReceiverColumns.SetParameter(New RParameter(".cols", 6))
         ucrReceiverColumns.Selector = ucrSelectVariables
@@ -179,7 +181,7 @@ Public Class dlgName
         clsNewLabelDataframeFunction.SetRCommand("data.frame")
 
         clsDummyFunction.AddParameter("checked", "FALSE", iPosition:=0)
-        clsDummyFunction.AddParameter("data", "x", iPosition:=1)
+        clsDummyFunction.AddParameter("checked", "whole", iPosition:=1)
 
         clsDefaultRFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$rename_column_in_data")
         clsDefaultRFunction.AddParameter("type", Chr(34) & "single" & Chr(34), iPosition:=4)
@@ -219,11 +221,11 @@ Public Class dlgName
         If bReset Then
             ucrPnlCase.SetRCode(clsDefaultRFunction, bReset)
             ucrInputReplace.SetRCode(clsDefaultRFunction, bReset)
+            ucrChkIncludeVariable.SetRCode(clsDummyFunction, bReset)
         End If
         ucrInputCase.SetRCode(clsDefaultRFunction, bReset)
         ucrNudAbbreviate.SetRCode(clsDefaultRFunction, bReset)
         ucrPnlOptions.SetRCode(clsDefaultRFunction, bReset)
-        ucrChkIncludeVariable.SetRCode(clsDummyFunction, bReset)
         ucrInputBy.SetRCode(clsDefaultRFunction, bReset)
         ucrPnlSelectData.SetRCode(clsDummyFunction, bReset)
     End Sub