From 5b7e140ae62b0c68f9bf718712a068a80e1e16ba Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 12 Feb 2025 11:22:20 +0100 Subject: [PATCH] Change made --- instat/dlgClimaticLengthOfSeason.vb | 61 +++++++++++++++++++---------- instat/sdgDoyRange.vb | 20 ++++++++++ 2 files changed, 61 insertions(+), 20 deletions(-) diff --git a/instat/dlgClimaticLengthOfSeason.vb b/instat/dlgClimaticLengthOfSeason.vb index 215636be31..e790eed097 100644 --- a/instat/dlgClimaticLengthOfSeason.vb +++ b/instat/dlgClimaticLengthOfSeason.vb @@ -35,7 +35,7 @@ Public Class dlgClimaticLengthOfSeason bReset = False TestOKEnabled() autoTranslate(Me) - Desablecontrols() + 'Desablecontrols() End Sub Private Sub InitialiseDialog() @@ -85,7 +85,7 @@ Public Class dlgClimaticLengthOfSeason ucrChkLengthmore.AddToLinkedControls(ucrInputFilterPreview, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=366) EnableLengthmore() - Desablecontrols() + ' Desablecontrols() ucrInputFilterPreview.IsReadOnly = True End Sub @@ -268,7 +268,7 @@ Public Class dlgClimaticLengthOfSeason 'Base Function ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseRFunction(clsApplyInstatCalcFunction) - Desablecontrols() + ' Desablecontrols() End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -392,10 +392,14 @@ Public Class dlgClimaticLengthOfSeason End Sub Private Sub cmdDoyRange_Click(sender As Object, e As EventArgs) Handles cmdDoyRange.Click - sdgDoyRange.Setup(clsNewDoyFilterCalc:=clsDayFromAndToFunction, clsNewIfElseFirstDoyFilledFunction:=clsIfElseFirstDoyFilledFunction, clsNewDayFromOperator:=clsDayFromOperator, clsNewDayToOperator:=clsDayToOperator, clsNewCalcFromList:=clsDayFilterCalcFromListFunction, strNewMainDataFrame:=ucrSelectorLengthofSeason.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strNewDoyColumn:="") - sdgDoyRange.ShowDialog() + Dim newSdgDoyRange As New sdgDoyRange() + newSdgDoyRange.isFromDlgClimaticLengthOfSeason = True + newSdgDoyRange.Setup(clsNewDoyFilterCalc:=clsDayFromAndToFunction, clsNewIfElseFirstDoyFilledFunction:=clsIfElseFirstDoyFilledFunction, clsNewDayFromOperator:=clsDayFromOperator, clsNewDayToOperator:=clsDayToOperator, clsNewCalcFromList:=clsDayFilterCalcFromListFunction, strNewMainDataFrame:=ucrSelectorLengthofSeason.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strNewDoyColumn:="") + newSdgDoyRange.ShowDialog() + newSdgDoyRange.Desablecontrols() + '' EnableControls() ucrInputFilterPreview.SetName(clsDayToOperator.ToScript()) - Desablecontrols() + ' Desablecontrols(newSdgDoyRange) End Sub Private Sub ucrInputFilterPreview_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFilterPreview.ControlValueChanged @@ -406,19 +410,36 @@ Public Class dlgClimaticLengthOfSeason End If End Sub - Private Sub Desablecontrols() - sdgDoyRange.rdoFromFixed.Enabled = False - sdgDoyRange.rdoFromVariable.Enabled = False - sdgDoyRange.ucrDoyFrom.Enabled = False - sdgDoyRange.ucrReceiverFrom.Enabled = False - sdgDoyRange.rdoToVariable.Enabled = False - sdgDoyRange.rdoLength.Enabled = False - sdgDoyRange.ucrReceiverTo.Enabled = False - sdgDoyRange.ucrNudToDiff.Enabled = False - sdgDoyRange.ucrSelectorDoy.Enabled = False - sdgDoyRange.Size = New Size(603, 218) - sdgDoyRange.grpFrom.Location = New Size(10, 12) - sdgDoyRange.grpTo.Location = New Size(269, 12) - sdgDoyRange.ucrBaseSub.Location = New Size(185, 140) + 'Private Sub Desablecontrols() + ' sdgDoyRange.rdoFromFixed.Enabled = False + ' sdgDoyRange.rdoFromVariable.Enabled = False + ' sdgDoyRange.ucrDoyFrom.Enabled = False + ' sdgDoyRange.ucrReceiverFrom.Enabled = False + ' sdgDoyRange.rdoToVariable.Enabled = False + ' sdgDoyRange.rdoLength.Enabled = False + ' sdgDoyRange.ucrReceiverTo.Enabled = False + ' sdgDoyRange.ucrNudToDiff.Enabled = False + ' sdgDoyRange.ucrSelectorDoy.Enabled = False + ' sdgDoyRange.Size = New Size(603, 218) + ' sdgDoyRange.grpFrom.Location = New Size(10, 12) + ' sdgDoyRange.grpTo.Location = New Size(269, 12) + ' sdgDoyRange.ucrBaseSub.Location = New Size(185, 140) + 'End Sub + + + Private Sub EnableControls() + sdgDoyRange.rdoFromFixed.Enabled = True + sdgDoyRange.rdoFromVariable.Enabled = True + sdgDoyRange.ucrDoyFrom.Enabled = True + sdgDoyRange.ucrReceiverFrom.Enabled = True + sdgDoyRange.rdoToVariable.Enabled = True + sdgDoyRange.rdoLength.Enabled = True + sdgDoyRange.ucrReceiverTo.Enabled = True + sdgDoyRange.ucrNudToDiff.Enabled = True + sdgDoyRange.ucrSelectorDoy.Enabled = True + sdgDoyRange.Size = New Size(603, 396) + sdgDoyRange.grpFrom.Location = New Size(10, 206) + sdgDoyRange.grpTo.Location = New Size(269, 206) + sdgDoyRange.ucrBaseSub.Location = New Size(185, 324) End Sub End Class \ No newline at end of file diff --git a/instat/sdgDoyRange.vb b/instat/sdgDoyRange.vb index cab5c87e4e..1a60bc9e09 100644 --- a/instat/sdgDoyRange.vb +++ b/instat/sdgDoyRange.vb @@ -18,6 +18,7 @@ Imports instat.Translations Imports RDotNet Public Class sdgDoyRange + Public isFromDlgClimaticLengthOfSeason As Boolean = False Private clsDoyFilterCalc As RFunction Private clsCalcFromList As RFunction Private clsCalcFromMainDataFrame As RFunction @@ -31,6 +32,7 @@ Public Class sdgDoyRange Private Sub sdgDoyRange_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) + Desablecontrols() End Sub Public Sub Setup(clsNewDoyFilterCalc As RFunction, clsNewDayFromOperator As ROperator, clsNewDayToOperator As ROperator, clsNewCalcFromList As RFunction, strNewMainDataFrame As String, strNewDoyColumn As String, Optional clsNewIfElseFirstDoyFilledFunction As RFunction = Nothing) @@ -264,4 +266,22 @@ Public Class sdgDoyRange UpdateFromValues() UpdateToValues() End Sub + + Public Sub Desablecontrols() + If Me.isFromDlgClimaticLengthOfSeason Then + Me.rdoFromFixed.Enabled = False + Me.rdoFromVariable.Enabled = False + Me.ucrDoyFrom.Enabled = False + Me.ucrReceiverFrom.Enabled = False + Me.rdoToVariable.Enabled = False + Me.rdoLength.Enabled = False + Me.ucrReceiverTo.Enabled = False + Me.ucrNudToDiff.Enabled = False + Me.ucrSelectorDoy.Enabled = False + Me.Size = New Size(603, 218) + Me.grpFrom.Location = New Size(10, 12) + Me.grpTo.Location = New Size(269, 12) + Me.ucrBaseSub.Location = New Size(185, 140) + End If + End Sub End Class