From 593128af91531915037109e1c6c87f9abcbd8ce8 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 21 Jan 2025 14:21:37 +0100 Subject: [PATCH 1/2] Added Climdex.Pcic package --- instat/dlgRPackages.vb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 488477f765..07b0595053 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -43,6 +43,7 @@ Public Class dlgInstallRPackage dctPackages.Add("rapidpror", Chr(34) & "rapidpror" & Chr(34)) dctPackages.Add("openappr", Chr(34) & "openappr" & Chr(34)) dctPackages.Add("networkGraphsR", Chr(34) & "networkGraphsR" & Chr(34)) + dctPackages.Add("climdex.pcic", Chr(34) & "climdex.pcic" & Chr(34)) ucrInputPackage.SetItems(dctPackages) ucrPnlRPackages.AddParameterValuesCondition(rdoCRAN, "checked", "cran") @@ -246,9 +247,19 @@ Public Class dlgInstallRPackage Private Sub ucrInputRepositoryName_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputRepositoryName.ControlValueChanged TestOkEnabled() GithubOption() + UseclimdexPackage() bUniqueChecked = False End Sub + Private Sub UseclimdexPackage() + If ucrInputPackage.GetText = "climdex.pcic" Then + ucrInputRepositoryName.SetText("pacificclimate") + Else + ucrInputRepositoryName.SetText("IDEMSInternational") + End If + + End Sub + Private Sub GithubOption() If Not (ucrInputPackage.IsEmpty AndAlso ucrInputRepositoryName.IsEmpty) Then clsRepositoryFunction.AddParameter("paste", Chr(34) & ucrInputRepositoryName.GetText & "/" & ucrInputPackage.GetText() & Chr(34), bIncludeArgumentName:=False) @@ -262,4 +273,8 @@ Public Class dlgInstallRPackage SetRCodeForControls(True) TestOkEnabled() End Sub + + Private Sub ucrInputPackage_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputPackage.ControlValueChanged + UseclimdexPackage() + End Sub End Class From 6cbd9b886371e06758be747ae7f5d0e9e6cbec3a Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 22 Jan 2025 09:13:14 +0100 Subject: [PATCH 2/2] Change made --- instat/dlgRPackages.vb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 07b0595053..31635f28e9 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -247,19 +247,9 @@ Public Class dlgInstallRPackage Private Sub ucrInputRepositoryName_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputRepositoryName.ControlValueChanged TestOkEnabled() GithubOption() - UseclimdexPackage() bUniqueChecked = False End Sub - Private Sub UseclimdexPackage() - If ucrInputPackage.GetText = "climdex.pcic" Then - ucrInputRepositoryName.SetText("pacificclimate") - Else - ucrInputRepositoryName.SetText("IDEMSInternational") - End If - - End Sub - Private Sub GithubOption() If Not (ucrInputPackage.IsEmpty AndAlso ucrInputRepositoryName.IsEmpty) Then clsRepositoryFunction.AddParameter("paste", Chr(34) & ucrInputRepositoryName.GetText & "/" & ucrInputPackage.GetText() & Chr(34), bIncludeArgumentName:=False) @@ -273,8 +263,4 @@ Public Class dlgInstallRPackage SetRCodeForControls(True) TestOkEnabled() End Sub - - Private Sub ucrInputPackage_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputPackage.ControlValueChanged - UseclimdexPackage() - End Sub End Class