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

Improving the Find-replace dialog #9437

Merged
merged 4 commits into from
Feb 13, 2025
Merged

Improving the Find-replace dialog #9437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d524771
Merge pull request #318 from IDEMSInternational/master
Vitalis95 Feb 11, 2025
ace3c12
changes to the code
Vitalis95 Feb 12, 2025
d2f9379
changes
Vitalis95 Feb 12, 2025
58cb9b9
changes
Vitalis95 Feb 12, 2025
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
42 changes: 31 additions & 11 deletions instat/dlgStringHandling.Designer.vb
View file
Open in desktop

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

55 changes: 49 additions & 6 deletions instat/dlgStringHandling.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Imports instat.Translations
Public Class dlgStringHandling
Private bFirstload As Boolean = True
Private bReset As Boolean = True
Private clsCountFunction, clsExtractFunction, clsDetectFunction, clsLocateFunction, clsReplaceFunction, clsReplaceAllFunction,
clsFixedFunction, clsRegexFunction, clsStringCollFunction, clsBoundaryFunction, clsRemoveFunction, clsReplaceNaFunction,
Private clsCountFunction, clsExtractFunction, clsDetectFunction, clsLocateFunction, clsReplaceFunction, clsReplaceAllFunction, clsNaIfFunction,
clsFixedFunction, clsRegexFunction, clsStringCollFunction, clsBoundaryFunction, clsRemoveFunction, clsReplaceNaFunction, clsStrToLowerFunction,
clsStartsFunction, clsEndsFunction, clsMatchAllFunction, clsExtractAllFunction, clsLocateAllFunction, clsRemoveAllFunction,
clsReplaceCellFunction, clsAsDataFrameFunction, clsMutateFunction, clsReplaceGrepFunction As New RFunction
clsReplaceCellFunction, clsCurrentNewColumnFunction, clsAsDataFrameFunction, clsMutateFunction, clsReplaceGrepFunction As New RFunction
Private clsPipeOperator As New ROperator
Private clsDummyFunction, clsFindDummyFunction As New RFunction

Expand Down Expand Up @@ -54,12 +54,14 @@ Public Class dlgStringHandling
ucrPnlStringHandling.AddRadioButton(rdoFind)
ucrPnlStringHandling.AddRadioButton(rdoReplaceNa)
ucrPnlStringHandling.AddRadioButton(rdoRemove)
ucrPnlStringHandling.AddRadioButton(rdoToNa)

ucrPnlStringHandling.AddParameterValuesCondition(rdoDetects, "string_handling", "detect")
ucrPnlStringHandling.AddParameterValuesCondition(rdoReplace, "string_handling", "replace")
ucrPnlStringHandling.AddParameterValuesCondition(rdoFind, "string_handling", "find")
ucrPnlStringHandling.AddParameterValuesCondition(rdoReplaceNa, "string_handling", "replace_na")
ucrPnlStringHandling.AddParameterValuesCondition(rdoRemove, "string_handling", "remove")
ucrPnlStringHandling.AddParameterValuesCondition(rdoToNa, "string_handling", "to_na")

ucrPnlDetectOptions.AddRadioButton(rdoDetects)
ucrPnlDetectOptions.AddRadioButton(rdoStarts)
Expand Down Expand Up @@ -143,7 +145,8 @@ Public Class dlgStringHandling

ucrChkReplaceBy.AddToLinkedControls(ucrInputReplaceNaBy, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="NA")
ucrPnlStringHandling.AddToLinkedControls({ucrInputReplaceBy, ucrPnlReplaceOptions}, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True)
ucrPnlStringHandling.AddToLinkedControls({ucrInputPattern, ucrChkIgnoreCase, ucrChkIncludeRegularExpressions}, {rdoDetect, rdoFind, rdoReplace, rdoRemove}, bNewLinkedHideIfParameterMissing:=True)
ucrPnlStringHandling.AddToLinkedControls(ucrChkIncludeRegularExpressions, {rdoDetect, rdoFind, rdoReplace, rdoRemove}, bNewLinkedHideIfParameterMissing:=True)
ucrPnlStringHandling.AddToLinkedControls({ucrInputPattern, ucrChkIgnoreCase}, {rdoDetect, rdoToNa, rdoFind, rdoReplace, rdoRemove}, bNewLinkedHideIfParameterMissing:=True)
ucrPnlStringHandling.AddToLinkedControls(ucrChkBoundary, {rdoDetect, rdoFind}, bNewLinkedHideIfParameterMissing:=True)
ucrPnlStringHandling.AddToLinkedControls(ucrPnlDetectOptions, {rdoDetect}, bNewLinkedHideIfParameterMissing:=True)
ucrPnlStringHandling.AddToLinkedControls(ucrPnlFindOptions, {rdoFind}, bNewLinkedHideIfParameterMissing:=True)
Expand Down Expand Up @@ -182,9 +185,10 @@ Public Class dlgStringHandling
clsReplaceCellFunction = New RFunction
clsAsDataFrameFunction = New RFunction
clsMutateFunction = New RFunction
clsNaIfFunction = New RFunction
clsPipeOperator = New ROperator
clsReplaceGrepFunction = New RFunction

clsStrToLowerFunction = New RFunction
ucrSelectorStringHandling.Reset()

