Merge pull request #161 from africanmathsinitiative/master

Pulling changes from the main
IDEMSInternational · Mar 1, 2016 · 42575ff · 42575ff
2 parents b422939 + 4e30478
commit 42575ff
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/instat/dlgRecode.Designer.vb b/instat/dlgRecode.Designer.vb
diff --git a/instat/dlgRecode.vb b/instat/dlgRecode.vb
@@ -20,12 +20,15 @@ Public Class dlgRecode
     Public bFirstLoad As Boolean = True
     Private Sub dlgRecode_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         autoTranslate(Me)
+        ucrReceiverRecode.Selector = ucrSelectorForRecode
+        ucrReceiverRecode.SetMeAsReceiver()
+        ucrMultipleNumericRecode.bIsNumericInput = True
         ucrBase.iHelpTopicID = 37
         ucrBase.clsRsyntax.SetFunction("cut")
         ucrBase.clsRsyntax.AddParameter("include.lowest", "TRUE")
-        ucrSelectorNewColumnName.SetDataFrameSelector(ucrSelectorDataFrameAddRemove.ucrAvailableDataFrames)
+        ucrSelectorNewColumnName.SetDataFrameSelector(ucrSelectorForRecode.ucrAvailableDataFrames)
         ucrSelectorNewColumnName.SetPrefix("Recode")
-        ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrSelectorNewColumnName.cboColumnName.Text, strTempDataframe:=ucrSelectorDataFrameAddRemove.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSelectorNewColumnName.cboColumnName.Text)
+        ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrSelectorNewColumnName.cboColumnName.Text, strTempDataframe:=ucrSelectorForRecode.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSelectorNewColumnName.cboColumnName.Text)
 
         If bFirstLoad Then
             SetDefaults()
@@ -38,13 +41,10 @@ Public Class dlgRecode
     End Sub
 
     Private Sub SetDefaults()
-
-        ucrMultipleNumericRecode.bIsNumericInput = True
         chkAddLabels.Checked = False
         ucrMultipleLabels.Visible = False
         rdoRight.Checked = True
-
-        ucrReceiverRecode.ResetText()
+        ucrSelectorForRecode.Reset()
     End Sub
 
     Private Sub ReopenDialog()
@@ -61,7 +61,8 @@ Public Class dlgRecode
 
     Private Sub ucrReceiverRecode_SelectionChanged() Handles ucrReceiverRecode.SelectionChanged
         If Not ucrReceiverRecode.IsEmpty Then
-            ucrBase.clsRsyntax.AddParameter("x", ucrReceiverRecode.GetVariableNames(False))
+            ucrBase.clsRsyntax.AddParameter("x", clsRFunctionParameter:=ucrReceiverRecode.GetVariables())
+
         Else
             ucrBase.clsRsyntax.RemoveParameter("x")
         End If