Merge pull request #244 from IDEMSInternational/master

update master
IDEMSInternational · Jun 3, 2024 · 779c17e · 779c17e
2 parents 0a4095c + 033cb24
commit 779c17e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git 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)
 

diff --git 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
@@ -171,9 +175,10 @@ 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", 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()
@@ -217,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)
@@ -226,9 +238,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()
@@ -425,9 +434,12 @@ 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:=1, bIncludeArgumentName:=False)
     End Sub
 
     Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverXVariables.ControlContentsChanged, ucrSaveGraph.ControlContentsChanged, ucrNudTransparency.ControlContentsChanged
         TestOkEnabled()
     End Sub
+
 End Class