diff --git a/instat/dlgDuplicates.Designer.vb b/instat/dlgDuplicates.Designer.vb index c436d639176..59dd20cbc89 100644 --- a/instat/dlgDuplicates.Designer.vb +++ b/instat/dlgDuplicates.Designer.vb @@ -59,7 +59,7 @@ Partial Class dlgDuplicates Me.rdoDataFrame.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoDataFrame.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoDataFrame.Location = New System.Drawing.Point(11, 12) + Me.rdoDataFrame.Location = New System.Drawing.Point(144, 12) Me.rdoDataFrame.Name = "rdoDataFrame" Me.rdoDataFrame.Size = New System.Drawing.Size(135, 27) Me.rdoDataFrame.TabIndex = 1 @@ -76,7 +76,7 @@ Partial Class dlgDuplicates Me.rdoSelectedVariables.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSelectedVariables.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSelectedVariables.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSelectedVariables.Location = New System.Drawing.Point(144, 12) + Me.rdoSelectedVariables.Location = New System.Drawing.Point(11, 12) Me.rdoSelectedVariables.Name = "rdoSelectedVariables" Me.rdoSelectedVariables.Size = New System.Drawing.Size(135, 27) Me.rdoSelectedVariables.TabIndex = 2 @@ -357,7 +357,7 @@ Partial Class dlgDuplicates Me.MinimizeBox = False Me.Name = "dlgDuplicates" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Duplicates" + Me.Text = "Duplicate Rows" Me.grpOptions.ResumeLayout(False) Me.grpOptions.PerformLayout() Me.ResumeLayout(False) diff --git a/instat/dlgDuplicates.vb b/instat/dlgDuplicates.vb index 1044d23c358..fb3ab718660 100644 --- a/instat/dlgDuplicates.vb +++ b/instat/dlgDuplicates.vb @@ -58,7 +58,7 @@ Public Class dlgDuplicates ucrPnlDuplicates.AddRadioButton(rdoDuplicatesOnly) ucrPnlDuplicates.AddRadioButton(rdoIndexNumberOfDuplicates) - ucrPnlDuplicates.AddToLinkedControls(ucrInputComboType, {rdoIndexNumberOfDuplicates}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlDuplicates.AddToLinkedControls(ucrInputComboType, {rdoIndexNumberOfDuplicates}, bNewLinkedHideIfParameterMissing:=True) ucrInputComboType.SetLinkedDisplayControl(lblType) ucrPnlDuplicates.AddFunctionNamesCondition(rdoAllDuplicateCases, "duplicated2") @@ -114,9 +114,8 @@ Public Class dlgDuplicates ucrInputConditions.SetDropDownStyleAsNonEditable() ucrInputComboType.SetParameter(New RParameter("type")) - dctType.Add("Count", Chr(34) & "count" & Chr(34)) dctType.Add("Index", Chr(34) & "index" & Chr(34)) - ucrInputComboType.SetRDefault(Chr(34) & "count" & Chr(34)) + dctType.Add("Count", Chr(34) & "count" & Chr(34)) ucrInputComboType.SetDropDownStyleAsNonEditable() ucrInputComboType.SetItems(dctType) @@ -156,6 +155,7 @@ Public Class dlgDuplicates clsStreakFunction.AddParameter("ignore", "NULL") clsDupCountIndex.SetRCommand("duplicated_count_index") + clsDupCountIndex.AddParameter("type", Chr(34) & "index" & Chr(34)) clsGetColumnsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") @@ -166,7 +166,7 @@ Public Class dlgDuplicates clsSubsetCol.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data") ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrNewColumnName.GetText, strTempDataframe:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrNewColumnName.GetText) - ucrBase.clsRsyntax.SetBaseRFunction(clsDuplicated2) + ucrBase.clsRsyntax.SetBaseRFunction(clsDuplicated) ucrBase.clsRsyntax.AddToAfterCodes(clsSummaryFunction, iPosition:=0) End Sub @@ -251,17 +251,17 @@ Public Class dlgDuplicates End Sub Private Sub SetDataFrameOrColumns() - If rdoDataFrame.Checked Then + If rdoSelectedVariables.Checked Then + ucrReceiverForSelectedVariables.SetMeAsReceiver() + ucrReceiverForSelectedVariables.SetParameterIsRFunction() + ucrSelectorDuplicateswithVariables.SetVariablesVisible(True) + ElseIf rdoDataFrame.Checked Then ucrSelectorDuplicateswithVariables.SetVariablesVisible(False) ucrSelectorDuplicateswithVariables.SetParameterIsrfunction() ' note that we have to run this here because the parameter x is used for both functions and all four radio buttons clsDuplicated.AddParameter("x", clsRFunctionParameter:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) clsDuplicated2.AddParameter("x", clsRFunctionParameter:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) clsDupCountIndex.AddParameter("x", clsRFunctionParameter:=ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) - ElseIf rdoSelectedVariables.Checked Then - ucrReceiverForSelectedVariables.SetMeAsReceiver() - ucrReceiverForSelectedVariables.SetParameterIsRFunction() - ucrSelectorDuplicateswithVariables.SetVariablesVisible(True) ElseIf rdoSuccessiveValues.Checked Then ucrReceiverForSuccessiveValues.SetMeAsReceiver() ucrSelectorDuplicateswithVariables.SetParameterIsString() diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 2cd5580aa49..89423cbeb01 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