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.

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

Fixed the new variable name in Prepare> Column:Text> Split dialog #8097

Merged
Merged
Changes from 4 commits
Commits
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
10 changes: 6 additions & 4 deletions instat/dlgSplitText.vb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ Public Class dlgSplitText
ucrSaveColumn.SetDataFrameSelector(ucrSelectorSplitTextColumn.ucrAvailableDataFrames)
ucrSaveColumn.SetLabelText("Prefix for New Columns:")
ucrSaveColumn.SetIsComboBox()
ucrSaveColumn.SetAssignToBooleans(bTempAssignToIsPrefix:=True)
ucrSaveColumn.setLinkedReceiver(ucrReceiverSplitTextColumn)
End Sub

Expand All @@ -101,6 +100,7 @@ Public Class dlgSplitText
clsPatternDummyFunction = New RFunction

ucrSelectorSplitTextColumn.Reset()
ucrSaveColumn.Reset()

ucrInputRegexPattern.SetName("")

Expand All @@ -126,7 +126,7 @@ Public Class dlgSplitText
clsTextComponentsMaximum.AddParameter("n", "Inf", iPosition:=2)
clsTextComponentsMaximum.AddParameter("simplify", "TRUE", iPosition:=3)

clsTextComponentsFixed.SetAssignTo(strTemp:="split", strTempDataframe:=ucrSelectorSplitTextColumn.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:="split", bAssignToIsPrefix:=True)
clsTextComponentsFixed.SetAssignTo(ucrSaveColumn.GetText(), strTempDataframe:=ucrSelectorSplitTextColumn.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveColumn.GetText)
clsTextComponentsMaximum.SetAssignTo("split", strTempDataframe:=ucrSelectorSplitTextColumn.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:="split", bAssignToIsPrefix:=True)
clsBinaryColumns.SetAssignTo("split", strTempDataframe:=ucrSelectorSplitTextColumn.ucrAvailableDataFrames.cboAvailableDataFrames.Text, bAssignToColumnWithoutNames:=True)
ucrBase.clsRsyntax.SetBaseRFunction(clsTextComponentsFixed)
Expand All @@ -135,15 +135,17 @@ Public Class dlgSplitText
Private Sub SetRCodeForControls(bReset As Boolean)
ucrReceiverSplitTextColumn.AddAdditionalCodeParameterPair(clsTextComponentsMaximum, New RParameter("string", 0), iAdditionalPairNo:=1)
ucrReceiverSplitTextColumn.AddAdditionalCodeParameterPair(clsBinaryColumns, New RParameter("var", 0), iAdditionalPairNo:=2)
ucrSaveColumn.AddAdditionalRCode(clsTextComponentsMaximum, bReset)

ucrSaveColumn.AddAdditionalRCode(clsTextComponentsMaximum, iAdditionalPairNo:=1)
ucrSaveColumn.AddAdditionalRCode(clsBinaryColumns, iAdditionalPairNo:=2)

ucrReceiverSplitTextColumn.SetRCode(clsTextComponentsFixed, bReset)
ucrInputPattern.SetRCode(clsPatternDummyFunction, bReset)
ucrNudPieces.SetRCode(clsTextComponentsFixed, bReset)
ucrChkIncludeRegularExpressions.SetRCode(clsSplitDummyFunction, bReset)
ucrPnlSplitText.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset)
ucrPnlTextComponents.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset)
ucrSaveColumn.SetRCode(clsTextComponentsFixed, bReset)
ucrSaveColumn.AddAdditionalRCode(clsBinaryColumns, bReset)
End Sub

Private Sub TestOKEnabled()
Expand Down