Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pulling changes from the sub branch #162

Merged
merged 9 commits into from
Mar 1, 2016
Merged

Pulling changes from the sub branch #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
584df0a
Merge pull request #151 from africanmathsinitiative/master
deaspo Feb 29, 2016
613a22b
dlgRecode:
Lunalo Feb 29, 2016
58037f2
dlgRecode
Lunalo Feb 29, 2016
11f85f5
Merge pull request #153 from africanmathsinitiative/master
deaspo Mar 1, 2016
8cf43e8
dlgRecode
Lunalo Mar 1, 2016
b422939
Merge pull request #158 from africanmathsinitiative/master
deaspo Mar 1, 2016
255c817
dlgRecode
Lunalo Mar 1, 2016
4e30478
Merge pull request #978 from Lunalo/dlgRecode
dannyparsons Mar 1, 2016
42575ff
Merge pull request #161 from africanmathsinitiative/master
deaspo Mar 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions instat/dlgRecode.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions instat/dlgRecode.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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
Expand Down