Merge pull request #437 from africanmathsinitiative/master

updated branch
shadrackkibet · Oct 25, 2023 · 9ce1c38 · 9ce1c38
2 parents 23abea8 + 8036fe6
commit 9ce1c38
Show file tree

Hide file tree

Showing 16 changed files with 540 additions and 804 deletions.
diff --git a/instat/Model/Output/clsOutputElement.vb b/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

diff --git a/instat/UserControl/ucrOutputPage.vb b/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
 

diff --git a/instat/dlgPasteNewColumns.Designer.vb b/instat/dlgPasteNewColumns.Designer.vb