Updating branch

docs/Download.html

@@ -78,6 +78,7 @@
           <div class="row">
               <div class="col-lg-8 col-lg-offset-2 text-center">
                   <h2 class="section-heading">Download R-Instat</h2>
+                  <p><strong>In response to the recent <a href=https://r4stats.com/articles/software-reviews/r-instat/ style="color:blue;" target="_blank">review of R-Instat</a> by Bob Muenchen we are preparing to release a new version of R-Instat, version 0.7.4, on Monday 31 January 2022, which will include some new features and initial improvements from the review. Come back then to download this version, or continue with the current version below.</strong></p>
                   <hr class="light">
                   <p><a href=https://bit.ly/r-instat_0731_Installer_32bit style="color:blue;" target="_blank">R-Instat 0.7.3.1 Installer 32 Bit (.exe 732MB)</a></p>
                   <p>If you know that you have a 64 bit computer, we suggest you download the 64 Bit version</p>

instat/Model/DataFrame/clsDataFrame.vb

@@ -161,15 +161,15 @@ Public Class clsDataFrame
     End Function
 
     ''' <summary>
-    ''' Updates datframe where data has changed 
+    ''' Updates dataframe where data has changed 
     ''' </summary>
     Public Sub RefreshData()
         If HasDataChanged() Then
             If _clsVisiblePage.RefreshData() Then
                 _iTotalRowCount = _RLink.GetDataFrameLength(_strName, False)
                 _iTotalColumnCount = _RLink.GetDataFrameColumnCount(_strName)
                 _clsFilter.RefreshData()
-                If _clsFilter.bApplied Then
+                If _clsFilter.bFilterApplied Then
                     _clsVisiblePage.SetTotalRowAndColumnCounts(_iTotalColumnCount, _clsFilter.iFilteredRowCount)
                 Else
                     _clsVisiblePage.SetTotalRowAndColumnCounts(_iTotalColumnCount, _iTotalRowCount)

instat/Model/DataFrame/clsDataFrameFilter.vb

@@ -23,7 +23,8 @@ Public Class clsDataFrameFilter
     Protected _strDataFrameName As String
     Protected _RLink As RLink
 
-    Protected _bApplied As Boolean
+    Protected _bFilterApplied As Boolean
+    Protected _bColumnSelectionApplied As Boolean
     Protected _iFilteredRowCount As Integer
     Protected _strFilterName As String
 
@@ -39,9 +40,15 @@ Public Class clsDataFrameFilter
         End Get
     End Property
 
-    Public ReadOnly Property bApplied() As Boolean
+    Public ReadOnly Property bFilterApplied() As Boolean
         Get
-            Return _bApplied
+            Return _bFilterApplied
+        End Get
+    End Property
+
+    Public ReadOnly Property bColumnSelectionApplied() As Boolean
+        Get
+            Return _bColumnSelectionApplied
         End Get
     End Property
 
@@ -64,9 +71,17 @@ Public Class clsDataFrameFilter
         Return _RLink.RunInternalScriptGetValue(clsFilterApplied.ToScript()).AsLogical(0)
     End Function
 
+    Private Function GetColumnSelectionAppliedFromRCommand() As Boolean
+        Dim clsColumnSelectionApplied As New RFunction
+        clsColumnSelectionApplied.SetRCommand(_RLink.strInstatDataObject & "$column_selection_applied")
+        clsColumnSelectionApplied.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34))
+        Return _RLink.RunInternalScriptGetValue(clsColumnSelectionApplied.ToScript()).AsLogical(0)
+    End Function
+
     Public Sub RefreshData()
         _iFilteredRowCount = _RLink.GetDataFrameLength(_strDataFrameName, True)
-        _bApplied = GetFilterAppliedFromRCommand()
+        _bFilterApplied = GetFilterAppliedFromRCommand()
+        _bColumnSelectionApplied = GetColumnSelectionAppliedFromRCommand()
         _strFilterName = GetFilterNameFromRCommand()
     End Sub
 

instat/Model/Output/clsOutputElement.vb

