diff --git a/instat/dlgUnstack.resx b/instat/dlgUnstack.resx index f224c2811a5..b31205480f7 100644 --- a/instat/dlgUnstack.resx +++ b/instat/dlgUnstack.resx @@ -352,7 +352,7 @@ 4, 4, 4, 4 - 120, 23 + 135, 23 26 @@ -373,7 +373,7 @@ True - 154, 279 + 172, 279 50, 20 @@ -526,7 +526,7 @@ 9, 412 - 405, 52 + 408, 52 15 @@ -642,9 +642,6 @@ 18 - - NoControl - CenterScreen diff --git a/instat/sdgProportionsPercentages.vb b/instat/sdgProportionsPercentages.vb index 127bc79914a..2432df90623 100644 --- a/instat/sdgProportionsPercentages.vb +++ b/instat/sdgProportionsPercentages.vb @@ -52,8 +52,7 @@ Public Class sdgProportionsPercentages ucrChkProportionsPercentages.SetRDefault(Chr(34) & "none" & Chr(34)) ucrChkProportionsPercentages.SetText("Calculate Proportions or Percentages") - ucrPnlBY.AddToLinkedControls(ucrReceiverByFactor, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlBY.AddToLinkedControls(ucrChkDisplayAsDecimal, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlBY.AddToLinkedControls({ucrReceiverByFactor, ucrChkDisplayAsDecimal}, objValues:={rdoByFactors}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkProportionsPercentages.AddToLinkedControls(ucrPnlBY, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=rdoByFactors) ucrChkProportionsPercentages.AddToLinkedControls(ucrSelectorProportionsPercentiles, objValues:={True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlBY.AddToLinkedControls(ucrReceiverColumn, objValues:={rdoByColumn}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -83,4 +82,12 @@ Public Class sdgProportionsPercentages ucrReceiverColumn.SetMeAsReceiver() End If End Sub + + Private Sub ucrChkProportionsPercentages_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkProportionsPercentages.ControlContentsChanged + 'temporarily fixes issue #8588 + If ucrChkProportionsPercentages.Checked Then + rdoByFactors.Checked = True + End If + End Sub + End Class \ No newline at end of file diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R index cebadbae238..f3af4aef9b6 100644 --- a/instat/static/InstatObject/R/install_packages.R +++ b/instat/static/InstatObject/R/install_packages.R @@ -167,6 +167,7 @@ pkgs <- "formattable", #A 'ggplot2' extension that allows text to follow curved paths. "geomtextpath", + "moderndive", "collapse" ) pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version)