From c56bba374a3e5ac041ecf69feca06bfb78152234 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 23 May 2024 13:54:32 +0300 Subject: [PATCH 1/4] changes to the code --- instat/dlgParallelCoordinatePlot.vb | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index 54210b80f68..d01e7830971 100644 --- a/instat/dlgParallelCoordinatePlot.vb +++ b/instat/dlgParallelCoordinatePlot.vb @@ -36,6 +36,8 @@ Public Class dlgParallelCoordinatePlot Private clsScaleFillViridisFunction As New RFunction Private clsScaleColourViridisFunction As New RFunction Private clsAnnotateFunction As New RFunction + Private clsMatchFunction As New RFunction + Private clsNamesFunction As New RFunction Private clsFacetFunction As New RFunction Private clsFacetVariablesOperator As New ROperator @@ -159,6 +161,8 @@ Public Class dlgParallelCoordinatePlot clsFacetColOp = New ROperator clsPipeOperator = New ROperator clsGroupByFunction = New RFunction + clsNamesFunction = New RFunction + clsMatchFunction = New RFunction ucrInputStation.SetName(strFacetWrap) ucrInputStation.bUpdateRCodeFromControl = True @@ -173,7 +177,8 @@ Public Class dlgParallelCoordinatePlot clsGGParCoordFunc.SetRCommand("ggparcoord") clsGGParCoordFunc.AddParameter("missing", Chr(34) & "exclude" & Chr(34), iPosition:=6) - clsGGParCoordFunc.AddParameter("order", Chr(34) & "skewness" & Chr(34), iPosition:=7) + clsGGParCoordFunc.AddParameter("order", clsRFunctionParameter:=clsMatchFunction, iPosition:=7) + clsGGParCoordFunc.AddParameter("centerObsID", "1", iPosition:=8) clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggparcord", clsRFunctionParameter:=clsGGParCoordFunc, iPosition:=0) @@ -194,6 +199,11 @@ Public Class dlgParallelCoordinatePlot clsGroupByFunction.SetPackageName("dplyr") clsGroupByFunction.SetRCommand("group_by") + clsMatchFunction.SetRCommand("match") + clsMatchFunction.SetAssignTo("column_numbers") + + clsNamesFunction.SetRCommand("names") + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsXLabsFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() @@ -425,9 +435,17 @@ Public Class dlgParallelCoordinatePlot Private Sub ucrSelectorParallelCoordinatePlot_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorParallelCoordinatePlot.ControlValueChanged AutoFacetStation() SetPipeAssignTo() + clsNamesFunction.AddParameter("names", ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0, bIncludeArgumentName:=False) + clsMatchFunction.AddParameter("data", clsRFunctionParameter:=clsNamesFunction, iPosition:=10, bIncludeArgumentName:=False) + End Sub Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverXVariables.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrNudTransparency.ControlContentsChanged TestOkEnabled() End Sub + + Private Sub ucrReceiverXVariables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverXVariables.ControlValueChanged + clsMatchFunction.AddParameter("var", ucrReceiverXVariables.GetVariableNames, bIncludeArgumentName:=False, iPosition:=0) + End Sub + End Class \ No newline at end of file From 1ed59647c4fb551f6fef54f9d731ff479b67bc5e Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 23 May 2024 14:59:02 +0300 Subject: [PATCH 2/4] changes to the code --- instat/dlgParallelCoordinatePlot.vb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index d01e7830971..dd91cdc908d 100644 --- a/instat/dlgParallelCoordinatePlot.vb +++ b/instat/dlgParallelCoordinatePlot.vb @@ -175,7 +175,7 @@ Public Class dlgParallelCoordinatePlot clsGGParCoordFunc.SetPackageName("GGally") clsGGParCoordFunc.SetRCommand("ggparcoord") - + clsGGParCoordFunc.AddParameter("columns", "column_numbers", iPosition:=1) clsGGParCoordFunc.AddParameter("missing", Chr(34) & "exclude" & Chr(34), iPosition:=6) clsGGParCoordFunc.AddParameter("order", clsRFunctionParameter:=clsMatchFunction, iPosition:=7) clsGGParCoordFunc.AddParameter("centerObsID", "1", iPosition:=8) @@ -236,9 +236,6 @@ Public Class dlgParallelCoordinatePlot ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrSaveGraph.SetRCode(clsBaseOperator, bReset) - If bReset Then - ucrReceiverXVariables.SetRCode(clsGGParCoordFunc, bReset) - End If End Sub Private Sub TestOkEnabled() From b50169b645019c8e9b72d5fe3d1beb94c97ce539 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 24 May 2024 10:35:03 +0300 Subject: [PATCH 3/4] changes --- instat/dlgParallelCoordinatePlot.vb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/instat/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index dd91cdc908d..e36c0fbf244 100644 --- a/instat/dlgParallelCoordinatePlot.vb +++ b/instat/dlgParallelCoordinatePlot.vb @@ -227,6 +227,8 @@ Public Class dlgParallelCoordinatePlot End Sub Private Sub SetRCodeForControls(bReset As Boolean) + ucrReceiverXVariables.AddAdditionalCodeParameterPair(clsMatchFunction, New RParameter("var", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrSelectorParallelCoordinatePlot.SetRCode(clsGGParCoordFunc, bReset) ucrReceiverFactor.SetRCode(clsGGParCoordFunc, bReset) ucrChkBoxplots.SetRCode(clsGGParCoordFunc, bReset) @@ -433,16 +435,11 @@ Public Class dlgParallelCoordinatePlot AutoFacetStation() SetPipeAssignTo() clsNamesFunction.AddParameter("names", ucrSelectorParallelCoordinatePlot.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0, bIncludeArgumentName:=False) - clsMatchFunction.AddParameter("data", clsRFunctionParameter:=clsNamesFunction, iPosition:=10, bIncludeArgumentName:=False) - + clsMatchFunction.AddParameter("data", clsRFunctionParameter:=clsNamesFunction, iPosition:=1, bIncludeArgumentName:=False) End Sub Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverXVariables.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrNudTransparency.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrReceiverXVariables_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverXVariables.ControlValueChanged - clsMatchFunction.AddParameter("var", ucrReceiverXVariables.GetVariableNames, bIncludeArgumentName:=False, iPosition:=0) - End Sub - End Class \ No newline at end of file From 74bacdad5b3eb42df324cc5677d86f9577c49119 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 27 May 2024 18:10:30 +0300 Subject: [PATCH 4/4] packages --- instat/dlgHelpVignettes.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgHelpVignettes.vb b/instat/dlgHelpVignettes.vb index 501464cf301..0a53e7924d9 100644 --- a/instat/dlgHelpVignettes.vb +++ b/instat/dlgHelpVignettes.vb @@ -40,6 +40,7 @@ Public Class dlgHelpVignettes Dim expPackageNames As SymbolicExpression Dim chrPackageNames As CharacterVector + ucrBase.iHelpTopicID = 695 ucrPnlHelpVignettes.AddRadioButton(rdoHelp) ucrPnlHelpVignettes.AddRadioButton(rdoVignettes)