@@ -109,7 +109,13 @@ Public Class clsOutputElement
     ''' <param name="strScript"></param>
     Public Sub AddScript(strScript As String)
         Dim rScript As New clsRScript(strScript)
-        For Each rToken In rScript.GetLstTokens(rScript.GetLstLexemes(strScript)) 'rScript.lstTokens
+        Dim lstTokens As List(Of clsRToken) = rScript.GetLstTokens(rScript.GetLstLexemes(strScript)) 'rScript.lstTokens
+
+        If lstTokens Is Nothing Then
+            Exit Sub
+        End If
+
+        For Each rToken In lstTokens
             _formattedRScript.Add(New clsRScriptElement With
                 {
                     .Text = rToken.strTxt,

instat/Model/RCommand/clsPrepareFunctionsForGrids.vb

@@ -208,6 +208,15 @@ Public Class clsPrepareFunctionsForGrids
         _RLink.RunScript(clsRemoveFilter.ToScript(), strComment:="Right click menu: Remove Current Filter")
     End Sub
     ''' <summary>
+    ''' Removes current column selection
+    ''' </summary>
+    Public Sub RemoveCurrentColumnSelection()
+        Dim clsRemoveCurrentColumnSelection As New RFunction
+        clsRemoveCurrentColumnSelection.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_current_column_selection")
+        clsRemoveCurrentColumnSelection.AddParameter("data_name", Chr(34) & _strDataFrame & Chr(34), iPosition:=0)
+        _RLink.RunScript(clsRemoveCurrentColumnSelection.ToScript(), strComment:="Right click menu: Remove Current Column Selection")
+    End Sub
+    ''' <summary>
     ''' Freeze selected columns
     ''' </summary>
     ''' <param name="strLastSelectedColumn"></param>

instat/UserControl/ucrOutputPage.vb

@@ -159,6 +159,10 @@ Public Class ucrOutputPage
     End Sub
 
     Private Function AddElementPanel(outputElement As clsOutputElement) As Panel
