Merge pull request #293 from IDEMSInternational/master

update

instat/Interface/IDataViewGrid.vb

@@ -29,6 +29,8 @@ Public Interface IDataViewGrid
 
     Event WorksheetChanged()
 
+    Event WorksheetInserted()
+
     Event WorksheetRemoved(worksheet As clsWorksheetAdapter)
 
     Event FindRow()
@@ -44,6 +46,8 @@ Public Interface IDataViewGrid
 
     Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False)
 
+    Sub Focus()
+
     Function GetSelectedColumns() As List(Of clsColumnHeaderDisplay)
 
     Function GetFirstRowHeader() As String

instat/Model/DataFrame/clsDataFramePage.vb

@@ -205,6 +205,58 @@ Public Class clsDataFramePage
         Return Math.Ceiling(_iTotalColumnCount / iColumnIncrements)
     End Function
 
+    Public Sub Undo()
+        Dim clsUndoRFunction As New RFunction
+        clsUndoRFunction.SetRCommand(_clsRLink.strInstatDataObject & "$undo_last_action")
+        clsUndoRFunction.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34))
+        _clsRLink.RunScript(clsUndoRFunction.ToScript)
+
+    End Sub
+
+    Public Function IsUndo(strCurrentDataFrame As String)
+        Dim clsIsUndoFunction As New RFunction
+        Dim expTemp As SymbolicExpression
+        clsIsUndoFunction.SetRCommand(_clsRLink.strInstatDataObject & "$is_undo")
+        clsIsUndoFunction.AddParameter("data_name", Chr(34) & strCurrentDataFrame & Chr(34))
+
+        If clsIsUndoFunction IsNot Nothing Then
+            expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsIsUndoFunction.ToScript(), bSilent:=True)
+            If expTemp IsNot Nothing AndAlso expTemp.AsCharacter(0) = "TRUE" Then
+                Return True
+            End If
+        End If
+
+        Return False
+    End Function
+
+    Public Sub DisableEnableUndo(bDisable As Boolean, strCurrentDataFrame As String)
+        Dim clsEnableDisableUndoRFunction As New RFunction
+        clsEnableDisableUndoRFunction.SetRCommand(_clsRLink.strInstatDataObject & "$set_enable_disable_undo")
+        clsEnableDisableUndoRFunction.AddParameter("data_name", Chr(34) & strCurrentDataFrame & Chr(34))
+
+        Dim strDisable As String = If(bDisable, "TRUE", "FALSE")
+        clsEnableDisableUndoRFunction.AddParameter("disable_undo", strDisable)
+        _clsRLink.RunScript(clsEnableDisableUndoRFunction.ToScript)
+
+    End Sub
+
+    Public Function HasUndoHistory()
+        Dim expTemp As SymbolicExpression
+        Dim bHasHistory As Boolean = False
+        Dim clsHasHistoryFunction As New RFunction
+
+        clsHasHistoryFunction.SetRCommand(_clsRLink.strInstatDataObject & "$has_undo_history")
+        clsHasHistoryFunction.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34))
+        If clsHasHistoryFunction IsNot Nothing Then
+            expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasHistoryFunction.ToScript(), bSilent:=True)
+            If expTemp IsNot Nothing AndAlso expTemp.AsCharacter(0) = "TRUE" Then
+                bHasHistory = True
+            End If
+        End If
+
+        Return bHasHistory
+    End Function
+
     Private Function GetDataFrameFromRCommand() As DataFrame
         Dim clsGetDataFrameRFunction As New RFunction
         Dim expTemp As SymbolicExpression

instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb

@@ -35,6 +35,8 @@ Public Class ucrDataViewLinuxGrid
 
     Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged
 
+    Public Event WorksheetInserted() Implements IDataViewGrid.WorksheetInserted
+
     Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved
 
     Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns
@@ -69,6 +71,10 @@ Public Class ucrDataViewLinuxGrid
         Next
     End Sub
 
+    Public Sub FocusGrid() Implements IDataViewGrid.Focus
+        Me.Focus()
+    End Sub
+
     Public Function SelectedTab() As String
         If tcTabs.SelectedTab Is Nothing Then
             Return ""

instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb

@@ -35,6 +35,8 @@ Public Class ucrDataViewReoGrid
 
     Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged
 
+    Public Event WorksheetInserted() Implements IDataViewGrid.WorksheetInserted
+
     Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved
 
     Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns
@@ -57,6 +59,11 @@ Public Class ucrDataViewReoGrid
         Next
     End Sub
 
+    Public Sub FocusGrid() Implements IDataViewGrid.Focus
+        grdData.Focus()
+        grdData.CurrentWorksheet.FocusPos = grdData.CurrentWorksheet.FocusPos
+    End Sub
+
     Public Sub AddRowData(dataFrame As clsDataFrame) Implements IDataViewGrid.AddRowData
         Dim textColour As Color
         Dim strRowNames As String()
@@ -217,6 +224,11 @@ Public Class ucrDataViewReoGrid
         RaiseEvent WorksheetChanged()
     End Sub
 
+    Private Sub grdData_WorksheetInserted(sender As Object, e As EventArgs) Handles grdData.WorksheetInserted
+        RaiseEvent WorksheetInserted()
+    End Sub
+
+
     Private Sub grdData_WorksheetRemoved(sender As Object, e As WorksheetRemovedEventArgs) Handles grdData.WorksheetRemoved
         RaiseEvent WorksheetRemoved(New clsWorksheetAdapter(e.Worksheet))
     End Sub

instat/clsInstatOptions.vb

@@ -31,6 +31,8 @@ Imports RDotNet
     Public iPreviewRows As Nullable(Of Integer)
     Public iMaxRows As Nullable(Of Integer)
     Public iMaxCols As Nullable(Of Integer)
+    Public iUndoColLimit As Nullable(Of Integer)
+    Public iUndoRowLimit As Nullable(Of Integer)
     Public lstColourPalette As List(Of Color)
     Public strGraphDisplayOption As String
     Public bCommandsinOutput As Nullable(Of Boolean)
@@ -43,6 +45,8 @@ Imports RDotNet
     Public bShowSignifStars As Nullable(Of Boolean)
     Public bChangeDataFrame As Nullable(Of Boolean)
     Public bAutoSaveData As Nullable(Of Boolean)
+    Public bSwitchOffUndo As Nullable(Of Boolean)
+    Public bUndoSwitchAction As Nullable(Of Boolean)
     Public iAutoSaveDataMinutes As Nullable(Of Integer)
     Public bShowWaitDialog As Nullable(Of Boolean)
     Public iWaitTimeDelaySeconds As Nullable(Of Integer)
@@ -75,6 +79,8 @@ Imports RDotNet
         iPreviewRows = clsInstatOptionsDefaults.DEFAULTiPreviewRows
         iMaxRows = clsInstatOptionsDefaults.DEFAULTiMaxRows
         iMaxCols = clsInstatOptionsDefaults.DEFAULTiMaxCols
+        iUndoColLimit = clsInstatOptionsDefaults.DEFAULTiUndoColLimit
+        iUndoRowLimit = clsInstatOptionsDefaults.DEFAULTiUndoRowLimit
         strComment = Translations.GetTranslation(clsInstatOptionsDefaults.DEFAULTstrComment)
         strGraphDisplayOption = clsInstatOptionsDefaults.DEFAULTstrGraphDisplayOption
         strLanguageCultureCode = clsInstatOptionsDefaults.DEFAULTstrLanguageCultureCode
@@ -84,6 +90,7 @@ Imports RDotNet
         bShowSignifStars = clsInstatOptionsDefaults.DEFAULTbShowSignifStars
         bChangeDataFrame = clsInstatOptionsDefaults.DEFAULTbChangeDataFrame
         bAutoSaveData = clsInstatOptionsDefaults.DEFAULTbAutoSaveData
+        bSwitchOffUndo = clsInstatOptionsDefaults.DEFAULTbSwitchOffUndo
         iAutoSaveDataMinutes = clsInstatOptionsDefaults.DEFAULTiAutoSaveDataMinutes
         bShowWaitDialog = clsInstatOptionsDefaults.DEFAULTbShowWaitDialog
         iWaitTimeDelaySeconds = clsInstatOptionsDefaults.DEFAULTiWaitTimeDelaySeconds