ucrInputReplaceBy.Reset()
Expand Down Expand Up @@ -267,6 +271,12 @@ Public Class dlgStringHandling
clsPipeOperator.AddParameter("x", "df", iPosition:=0, bIncludeArgumentName:=False)
clsPipeOperator.AddParameter("y", clsRFunctionParameter:=clsMutateFunction, iPosition:=1)

clsNaIfFunction.SetPackageName("dplyr")
clsNaIfFunction.SetRCommand("na_if")

clsStrToLowerFunction.SetPackageName("stringr")
clsStrToLowerFunction.SetRCommand("str_to_lower")

clsDetectFunction.SetAssignTo(ucrSaveStringHandling.GetText, strTempDataframe:=ucrSelectorStringHandling.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveStringHandling.GetText, bAssignToIsPrefix:=True)
ucrBase.clsRsyntax.SetBaseRFunction(clsDetectFunction)
NewColumnName()
Expand Down Expand Up @@ -313,6 +323,7 @@ Public Class dlgStringHandling
ucrSaveStringHandling.AddAdditionalRCode(clsMatchAllFunction, iAdditionalPairNo:=12)
ucrSaveStringHandling.AddAdditionalRCode(clsRemoveAllFunction, iAdditionalPairNo:=13)
ucrSaveStringHandling.AddAdditionalRCode(clsPipeOperator, iAdditionalPairNo:=14)
ucrSaveStringHandling.AddAdditionalRCode(clsNaIfFunction, iAdditionalPairNo:=15)

ucrReceiverStringHandling.SetRCode(clsDetectFunction, bReset)
ucrInputReplaceBy.SetRCode(clsReplaceAllFunction, bReset)
Expand All @@ -333,7 +344,7 @@ Public Class dlgStringHandling
End Sub

Private Sub TestOkEnabled()
If (rdoDetect.Checked OrElse rdoFind.Checked OrElse rdoReplace.Checked OrElse rdoRemove.Checked) AndAlso ucrSaveStringHandling.IsComplete() AndAlso Not ucrReceiverStringHandling.IsEmpty() Then
If (rdoDetect.Checked OrElse rdoFind.Checked OrElse rdoReplace.Checked OrElse rdoRemove.Checked OrElse rdoToNa.Checked) AndAlso ucrSaveStringHandling.IsComplete() AndAlso Not ucrReceiverStringHandling.IsEmpty() Then
ucrBase.OKEnabled(True)
ElseIf rdoReplaceNa.Checked AndAlso ucrSaveStringHandling.IsComplete() Then
ucrBase.OKEnabled(True)
Expand All @@ -359,6 +370,7 @@ Public Class dlgStringHandling
Private Sub AddRemoveParameters()
clsStringCollFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsRegexFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsNaIfFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
If ucrChkIncludeRegularExpressions.Checked Then
clsCountFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1)
clsRemoveFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1)
Expand Down Expand Up @@ -446,6 +458,9 @@ Public Class dlgStringHandling
ucrBase.clsRsyntax.SetBaseRFunction(clsReplaceNaFunction)
ucrSaveStringHandling.SetPrefix("replace_na")
clsFindDummyFunction.AddParameter("string_handling", "replace_na", iPosition:=3)
ElseIf rdoToNa.Checked Then
ucrBase.clsRsyntax.SetBaseRFunction(clsNaIfFunction)
ucrSaveStringHandling.SetPrefix("replace")
ElseIf rdoRemove.Checked Then
If ucrChkRemoveAll.Checked Then
ucrBase.clsRsyntax.SetBaseRFunction(clsRemoveAllFunction)
Expand All @@ -461,6 +476,7 @@ Public Class dlgStringHandling
AddRemoveParameters()
CellParameters()
RegularExpressionControl()
IgnoreCaseControl()
End Sub

Private Sub ChangePrefixName()
Expand Down Expand Up @@ -526,4 +542,31 @@ Public Class dlgStringHandling
clsFindDummyFunction.AddParameter("replace", "replace", iPosition:=2)
End If
End Sub

Private Sub IgnoreCaseControl()
clsCurrentNewColumnFunction = ucrReceiverStringHandling.GetVariables()
clsCurrentNewColumnFunction.SetAssignTo("columns")
If rdoToNa.Checked Then
If ucrChkIgnoreCase.Checked Then
clsStrToLowerFunction.AddParameter("var1", clsRFunctionParameter:=clsCurrentNewColumnFunction, bIncludeArgumentName:=False, iPosition:=0)
clsNaIfFunction.AddParameter("string", clsRFunctionParameter:=clsStrToLowerFunction, bIncludeArgumentName:=False, iPosition:=0)
clsNaIfFunction.RemoveParameterByName("var2")
Else
clsNaIfFunction.AddParameter("var2", clsRFunctionParameter:=clsCurrentNewColumnFunction, bIncludeArgumentName:=False, iPosition:=0)
clsStrToLowerFunction.RemoveParameterByName("var1")
clsNaIfFunction.RemoveParameterByName("string")
End If
Else
clsStrToLowerFunction.RemoveParameterByName("var1")
clsNaIfFunction.RemoveParameterByName("string")
End If
End Sub

Private Sub ucrReceiverStringHandling_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStringHandling.ControlValueChanged
IgnoreCaseControl()
End Sub

Private Sub ucrChkIgnoreCase_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIgnoreCase.ControlValueChanged
IgnoreCaseControl()
End Sub
End Class
Binary file modified instat/translations/rInstatTranslations.db
View file
Open in desktop
Binary file not shown.
Loading