+        If outputElement Is Nothing OrElse outputElement.FormatedRScript Is Nothing Then
+            Return Nothing
+        End If
+
         Dim panel As New Panel With {
             .Height = 10, ' = 10 'small height as panel will grow
             .AutoSize = True,

instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb

@@ -46,7 +46,7 @@ Public Class ucrDataViewLinuxGrid
     Public Sub AddRowData(dataFrame As clsDataFrame) Implements IDataViewGrid.AddRowData
         Dim dataGrid = GetDataGridFromSelectedTab()
 
-        If dataFrame.clsFilter.bApplied Then
+        If dataFrame.clsFilter.bFilterApplied Then
             dataGrid.RowHeadersDefaultCellStyle.ForeColor = Color.Red
         Else
             dataGrid.RowHeadersDefaultCellStyle.ForeColor = Color.DarkBlue

instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb

@@ -51,7 +51,7 @@ Public Class ucrDataViewReoGrid
         grdData.CurrentWorksheet.Rows = dataFrame.iDisplayedRowCount
         UpdateWorksheetSettings(grdData.CurrentWorksheet)
 
-        If dataFrame.clsFilter.bApplied Then
+        If dataFrame.clsFilter.bFilterApplied Then
             textColour = Color.Red
         Else
             textColour = Color.DarkBlue

instat/clsRLink.vb

@@ -14,6 +14,7 @@
 ' You should have received a copy of the GNU General Public License 
 ' along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+Imports System.Runtime.InteropServices
 Imports RDotNet
 Imports unvell.ReoGrid
 Imports System.IO
@@ -1296,16 +1297,22 @@ Public Class RLink
                     thrDelay.IsBackground = True
                     thrWaitDisplay = New Threading.Thread(Sub()
                                                               If bCurrentShowWaiting Then
-                                                                  frmSetupLoading.Show()
+                                                                  If Not RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then
+                                                                      frmSetupLoading.Show()
+                                                                  End If
                                                               End If
-                                                              While thrRScript.IsAlive
+                                                                  While thrRScript.IsAlive
                                                                   If bErrorMessageOpen Then
-                                                                      frmSetupLoading.Close()
+                                                                      If Not RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then
+                                                                          frmSetupLoading.Close()
+                                                                      End If
                                                                   End If
                                                                   Threading.Thread.Sleep(5)
                                                                   Application.DoEvents()
                                                               End While
-                                                              frmSetupLoading.Close()
+                                                              If Not RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then
+                                                                  frmSetupLoading.Close()
+                                                              End If
                                                               evtWaitHandleWaitDisplayDone.Set()
                                                           End Sub)
                     thrWaitDisplay.IsBackground = True

instat/clsRecentFiles.vb

@@ -65,13 +65,7 @@ Public Class clsRecentFiles
         Dim arrStrPaths() As String = File.ReadAllLines(strRecentFilesPath)
         For Each strPath As String In arrStrPaths
             If Not String.IsNullOrEmpty(strPath) Then
-                ' Disabled this so that you can still see files that don't exist in the list
-                ' only add files that still exist...
-                'If File.Exists(sPath) Then
-                '    ' add to the list of recently opened files
-                '    strListMRU.Add(sPath)
-                'End If
-                lstRecentOpenedFiles.Add(strPath)
+                lstRecentOpenedFiles.Add(strPath.Replace("\", "/"))
             End If
         Next
         'display the recently opened files if there are any items to display in the file
@@ -115,6 +109,7 @@ Public Class clsRecentFiles
         'remove file if it exists(helps with making sure displayed file names are rearranged)
         lstRecentOpenedFiles.Remove(strFilePath)
         'add to recent opened files list..
+        strFilePath = strFilePath.Replace("\", "/")
         lstRecentOpenedFiles.Add(strFilePath)
         'make sure there are only ever 30 items...
         'todo. add this to the general options on the number of recently files to show
@@ -192,6 +187,7 @@ Public Class clsRecentFiles
         End If
 
         Dim strFilePathTmp As String = strFilePath.Replace("MRU:", "")
+        strFilePathTmp = strFilePathTmp.Replace("\", "/")
         If File.Exists(strFilePathTmp) Then
             dlgImportDataset.strFileToOpenOn = strFilePathTmp
             dlgImportDataset.ShowDialog()

instat/dlgClimaticBoxPlot.vb

@@ -269,6 +269,7 @@ Public Class dlgClimaticBoxPlot
         clsRaesFunction.AddParameter("x", Chr(34) & Chr(34))
 
         clsAsFactorFunction.SetRCommand("make_factor")
+        clsAsFactorFunction.AddParameter("x", Chr(34) & Chr(34), bIncludeArgumentName:=False)
 
         clsRgeomPlotFunction.SetPackageName("ggplot2")
         clsRgeomPlotFunction.SetRCommand("geom_boxplot")

instat/dlgExportDataset.resx

@@ -117,15 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ucrFilePath.FilePathBrowseText" xml:space="preserve">
-    <value>Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E)
-A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db.</value>
-  </data>
   <data name="ucrFilePath.FilePathDialogFilter" xml:space="preserve">
     <value>Comma separated file (*.csv)|*.csv|Excel files (*.xlsx)|*.xlsx|TAB-separated data (*.tsv)|*.tsv|Pipe-separated data (*.psv)|*.psv|Feather r / Python interchange format (*.feather)|*.feather|Fixed-Width format data (*.fwf)|*.fwf|Serialized r objects (*.rds)|*.rds|Saved r objects (*.RData)|*.RData|JSON(*.json)|*.json|YAML(*.yml)|*.yml|Stata(*.dta)|*.dta|SPSS(*.sav)|*.sav|XBASE database files (*.dbf)|*.dbf| Weka Attribute - Relation File Format (*.arff)|*.arff|r syntax object (*.R)|*.R|Xml(*.xml)|*.xml|HTML(*.html)|*.html</value>
   </data>
-  <data name="ucrFilePath.FilePathLabel" xml:space="preserve">
-    <value>Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E)
-A problem occured attempting to translate string 'Export File(s):' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db.</value>
-  </data>
 </root>