@@ -144,6 +151,18 @@ Imports RDotNet
             SetMaxCols(clsInstatOptionsDefaults.DEFAULTiMaxCols)
         End If
 
+        If iUndoColLimit.HasValue Then
+            SetUndoColLimit(iUndoColLimit)
+        Else
+            SetUndoColLimit(clsInstatOptionsDefaults.DEFAULTiUndoColLimit)
+        End If
+
+        If iUndoRowLimit.HasValue Then
+            SetUndoRowLimit(iUndoRowLimit)
+        Else
+            SetUndoRowLimit(clsInstatOptionsDefaults.DEFAULTiUndoRowLimit)
+        End If
+
         If bCommandsinOutput.HasValue Then
             SetCommandInOutpt(bCommandsinOutput)
         Else
@@ -244,6 +263,12 @@ Imports RDotNet
             SetAutoSaveData(clsInstatOptionsDefaults.DEFAULTbAutoSaveData)
         End If
 
+        If bSwitchOffUndo.HasValue Then
+            SetOffUndo(bSwitchOffUndo)
+        Else
+            SetOffUndo(clsInstatOptionsDefaults.DEFAULTbSwitchOffUndo)
+        End If
+
         If iAutoSaveDataMinutes.HasValue Then
             SetAutoSaveDataMinutes(iAutoSaveDataMinutes)
         Else
@@ -356,6 +381,14 @@ Imports RDotNet
         Return If(expression Is Nothing OrElse expression.Type = Internals.SymbolicExpressionType.Null, Nothing, expression.AsCharacter(0))
     End Function
 
+    Public Sub SetUndoColLimit(iNewUndoColLimit As Integer)
+        iUndoColLimit = iNewUndoColLimit
+    End Sub
+
+    Public Sub SetUndoRowLimit(iNewUndoRowLimit As Integer)
+        iUndoRowLimit = iNewUndoRowLimit
+    End Sub
+
     Public Sub SetMaxRows(iRows As Integer)
         iMaxRows = iRows
         frmMain.UpdateAllGrids()
@@ -530,6 +563,10 @@ Imports RDotNet
         bAutoSaveData = bNewAutoSave
     End Sub
 
+    Public Sub SetOffUndo(bNewSwitchOffUndo As Boolean)
+        bSwitchOffUndo = bNewSwitchOffUndo
+    End Sub
+
     Public Sub SetAutoSaveDataMinutes(iNewMinutes As Integer)
         iAutoSaveDataMinutes = iNewMinutes
         frmMain.ResetTimer()

instat/clsInstatOptionsDefaults.vb

@@ -33,6 +33,8 @@ Public Class clsInstatOptionsDefaults
     Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10
     Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000
     Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50
+    Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 200
+    Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 200000
     Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:"
     Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window"
     Public Shared ReadOnly DEFAULTbChangeDataFrame As Boolean = False
@@ -45,6 +47,7 @@ Public Class clsInstatOptionsDefaults
     Public Shared ReadOnly DEFAULTiDigits As Integer = 4
     Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False
     Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True
+    Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = False
     Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10
     Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True
     Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2

instat/dlgCalculator.vb

@@ -36,8 +36,11 @@ Public Class dlgCalculator
     Private strDefaultKeyboard As String
     ' Note: This list needs to be updated when a new keyboard is added.
     Private strKeyboards() As String = {"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer", "Functions"}
+    Private Shared ReadOnly Logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger()
+
 
     Private Sub dlgCalculator_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        Dim start = DateTime.Now
         If bFirstLoad Then
             InitialiseDialog()
             iBasicWidth = Me.Width
@@ -48,6 +51,10 @@ Public Class dlgCalculator
         ReopenDialog()
         TestOKEnabled()
         autoTranslate(Me)
+
+        Logger.Debug("This is in the load")
+        Logger.Debug(Process.GetCurrentProcess().WorkingSet64)
+        Logger.Debug("Time", DateTime.Now - start)
     End Sub
 
     Private Sub TestOKEnabled()