Merge pull request #24 from africanmathsinitiative/master

updating master
IDEMSInternational · May 2, 2017 · 1a20ca2 · 1a20ca2
2 parents e62bcef + 089911e
commit 1a20ca2
Show file tree

Hide file tree

Showing 9 changed files with 364 additions and 108 deletions.
diff --git a/instat/dlgConvertColumns.Designer.vb b/instat/dlgConvertColumns.Designer.vb
diff --git a/instat/dlgConvertColumns.vb b/instat/dlgConvertColumns.vb
@@ -20,6 +20,7 @@ Public Class dlgConvertColumns
     Public bFirstLoad As Boolean = True
     Public bToFactorOnly As Boolean = False
     Private bReset As Boolean = True
+    Private clsDefaultFunction As New RFunction
 
     Private Sub dlgConvertColumns_Load(sender As Object, e As EventArgs) Handles Me.Load
         autoTranslate(Me)
@@ -39,23 +40,6 @@ Public Class dlgConvertColumns
         SetToFactorStatus(bToFactorOnly)
     End Sub
 
-    Public Sub SetRCodeForControls(bReset As Boolean)
-        SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset)
-    End Sub
-
-    Private Sub SetToFactorStatus(bToFactorOnly As Boolean)
-        If bToFactorOnly Then
-            rdoFactor.Checked = True
-            rdoCharacter.Enabled = False
-            rdoInteger.Enabled = False
-            rdoNumeric.Enabled = False
-        Else
-            rdoCharacter.Enabled = True
-            rdoInteger.Enabled = True
-            rdoNumeric.Enabled = True
-        End If
-    End Sub
-
     Private Sub InitialiseDialog()
         ucrBase.iHelpTopicID = 67
 
@@ -75,10 +59,11 @@ Public Class dlgConvertColumns
         ucrPnlConvertTo.AddRadioButton(rdoInteger, Chr(34) & "integer" & Chr(34))
         ucrPnlConvertTo.AddToLinkedControls(ucrChkSpecifyDecimalsToDisplay, {rdoFactor, rdoOrderedFactor}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
 
-        ucrPnlFactorToNumericOptions.SetParameter(New RParameter("factor_numeric", 3))
-        ucrPnlFactorToNumericOptions.AddRadioButton(rdoConvertLevels, Chr(34) & "by_levels" & Chr(34))
-        ucrPnlFactorToNumericOptions.AddRadioButton(rdoConvertOrdinals, Chr(34) & "by_ordinals" & Chr(34))
-        ucrPnlFactorToNumericOptions.SetRDefault(Chr(34) & "by_levels" & Chr(34))
+        ucrPnlFactorToNumericOptions.SetParameter(New RParameter("factor_values", 3))
+        ucrPnlFactorToNumericOptions.AddRadioButton(rdoDefault, "NULL")
+        ucrPnlFactorToNumericOptions.AddRadioButton(rdoConvertLevels, Chr(34) & "force_values" & Chr(34))
+        ucrPnlFactorToNumericOptions.AddRadioButton(rdoConvertOrdinals, Chr(34) & "force_ordinals" & Chr(34))
+        ucrPnlFactorToNumericOptions.SetRDefault("NULL")
         ucrPnlFactorToNumericOptions.SetLinkedDisplayControl(grpFactorToNumericOptions)
 
         ucrPnlConvertTo.AddToLinkedControls(ucrPnlFactorToNumericOptions, {rdoNumeric}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
@@ -100,20 +85,18 @@ Public Class dlgConvertColumns
     End Sub
 
     Private Sub SetDefaults()
-        Dim clsDefaultFunction As New RFunction
+        clsDefaultFunction = New RFunction
 
         ucrSelectorDataFrameColumns.Reset()
         SetToFactorStatus(bToFactorOnly)
 
         clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$convert_column_to_type")
         clsDefaultFunction.AddParameter("to_type", Chr(34) & "factor" & Chr(34))
-        ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction.Clone())
+        ucrBase.clsRsyntax.SetBaseRFunction(clsDefaultFunction)
     End Sub
 
-    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
-        SetDefaults()
-        SetRCodeForControls(True)
-        TestOKEnabled()
+    Private Sub SetRCodeForControls(bReset As Boolean)
+        SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, bReset)
     End Sub
 
     Private Sub TestOKEnabled()
@@ -128,6 +111,25 @@ Public Class dlgConvertColumns
         End If
     End Sub
 
+    Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
+        SetDefaults()
+        SetRCodeForControls(True)
+        TestOKEnabled()
+    End Sub
+
+    Private Sub SetToFactorStatus(bToFactorOnly As Boolean)
+        If bToFactorOnly Then
+            rdoFactor.Checked = True
+            rdoCharacter.Enabled = False
+            rdoInteger.Enabled = False
+            rdoNumeric.Enabled = False
+        Else
+            rdoCharacter.Enabled = True
+            rdoInteger.Enabled = True
+            rdoNumeric.Enabled = True
+        End If
+    End Sub
+
     Private Sub ucrChkSpecifyDecimalsToDisplay_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSpecifyDecimalsToDisplay.ControlValueChanged
         If ucrChkSpecifyDecimalsToDisplay.Checked Then
             ucrReceiverColumnsToConvert.SetDataType("numeric")

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