Merge pull request #119 from africanmathsinitiative/master

Update main branch
IDEMSInternational · Aug 15, 2016 · a36cf52 · a36cf52
2 parents d03f125 + 5c8be5c
commit a36cf52
Show file tree

Hide file tree

Showing 16 changed files with 1,039 additions and 950 deletions.
diff --git a/instat/clsGridLink.vb b/instat/clsGridLink.vb
@@ -114,7 +114,8 @@ Public Class clsGridLink
                     frmMain.clsRLink.RunInternalScript(clsSetDataFramesChanged.ToScript())
                 End If
                 clsVariablesMetadataChanged.AddParameter("data_name", Chr(34) & strDataName & Chr(34))
-                If (bGrdVariablesMetadataExists AndAlso frmMain.clsRLink.RunInternalScriptGetValue(clsVariablesMetadataChanged.ToScript()).AsLogical(0)) Then
+                If (bGrdVariablesMetadataExists AndAlso frmMain.clsRLink.RunInternalScriptGetValue(clsVariablesMetadataChanged.ToScript()).AsLogical(0)) Then
+                    clsGetVariablesMetadata.AddParameter("data_name", Chr(34) & strDataName & Chr(34))
                     dfTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsGetVariablesMetadata.ToScript()).AsCharacterMatrix()
                     FillSheet(dfTemp, strDataName, grdVariablesMetadata)
                     clsSetVariablesMetadataChanged.AddParameter("data_name", Chr(34) & strDataName & Chr(34))
@@ -166,7 +167,7 @@ Public Class clsGridLink
         End If
 
         If bGrdMetadataExists And (bGrdMetadataChanged Or bRMetadataChanged) Then
-            clsGetCombinedMetadata.AddParameter("convert_to_character", "True")
+            clsGetCombinedMetadata.AddParameter("convert_to_character", "TRUE")
             dfTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsGetCombinedMetadata.ToScript()).AsCharacterMatrix()
             FillSheet(dfTemp, "metadata", grdMetadata)
             clsSetMetadataChanged.AddParameter("new_val", "TRUE")

diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb
@@ -272,6 +272,8 @@ Public Class RLink
         'TClears selection
         box.SelectionLength = 0
         ' clear
+        box.SelectionStart = box.Text.Length
+        box.ScrollToCaret()
     End Sub
 
     Public Function RunInternalScriptGetValue(strScript As String, Optional strVariableName As String = ".temp_value", Optional bSilent As Boolean = False) As SymbolicExpression

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